Further NXP P1021 fixes and improvements:

* Added ELF32 and ELF64 loader support (config `ELF=1` or build option `WOLFBOOT_ELF`).
* Add ELF support to `update_ram.c` loader.
* Add support for loading entire flash image to RAM when `EXT_FLASH=1` and `NO_XIP=1` (or `WOLFBOOT_USE_RAMBOOT`).
* Added QUICC Engine support to load microcode and enable.
* Add multiple core support for NXP P1021.
* Fixes to resolve first stage boot ROM relocation.
  - Implemented temporary workaround to resolve stack traps.
* Added PPC GOT relocation support.
* Fix for the PPC `isr_empty` handler address.
* Fix to allow stack to use DDR by having assembly setup DDR TLB. After relocating wolfBoot use stack on DDR.
* Cleanup wolfBoot output.
  - Only remove extra .bin/.elf created unless `make distclean` is used.
  - Don't output the key grep test (only check result).
  - Adjust build order (first stage, wolfboot, test app, key, sign test app and factory).
  - Fix to make sure linker script is rebuilt before objects.

Sample NXP P1021 Output:

```
Relocating BOOT ROM to DDR
Loading wolfBoot to DDR
Jumping to full wolfBoot
wolfBoot HAL Init
Flash Init: Ret 0, ID 0x76207620
QE: Length 63732, Count 1
QE: uploading 'Microcode for P1021 r1.0' version 0.0.1
QE: Traps 0
MP: Starting core 2 (spin table 0xFFFFF240)
Versions: Boot 1, Update 0
Trying Boot partition at 0x200000
Loading header 512 bytes to 0x1DFFFE00
Loading image 3170724 bytes to 0x1E000000
Image size 3170724
Firmware Valid
Loading elf at 0x1E000000
Found valid elf32 (big endian)
Booting at 0x6000
```

Author: dgarske

.gitignore

@@ -98,6 +98,7 @@ tools/test-update-server/server
 tools/uart-flash-server/ufserver
 tools/unit-tests/unit-parser
 tools/bin-assemble/bin-assemble
