lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP

Browse Source 
If we don't have ARCH_OMAP2, 3 or 4 selected randconfig will always
fail with multiple errors as the CPU and MACHINE are not set.

Fix this by changing arch/arm/Makefile to build mach-omap2 based on
ARCH_OMAP2PLUS. And let's introduce SOC_OMAP and SOC_OMAP_NOOP that
allow randconfig to generate buildable .config files.

Note that we can also remove few uncecssary ARCH_OMAP2PLUS lines
as they are all within if ARCH_OMAP2PLUS block.

Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2012-02-23 16:41:53 -08:00
parent 3e2e613f5f
commit c295fb633e
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/Makefile
View File

@ -164,9 +164,7 @@ machine-$(CONFIG_ARCH_MXS) := mxs
machine-$(CONFIG_ARCH_NETX) := netx
machine-$(CONFIG_ARCH_NOMADIK) := nomadik
machine-$(CONFIG_ARCH_OMAP1) := omap1
machine-$(CONFIG_ARCH_OMAP2) := omap2
machine-$(CONFIG_ARCH_OMAP3) := omap2
machine-$(CONFIG_ARCH_OMAP4) := omap2
machine-$(CONFIG_ARCH_OMAP2PLUS) := omap2
machine-$(CONFIG_ARCH_ORION5X) := orion5x
machine-$(CONFIG_ARCH_PICOXCELL) := picoxcell
machine-$(CONFIG_ARCH_PNX4008) := pnx4008

51
arch/arm/mach-omap2/Kconfig
View File

@ -21,16 +21,12 @@ config ARCH_OMAP2PLUS_TYPICAL
Compile a kernel suitable for booting most boards
config ARCH_OMAP2
bool "TI OMAP2"
depends on ARCH_OMAP2PLUS
default y
bool
select CPU_V6
select MULTI_IRQ_HANDLER
config ARCH_OMAP3
bool "TI OMAP3"
depends on ARCH_OMAP2PLUS
default y
bool
select CPU_V7
select USB_ARCH_HAS_EHCI if USB_SUPPORT
select ARCH_HAS_OPP
@ -39,9 +35,7 @@ config ARCH_OMAP3
select MULTI_IRQ_HANDLER
config ARCH_OMAP4
bool "TI OMAP4"
default y
depends on ARCH_OMAP2PLUS
bool
select CACHE_L2X0
select CPU_V7
select ARM_GIC
@ -56,36 +50,58 @@ config ARCH_OMAP4
select ARM_CPU_SUSPEND if PM
comment "OMAP Core Type"
depends on ARCH_OMAP2
config SOC_OMAP
bool
config SOC_OMAP2420
bool "OMAP2420 support"
depends on ARCH_OMAP2
default y
select SOC_OMAP
select ARCH_OMAP2
select OMAP_DM_TIMER
select ARCH_OMAP_OTG
config SOC_OMAP2430
bool "OMAP2430 support"
depends on ARCH_OMAP2
default y
select SOC_OMAP
select ARCH_OMAP2
select ARCH_OMAP_OTG
config SOC_OMAP3430
bool "OMAP3430 support"
depends on ARCH_OMAP3
default y
select SOC_OMAP
select ARCH_OMAP3
select ARCH_OMAP_OTG
config SOC_OMAPTI81XX
bool "TI81XX support"
depends on ARCH_OMAP3
default y
select SOC_OMAP
select ARCH_OMAP3
config SOC_OMAPAM33XX
bool "AM33XX support"
depends on ARCH_OMAP3
default y
select SOC_OMAP
select ARCH_OMAP3
config SOC_OMAP44XX
bool "OMAP44XX support"
default y
select SOC_OMAP
select ARCH_OMAP4
config SOC_OMAP_NOOP
bool
depends on !SOC_OMAP
default y
select ARCH_OMAP2
select ARCH_OMAP3
select ARCH_OMAP4
select MACH_OMAP_GENERIC
config OMAP_PACKAGE_ZAF
bool
@ -112,17 +128,17 @@ config OMAP_PACKAGE_CBS
bool
comment "OMAP Board Type"
depends on ARCH_OMAP2PLUS
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
if SOC_OMAP
config MACH_OMAP2_TUSB6010
bool
depends on ARCH_OMAP2 && SOC_OMAP2420
@ -343,6 +359,7 @@ config MACH_OMAP4_PANDA
select OMAP_PACKAGE_CBS
select REGULATOR_FIXED_VOLTAGE if REGULATOR
endif
config OMAP3_EMU
bool "OMAP3 debugging peripherals"
depends on ARCH_OMAP3