diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-06-22 16:15:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-25 22:17:55 -0400 |
| commit | c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d (patch) | |
| tree | 727c74825b6b09abddfb19b1ab7232e1d02d068c /arch/arm | |
| parent | 3c85c8b9f91334b001837123ffaba0a17cde51eb (diff) | |
| download | u-boot-imx-c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d.zip u-boot-imx-c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d.tar.gz u-boot-imx-c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d.tar.bz2 | |
Move default y configs out of arch/board Kconfig
Some archs/boards specify their own default by pre-defining the config
which causes the Kconfig system to mix up the order of the configs in
the defconfigs... This will cause merge pain if allowed to proliferate.
Remove the configs that behave this way from the archs.
A few configs still remain, but that is because they only exist as
defaults and do not have a proper Kconfig entry. Those appear to be:
SPIFLASH
DISPLAY_BOARDINFO
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
[trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates,
drop DM_USB from MSI_Primo81 as USB_MUSB_SUNXI isn't converted yet to DM]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv7/exynos/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-bcm283x/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 12 |
3 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig index 3ca7128..4a7d82f 100644 --- a/arch/arm/cpu/armv7/exynos/Kconfig +++ b/arch/arm/cpu/armv7/exynos/Kconfig @@ -74,9 +74,6 @@ endchoice config SYS_SOC default "exynos" -config DM_USB - default y - source "board/samsung/smdkv310/Kconfig" source "board/samsung/trats/Kconfig" source "board/samsung/universal_c210/Kconfig" diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 99779df..2315a13 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -15,9 +15,6 @@ config TARGET_RPI_2 endchoice -config PHYS_TO_BUS - default y - config SYS_BOARD default "rpi" if TARGET_RPI default "rpi_2" if TARGET_RPI_2 diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index f5b5ee9..54bd648 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -21,18 +21,6 @@ endchoice config SYS_MALLOC_F_LEN default 0x1800 -config USE_PRIVATE_LIBGCC - default y - -config DM_USB - default y - -config SPL_DM - default y - -config SPL_DISABLE_OF_CONTROL - default y - source "arch/arm/mach-tegra/tegra20/Kconfig" source "arch/arm/mach-tegra/tegra30/Kconfig" source "arch/arm/mach-tegra/tegra114/Kconfig" |