[U-Boot] [PATCH 1/2] board: move ppa header address in board specific kconfig

Since, ppa firmware address is moved to board specific Kconfig, moving their respective headers also to the same Kconfig files.

Signed-off-by: Vinitha V Pillai vinitha.pillai@nxp.com

This patch depends on the following patches:

https://patchwork.ozlabs.org/patch/908676/ https://patchwork.ozlabs.org/patch/908089/

--- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 17 ------------- board/freescale/ls1012ardb/Kconfig | 6 +++++ board/freescale/ls1043aqds/Kconfig | 18 +++++++++++++ board/freescale/ls1043ardb/Kconfig | 21 ++++++++++++++++ board/freescale/ls1046aqds/Kconfig | 18 +++++++++++++ board/freescale/ls1046ardb/Kconfig | 21 ++++++++++++++++ board/freescale/ls1088a/Kconfig | 24 ++++++++++++++++++ board/freescale/ls2080aqds/Kconfig | 18 +++++++++++++ board/freescale/ls2080ardb/Kconfig | 42 +++++++++++++++++++++++++++++++ 9 files changed, 168 insertions(+), 17 deletions(-)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 66d6465..2743d87 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -237,23 +237,6 @@ config SYS_LS_PPA_FW_IN_NAND

endchoice

-config SYS_LS_PPA_ESBC_ADDR - hex "hdr address of PPA firmware loading from" - depends on FSL_LS_PPA && CHAIN_OF_TRUST - default 0x60680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A - default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A - default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A - default 0x580680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1088A - default 0x680000 if SYS_LS_PPA_FW_IN_MMC - default 0x680000 if SYS_LS_PPA_FW_IN_NAND - help - If the PPA header firmware locate at XIP flash, such as NOR or - QSPI flash, this address is a directly memory-mapped. - If it is in a serial accessed flash, such as NAND and SD - card, it is a byte offset. - config LS_PPA_ESBC_HDR_SIZE hex "Length of PPA ESBC header" depends on FSL_LS_PPA && CHAIN_OF_TRUST && !SYS_LS_PPA_FW_IN_XIP diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig index 0b873dd..4cd66bd 100644 --- a/board/freescale/ls1012ardb/Kconfig +++ b/board/freescale/ls1012ardb/Kconfig @@ -16,6 +16,12 @@ config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000

+if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif + if FSL_PFE

config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/freescale/ls1043aqds/Kconfig b/board/freescale/ls1043aqds/Kconfig index 3c571aa..c3b660f 100644 --- a/board/freescale/ls1043aqds/Kconfig +++ b/board/freescale/ls1043aqds/Kconfig @@ -17,6 +17,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x60400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x60680000 +endif endif

if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -24,6 +30,12 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif endif

if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -31,6 +43,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif

source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1043ardb/Kconfig b/board/freescale/ls1043ardb/Kconfig index 26272c9..60dc9ff 100644 --- a/board/freescale/ls1043ardb/Kconfig +++ b/board/freescale/ls1043ardb/Kconfig @@ -27,6 +27,13 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x60400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x60680000 +endif + endif

if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -34,6 +41,13 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif + endif

if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -41,6 +55,13 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif + endif

source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1046aqds/Kconfig b/board/freescale/ls1046aqds/Kconfig index d75960f..bf93ab9 100644 --- a/board/freescale/ls1046aqds/Kconfig +++ b/board/freescale/ls1046aqds/Kconfig @@ -17,6 +17,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x60400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x60680000 +endif endif

if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -24,6 +30,12 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif endif

if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -31,6 +43,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif

source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1046ardb/Kconfig b/board/freescale/ls1046ardb/Kconfig index cd05cbf..34b7ac2 100644 --- a/board/freescale/ls1046ardb/Kconfig +++ b/board/freescale/ls1046ardb/Kconfig @@ -18,6 +18,13 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x60400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x60680000 +endif + endif

if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -25,6 +32,13 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif + endif

if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -32,6 +46,13 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif + endif

source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1088a/Kconfig b/board/freescale/ls1088a/Kconfig index 235e5d1..931367d 100644 --- a/board/freescale/ls1088a/Kconfig +++ b/board/freescale/ls1088a/Kconfig @@ -17,6 +17,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif endif

if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -24,6 +30,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif

source "board/freescale/common/Kconfig" @@ -48,6 +60,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif endif

if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -55,6 +73,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif

source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls2080aqds/Kconfig b/board/freescale/ls2080aqds/Kconfig index 5f23304..8db2dcb 100644 --- a/board/freescale/ls2080aqds/Kconfig +++ b/board/freescale/ls2080aqds/Kconfig @@ -18,6 +18,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x580400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x580680000 +endif endif

if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -25,6 +31,12 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif endif

if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -32,6 +44,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif

source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls2080ardb/Kconfig b/board/freescale/ls2080ardb/Kconfig index 787f8f4..0e66d66 100644 --- a/board/freescale/ls2080ardb/Kconfig +++ b/board/freescale/ls2080ardb/Kconfig @@ -18,6 +18,13 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x580400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x580680000 +endif + endif

if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -25,6 +32,13 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif + endif

if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -32,6 +46,13 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif + endif

source "board/freescale/common/Kconfig" @@ -57,6 +78,13 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x580400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x580680000 +endif + endif

if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -64,6 +92,13 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif + endif

if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -71,6 +106,13 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif + endif

source "board/freescale/common/Kconfig"