evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Browse source 
* 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  Revert "ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP"
This commit is contained in:
Olof Johansson 2012-03-07 14:05:13 -08:00
commit 412fe6b3a1
2 changed files with 20 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/Makefile
View file

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

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

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