Fix CI build errors

Author: dgarske

.github/workflows/test-build-riscv.yml

@@ -87,16 +87,20 @@ jobs:
       - name: Download and install RISC-V toolchain (riscv32)
         if: ${{ inputs.arch == 'riscv' }}
         run: |
-          wget -q https://github.com/riscv-collab/riscv-gnu-toolchain/releases/latest/download/riscv32-elf-ubuntu-24.04-gcc.tar.xz
-          tar -xf riscv32-elf-ubuntu-24.04-gcc.tar.xz
+          wget -q https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2025.01.17/riscv32-elf-ubuntu-24.04-gcc-nightly-2025.01.17-nightly.tar.xz
+          echo "cc7855191591487a344e142271b6de5c33e07c173a6529dd695aa9dd26a20fff  riscv32-elf-ubuntu-24.04-gcc-nightly-2025.01.17-nightly.tar.xz" | sha256sum -c -
+          tar -xf riscv32-elf-ubuntu-24.04-gcc-nightly-2025.01.17-nightly.tar.xz
           echo "$GITHUB_WORKSPACE/riscv/bin" >> $GITHUB_PATH
           $GITHUB_WORKSPACE/riscv/bin/riscv32-unknown-elf-gcc --version
 
-      - name: Install RISC-V toolchain (riscv64)
+      - name: Download and install RISC-V toolchain (riscv64)
         if: ${{ inputs.arch == 'riscv64' }}
         run: |
-          sudo apt-get install -y gcc-riscv64-unknown-elf binutils-riscv64-unknown-elf
-          riscv64-unknown-elf-gcc --version
+          wget -q https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2025.01.17/riscv64-elf-ubuntu-24.04-gcc-nightly-2025.01.17-nightly.tar.xz
+          echo "a4fa9babf81452e4f7171432276dcbd95faa2cdbefcffe00b920f486ec79e0ea  riscv64-elf-ubuntu-24.04-gcc-nightly-2025.01.17-nightly.tar.xz" | sha256sum -c -
+          tar -xf riscv64-elf-ubuntu-24.04-gcc-nightly-2025.01.17-nightly.tar.xz
+          echo "$GITHUB_WORKSPACE/riscv/bin" >> $GITHUB_PATH
+          $GITHUB_WORKSPACE/riscv/bin/riscv64-unknown-elf-gcc --version
 
       # ============================================================
       # Build wolfboot

arch.mk

@@ -582,6 +582,16 @@ ifeq ($(ARCH),RISCV)
   CFLAGS+=-march=rv32imac$(RISCV32_ZICSR)$(RISCV32_ZIFENCEI) -mabi=ilp32 -mcmodel=medany
   # Linking: base march (no extension suffixes) for multilib lookup
   LDFLAGS+=-march=rv32imac -mabi=ilp32 -mcmodel=medany
+  # Some prebuilt toolchains lack rv32imac/ilp32 multilib (only ship the
+  # default rv32gc/ilp32d).  Detect and fall back to -nostdlib with the
+  # default-multilib libgcc.
+  RISCV_LINK_TEST := $(shell echo "void _start(void){}" | \
+    $(CROSS_COMPILE)gcc -march=rv32imac -mabi=ilp32 -nostartfiles \
+    -x c - -o /dev/null 2>/dev/null && echo ok)
+  ifneq ($(RISCV_LINK_TEST),ok)
+    LDFLAGS+=-nostdlib -Wl,--no-warn-mismatch
+    LIBS+=$(shell $(CROSS_COMPILE)gcc -print-libgcc-file-name)
+  endif
   MATH_OBJS += $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sp_c32.o
 
   # Prune unused functions and data
@@ -639,6 +649,14 @@ ifeq ($(ARCH),RISCV64)
     # E51 core: rv64imac (no FPU, no crypto extensions)
     CFLAGS+=-march=rv64imac$(RISCV64_ZICSR)$(RISCV64_ZIFENCEI) -mabi=lp64 -mcmodel=medany
     LDFLAGS+=-march=rv64imac -mabi=lp64 -mcmodel=medany
+    # Multilib fallback (see RISCV 32-bit section comment)
+    RISCV_LINK_TEST := $(shell echo "void _start(void){}" | \
+      $(CROSS_COMPILE)gcc -march=rv64imac -mabi=lp64 -nostartfiles \
+      -x c - -o /dev/null 2>/dev/null && echo ok)
+    ifneq ($(RISCV_LINK_TEST),ok)
+      LDFLAGS+=-nostdlib -Wl,--no-warn-mismatch
+      LIBS+=$(shell $(CROSS_COMPILE)gcc -print-libgcc-file-name)
+    endif
   else
     # U54 cores: rv64gc (with FPU)
     CFLAGS+=-march=rv64imafd$(RISCV64_ZICSR)$(RISCV64_ZIFENCEI) -mabi=lp64d -mcmodel=medany

hal/mpfs250.c

@@ -222,7 +222,7 @@ int mpfs_read_serial_number(uint8_t *serial)
     SCBCTRL_REG(SERVICES_CR_OFFSET) = cmd;
 
     /* Wait for request bit to clear (command accepted) */
-    timeout = 10000;
+    timeout = MPFS_SCB_TIMEOUT;
     while ((SCBCTRL_REG(SERVICES_CR_OFFSET) & SERVICES_CR_REQ_MASK) && timeout > 0) {
         timeout--;
     }
