diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-09-20 14:27:00 +0900 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-09-23 00:38:38 +0900 |
commit | 0298f4c0032e2ba7e417aacc66da98887a2e0a5b (patch) | |
tree | 04c9ad101f0d0c7f415758e1338577e2d7991dcb /arch/arm | |
parent | bbdae1651e96a4fca82b16765e641649170656e5 (diff) |
ARM: uniphier: move CONFIG_SPL_* to defconfig or select
As I repeated in the ML, I am unhappy with config entries with bare
defaults. Kick them out of arch/arm/mach-uniphier/Kconfig.
Currently, CONFIG_SPL_SERIAL_SUPPORT is not user-configurable
(build fails without it), but it should be fixed later anyway,
so I am moving CONFIG_SPL_SERIAL_SUPPORT to defconfigs.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-uniphier/Kconfig | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a311215c92..5de3bfcc9f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -868,6 +868,8 @@ config ARCH_UNIPHIER select PINCTRL select SPL select SPL_DM + select SPL_LIBCOMMON_SUPPORT + select SPL_LIBGENERIC_SUPPORT select SPL_OF_CONTROL select SPL_PINCTRL select SUPPORT_SPL diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index 2e824bb7b8..7bee6c7a29 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -1,20 +1,5 @@ if ARCH_UNIPHIER -config SPL_LIBCOMMON_SUPPORT - default y - -config SPL_LIBGENERIC_SUPPORT - default y - -config SPL_MMC_SUPPORT - default y if !ARCH_UNIPHIER_64BIT - -config SPL_NAND_SUPPORT - default y if !ARM64 - -config SPL_SERIAL_SUPPORT - default y - config SYS_CONFIG_NAME default "uniphier" |