ARM: uniphier: move CONFIG_SPL_* to defconfig or select

PATCH Superseded Masahiro Yamada 2 participants 2 messages Sep 19, 2016

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/uniphier architecture

lore

Share & tools

lore

Masahiro Yamada

author

2016-09-19 12:26 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

 arch/arm/Kconfig                     |  2 ++
 arch/arm/mach-uniphier/Kconfig       | 15 ---------------
 configs/uniphier_ld11_defconfig      |  1 +
 configs/uniphier_ld20_defconfig      |  1 +
 configs/uniphier_ld4_sld8_defconfig  |  3 +++
 configs/uniphier_pro4_defconfig      |  3 +++
 configs/uniphier_pxs2_ld6b_defconfig |  3 +++
 configs/uniphier_sld3_defconfig      |  3 +++
 8 files changed, 16 insertions(+), 15 deletions(-)

arch/arm/Kconfig +2 -0

index a311215..5de3bfc 100644
@@ -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

arch/arm/mach-uniphier/Kconfig +0 ~~-15~~

index 2e824bb..7bee6c7 100644
@@ -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"

configs/uniphier_ld11_defconfig +1 -0

index 6b27e71..cd9918f 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
+CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_ARCH_UNIPHIER_LD11=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000

configs/uniphier_ld20_defconfig +1 -0

index 3c0313e..564258d 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
+CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_ARCH_UNIPHIER_LD20=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000

configs/uniphier_ld4_sld8_defconfig +3 -0

index 4e2f401..dbff719 100644
@@ -1,5 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_ARCH_UNIPHIER_LD4_SLD8=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000

configs/uniphier_pro4_defconfig +3 -0

index 6bfb6da..75287cf 100644
@@ -1,5 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"

configs/uniphier_pxs2_ld6b_defconfig +3 -0

index f88350e..f0d3420 100644
@@ -1,5 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000

configs/uniphier_sld3_defconfig +3 -0

index 26f3663..91d5226 100644
@@ -1,5 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_ARCH_UNIPHIER_SLD3=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000

Signature · 1 line

1.9.1

Tom Rini

2016-09-19 19:20 UTC #1 lore raw

PATCH 1/1 ARM: uniphier: move CONFIG_SPL_* to defconfig or select

Quoted 8 lines · Masahiro Yamada

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 <[email protected]>

Yes, this is the kind of clean-up that needs to be done after moving them over, sadly. Thanks!

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160919/e892e340/attachment.sig>