diff mbox series

[v2] distro: use imply to enable DISTRO_DEFAULTS as SoC default

Message ID 1524649672-15972-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 7325f6cfdcf6cbc4fc5acf706b6cbcc786ae8db5
Headers show
Series [v2] distro: use imply to enable DISTRO_DEFAULTS as SoC default | expand

Commit Message

Masahiro Yamada April 25, 2018, 9:47 a.m. UTC 
The default of DISTRO_DEFAULTS is messy.  Using the 'imply' keyword
is equivalent and cleaner.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - Update doc/README.distro

 Kconfig                                   | 5 -----
 arch/arm/Kconfig                          | 4 ++++
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 +
 doc/README.distro                         | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

Comments

Tom Rini April 28, 2018, 10:20 p.m. UTC | #1 
On Wed, Apr 25, 2018 at 06:47:52PM +0900, Masahiro Yamada wrote:

> The default of DISTRO_DEFAULTS is messy.  Using the 'imply' keyword

> is equivalent and cleaner.

> 

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>


Applied to u-boot/master, thanks!

-- 
Tom
diff mbox series

Patch

diff --git a/Kconfig b/Kconfig
index 6957097..3bf95c1 100644
--- a/Kconfig
+++ b/Kconfig
@@ -68,11 +68,6 @@  config CC_COVERAGE
 
 config DISTRO_DEFAULTS
 	bool "Select defaults suitable for booting general purpose Linux distributions"
-	default y if ARCH_SUNXI || TEGRA
-	default y if ARCH_LS2080A
-	default y if ARCH_MESON
-	default y if ARCH_ROCKCHIP
-	default n
 	imply USE_BOOTCOMMAND
 	select CMD_BOOTZ if ARM && !ARM64
 	select CMD_BOOTI if ARM64
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7212fc5..4848954 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -581,6 +581,7 @@  config ARCH_OMAP2PLUS
 
 config ARCH_MESON
 	bool "Amlogic Meson"
+	imply DISTRO_DEFAULTS
 	help
 	  Support for the Meson SoC family developed by Amlogic Inc.,
 	  targeted at media players and tablet computers. We currently
@@ -720,6 +721,7 @@  config ARCH_SUNXI
 	select USB_KEYBOARD if DISTRO_DEFAULTS
 	select USE_TINY_PRINTF
 	imply CMD_GPT
+	imply DISTRO_DEFAULTS
 	imply FAT_WRITE
 	imply OF_LIBFDT_OVERLAY
 	imply PRE_CONSOLE_BUFFER
@@ -780,6 +782,7 @@  config ARCH_ZYNQMP
 
 config TEGRA
 	bool "NVIDIA Tegra"
+	imply DISTRO_DEFAULTS
 	imply FAT_WRITE
 
 config TARGET_VEXPRESS64_AEMV8A
@@ -1178,6 +1181,7 @@  config ARCH_ROCKCHIP
 	select DM_REGULATOR
 	select ENABLE_ARM_SOC_BOOT0_HOOK
 	imply CMD_FASTBOOT
+	imply DISTRO_DEFAULTS
 	imply FASTBOOT
 	imply FAT_WRITE
 	imply USB_FUNCTION_FASTBOOT
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index c4a96d4..7edc06d 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -167,6 +167,7 @@  config ARCH_LS2080A
 	select SYS_I2C_MXC_I2C2
 	select SYS_I2C_MXC_I2C3
 	select SYS_I2C_MXC_I2C4
+	imply DISTRO_DEFAULTS
 	imply PANIC_HANG
 
 config FSL_LSCH2
diff --git a/doc/README.distro b/doc/README.distro
index 2af5590..522deb3 100644
--- a/doc/README.distro
+++ b/doc/README.distro
@@ -165,8 +165,7 @@  Enabling the distro options
 In your board's defconfig, enable the DISTRO_DEFAULTS option by adding
 a line with "CONFIG_DISTRO_DEFAULTS=y". If you want to enable this
 from Kconfig itself, for e.g. all boards using a specific SoC then
-add a "default y if ARCH_FOO" to the DISTRO_DEFAULTS section of
-the Kconfig file in the root of the u-boot sources.
+add a "imply DISTRO_DEFAULTS" to your SoC CONFIG option.
 
 In your board configuration file, include the following: