* Tony Lindgren <tony@xxxxxxxxxxx> [120303 11:29]: > * Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> [120303 10:57]: > > > > Even with the full config, making oldconfig I get: > > > > OMAP2420 support (SOC_OMAP2420) [Y/n] (NEW) > > OMAP2430 support (SOC_OMAP2430) [Y/n] (NEW) > > OMAP3430 support (SOC_OMAP3430) [Y/n] (NEW) > > TI81XX support (SOC_OMAPTI81XX) [Y/n] (NEW) > > AM33XX support (SOC_OMAPAM33XX) [Y/n] (NEW) > > OMAP44XX support (SOC_OMAP44XX) [Y/n] (NEW) > > > > May I remind you of this mail from Linus: > > > > https://lkml.org/lkml/2012/1/6/354 > > > > So really this is a rather horrid mess. > > Hmm yes. Sounds like we need to remove the defaults and instead > add them to omap2plus_defconfig. > > I'll do a patch to fix that. How about the following patch after we revert commit 72b026a4? That still leaves the randconfig not necessarily selecting any of ARCH_OMAP2/3/4 issue, but that can be dealt separately later on. Sorry for the breakage, I guess I'm too stuck on just doing make omap2plus_defconfig and don't even have other hardware specific .config files any longer. Regards, Tony From: Tony Lindgren <tony@xxxxxxxxxxx> Date: Sat, 3 Mar 2012 12:10:29 -0800 Subject: [PATCH] ARM: OMAP2+: Remove default y for mach-omap2/Kconfig This can make existing .config files too greedy when running make oldconfig. Further default y should not be set as pointed out by Russell King and explained by Linus Torvalds at: https://lkml.org/lkml/2012/1/6/354 Instead, let's update omap2plus_defconfig with the existing boards as this defconfig is supposed to boot on all omap2plus boards. Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index d5f00d7..56084fb 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -23,6 +23,44 @@ CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_ARCH_OMAP=y CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_MUX_DEBUG=y +CONFIG_MACH_OMAP_GENERIC=y +CONFIG_ARCH_OMAP2PLUS_TYPICAL=y +CONFIG_ARCH_OMAP2=y +CONFIG_ARCH_OMAP3=y +CONFIG_ARCH_OMAP4=y +CONFIG_SOC_OMAP2420=y +CONFIG_SOC_OMAP2430=y +CONFIG_SOC_OMAP3430=y +CONFIG_SOC_OMAPTI81XX=y +CONFIG_SOC_OMAPAM33XX=y +CONFIG_MACH_OMAP_H4=y +CONFIG_MACH_OMAP_APOLLON=y +CONFIG_MACH_OMAP_2430SDP=y +CONFIG_MACH_OMAP3_BEAGLE=y +CONFIG_MACH_DEVKIT8000=y +CONFIG_MACH_OMAP_LDP=y +CONFIG_MACH_OMAP3530_LV_SOM=y +CONFIG_MACH_OMAP3_TORPEDO=y +CONFIG_MACH_OVERO=y +CONFIG_MACH_OMAP3EVM=y +CONFIG_MACH_OMAP3517EVM=y +CONFIG_MACH_OMAP3_PANDORA=y +CONFIG_MACH_OMAP3_TOUCHBOOK=y +CONFIG_MACH_OMAP_3430SDP=y +CONFIG_MACH_NOKIA_N8X0=y +CONFIG_MACH_NOKIA_RM680=y +CONFIG_MACH_NOKIA_RX51=y +CONFIG_MACH_OMAP_ZOOM2=y +CONFIG_MACH_OMAP_ZOOM3=y +CONFIG_MACH_CM_T35=y +CONFIG_MACH_CM_T3517=y +CONFIG_MACH_IGEP0030=y +CONFIG_MACH_SBC3530=y +CONFIG_MACH_OMAP_3630SDP=y +CONFIG_MACH_TI8168EVM=y +CONFIG_MACH_TI8148EVM=y +CONFIG_MACH_OMAP_4430SDP=y +CONFIG_MACH_OMAP4_PANDA=y CONFIG_ARM_THUMBEE=y CONFIG_ARM_ERRATA_411920=y CONFIG_NO_HZ=y diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 337f98d..1749d03 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -4,7 +4,6 @@ menu "TI OMAP2/3/4 Specific Features" config ARCH_OMAP2PLUS_TYPICAL bool "Typical OMAP configuration" - default y select AEABI select REGULATOR select PM_RUNTIME @@ -23,14 +22,12 @@ config ARCH_OMAP2PLUS_TYPICAL config ARCH_OMAP2 bool "TI OMAP2" depends on ARCH_OMAP2PLUS - default y select CPU_V6 select MULTI_IRQ_HANDLER config ARCH_OMAP3 bool "TI OMAP3" depends on ARCH_OMAP2PLUS - default y select CPU_V7 select USB_ARCH_HAS_EHCI if USB_SUPPORT select ARCH_HAS_OPP @@ -40,7 +37,6 @@ config ARCH_OMAP3 config ARCH_OMAP4 bool "TI OMAP4" - default y depends on ARCH_OMAP2PLUS select CACHE_L2X0 select CPU_V7 @@ -61,31 +57,26 @@ comment "OMAP Core Type" config SOC_OMAP2420 bool "OMAP2420 support" depends on ARCH_OMAP2 - default y select OMAP_DM_TIMER select ARCH_OMAP_OTG config SOC_OMAP2430 bool "OMAP2430 support" depends on ARCH_OMAP2 - default y select ARCH_OMAP_OTG config SOC_OMAP3430 bool "OMAP3430 support" depends on ARCH_OMAP3 - default y select ARCH_OMAP_OTG config SOC_OMAPTI81XX bool "TI81XX support" depends on ARCH_OMAP3 - default y config SOC_OMAPAM33XX bool "AM33XX support" depends on ARCH_OMAP3 - default y config OMAP_PACKAGE_ZAF bool @@ -118,7 +109,6 @@ config MACH_OMAP_GENERIC bool "Generic OMAP2+ board" depends on ARCH_OMAP2PLUS select USE_OF - default y help Support for generic TI OMAP2+ boards using Flattened Device Tree. More information at Documentation/devicetree @@ -131,45 +121,38 @@ config MACH_OMAP2_TUSB6010 config MACH_OMAP_H4 bool "OMAP 2420 H4 board" depends on SOC_OMAP2420 - default y select OMAP_PACKAGE_ZAF select OMAP_DEBUG_DEVICES config MACH_OMAP_APOLLON bool "OMAP 2420 Apollon board" depends on SOC_OMAP2420 - default y select OMAP_PACKAGE_ZAC config MACH_OMAP_2430SDP bool "OMAP 2430 SDP board" depends on SOC_OMAP2430 - default y select OMAP_PACKAGE_ZAC config MACH_OMAP3_BEAGLE bool "OMAP3 BEAGLE board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_DEVKIT8000 bool "DEVKIT8000 board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CUS config MACH_OMAP_LDP bool "OMAP3 LDP board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_OMAP3530_LV_SOM bool "OMAP3 Logic 3530 LV SOM board" depends on ARCH_OMAP3 select OMAP_PACKAGE_CBB - default y help Support for the LogicPD OMAP3530 SOM Development kit for full description please see the products webpage at @@ -179,7 +162,6 @@ config MACH_OMAP3_TORPEDO bool "OMAP3 Logic 35x Torpedo board" depends on ARCH_OMAP3 select OMAP_PACKAGE_CBB - default y help Support for the LogicPD OMAP35x Torpedo Development kit for full description please see the products webpage at @@ -188,19 +170,16 @@ config MACH_OMAP3_TORPEDO config MACH_OVERO bool "Gumstix Overo board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_OMAP3EVM bool "OMAP 3530 EVM board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_OMAP3517EVM bool "OMAP3517/ AM3517 EVM board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_CRANEBOARD @@ -211,19 +190,16 @@ config MACH_CRANEBOARD config MACH_OMAP3_PANDORA bool "OMAP3 Pandora" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB select REGULATOR_FIXED_VOLTAGE if REGULATOR config MACH_OMAP3_TOUCHBOOK bool "OMAP3 Touch Book" depends on ARCH_OMAP3 - default y config MACH_OMAP_3430SDP bool "OMAP 3430 SDP board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_NOKIA_N800 @@ -238,7 +214,6 @@ config MACH_NOKIA_N810_WIMAX config MACH_NOKIA_N8X0 bool "Nokia N800/N810" depends on SOC_OMAP2420 - default y select OMAP_PACKAGE_ZAC select MACH_NOKIA_N800 select MACH_NOKIA_N810 @@ -247,19 +222,16 @@ config MACH_NOKIA_N8X0 config MACH_NOKIA_RM680 bool "Nokia RM-680 board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_NOKIA_RX51 bool "Nokia RX-51 board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_OMAP_ZOOM2 bool "OMAP3 Zoom2 board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB select SERIAL_8250 select SERIAL_CORE_CONSOLE @@ -269,7 +241,6 @@ config MACH_OMAP_ZOOM2 config MACH_OMAP_ZOOM3 bool "OMAP3630 Zoom3 board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBP select SERIAL_8250 select SERIAL_CORE_CONSOLE @@ -279,14 +250,12 @@ config MACH_OMAP_ZOOM3 config MACH_CM_T35 bool "CompuLab CM-T35/CM-T3730 modules" depends on ARCH_OMAP3 - default y select MACH_CM_T3730 select OMAP_PACKAGE_CUS config MACH_CM_T3517 bool "CompuLab CM-T3517 module" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_CM_T3730 @@ -295,41 +264,34 @@ config MACH_CM_T3730 config MACH_IGEP0020 bool "IGEP v2 board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB config MACH_IGEP0030 bool "IGEP OMAP3 module" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBB select MACH_IGEP0020 config MACH_SBC3530 bool "OMAP3 SBC STALKER board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CUS config MACH_OMAP_3630SDP bool "OMAP3630 SDP board" depends on ARCH_OMAP3 - default y select OMAP_PACKAGE_CBP config MACH_TI8168EVM bool "TI8168 Evaluation Module" depends on SOC_OMAPTI81XX - default y config MACH_TI8148EVM bool "TI8148 Evaluation Module" depends on SOC_OMAPTI81XX - default y config MACH_OMAP_4430SDP bool "OMAP 4430 SDP board" - default y depends on ARCH_OMAP4 select OMAP_PACKAGE_CBL select OMAP_PACKAGE_CBS @@ -337,7 +299,6 @@ config MACH_OMAP_4430SDP config MACH_OMAP4_PANDA bool "OMAP4 Panda Board" - default y depends on ARCH_OMAP4 select OMAP_PACKAGE_CBL select OMAP_PACKAGE_CBS -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