+tools/elf-parser/elf-parser
 config/*.ld
 
 # Generated confiuguration file

Makefile

@@ -163,7 +163,7 @@ $(PRIVATE_KEY):
 	$(Q)(test $(SIGN) = NONE) && (echo "// SIGN=NONE" >  src/keystore.c) || true
 
 keytools:
-	@$(MAKE) -C tools/keytools clean
+	@$(MAKE) -C tools/keytools -s clean
 	@$(MAKE) -C tools/keytools
 
 test-app/image_v1_signed.bin: $(BOOT_IMG)
@@ -175,28 +175,28 @@ test-app/image.elf: wolfboot.elf
 	$(Q)$(MAKE) -C test-app WOLFBOOT_ROOT="$(WOLFBOOT_ROOT)" image.elf
 	$(Q)$(SIZE) test-app/image.elf
 
-internal_flash.dd: test-app/image_v1_signed.bin wolfboot.elf $(BINASSEMBLE)
+internal_flash.dd: $(BINASSEMBLE) wolfboot.elf test-app/image_v1_signed.bin
 	@echo "\t[MERGE] internal_flash.dd"
 	$(Q)dd if=/dev/zero bs=1 count=$$(($(WOLFBOOT_SECTOR_SIZE))) > /tmp/swap
 	$(Q)$(BINASSEMBLE) $@ 0 test-app/image_v1_signed.bin \
 		$(WOLFBOOT_PARTITION_SIZE) /tmp/swap \
 		$$(($(WOLFBOOT_PARTITION_SIZE)*2)) /tmp/swap
 
-factory.bin: $(BOOT_IMG) wolfboot.bin $(PRIVATE_KEY) test-app/image_v1_signed.bin $(BINASSEMBLE)
+factory.bin: $(BINASSEMBLE) wolfboot.bin $(BOOT_IMG) $(PRIVATE_KEY) test-app/image_v1_signed.bin
 	@echo "\t[MERGE] $@"
 	$(Q)$(BINASSEMBLE) $@ \
 		$(WOLFBOOT_ORIGIN) wolfboot.bin \
 		$(WOLFBOOT_PARTITION_BOOT_ADDRESS) test-app/image_v1_signed.bin
 
-factory_wstage1.bin: $(BOOT_IMG) wolfboot.bin $(PRIVATE_KEY) test-app/image_v1_signed.bin $(BINASSEMBLE) stage1/loader_stage1.bin
+factory_wstage1.bin: $(BINASSEMBLE) stage1/loader_stage1.bin wolfboot.bin $(BOOT_IMG) $(PRIVATE_KEY) test-app/image_v1_signed.bin
 	@echo "\t[MERGE] $@"
 	$(Q)$(BINASSEMBLE) $@ \
 		$(WOLFBOOT_STAGE1_FLASH_ADDR) stage1/loader_stage1.bin \
 		$(WOLFBOOT_ORIGIN) wolfboot.bin \
 		$(WOLFBOOT_PARTITION_BOOT_ADDRESS) test-app/image_v1_signed.bin
 
-wolfboot.elf: include/target.h $(OBJS) $(LSCRIPT) FORCE
-	$(Q)(test $(SIGN) = NONE) || (grep $(SIGN) src/keystore.c) || (echo "Key mismatch: please run 'make distclean' to remove all keys if you want to change algorithm" && false)
+wolfboot.elf: include/target.h $(LSCRIPT) $(OBJS) $(BINASSEMBLE) FORCE
+	$(Q)(test $(SIGN) = NONE) || (grep -q $(SIGN) src/keystore.c) || (echo "Key mismatch: please run 'make distclean' to remove all keys if you want to change algorithm" && false)
 	@echo "\t[LD] $@"
 	@echo $(OBJS)
 	$(Q)$(LD) $(LDFLAGS) $(LSCRIPT_FLAGS) $(LD_START_GROUP) $(OBJS) $(LD_END_GROUP) -o $@
@@ -236,28 +236,28 @@ keys: $(PRIVATE_KEY)
 
 clean:
 	$(Q)rm -f src/*.o hal/*.o hal/spi/*.o lib/wolfssl/wolfcrypt/src/*.o test-app/*.o
-	$(Q)rm -f *.bin *.elf wolfboot.map test-update.rom *.hex $(LSCRIPT)
-	$(Q)$(MAKE) -C test-app clean
-	$(Q)$(MAKE) -C tools/check_config clean
-	$(Q)$(MAKE) -C stage1 clean
+	$(Q)rm -f wolfboot.bin wolfboot.elf wolfboot.map test-update.rom *.hex $(LSCRIPT)
+	$(Q)rm -f $(MAIN_TARGET)
+	$(Q)$(MAKE) -C test-app -s clean
+	$(Q)$(MAKE) -C tools/check_config -s clean
+	$(Q)$(MAKE) -C stage1 -s clean
 
 utilsclean: clean
-	$(Q)$(MAKE) -C tools/keytools clean
-	$(Q)$(MAKE) -C tools/delta clean
-	$(Q)$(MAKE) -C tools/bin-assemble clean
-	$(Q)$(MAKE) -C tools/check_config clean
-	$(Q)$(MAKE) -C tools/test-expect-version clean
-	$(Q)$(MAKE) -C tools/test-update-server clean
-	$(Q)$(MAKE) -C tools/uart-flash-server clean
-	$(Q)$(MAKE) -C tools/unit-tests clean
+	$(Q)$(MAKE) -C tools/keytools -s clean
+	$(Q)$(MAKE) -C tools/delta -s clean
+	$(Q)$(MAKE) -C tools/bin-assemble -s clean
+	$(Q)$(MAKE) -C tools/elf-parser -s clean
+	$(Q)$(MAKE) -C tools/check_config -s clean
+	$(Q)$(MAKE) -C tools/test-expect-version -s clean
+	$(Q)$(MAKE) -C tools/test-update-server -s clean
+	$(Q)$(MAKE) -C tools/uart-flash-server -s clean
+	$(Q)$(MAKE) -C tools/unit-tests -s clean
 
 keysclean: clean
-	@rm -f *.pem *.der tags ./src/*_pub_key.c ./src/keystore.c include/target.h
-
-
+	$(Q)rm -f *.pem *.der tags ./src/*_pub_key.c ./src/keystore.c include/target.h
 
 distclean: clean keysclean utilsclean
-
+	$(Q)rm -f *.bin *.elf
 
 include/target.h: $(TARGET_H_TEMPLATE) FORCE
 	@cat $(TARGET_H_TEMPLATE) | \
@@ -280,6 +280,9 @@ tools/delta/bmdiff: FORCE
 delta-test: FORCE
 	$(Q)$(MAKE) -C tools/delta $@
 
+elf-parser:
+	@$(MAKE) -C tools/elf-parser -s clean
+	@$(MAKE) -C tools/elf-parser
 
 config: FORCE
 	$(MAKE) -C config

arch.mk

@@ -216,6 +216,7 @@ endif
 ifeq ($(ARCH),PPC)
   CROSS_COMPILE?=powerpc-linux-gnu-
   LDFLAGS+=-Wl,--build-id=none
+  CFLAGS+=-DARCH_PPC
 
   ifeq ($(DEBUG_UART),0)
     CFLAGS+=-fno-builtin-printf
@@ -324,6 +325,10 @@ ifeq ($(TARGET),nxp_p1021)
   LDFLAGS+=$(ARCH_FLAGS)
   LDFLAGS+=-Wl,--as-needed # remove weak functions not used
   UPDATE_OBJS:=src/update_ram.o
+  UPDATE_OBJS+=src/boot_ppc_mp.o
+
+  # Use PPC stdlib for memcpy, etc.
+  #CFLAGS+=-DWOLFBOOT_USE_STDLIBC
 
   ifeq ($(SPMATH),1)
     MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_c32.o

config/examples/nxp-p1021.config

@@ -20,7 +20,8 @@ SPMATH?=0
 SPMATHALL?=1
 RAM_CODE?=0
 DUALBANK_SWAP?=0
-WOLFTPM?=1
+WOLFTPM?=0
+ELF?=1
 
 # Flash Sector (Block) Size (16KB)
 WOLFBOOT_SECTOR_SIZE=0x4000
@@ -33,7 +34,7 @@ WOLFBOOT_STAGE1_SIZE=0x1000
 BOOTLOADER_PARTITION_SIZE=0x20000
 
 # Application Partition Size (16MB)
-WOLFBOOT_PARTITION_SIZE?=0x1000000
+WOLFBOOT_PARTITION_SIZE=0x1000000
 
 
 ## NAND Flash Offsets ##
@@ -42,22 +43,22 @@ WOLFBOOT_STAGE1_FLASH_ADDR=0x0
 # Location in Flash for wolfBoot
 WOLFBOOT_ORIGIN=0x8000
 # Location in Flash for Application Partition
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=  0x200000
+WOLFBOOT_PARTITION_BOOT_ADDRESS=  0x200000
 # Location in Flash for Update Partition
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x1200000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x1200000
 # Location in Flash for temporary sector used during updates
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=  0x2200000
+WOLFBOOT_PARTITION_SWAP_ADDRESS=  0x2200000
 
 ## Loader Destinations (DDR) ##
 
 # Address in RAM to load stage 1 loader (can't be 0x0)
-WOLFBOOT_STAGE1_BASE_ADDR=0x4000
+WOLFBOOT_STAGE1_BASE_ADDR=0x8000
 
-# Address in RAM to load wolfBoot
-WOLFBOOT_STAGE1_LOAD_ADDR=0x8000
+# Address in RAM to load wolfBoot (end of DDR at 512MB-1MB)
+WOLFBOOT_STAGE1_LOAD_ADDR=0x1FF00000
 
 # Address in RAM to load application partition (at 480MB)
-WOLFBOOT_LOAD_ADDRESS?=0x1E000000
+WOLFBOOT_LOAD_ADDRESS=0x1E000000
 
-# Read from flash in blocks of 512 (align with NAND page size)
-CFLAGS_EXTRA+=-DWOLFBOOT_SHA_BLOCK_SIZE=512
+# Read from flash (must be multiple of NAND page size 512 bytes)
+CFLAGS_EXTRA+=-DWOLFBOOT_SHA_BLOCK_SIZE=4096

docs/Targets.md

@@ -10,8 +10,8 @@ This README describes configuration of supported targets.
 * [NXP LPC54xxx](#nxp-lpc54xxx)
 * [NXP iMX-RT](#nxp-imx-rt)
 * [NXP Kinetis](#nxp-kinetis)
-* [NXP P1021 PPC](#nxp-p1021-ppc)
-* [NXP T2080 PPC](#nxp-t2080-ppc)
+* [NXP P1021 PPC](#nxp-qoriq-p1021-ppc)
+* [NXP T2080 PPC](#nxp-qoriq-t2080-ppc)
 * [Qemu x86-64 UEFI](#qemu-x86-64-uefi)
 * [SiFive HiFive1 RISC-V](#sifive-hifive1-risc-v)
 * [STM32F4](#stm32f4)
@@ -1113,28 +1113,55 @@ A loader must reside in the 4KB page to handle early startup including DDR and t
 
 A first stage loader is required to load the wolfBoot image into DDR for execution. This is because only 4KB of code space is available on boot. The stage 1 loader must also copy iteslf from the FCM buffer to DDR (or L2SRAM) to allow using of the eLBC to read NAND blocks.
 
-### Building wolfBoot for NXP P1021 PPC
-
-By default wolfBoot will use `powerpc-linux-gnu-` cross-compiler prefix. These tools can be installed with the Debian package `gcc-powerpc-linux-gnu` (`sudo apt install gcc-powerpc-linux-gnu`).
-
-The `make` creates a `factory_wstage1.bin` image that can be programmed at `0x00000000`
-
-```
-cp ./config/examples/nxp-p1021.config .config
-make keytools
-make clean && make
-```
-
 #### Flash Layout for NXP P1021 PPC (default)
 
 | File                         | NAND offset |
 | ---------------------------- | ----------- |
 | stage1/loader_stage1.bin     | 0x00000000  |
-| wolfboot.bin                 | 0x00004000  |
+| wolfboot.bin                 | 0x00008000  |
 | test-app/image_v1_signed.bin | 0x00200000  |
 | update                       | 0x01200000  |
+| fsl_qe_ucode_1021_10_A.bin   | 0x01F00000  |
 | swap block                   | 0x02200000  |
 
+### Building wolfBoot for NXP P1021 PPC
+
+By default wolfBoot will use `powerpc-linux-gnu-` cross-compiler prefix. These tools can be installed with the Debian package `gcc-powerpc-linux-gnu` (`sudo apt install gcc-powerpc-linux-gnu`).
+
+The `make` creates a `factory_wstage1.bin` image that can be programmed at `0x00000000`, that include the first stage loader, wolfBoot and a signed test application.
+
+To build the first stage load, wolfBoot, sign a custom application and assembly a single factory image use:
+
+```
+cp config/examples/nxp-p1021.config .config
+
+# build the C version of the key tools (instead of using the python ones)
+make keytools
+
+make clean
+make stage1
+
+# Build wolfBoot (with or without DEBUG)
+make DEBUG=1 wolfboot.bin
+# OR
+make wolfboot.bin
+
+# Sign application
+# 1=version (can be any 32-bit value)
+./tools/keytools/sign \
+    --ecc384 \
+    --sha384 \
+    test-app/image.bin \
+    wolfboot_signing_private_key.der \
+    1
+
+./tools/bin-assemble/bin-assemble \
+  factory.bin \
+    0x0        hal/nxp_p1021_stage1.bin \
+    0x8000     wolfboot.bin \
+    0x200000   test-app/image.bin \
+    0x01F00000 fsl_qe_ucode_1021_10_A.bin
+```
 
 ### Debugging NXP P1021 PPC