armv8: LS2080A: Adjust memory map for secure boot headers for NOR-boot

This patch adjusts memory map for secure boot headers on LS2080AQDS
and LS2080ARDB platforms. Secure boot headers are placed on NOR
flash at offset 0x00600000.

Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/board/freescale/ls2080aqds/README b/board/freescale/ls2080aqds/README
index fd0e25a68658f7a0dd0d3c543027ae5a0cbf0556..cad860eac2008fe93055a6caa006364b2486fe61 100644 (file)
--- a/board/freescale/ls2080aqds/README
+++ b/board/freescale/ls2080aqds/README
@@ -96,6 +96,7 @@ RCW+PBI                               0x00000000
 Boot firmware (U-Boot)         0x00100000
 Boot firmware Environment      0x00300000
 PPA firmware                   0x00400000
+Secure Headers                 0x00600000
 DPAA2 MC                       0x00A00000
 DPAA2 DPL                      0x00D00000
 DPAA2 DPC                      0x00E00000

diff --git a/board/freescale/ls2080ardb/README b/board/freescale/ls2080ardb/README
index f228d8054941db18e872924d28541b1347aefea3..205c45cb2af3a1fc19c845a4aa07f50409143562 100644 (file)
--- a/board/freescale/ls2080ardb/README
+++ b/board/freescale/ls2080ardb/README
@@ -92,6 +92,7 @@ RCW+PBI                               0x00000000
 Boot firmware (U-Boot)         0x00100000
 Boot firmware Environment      0x00300000
 PPA firmware                   0x00400000
+Secure Headers                 0x00600000
 Cortina PHY firmware           0x00980000
 DPAA2 MC                       0x00A00000
 DPAA2 DPL                      0x00D00000

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 4788c15d3212cba8b0cdfaa317a9701158abb0bc..84e9db264895085a6712765a4bf0dc699efe534f 100644 (file)
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -359,14 +359,14 @@ unsigned long get_board_ddr_clk(void);
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "kernel_start=0x581100000\0"            \
+       "kernel_start=0x581000000\0"            \
        "kernel_load=0xa0000000\0"              \
        "kernel_size=0x2800000\0"               \
        "mcmemsize=0x40000000\0"                \
-       "mcinitcmd=esbc_validate 0x580c80000;"  \
-       "esbc_validate 0x580cc0000;"            \
-       "fsl_mc start mc 0x580300000"           \
-       " 0x580800000 \0"
+       "mcinitcmd=esbc_validate 0x580700000;"  \
+       "esbc_validate 0x580740000;"            \
+       "fsl_mc start mc 0x580a00000"           \
+       " 0x580e00000 \0"
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 0e920f63742601c8bec259fe09da6ff5052e8870..c20a7f437c842af31751cfd004025f2fcf8ef83b 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -378,15 +378,15 @@ unsigned long get_board_sys_clk(void);
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "kernel_start=0x581100000\0"            \
+       "kernel_start=0x581000000\0"            \
        "kernel_load=0xa0000000\0"              \
        "kernel_size=0x2800000\0"               \
        "mcmemsize=0x40000000\0"                \
        "fdtfile=fsl-ls2080a-rdb.dtb\0"         \
-       "mcinitcmd=esbc_validate 0x580c80000;"  \
-       "esbc_validate 0x580cc0000;"            \
-       "fsl_mc start mc 0x580300000"           \
-       " 0x580800000 \0"                       \
+       "mcinitcmd=esbc_validate 0x580700000;"  \
+       "esbc_validate 0x580740000;"            \
+       "fsl_mc start mc 0x580a00000"           \
+       " 0x580e00000 \0"                       \
        BOOTENV
 #else
 #ifdef CONFIG_QSPI_BOOT