浏览代码

distro: use imply to enable DISTRO_DEFAULTS as SoC default

The default of DISTRO_DEFAULTS is messy.  Using the 'imply' keyword
is equivalent and cleaner.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Masahiro Yamada 7 年之前
父节点
当前提交
7325f6cfdc
共有 4 个文件被更改,包括 6 次插入7 次删除
  1. 0 5
      Kconfig
  2. 4 0
      arch/arm/Kconfig
  3. 1 0
      arch/arm/cpu/armv8/fsl-layerscape/Kconfig
  4. 1 2
      doc/README.distro

+ 0 - 5
Kconfig

@@ -68,11 +68,6 @@ config CC_COVERAGE
 
 
 config DISTRO_DEFAULTS
 config DISTRO_DEFAULTS
 	bool "Select defaults suitable for booting general purpose Linux distributions"
 	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
 	imply USE_BOOTCOMMAND
 	select CMD_BOOTZ if ARM && !ARM64
 	select CMD_BOOTZ if ARM && !ARM64
 	select CMD_BOOTI if ARM64
 	select CMD_BOOTI if ARM64

+ 4 - 0
arch/arm/Kconfig

@@ -584,6 +584,7 @@ config ARCH_OMAP2PLUS
 
 
 config ARCH_MESON
 config ARCH_MESON
 	bool "Amlogic Meson"
 	bool "Amlogic Meson"
+	imply DISTRO_DEFAULTS
 	help
 	help
 	  Support for the Meson SoC family developed by Amlogic Inc.,
 	  Support for the Meson SoC family developed by Amlogic Inc.,
 	  targeted at media players and tablet computers. We currently
 	  targeted at media players and tablet computers. We currently
@@ -723,6 +724,7 @@ config ARCH_SUNXI
 	select USB_KEYBOARD if DISTRO_DEFAULTS
 	select USB_KEYBOARD if DISTRO_DEFAULTS
 	select USE_TINY_PRINTF
 	select USE_TINY_PRINTF
 	imply CMD_GPT
 	imply CMD_GPT
+	imply DISTRO_DEFAULTS
 	imply FAT_WRITE
 	imply FAT_WRITE
 	imply OF_LIBFDT_OVERLAY
 	imply OF_LIBFDT_OVERLAY
 	imply PRE_CONSOLE_BUFFER
 	imply PRE_CONSOLE_BUFFER
@@ -784,6 +786,7 @@ config ARCH_ZYNQMP
 
 
 config TEGRA
 config TEGRA
 	bool "NVIDIA Tegra"
 	bool "NVIDIA Tegra"
+	imply DISTRO_DEFAULTS
 	imply FAT_WRITE
 	imply FAT_WRITE
 
 
 config TARGET_VEXPRESS64_AEMV8A
 config TARGET_VEXPRESS64_AEMV8A
@@ -1183,6 +1186,7 @@ config ARCH_ROCKCHIP
 	select ENABLE_ARM_SOC_BOOT0_HOOK
 	select ENABLE_ARM_SOC_BOOT0_HOOK
 	select SPI
 	select SPI
 	imply CMD_FASTBOOT
 	imply CMD_FASTBOOT
+	imply DISTRO_DEFAULTS
 	imply FASTBOOT
 	imply FASTBOOT
 	imply FAT_WRITE
 	imply FAT_WRITE
 	imply USB_FUNCTION_FASTBOOT
 	imply USB_FUNCTION_FASTBOOT

+ 1 - 0
arch/arm/cpu/armv8/fsl-layerscape/Kconfig

@@ -167,6 +167,7 @@ config ARCH_LS2080A
 	select SYS_I2C_MXC_I2C2
 	select SYS_I2C_MXC_I2C2
 	select SYS_I2C_MXC_I2C3
 	select SYS_I2C_MXC_I2C3
 	select SYS_I2C_MXC_I2C4
 	select SYS_I2C_MXC_I2C4
+	imply DISTRO_DEFAULTS
 	imply PANIC_HANG
 	imply PANIC_HANG
 
 
 config FSL_LSCH2
 config FSL_LSCH2

+ 1 - 2
doc/README.distro

@@ -165,8 +165,7 @@ Enabling the distro options
 In your board's defconfig, enable the DISTRO_DEFAULTS option by adding
 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
 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
 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:
 In your board configuration file, include the following: