Enable MPFS250 build test

Author: trini

.github/workflows/test-build.yml

@@ -75,7 +75,7 @@ jobs:
 
       - name: Install cross compilers
         run: |
-          sudo apt-get install -y gcc-arm-none-eabi gcc-aarch64-linux-gnu gcc-powerpc-linux-gnu gnu-efi
+          sudo apt-get install -y gcc-arm-none-eabi gcc-aarch64-linux-gnu gcc-powerpc-linux-gnu gnu-efi gcc-riscv64-unknown-elf
 
       - name: make clean
         run: |

.github/workflows/test-configs.yml

@@ -207,12 +207,12 @@ jobs:
       arch: arm
       config-file: ./config/examples/mcxw-tz.config
 
-  # TODO: polarfire_mpfs250.config requires PolarFire SoC SDK
-  #polarfire_mpfs250_test:
-  #  uses: ./.github/workflows/test-build-mcux-sdk.yml
-  #  with:
-  #    arch: riscv64
-  #    config-file: ./config/examples/polarfire_mpfs250.config
+  microchip_mpfs250_test:
+    uses: ./.github/workflows/test-build.yml
+    with:
+      arch: riscv64
+      config-file: ./config/examples/polarfire_mpfs250.config
+
   raspi3_test:
     uses: ./.github/workflows/test-build.yml
     with:

arch.mk

@@ -561,9 +561,8 @@ endif
 ifeq ($(ARCH),RISCV64)
   CROSS_COMPILE?=riscv64-unknown-elf-
   CFLAGS+=-DMMU -DWOLFBOOT_DUALBOOT
-  #UPDATE_OBJS:=src/update_ram.o
-  UPDATE_OBJS:=src/update_disk.o
   CFLAGS+=-DWOLFBOOT_UPDATE_DISK
+  UPDATE_OBJS:=src/update_disk.o
   OBJS += src/gpt.o
   ARCH_FLAGS=-march=rv64imafdc -mabi=lp64d -mcmodel=medany
   CFLAGS+=-fno-builtin-printf -DUSE_M_TIME -g -nostartfiles -DARCH_RISCV64
@@ -575,8 +574,8 @@ ifeq ($(ARCH),RISCV64)
   LDFLAGS+=-Wl,--gc-sections
 
   OBJS+=src/boot_riscv64_start.o src/boot_riscv64.o src/vector_riscv64.o
-  ARCH_FLASH_OFFSET=0x20220000
 
+  CFLAGS+=-DWOLFBOOT_FDT
   OBJS+=src/fdt.o
 
   ifeq ($(SPMATH),1)
@@ -849,7 +848,7 @@ ifeq ($(TARGET),nxp_t1024)
   ARCH_FLAGS=-mhard-float -mcpu=e5500
   CFLAGS+=$(ARCH_FLAGS)
   BIG_ENDIAN=1
-  CFLAGS+=-DMMU -DWOLFBOOT_DUALBOOT
+  CFLAGS+=-DMMU -DWOLFBOOT_FDT -DWOLFBOOT_DUALBOOT
   CFLAGS+=-pipe # use pipes instead of temp files
   CFLAGS+=-feliminate-unused-debug-types
   LDFLAGS+=$(ARCH_FLAGS)
@@ -870,7 +869,7 @@ ifeq ($(TARGET),nxp_t2080)
   ARCH_FLAGS=-mhard-float -mcpu=e6500
   CFLAGS+=$(ARCH_FLAGS)
   BIG_ENDIAN=1
-  CFLAGS+=-DMMU -DWOLFBOOT_DUALBOOT
+  CFLAGS+=-DMMU -DWOLFBOOT_FDT -DWOLFBOOT_DUALBOOT
   CFLAGS+=-pipe # use pipes instead of temp files
   CFLAGS+=-feliminate-unused-debug-types
   LDFLAGS+=$(ARCH_FLAGS)
@@ -1033,9 +1032,6 @@ ifeq ($(filter $(TARGET),x86_fsp_qemu kontron_vx3060_s2),$(TARGET))
     FSP_TGL=1
     CFLAGS+=-DWOLFBOOT_TGL=1
   endif
-
-  # load to address in RAM after wolfBoot (aligned to 16 bytes)
-  CFLAGS+=-DWOLFBOOT_NO_LOAD_ADDRESS
 endif
 
 ifeq ($(TARGET),x86_fsp_qemu)
