Fix CI build errors

Author: dgarske

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

@@ -87,7 +87,7 @@ 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
+          wget -q https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2025.01.17/riscv32-elf-ubuntu-24.04-gcc.tar.xz
           tar -xf riscv32-elf-ubuntu-24.04-gcc.tar.xz
           echo "$GITHUB_WORKSPACE/riscv/bin" >> $GITHUB_PATH
           $GITHUB_WORKSPACE/riscv/bin/riscv32-unknown-elf-gcc --version

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--;
     }

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

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 */