Progress testing

Author: dgarske

config/examples/nxp-t1040.config

@@ -26,34 +26,34 @@ WOLFTPM?=0
 ELF?=1
 DEBUG_ELF=0
 
-# NOR Base Address (256MB NOR at 0xE8000000 - 0xF7FFFFFF)
+# NOR Base Address (128MB NOR at 0xE8000000 - 0xEFFFFFFF)
 ARCH_FLASH_OFFSET?=0xE8000000
 
 # Flash Sector Size (128KB)
 WOLFBOOT_SECTOR_SIZE=0x20000
 
-# wolfBoot start address
-WOLFBOOT_ORIGIN=0xF7F40000
+# wolfBoot start address (same as T1024 - NOR top is 0xEFFFFFFF)
+WOLFBOOT_ORIGIN=0xEFF40000
 # wolfBoot partition size (custom)
 BOOTLOADER_PARTITION_SIZE=0xC0000
 
 # Application Partition Size (15MB)
 WOLFBOOT_PARTITION_SIZE?=0xF00000
 # Location in Flash for Application Partition
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xF6000000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xEE000000
 # Load Partition to RAM Address
 WOLFBOOT_LOAD_ADDRESS?=0x70000000
 
 # Location in Flash for Update Partition
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0xF6F00000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0xEEF00000
 
 # Location of temporary sector used during updates
 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xE80F0000
 
 # Stage 1 loader settings (16KB)
 WOLFBOOT_STAGE1_SIZE=0x4000
 # Location in Flash for stage 1 loader (XIP from boot ROM)
-WOLFBOOT_STAGE1_FLASH_ADDR=0xF7FFC000
+WOLFBOOT_STAGE1_FLASH_ADDR=0xEFFFC000
 # Address in RAM to load wolfBoot (end of DDR at 2GB-1MB for 32-bit addressing)
 WOLFBOOT_STAGE1_LOAD_ADDR=0x7FF00000
 

docs/Targets.md

@@ -3277,9 +3277,9 @@ Reset Configuration Word (RCW):
 00000020: 00000000 00000000 00000000 00030810
 00000030: 00000000 0342580f 00000000 00000000
 
-Flash is NOR on IFC CS0 (0x0_E800_0000) 256MB.
+Flash is NOR on IFC CS0 (0x0_E800_0000) 128MB (Micron JS28F00AM29EWHA, 16-bit, AMD CFI).
 
-Default NOR Flash Memory Layout (256MB) (128KB block, 1K page)
+Default NOR Flash Memory Layout (128MB) (128KB block, 1K page)
 
 | Description       | Address    | Size                 |
 | ----------------- | ---------- | -------------------- |
@@ -3289,13 +3289,13 @@ Default NOR Flash Memory Layout (256MB) (128KB block, 1K page)
 | Free              | 0xE8100000 | 0x00700000 (  7 MB)  |
 | FDT (Primary)     | 0xE8800000 | 0x00020000 (128 KB)  |
 | FDT (Update)      | 0xE8820000 | 0x00020000 (128 KB)  |
-| Free              | 0xE8840000 | 0x0D7C0000 (~200 MB) |
-| Application (OS)  | 0xF6000000 | 0x00F00000 ( 15 MB)  |
-| Update (OS)       | 0xF6F00000 | 0x00F00000 ( 15 MB)  |
-| QUICC             | 0xF7E00000 | 0x00100000 (  1 MB)  |
-| DPAA (FMAN)       | 0xF7F00000 | 0x00020000 (128 KB)  |
-| wolfBoot          | 0xF7F40000 | 0x000BC000 (752 KB)  |
-| wolfBoot Stage 1  | 0xF7FFC000 | 0x00004000 ( 16 KB)  |
+| Free              | 0xE8840000 | 0x057C0000 ( 87 MB)  |
+| Application (OS)  | 0xEE000000 | 0x00F00000 ( 15 MB)  |
+| Update (OS)       | 0xEEF00000 | 0x00F00000 ( 15 MB)  |
+| QUICC             | 0xEFE00000 | 0x00100000 (  1 MB)  |
+| DPAA (FMAN)       | 0xEFF00000 | 0x00020000 (128 KB)  |
+| wolfBoot          | 0xEFF40000 | 0x000BC000 (752 KB)  |
+| wolfBoot Stage 1  | 0xEFFFC000 | 0x00004000 ( 16 KB)  |
 
 QE: uploading microcode 'Microcode for T1040 r1.0' version 0.0.1
 
@@ -3336,11 +3336,11 @@ If getting errors with keystore then you can reset things using `make distclean`
 ./tools/bin-assemble/bin-assemble factory_custom.bin \
     0xE8000000 RCW.bin \
     0xE8020000 custom.dtb \