@@ -1049,6 +1045,8 @@ ifeq ("${FSP}", "1")
   LD_START_GROUP =
   LD_END_GROUP =
   LD := ld
+  # load to address in RAM after wolfBoot (aligned to 16 bytes)
+  CFLAGS+=-DWOLFBOOT_NO_LOAD_ADDRESS
   ifeq ($(filter-out $(STAGE1),1),)
     # building stage1
     ifeq ($(FSP_TGL), 1)
@@ -1377,7 +1375,7 @@ BOOT_IMG?=test-app/image.bin
 
 ## Update mechanism
 ifeq ($(ARCH),AARCH64)
-  CFLAGS+=-DMMU -DWOLFBOOT_DUALBOOT
+  CFLAGS+=-DMMU -DWOLFBOOT_FDT -DWOLFBOOT_DUALBOOT
   OBJS+=src/fdt.o
   UPDATE_OBJS:=src/update_ram.o
 else

config/examples/raspi3-encrypted.config

@@ -16,7 +16,6 @@ WOLFBOOT_PARTITION_SWAP_ADDRESS=0xFFFFFFFF
 WOLFBOOT_PARTITION_SIZE=0x1000000
 WOLFBOOT_SECTOR_SIZE=0x400
 EXT_FLASH=0
-MMU=1
 ENCRYPT=1
 NO_XIP=1
 ENCRYPT_WITH_AES256=1

hal/x86_fsp_qemu_loader.c

@@ -27,9 +27,6 @@
 #ifdef __WOLFBOOT
 #include <printf.h>
 
-
-static void panic(void);
-
 void hal_init(void)
 {
 }
@@ -88,7 +85,3 @@ void *hal_get_dts_update_address(void)
     return 0;
 }
 
-static void panic(void)
-{
-    while(1) {}
-}

src/elf.c

@@ -50,7 +50,7 @@ static int check_scatter_format(const unsigned char* ehdr, int is_elf32);
 
 
 
-#if defined(MMU) || defined (WOLFBOOT_FSP) || defined (ARCH_PPC)
+#if defined(MMU) || defined(WOLFBOOT_FSP) || defined(WOLFBOOT_ELF)
 /* Loader for elf32 or elf64 format program headers
  * Returns the entry point function
  */

src/fdt.c

@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#if defined(MMU) && !defined(BUILD_LOADER_STAGE1)
+#if (defined(MMU) || defined(WOLFBOOT_FDT)) && !defined(BUILD_LOADER_STAGE1)
 
 #include "fdt.h"
 #include "hal.h"
@@ -851,4 +851,4 @@ void* fit_load_image(void* fdt, const char* image, int* lenp)
 
 }
 
-#endif /* MMU && !BUILD_LOADER_STAGE1 */
+#endif /* (MMU || WOLFBOOT_FDT) && !BUILD_LOADER_STAGE1 */

src/string.c

@@ -27,7 +27,7 @@
 #endif
 
 #include <stddef.h>
-#ifndef TARGET_library
+#if !defined(TARGET_library) && !defined(ARCH_RISCV64)
 #include <string.h>
 #else
 size_t strlen(const char *s); /* forward declaration */

src/update_disk.c

@@ -43,6 +43,9 @@
 #include "printf.h"
 #include "wolfboot/wolfboot.h"
 #include "disk.h"
+#ifdef WOLFBOOT_ELF
+#include "elf.h"
+#endif
 
 #include <stdint.h>
 #include <string.h>
@@ -53,10 +56,7 @@
 #include "x86/ahci.h"
 #include "x86/ata.h"
 #include "pci.h"
-
-#ifdef WOLFBOOT_TGL
 #include "x86/tgl_fsp.h"
-#endif
 
 #ifdef TARGET_kontron_vx3060_s2
     #define BOOT_PART_A 5
@@ -117,7 +117,6 @@ void RAMFUNCTION wolfBoot_start(void)
 #ifdef WOLFBOOT_FSP
     struct stage2_parameter *stage2_params;
     uint32_t sata_bar;
-
     ret = x86_fsp_tgl_init_sata(&sata_bar);
     if (ret != 0)
         wolfBoot_panic();
@@ -191,7 +190,7 @@ void RAMFUNCTION wolfBoot_start(void)
         }
 
         memset(&os_image, 0, sizeof(os_image));
