GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: move CONFIG_TFABOOT to generic Kconfig

Browse source 
Currently, CONFIG_TFABOOT is located in armv8/fsl-layerscape Kconfig,
but it will be also useful for other targets if some additional
configuration are necessary.
So move it to arch/arm/Kconfig.

Please note that CONFIG_TFABOOT still depends on
CONFIG_ARCH_SUPPORT_TFABOOT and so the menu won't come up
if any target doesn't need its own customization for TF-A boot.
This will maintain the compatibility.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: Rajesh Bhagat <rajesh.bhagat@nxp.com>
Cc: York Sun <york.sun@nxp.com>
Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Cc: Priyanka Jain <priyanka.jain@nxp.com>
Cc: Sriram Dash <sriram.dash@nxp.com>
Cc: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Cc: Peng Ma <peng.ma@nxp.com>
Cc: Yuantian Tang <andy.tang@nxp.com>
Cc: Pankit Garg <pankit.garg@nxp.com>
This commit is contained in:
AKASHI Takahiro 2019-07-03 10:44:39 +09:00 • committed by Tom Rini
parent d963f64c0b
commit 6324d50679
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
arch/arm/Kconfig
View file

@ -1100,6 +1100,7 @@ config TARGET_LS1088AQDS
select ARCH_MISC_INIT select ARCH_MISC_INIT
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
select SUPPORT_SPL select SUPPORT_SPL
select FSL_DDR_INTERACTIVE if !SD_BOOT select FSL_DDR_INTERACTIVE if !SD_BOOT
@ -1115,6 +1116,7 @@ config TARGET_LS2080AQDS
select ARCH_MISC_INIT select ARCH_MISC_INIT
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
select SUPPORT_SPL select SUPPORT_SPL
imply SCSI imply SCSI
@ -1133,6 +1135,7 @@ config TARGET_LS2080ARDB
select ARCH_MISC_INIT select ARCH_MISC_INIT
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
select SUPPORT_SPL select SUPPORT_SPL
select FSL_DDR_BIST select FSL_DDR_BIST
@ -1165,6 +1168,7 @@ config TARGET_LX2160ARDB
select ARCH_MISC_INIT select ARCH_MISC_INIT
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
help help
Support for NXP LX2160ARDB platform. Support for NXP LX2160ARDB platform.
@ -1178,6 +1182,7 @@ config TARGET_LX2160AQDS
select ARCH_MISC_INIT select ARCH_MISC_INIT
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
help help
Support for NXP LX2160AQDS platform. Support for NXP LX2160AQDS platform.
@ -1218,6 +1223,7 @@ config TARGET_LS1012AQDS
bool "Support ls1012aqds" bool "Support ls1012aqds"
select ARCH_LS1012A select ARCH_LS1012A
select ARM64 select ARM64
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
help help
Support for Freescale LS1012AQDS platform. Support for Freescale LS1012AQDS platform.
@ -1229,6 +1235,7 @@ config TARGET_LS1012ARDB
bool "Support ls1012ardb" bool "Support ls1012ardb"
select ARCH_LS1012A select ARCH_LS1012A
select ARM64 select ARM64
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
imply SCSI imply SCSI
imply SCSI_AHCI imply SCSI_AHCI
@ -1242,6 +1249,7 @@ config TARGET_LS1012A2G5RDB
bool "Support ls1012a2g5rdb" bool "Support ls1012a2g5rdb"
select ARCH_LS1012A select ARCH_LS1012A
select ARM64 select ARM64
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
imply SCSI imply SCSI
help help
@ -1254,6 +1262,7 @@ config TARGET_LS1012AFRWY
bool "Support ls1012afrwy" bool "Support ls1012afrwy"
select ARCH_LS1012A select ARCH_LS1012A
select ARM64 select ARM64
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
imply SCSI imply SCSI
imply SCSI_AHCI imply SCSI_AHCI
@ -1267,6 +1276,7 @@ config TARGET_LS1012AFRDM
bool "Support ls1012afrdm" bool "Support ls1012afrdm"
select ARCH_LS1012A select ARCH_LS1012A
select ARM64 select ARM64
select ARCH_SUPPORT_TFABOOT
help help
Support for Freescale LS1012AFRDM platform. Support for Freescale LS1012AFRDM platform.
The LS1012A Freedom board (FRDM) is a high-performance The LS1012A Freedom board (FRDM) is a high-performance
@ -1278,6 +1288,7 @@ config TARGET_LS1028AQDS
select ARCH_LS1028A select ARCH_LS1028A
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
help help
Support for Freescale LS1028AQDS platform Support for Freescale LS1028AQDS platform
The LS1028A Development System (QDS) is a high-performance The LS1028A Development System (QDS) is a high-performance
@ -1289,6 +1300,7 @@ config TARGET_LS1028ARDB
select ARCH_LS1028A select ARCH_LS1028A
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
help help
Support for Freescale LS1028ARDB platform Support for Freescale LS1028ARDB platform
The LS1028A Development System (RDB) is a high-performance The LS1028A Development System (RDB) is a high-performance
@ -1301,6 +1313,7 @@ config TARGET_LS1088ARDB
select ARCH_MISC_INIT select ARCH_MISC_INIT
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_LATE_INIT select BOARD_LATE_INIT
select SUPPORT_SPL select SUPPORT_SPL
select FSL_DDR_INTERACTIVE if !SD_BOOT select FSL_DDR_INTERACTIVE if !SD_BOOT
@ -1359,6 +1372,7 @@ config TARGET_LS1043AQDS
select ARCH_LS1043A select ARCH_LS1043A
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_EARLY_INIT_F select BOARD_EARLY_INIT_F
select BOARD_LATE_INIT select BOARD_LATE_INIT
select SUPPORT_SPL select SUPPORT_SPL
@ -1373,6 +1387,7 @@ config TARGET_LS1043ARDB
select ARCH_LS1043A select ARCH_LS1043A
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_EARLY_INIT_F select BOARD_EARLY_INIT_F
select BOARD_LATE_INIT select BOARD_LATE_INIT
select SUPPORT_SPL select SUPPORT_SPL
@ -1384,6 +1399,7 @@ config TARGET_LS1046AQDS
select ARCH_LS1046A select ARCH_LS1046A
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_EARLY_INIT_F select BOARD_EARLY_INIT_F
select BOARD_LATE_INIT select BOARD_LATE_INIT
select DM_SPI_FLASH if DM_SPI select DM_SPI_FLASH if DM_SPI
@ -1403,6 +1419,7 @@ config TARGET_LS1046ARDB
select ARCH_LS1046A select ARCH_LS1046A
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_EARLY_INIT_F select BOARD_EARLY_INIT_F
select BOARD_LATE_INIT select BOARD_LATE_INIT
select DM_SPI_FLASH if DM_SPI select DM_SPI_FLASH if DM_SPI
@ -1422,6 +1439,7 @@ config TARGET_LS1046AFRWY
select ARCH_LS1046A select ARCH_LS1046A
select ARM64 select ARM64
select ARMV8_MULTIENTRY select ARMV8_MULTIENTRY
select ARCH_SUPPORT_TFABOOT
select BOARD_EARLY_INIT_F select BOARD_EARLY_INIT_F
select BOARD_LATE_INIT select BOARD_LATE_INIT
select DM_SPI_FLASH if DM_SPI select DM_SPI_FLASH if DM_SPI
@ -1565,6 +1583,17 @@ config ARCH_ASPEED
endchoice endchoice
config ARCH_SUPPORT_TFABOOT
bool
config TFABOOT
bool "Support for booting from TF-A"
depends on ARCH_SUPPORT_TFABOOT
default n
help
Enabling this will make a U-Boot binary that is capable of being
booted via TF-A.
config TI_SECURE_DEVICE config TI_SECURE_DEVICE
bool "HS Device Type Support" bool "HS Device Type Support"
depends on ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3 depends on ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3

7
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
View file

@ -623,10 +623,3 @@ config HAS_FSL_XHCI_USB
help help
For some SoC(such as LS1043A and LS1046A), USB and QE-HDLC multiplex use For some SoC(such as LS1043A and LS1046A), USB and QE-HDLC multiplex use
pins, select it when the pins are assigned to USB. pins, select it when the pins are assigned to USB.
config TFABOOT
bool "Support for booting from TFA"
default n
help
Enabling this will make a U-Boot binary that is capable of being
booted via TFA.