board: Kconfig: Re-Arrangement of PPA firmware and header addresses

PPA firmware and header address may vary depending upon different
boards, configure ppa firmware and header address in board specific
Kconfig.

Signed-off-by: Vinitha V Pillai <vinitha.pillai@nxp.com>
Signed-off-by: Jagdish Gediya <jagdish.gediya@nxp.com>
Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 546de33..f2111fa 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -261,40 +261,6 @@ config SYS_LS_PPA_FW_IN_NAND
 
 endchoice
 
-config SYS_LS_PPA_FW_ADDR
-       hex "Address of PPA firmware loading from"
-       depends on FSL_LS_PPA
-       default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A
-       default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
-       default 0x580400000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A
-       default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1088A
-       default 0x60400000 if SYS_LS_PPA_FW_IN_XIP
-       default 0x400000 if SYS_LS_PPA_FW_IN_MMC
-       default 0x400000 if SYS_LS_PPA_FW_IN_NAND
-
-       help
-         If the PPA 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 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/ls1012afrdm/Kconfig b/board/freescale/ls1012afrdm/Kconfig
index 22d521b..fd33807 100644 (file)
--- a/board/freescale/ls1012afrdm/Kconfig
+++ b/board/freescale/ls1012afrdm/Kconfig
@@ -12,6 +12,10 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1012afrdm"
 
+config SYS_LS_PPA_FW_ADDR
+       hex "PPA Firmware Addr"
+       default 0x40400000
+
 if FSL_PFE
 
 config BOARD_SPECIFIC_OPTIONS # dummy

diff --git a/board/freescale/ls1012aqds/Kconfig b/board/freescale/ls1012aqds/Kconfig
index c0b12ed..b702fb2 100644 (file)
--- a/board/freescale/ls1012aqds/Kconfig
+++ b/board/freescale/ls1012aqds/Kconfig
@@ -12,6 +12,9 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1012aqds"
 
+config SYS_LS_PPA_FW_ADDR
+        hex "PPA Firmware Addr"
+        default 0x40400000
 
 if FSL_PFE
 

diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig
index 493d477..4cd66bd 100644 (file)
--- a/board/freescale/ls1012ardb/Kconfig
+++ b/board/freescale/ls1012ardb/Kconfig
@@ -12,6 +12,16 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1012ardb"
 
+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
@@ -59,6 +69,10 @@ config SYS_SOC
 config SYS_CONFIG_NAME
         default "ls1012a2g5rdb"
 
+config SYS_LS_PPA_FW_ADDR
+        hex "PPA Firmware Addr"
+        default 0x40400000
+
 if FSL_PFE
 
 config BOARD_SPECIFIC_OPTIONS # dummy

diff --git a/board/freescale/ls1043aqds/Kconfig b/board/freescale/ls1043aqds/Kconfig
index 95d2888..182900e 100644 (file)
--- a/board/freescale/ls1043aqds/Kconfig
+++ b/board/freescale/ls1043aqds/Kconfig
@@ -12,6 +12,22 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1043aqds"
 
+if FSL_LS_PPA
+config SYS_LS_PPA_FW_ADDR
+       hex "PPA Firmware Addr"
+       default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x60400000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+
+if CHAIN_OF_TRUST
+config SYS_LS_PPA_ESBC_ADDR
+       hex "PPA Firmware HDR Addr"
+       default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x60680000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+endif
+endif
+
 source "board/freescale/common/Kconfig"
 
 endif

diff --git a/board/freescale/ls1043ardb/Kconfig b/board/freescale/ls1043ardb/Kconfig
index 1bab7ca..3d9e295 100644 (file)
--- a/board/freescale/ls1043ardb/Kconfig
+++ b/board/freescale/ls1043ardb/Kconfig
@@ -22,6 +22,20 @@ config SYS_HAS_ARMV8_SECURE_BASE
          If enabled, please also define the value for ARMV8_SECURE_BASE,
          for LS1043ARDB, it could be some address in OCRAM.
 
+if FSL_LS_PPA
+config SYS_LS_PPA_FW_ADDR
+       hex "PPA Firmware Addr"
+       default 0x60400000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+
+if CHAIN_OF_TRUST
+config SYS_LS_PPA_ESBC_ADDR
+       hex "PPA Firmware HDR Addr"
+       default 0x60680000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+endif
+endif
+
 source "board/freescale/common/Kconfig"
 
 endif

diff --git a/board/freescale/ls1046aqds/Kconfig b/board/freescale/ls1046aqds/Kconfig
index 070827d..1616dcc 100644 (file)
--- a/board/freescale/ls1046aqds/Kconfig
+++ b/board/freescale/ls1046aqds/Kconfig
@@ -12,6 +12,22 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1046aqds"
 