-        ret = wolfBoot_open_image_address(&os_image, (void*)load_address);
+        ret = wolfBoot_open_image_address(&os_image, (void*)p_hdr);
         if (ret < 0) {
             wolfBoot_printf("Error parsing loaded image\r\n");
             selected ^= 1;
@@ -208,7 +207,7 @@ void RAMFUNCTION wolfBoot_start(void)
         }
         /* Log memory load */
         x86_log_memory_load((uint32_t)(uintptr_t)load_address,
-                            (uint32_t)(uintptr_t)load_address + os_image.fw_size,
+                            (uint32_t)(uintptr_t)load_address + os_image.fw_size + IMAGE_HEADER_SIZE,
                             part_name);
 #endif
 
@@ -217,7 +216,7 @@ void RAMFUNCTION wolfBoot_start(void)
         load_off = 0;
         do {
             ret = disk_read(BOOT_DISK, cur_part, load_off, DISK_BLOCK_SIZE,
-                    (uint8_t *)load_address + load_off);
+                    (uint8_t*)load_address + load_off);
             if (ret < 0)
                 break;
             load_off += ret;
@@ -265,14 +264,7 @@ void RAMFUNCTION wolfBoot_start(void)
 
     load_address = (uint32_t*)os_image.fw_base;
 
-#ifdef WOLFBOOT_ELF
-    /* Load elf */
-    if (elf_load_image_mmu((uint8_t*)load_address, (uintptr_t*)&load_address, NULL) != 0){
-        wolfBoot_printf("Invalid elf, falling back to raw binary\n");
-    }
-#endif
-
-#ifdef MMU
+#ifdef WOLFBOOT_FDT
     /* Is this a Flattened uImage Tree (FIT) image (FDT format) */
     if (wolfBoot_get_dts_size(load_address) > 0) {
         void* fit = (void*)load_address;
@@ -296,42 +288,14 @@ void RAMFUNCTION wolfBoot_start(void)
             }
         }
     }
-    else {
-    /* Load DTS to RAM */
-    #ifdef EXT_FLASH
-        if (PART_IS_EXT(&os_image) &&
-            wolfBoot_open_image(&os_image, PART_DTS_BOOT) >= 0) {
-            dts_addr = (uint8_t*)WOLFBOOT_LOAD_DTS_ADDRESS;
-            dts_size = (uint32_t)os_image.fw_size;
-
-            wolfBoot_printf("Loading DTS (size %lu) to RAM at %08lx\n",
-                (long unsigned int)dts_size, (long unsigned int)dts_addr);
-            ext_flash_check_read((uintptr_t)os_image.fw_base,
-                    (uint8_t*)dts_addr, dts_size);
-        }
-        else
-    #endif /* EXT_FLASH */
-        {
-            dts_addr = hal_get_dts_address();
-            if (dts_addr) {
-                ret = wolfBoot_get_dts_size(dts_addr);
-                if (ret < 0) {
-                    wolfBoot_printf("Failed parsing DTB to load\n");
-                    /* Allow failure, continue booting */
-                }
-                else {
-                    /* relocate DTS to RAM */
-                    uint8_t* dts_dst = (uint8_t*)WOLFBOOT_LOAD_DTS_ADDRESS;
-                    dts_size = (uint32_t)ret;
-                    wolfBoot_printf("Loading DTB (size %d) from %p to RAM at %p\n",
-                        dts_size, dts_addr, (void*)WOLFBOOT_LOAD_DTS_ADDRESS);
-                    memcpy(dts_dst, dts_addr, dts_size);
-                    dts_addr = dts_dst;
-                }
-            }
-        }
+#endif
+
+#ifdef WOLFBOOT_ELF
+    /* Load elf */
+    if (elf_load_image_mmu((uint8_t*)load_address, (uintptr_t*)&load_address, NULL) != 0){
+        wolfBoot_printf("Invalid elf, falling back to raw binary\n");
     }
-#endif /* MMU */
+#endif
 
     wolfBoot_printf("Booting at %08lx\r\n", load_address);
 

tools/elf-parser/Makefile

@@ -4,7 +4,7 @@
 
 CC=gcc
 CFLAGS=-Wall -g -ggdb
-CFLAGS+=-I../../include -DWOLFBOOT_ELF -DELF_PARSER -DPRINTF_ENABLED -DMMU -DARCH_FLASH_OFFSET=0
+CFLAGS+=-I../../include -DWOLFBOOT_ELF -DELF_PARSER -DPRINTF_ENABLED -DARCH_FLASH_OFFSET=0
 EXE=elf-parser
 
 LIBS=