@@ -232,7 +232,7 @@ int mpfs_read_serial_number(uint8_t *serial)
     }
 
     /* Wait for busy bit to clear (command completed) */
-    timeout = 10000;
+    timeout = MPFS_SCB_TIMEOUT;
     while (mpfs_scb_mailbox_busy() && timeout > 0) {
         timeout--;
     }
@@ -1268,6 +1268,8 @@ static void uart_config_baud(unsigned long base, uint32_t baudrate)
     uint32_t div_int  = div_x64 / 64u;
     uint32_t div_frac = div_x64 - (div_int * 64u);
     div_frac += (div_x128 - (div_int * 128u)) - (div_frac * 2u);
+    if (div_frac > 63u)
+        div_frac = 63u;
     if (div_int > (uint32_t)UINT16_MAX)
         return;
     MMUART_LCR(base) |= DLAB_MASK;

hal/mpfs250.h

@@ -295,8 +295,8 @@ typedef struct {
     volatile uint32_t shared_mem_marker; /* 0x08: Init marker */
     volatile uint32_t shared_mem_status; /* 0x0C: Status */
     volatile uint64_t* shared_mem;       /* 0x10: Shared memory pointer */
-    volatile uint64_t reserved[2];       /* 0x18: Reserved/padding */
-} HLS_DATA;  /* 64 bytes */
+    volatile uint64_t reserved[5];       /* 0x18: Reserved/padding to 64 bytes */
+} HLS_DATA;  /* 64 bytes total */
 #endif /* __ASSEMBLER__ */
 
 #define HLS_MAIN_HART_STARTED       0x12344321UL

hal/nxp_t2080.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 #include <stdint.h>
+#include <stddef.h>
 #include "target.h"
 #include "printf.h"
 #include "image.h" /* for RAMFUNCTION */

include/printf.h

@@ -48,7 +48,9 @@
 
 /* support for wolfBoot_printf logging */
 #if defined(PRINTF_ENABLED) && !defined(WOLFBOOT_NO_PRINTF)
-#   include <stdio.h>
+#   if !defined(DEBUG_UART) && !defined(DEBUG_ZYNQ) && !defined(WOLFBOOT_DEBUG_EFI)
+#       include <stdio.h>
+#   endif
 #   if defined(DEBUG_ZYNQ) && !defined(USE_QNX) && !defined(DEBUG_UART)
 #       include "xil_printf.h"
 #       define wolfBoot_printf(_f_, ...) xil_printf(_f_, ##__VA_ARGS__)

src/boot_riscv.c

@@ -273,7 +273,7 @@ void do_boot(const uint32_t *app_offset)
     unsigned long dts_addr;
     hal_dts_fixup((uint32_t*)dts_offset);
     dts_addr = (unsigned long)dts_offset;
-#else
+#elif defined(WOLFBOOT_RISCV_MMODE) || __riscv_xlen == 64
     unsigned long dts_addr = 0;
 #endif
 

src/boot_riscv_start.S

@@ -121,12 +121,11 @@ _copy_params:
     li    t0, MIE_MSIE                 /* wake only on IPI */
     csrw  mie, t0
 
-    /* Set up per-hart stack: base + (hartid+1)*STACK_SIZE_PER_HART */
+    /* Set up per-hart stack: base + hartid*STACK_SIZE_PER_HART */
     csrr  a0, mhartid
     la    t0, _secondary_hart_stack_base
     li    t1, STACK_SIZE_PER_HART
-    addi  a1, a0, 1
-    mul   t2, a1, t1
+    mul   t2, a0, t1
     add   sp, t0, t2
     li    t0, -16
     and   sp, sp, t0

src/string.c

@@ -30,7 +30,7 @@
 #if defined(_RENESAS_RA_)
 #include <stdint.h>
 #endif
-#ifndef TARGET_library
+#if !defined(TARGET_library) && defined(__STDC_HOSTED__) && __STDC_HOSTED__
 #include <string.h>
 #else
 size_t strlen(const char *s); /* forward declaration */
@@ -289,7 +289,7 @@ void RAMFUNCTION *memcpy(void *dst, const void *src, size_t n)
 }
 #endif /* IAR */
 
-#ifndef __IAR_SYSTEMS_ICC__
+#if !defined(__IAR_SYSTEMS_ICC__) && !defined(TARGET_X86_64_EFI)
 void *memmove(void *dst, const void *src, size_t n)
 {
     int i;
@@ -306,7 +306,7 @@ void *memmove(void *dst, const void *src, size_t n)
         return memcpy(dst, src, n);
     }
 }
-#endif
+#endif /* !IAR && !X86_64_EFI */
 #endif /* __CCRX__ Renesas CCRX */
 #endif /* WOLFBOOT_USE_STDLIBC */
 

src/x86/exceptions.c

@@ -202,7 +202,7 @@ int setup_interrupts()
 
 void deinit_interrupts()
 {
-    idt_descriptor.base = (uintptr_t)NULL;
+    idt_descriptor.base = (uintptr_t)0;
     idt_descriptor.limit = 0xffff;
     asm ("cli\r\n");
     asm ("lidt %0\r\n" : : "m"(idt_descriptor));