+if FSL_LS_PPA
+config SYS_LS_PPA_FW_ADDR
+       hex "PPA Firmware Addr"
+       default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x60400000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+
+if CHAIN_OF_TRUST
+config SYS_LS_PPA_ESBC_ADDR
+       hex "PPA Firmware HDR Addr"
+       default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x60680000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+endif
+endif
+
 source "board/freescale/common/Kconfig"
 
 endif

diff --git a/board/freescale/ls1046ardb/Kconfig b/board/freescale/ls1046ardb/Kconfig
index b9f2ed7..4c31e0e 100644 (file)
--- a/board/freescale/ls1046ardb/Kconfig
+++ b/board/freescale/ls1046ardb/Kconfig
@@ -12,5 +12,20 @@ config SYS_SOC
 
 config SYS_CONFIG_NAME
        default "ls1046ardb"
+
+if FSL_LS_PPA
+config SYS_LS_PPA_FW_ADDR
+       hex "PPA Firmware Addr"
+       default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+
+if CHAIN_OF_TRUST
+config SYS_LS_PPA_ESBC_ADDR
+       hex "PPA Firmware HDR Addr"
+       default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+endif
+endif
+
 source "board/freescale/common/Kconfig"
 endif

diff --git a/board/freescale/ls1088a/Kconfig b/board/freescale/ls1088a/Kconfig
index 4479dd0..8bb828e 100644 (file)
--- a/board/freescale/ls1088a/Kconfig
+++ b/board/freescale/ls1088a/Kconfig
@@ -12,6 +12,20 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1088aqds"
 
+if FSL_LS_PPA
+config SYS_LS_PPA_FW_ADDR
+        hex "PPA Firmware Addr"
+       default 0x20400000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+
+if CHAIN_OF_TRUST
+config SYS_LS_PPA_ESBC_ADDR
+       hex "PPA Firmware HDR Addr"
+       default 0x20680000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+endif
+endif
+
 source "board/freescale/common/Kconfig"
 endif
 
@@ -29,5 +43,19 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1088ardb"
 
+if FSL_LS_PPA
+config SYS_LS_PPA_FW_ADDR
+        hex "PPA Firmware Addr"
+       default 0x20400000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+
+if CHAIN_OF_TRUST
+config SYS_LS_PPA_ESBC_ADDR
+       hex "PPA Firmware HDR Addr"
+       default 0x20680000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+endif
+endif
+
 source "board/freescale/common/Kconfig"
 endif

diff --git a/board/freescale/ls2080aqds/Kconfig b/board/freescale/ls2080aqds/Kconfig
index e2b2c8d..6b2b645 100644 (file)
--- a/board/freescale/ls2080aqds/Kconfig
+++ b/board/freescale/ls2080aqds/Kconfig
@@ -13,6 +13,22 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls2080aqds"
 
+if FSL_LS_PPA
+config SYS_LS_PPA_FW_ADDR
+       hex "PPA Firmware Addr"
+       default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x580400000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+
+if CHAIN_OF_TRUST
+config SYS_LS_PPA_ESBC_ADDR
+       hex "PPA Firmware HDR Addr"
+       default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x580680000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+endif
+endif
+
 source "board/freescale/common/Kconfig"
 
 endif

diff --git a/board/freescale/ls2080ardb/Kconfig b/board/freescale/ls2080ardb/Kconfig
index 8f64642..678d582 100644 (file)
--- a/board/freescale/ls2080ardb/Kconfig
+++ b/board/freescale/ls2080ardb/Kconfig
@@ -1,5 +1,4 @@
-
-if TARGET_LS2080ARDB
+if TARGET_LS2080ARDB || TARGET_LS2081ARDB
 
 config SYS_BOARD
        default "ls2080ardb"
@@ -15,21 +14,21 @@ config SYS_CONFIG_NAME
 
 source "board/freescale/common/Kconfig"
 
+if FSL_LS_PPA
+config SYS_LS_PPA_FW_ADDR
+       hex "PPA Firmware Addr"
+       default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x580400000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+
+if CHAIN_OF_TRUST
+config SYS_LS_PPA_ESBC_ADDR
+       hex "PPA Firmware HDR Addr"
+       default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x580680000 if SYS_LS_PPA_FW_IN_XIP
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND
+endif
 endif
-
-if TARGET_LS2081ARDB
-
-config SYS_BOARD
-       default "ls2080ardb"
-
-config SYS_VENDOR
-       default "freescale"
-
-config SYS_SOC
-       default "fsl-layerscape"
-
-config SYS_CONFIG_NAME
-       default "ls2080ardb"
 
 source "board/freescale/common/Kconfig"