Merge remote-tracking branch 'upstream/master' into h5-wolfhsm-port

Author: aidangarske

.github/workflows/test-configs.yml

@@ -211,6 +211,24 @@ jobs:
       arch: ppc
       config-file: ./config/examples/nxp-t2080.config
 
+  # Additional T2080 board-specific compile tests for alternate board macros.
+  nxp_t2080_test_naii_68ppc2:
+    uses: ./.github/workflows/test-build-powerpc.yml
+    with:
+      arch: ppc
+      config-file: ./config/examples/nxp-t2080.config
+      make-args: CFLAGS_EXTRA=-DBOARD_NAII_68PPC2
+
+  # VPX3-152 compile test: validates board-specific code paths build cleanly.
+  # Uses default config addresses (128MB layout); real hardware needs the
+  # VPX3-152 address overrides uncommented in .config.
+  nxp_t2080_vpx3152_test:
+    uses: ./.github/workflows/test-build-powerpc.yml
+    with:
+      arch: ppc
+      config-file: ./config/examples/nxp-t2080.config
+      make-args: CFLAGS_EXTRA=-DBOARD_CW_VPX3152
+
   nxp_lpc54s0xx_test:
     uses: ./.github/workflows/test-build.yml
     with:

arch.mk

@@ -840,6 +840,10 @@ ifeq ($(ARCH),PPC)
 
   OBJS+=src/boot_ppc_start.o src/boot_ppc.o
 
+  # CRC32 helpers in src/gpt.c are reused by update_ram.c's uImage header
+  # validator (WOLFBOOT_UBOOT_LEGACY -> uboot_legacy_header_valid).
+  OBJS+=src/gpt.o
+
   ifeq ($(SPMATH),1)
     MATH_OBJS += $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sp_c32.o
   endif
@@ -1231,6 +1235,18 @@ ifeq ($(TARGET),nxp_t2080)
   CFLAGS+=$(ARCH_FLAGS)
   BIG_ENDIAN=1
   CFLAGS+=-DMMU -DWOLFBOOT_FDT -DWOLFBOOT_DUALBOOT
+  # Support U-Boot legacy uImage header: strip 64-byte header before jumping
+  # to the OS image (e.g. uVxWorks, uImage Linux kernel).
+  CFLAGS+=-DWOLFBOOT_UBOOT_LEGACY
+  # 64-bit OS support (VxWorks 7, Linux 64-bit): transitions LAW/TLB to
+  # 36-bit physical addressing before jumping to the OS. Equivalent to
+  # CW U-Boot "ossel ostype2". Set OS_64BIT=1 in .config to enable.
+  ifeq ($(OS_64BIT),1)
+    CFLAGS+=-DENABLE_OS64BIT
+  endif
+  ifneq ($(WOLFBOOT_BOOTARGS),)
+    CFLAGS+=-DWOLFBOOT_BOOTARGS='"$(WOLFBOOT_BOOTARGS)"'
+  endif
   CFLAGS+=-pipe # use pipes instead of temp files
   CFLAGS+=-feliminate-unused-debug-types
   LDFLAGS+=$(ARCH_FLAGS)

config/examples/nxp-t2080.config

@@ -1,13 +1,21 @@
 # NXP T2080 wolfBoot Configuration
 # Default board: T2080 RDB (66.66 MHz oscillator, DDR3L SODIMM)
 #
-# Board selection: uncomment exactly one line to override the default.
-#   Default (no define): T2080 RDB (66.66 MHz oscillator, DDR3L SODIMM)
-#   BOARD_CW_VPX3152:   CW VPX3-152 (66.667 MHz oscillator, DDR3L)
-#   BOARD_NAII_68PPC2:  NAII 68PPC2 (100 MHz oscillator, 8GB DDR3)
+# Board selection:
+#   Default (no define):  T2080 RDB (66.66 MHz oscillator, DDR3L SODIMM)
+#   BOARD_NAII_68PPC2:    NAII 68PPC2 (100 MHz oscillator, 8 GB DDR3)
+#   BOARD_CW_VPX3152:     CW VPX3-152 (66.667 MHz oscillator, 4 GB DDR3L)
 #
-#CFLAGS_EXTRA+=-DBOARD_CW_VPX3152
+# For NAII 68PPC2, uncomment the line below (addresses are the same as RDB):
 #CFLAGS_EXTRA+=-DBOARD_NAII_68PPC2
+#
+# For CW VPX3-152 (256 MB NOR flash at 0xF0000000), uncomment the BOARD
+# define below AND the entire address-override block at the bottom of this
+# file. That block includes OS_64BIT=1, which is REQUIRED to boot a 64-bit
+# RTOS (VxWorks 7 / Green Hills INTEGRITY-178 tuMP) -- it gates the e6500 SMP
+# spin-table + DDR-LAW handoff in hal/nxp_t2080.c; without it the loader runs
+# but the OS hangs silently right after "do_boot: jumping".
+#CFLAGS_EXTRA+=-DBOARD_CW_VPX3152
 
 ARCH=PPC
 TARGET=nxp_t2080
@@ -34,51 +42,82 @@ RAM_CODE?=1
 DUALBANK_SWAP?=0
 WOLFTPM?=0
 OPTIMIZATION_LEVEL?=1
+ELF?=1
+DEBUG_ELF=0
 