-    0xF6000000 custom_v1_signed.bin \
-    0xF7E00000 iram_Type_A_T1040_r1.0.bin \
-    0xF7F00000 fsl_fman_ucode_t1040.bin \
-    0xF7F40000 wolfboot.bin \
-    0xF7FFC000 stage1/loader_stage1.bin
+    0xEE000000 custom_v1_signed.bin \
+    0xEFE00000 iram_Type_A_T1040_r1.0.bin \
+    0xEFF00000 fsl_fman_ucode_t1040.bin \
+    0xEFF40000 wolfboot.bin \
+    0xEFFFC000 stage1/loader_stage1.bin
 ```
 
 Flash factory_custom.bin to NOR base 0xE800_0000

hal/nxp_ppc.h

@@ -131,10 +131,11 @@
     #define DDR_SIZE (8192ULL * 1024ULL * 1024ULL) /* 8GB */
     #endif
 
-    /* 256MB NOR: 0xE8000000 - 0xF7FFFFFF */
+    /* 128MB NOR: 0xE8000000 - 0xEFFFFFFF */
     #define FLASH_BASE_ADDR      0xE8000000UL
     #define FLASH_BASE_PHYS_HIGH 0xFULL
-    #define FLASH_LAW_SIZE       LAW_SIZE_256MB
+    #define FLASH_LAW_SIZE       LAW_SIZE_128MB
+    /* e5500 BookE has no 128M page size (64M->256M), use 256M TLB */
     #define FLASH_TLB_PAGESZ     BOOKE_PAGESZ_256M
 
     #define USE_LONG_JUMP

hal/nxp_t1040.ld

@@ -4,7 +4,7 @@ ENTRY( _reset )
 
 MEMORY
 {
-    /* DDR4 - 8GB (offset by destination address and 4KB boot region) */
+    /* DDR4 - 8GB physical (32-bit addressing limits window to <2GB) */
     DRAM (rwx) : ORIGIN = @WOLFBOOT_STAGE1_LOAD_ADDR@,
                  LENGTH = 0x7FFFFFFF - 4K - @WOLFBOOT_STAGE1_LOAD_ADDR@
 

hal/nxp_t1040_stage1.ld

@@ -2,16 +2,16 @@ OUTPUT_ARCH( "powerpc" )
 
 ENTRY( _reset )
 
-/* Boot ROM out of reset mapped to 0xF7FFF000 */
+/* Boot ROM out of reset mapped to 0xEFFFF000 (top of 128MB NOR) */
 BASE_ADDR = @WOLFBOOT_STAGE1_FLASH_ADDR@;
 
 LOADER_STAGE1_SIZE = @WOLFBOOT_STAGE1_SIZE@;
 
 /* Boot initialization code */
-BOOTSTRAP_TLB = 0xF7FFF000;
+BOOTSTRAP_TLB = 0xEFFFF000;
 
 /* Entry point where RCW directs code to execute from */
-BOOTSTRAP_ENTRY = 0xF7FFFFFC;
+BOOTSTRAP_ENTRY = 0xEFFFFFFC;
 
 MEMORY
 {
@@ -24,7 +24,8 @@ MEMORY
     /* Platform SRAM - 160KB */
     PSRAM (rwx) : ORIGIN = 0xFDFC0000, LENGTH = 0x28000
 
-    /* DDR - 8GB: Start at 16MB to avoid using 0x0 (NULL) addresses */
+    /* DDR - 8GB physical, 32-bit addressing limits window to <2GB.
+     * Start at 16MB to avoid using 0x0 (NULL) addresses */
     DRAM (rwx) : ORIGIN = 0x1000000, LENGTH = 0x7FFFFFFF - 0x1000000
 }
 

hal/nxp_t10xx.c

@@ -525,7 +525,7 @@ enum ifc_amask_sizes {
 
 /* NOR Flash */
 #ifdef TARGET_nxp_t1040
-#define FLASH_BANK_SIZE   (256*1024*1024) /* 256MB NOR */
+#define FLASH_BANK_SIZE   (128*1024*1024) /* 128MB NOR */
 #else
 #define FLASH_BANK_SIZE   (64*1024*1024)  /* 64MB NOR */
 #endif
@@ -1304,7 +1304,7 @@ static void hal_flash_init(void)
                         IFC_CSPR_MSEL_NOR |
                         IFC_CSPR_V));
 #ifdef TARGET_nxp_t1040
-    set32(IFC_AMASK(0), IFC_AMASK_256MB);
+    set32(IFC_AMASK(0), IFC_AMASK_128MB);
 #else
     set32(IFC_AMASK(0), IFC_AMASK_64MB);
 #endif

test-app/app_nxp_t1040.c

@@ -28,7 +28,7 @@ static const char* hex_lut = "0123456789abcdef";
 void main(void)
 {
     int i = 0;
-    int j = 0;
+    volatile int j = 0;
     int k = 0;
     char snum[8];