diff options
| author | Hongbo Zhang <hongbo.zhang@nxp.com> | 2016-09-21 18:31:04 +0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-10-06 09:56:59 -0700 |
| commit | adee1d4c9eb16a49ec1396b3367d027b7c3d2940 (patch) | |
| tree | 77d11a924666db9b67c8636ac6fdf2775404d429 | |
| parent | ef9a5fd8643ebdd5f492a5b09725134999f428b9 (diff) | |
| download | u-boot-imx-adee1d4c9eb16a49ec1396b3367d027b7c3d2940.zip u-boot-imx-adee1d4c9eb16a49ec1396b3367d027b7c3d2940.tar.gz u-boot-imx-adee1d4c9eb16a49ec1396b3367d027b7c3d2940.tar.bz2 | |
ARMv7: LS102xA: Move two macros from header files to Kconfig
Following commits 217f92b and 1544698, these two config
CPU_V7_HAS_NONSEC and CPU_V7_HAS_VIRT are moved to Kconfig,
for correctly select ARMV7_PSCI.
Signed-off-by: Hongbo Zhang <hongbo.zhang@nxp.com>
[York Sun: Reformatted commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | include/configs/ls1021aqds.h | 2 | ||||
| -rw-r--r-- | include/configs/ls1021atwr.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f55d5b2..ddc7d7b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -736,6 +736,8 @@ config TARGET_LS1012AFRDM config TARGET_LS1021AQDS bool "Support ls1021aqds" select CPU_V7 + select CPU_V7_HAS_NONSEC + select CPU_V7_HAS_VIRT select SUPPORT_SPL select ARCH_LS1021A select ARCH_SUPPORT_PSCI @@ -744,6 +746,8 @@ config TARGET_LS1021AQDS config TARGET_LS1021ATWR bool "Support ls1021atwr" select CPU_V7 + select CPU_V7_HAS_NONSEC + select CPU_V7_HAS_VIRT select SUPPORT_SPL select ARCH_LS1021A select ARCH_SUPPORT_PSCI diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 58d927c..7cf8253 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -543,8 +543,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_EDITING -#define CONFIG_ARMV7_NONSEC -#define CONFIG_ARMV7_VIRT #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index c6294e0..023143c 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -415,8 +415,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_EDITING -#define CONFIG_ARMV7_NONSEC -#define CONFIG_ARMV7_VIRT #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 |