-# NOR Base Address
-# T2080 RDB:   128MB flash at 0xE8000000, wolfBoot at top (0xEFFE0000)
-# CW VPX3-152: 256MB flash at 0xF0000000, wolfBoot at top (0xFFFE0000)
+# -----------------------------------------------------------------------------
+# Default addresses: T2080 RDB / NAII 68PPC2 (128 MB NOR flash @ 0xE8000000)
+# -----------------------------------------------------------------------------
+
+# NOR Base Address: wolfBoot at top of flash
 ARCH_FLASH_OFFSET?=0xEFFE0000
-#ARCH_FLASH_OFFSET?=0xFFFE0000  # CW VPX3-152
 
 # CPC SRAM address (must match L2SRAM_ADDR in nxp_ppc.h)
-# CW VPX3-152: relocated to 0xEE900000 to avoid 256MB flash TLB overlap
 L2SRAM_ADDR?=0xF8F00000
-#L2SRAM_ADDR?=0xEE900000  # CW VPX3-152
 
 # Flash Sector Size
 WOLFBOOT_SECTOR_SIZE?=0x10000
 
 # wolfBoot start address
 WOLFBOOT_ORIGIN?=0xEFFE0000
-#WOLFBOOT_ORIGIN?=0xFFFE0000  # CW VPX3-152
 # wolfBoot partition size (custom)
 BOOTLOADER_PARTITION_SIZE=0x20000
 
 # Application Partition Size
 WOLFBOOT_PARTITION_SIZE?=0x100000
 # Location in Flash for Application Partition
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xEFEE0000
-#WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xFFEE0000  # CW VPX3-152
 # Load Partition to RAM Address
 WOLFBOOT_LOAD_ADDRESS?=0x19000
 
 # Location in Flash for Update Partition
 WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0xEFDE0000
-#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0xFFDE0000  # CW VPX3-152
 
 # Location of temporary sector used during updates
 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xEFDD0000
-#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xFFDD0000  # CW VPX3-152
 
 # DTS (Device Tree)
 WOLFBOOT_DTS_BOOT_ADDRESS?=0xE8040000
-#WOLFBOOT_DTS_BOOT_ADDRESS?=0xF0040000  # CW VPX3-152
 WOLFBOOT_DTS_UPDATE_ADDRESS?=0xE8050000
-#WOLFBOOT_DTS_UPDATE_ADDRESS?=0xF0050000  # CW VPX3-152
 # DTS Load to RAM Address
 WOLFBOOT_LOAD_DTS_ADDRESS?=0x200000
 
+# -----------------------------------------------------------------------------
+# CW VPX3-152 overrides (256 MB NOR flash @ 0xF0000000, 4 GB DDR3L)
+# Uncomment ALL lines below when building for VPX3-152, AND uncomment
+# CFLAGS_EXTRA+=-DBOARD_CW_VPX3152 at the top of this file. This is the
+# known-good config used to boot VxWorks 7 and Green Hills INTEGRITY-178
+# tuMP (Ada Scheduler) on this board.
+# -----------------------------------------------------------------------------
+#ARCH_FLASH_OFFSET=0xFFFE0000
+#L2SRAM_ADDR=0xEE900000
+#WOLFBOOT_ORIGIN=0xFFFE0000
+# 8 MB partitions -- full RTOS images do not fit the 1 MB RDB default.
+#WOLFBOOT_PARTITION_SIZE=0x800000
+#WOLFBOOT_PARTITION_BOOT_ADDRESS=0xFF000000
+#WOLFBOOT_PARTITION_UPDATE_ADDRESS=0xFE800000
+#WOLFBOOT_PARTITION_SWAP_ADDRESS=0xFE7F0000
+#WOLFBOOT_DTS_BOOT_ADDRESS=0xF0040000
+#WOLFBOOT_DTS_UPDATE_ADDRESS=0xF0050000
+#WOLFBOOT_LOAD_DTS_ADDRESS=0x03FE6000
+# REQUIRED for 64-bit RTOS boot (VxWorks 7 / INTEGRITY-178 tuMP). Gates the
+# e6500 SMP spin-table (0x7FEE41C0) + DDR-LAW-slot-17 handoff in
+# hal/nxp_t2080.c. Without it the loader runs but the OS hangs silently after
+# "do_boot: jumping" (it is NOT a missing device tree -- tuMP has no FDT
+# parser; this build option is what was actually missing).
+#OS_64BIT=1
+# ELF staging buffer. wolfBoot copies the signed image here, then elf_load
+# scatters PT_LOAD segments IN PLACE to their vaddrs. It MUST sit ABOVE the
+# ELF's vaddr span (a VxWorks/INTEGRITY ELF spans ~0x2000-0x75F000) or the
+# in-place loader's collide-guard silently drops the segment overlapping the
+# program-header table -- the OS then executes unloaded memory and traps
+# early. The 0x19000 default overlaps the span; 0x900000 is above it, below
+# the 16 MB DDR stack, inside the 32 MB cache-inhibit window. Raw uImage
+# kernels override this via ih_load (unaffected).
+#WOLFBOOT_LOAD_ADDRESS=0x900000
+# Optional: verbose pre-OS register/TLB/LAW dump for handoff debugging.
+#CFLAGS_EXTRA+=-DWOLFBOOT_PPC_PRE_OS_DUMP
+
 # Flash erase/write/read test at update partition address
 #TEST_FLASH?=1