diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-07-13 20:32:15 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-07-26 22:27:15 +0900 |
| commit | ee8d037ce7b5ece66d085c0e6b7793e6e3fbef5b (patch) | |
| tree | 1bb03f8871c41c669f29f46c95ddce08e4eadd15 /arch/arm/mach-uniphier/Kconfig | |
| parent | 609bf924117950b88987a5fa477acf1239bfdbc1 (diff) | |
| download | u-boot-ee8d037ce7b5ece66d085c0e6b7793e6e3fbef5b.zip u-boot-ee8d037ce7b5ece66d085c0e6b7793e6e3fbef5b.tar.gz u-boot-ee8d037ce7b5ece66d085c0e6b7793e6e3fbef5b.tar.bz2 | |
ARM: uniphier: remove SPL support for ARMv8 SoCs
It has been a while since ARM Trusted Firmware supported UniPhier SoC
family. U-Boot SPL was intended as a temporary loader that runs in
secure world. It is a maintenance headache to support two different
boot mechanisms. Secure firmware is realm of ARM Trusted Firmware
and now U-Boot only serves as a non-secure boot loader for UniPhier
ARMv8 SoCs.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/Kconfig')
| -rw-r--r-- | arch/arm/mach-uniphier/Kconfig | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index 5739325..1aed55a 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -10,14 +10,6 @@ config ARCH_UNIPHIER_32BIT select ARMV7_NONSEC select ARCH_SUPPORT_PSCI -config ARCH_UNIPHIER_64BIT - bool - select ARM64 - select CMD_UNZIP - select SPL_SEPARATE_BSS if SPL - select ARMV8_MULTIENTRY if SPL - select ARMV8_SPIN_TABLE if SPL - choice prompt "UniPhier SoC select" default ARCH_UNIPHIER_PRO4 @@ -38,18 +30,11 @@ config ARCH_UNIPHIER_PRO5_PXS2_LD6B bool "UniPhier Pro5/PXs2/LD6b SoCs" select ARCH_UNIPHIER_32BIT -config ARCH_UNIPHIER_LD11_SINGLE - bool "UniPhier LD11 SoC" - select ARCH_UNIPHIER_64BIT - -config ARCH_UNIPHIER_LD20_SINGLE - bool "UniPhier LD20 SoC" - select ARCH_UNIPHIER_64BIT - config ARCH_UNIPHIER_V8_MULTI bool "UniPhier V8 SoCs" depends on !SPL - select ARCH_UNIPHIER_64BIT + select ARM64 + select CMD_UNZIP endchoice @@ -79,13 +64,13 @@ config ARCH_UNIPHIER_LD6B default y config ARCH_UNIPHIER_LD11 - bool "Enable UniPhier LD11 SoC support" if ARCH_UNIPHIER_V8_MULTI - depends on ARCH_UNIPHIER_LD11_SINGLE || ARCH_UNIPHIER_V8_MULTI + bool "Enable UniPhier LD11 SoC support" + depends on ARCH_UNIPHIER_V8_MULTI default y config ARCH_UNIPHIER_LD20 - bool "Enable UniPhier LD20 SoC support" if ARCH_UNIPHIER_V8_MULTI - depends on ARCH_UNIPHIER_LD20_SINGLE || ARCH_UNIPHIER_V8_MULTI + bool "Enable UniPhier LD20 SoC support" + depends on ARCH_UNIPHIER_V8_MULTI select OF_BOARD_SETUP default y |