[PATCH] UBUNTU: [Config] Enable OMAP4 support in master
Amit Kucheria
amit.kucheria at canonical.com
Thu Jul 15 08:43:52 UTC 2010
Hi,
Since 2.6.35 it is possible to compile a single kernel for OMAP2/OMAP3/OMAP4.
Enabling the mainline version of OMAP4 code (in the master branch, -omap
flavour) will allow us to exercise that code and help with upstream QA.
If one of the ARM developers could pull in the patches adding Panda support
from Tony Lindgren's linux-omap tree (slated to be integrated in the 2.6.36
merge window), that would allow us to have a mainline version OMAP4 kernel to
test against.
Here is an untested config patch (lack of HW) to enable this.
Regards,
Amit
--
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com
----------------------------------------------------------------------
>From a8d6819636e3adacafc7c21f4cc13e2ca97daabd Mon Sep 17 00:00:00 2001
Message-Id: <a8d6819636e3adacafc7c21f4cc13e2ca97daabd.1279183035.git.amit.kucheria at canonical.com>
From: Amit Kucheria <amit.kucheria at canonical.com>
Date: Thu, 15 Jul 2010 11:35:22 +0300
Subject: [PATCH] UBUNTU: [Config] Enable OMAP4 support
>From 2.6.35, one can compile a single kernel for OMAP2/OMAP3/OMAP4 SoCs. Since
OMAP2 is ARMv6, skip that and enable OMAP4 support.
Enable relevant boards - 4430SDP and DEVKIT8000 (omap3)
Signed-off-by: Amit Kucheria <amit.kucheria at canonical.com>
---
debian.master/config/amd64/config.common.amd64 | 2 ++
debian.master/config/armel/config.common.armel | 2 +-
debian.master/config/armel/config.flavour.omap | 3 +++
.../config/armel/config.flavour.versatile | 3 +++
debian.master/config/config.common.ubuntu | 13 +++++++++++--
debian.master/config/i386/config.common.i386 | 2 ++
6 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 0f25e8e..a2990f6 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -7,6 +7,7 @@ CONFIG_AGP=y
CONFIG_AGP_AMD64=y
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_ARCH_OMAP4 is not set
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
@@ -93,6 +94,7 @@ CONFIG_LLC2=m
CONFIG_LOG_BUF_SHIFT=18
# CONFIG_M586 is not set
# CONFIG_M586TSC is not set
+# CONFIG_MACH_DEVKIT8000 is not set
CONFIG_MEMSTICK=m
CONFIG_MFD_JANZ_CMODIO=m
# CONFIG_MFD_TMIO is not set
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index a40b19f..12b8776 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -44,9 +44,9 @@ CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_SM_COMMON is not set
# CONFIG_MTD_SST25L is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_NEED_DMA_MAP_STATE=y
# CONFIG_NET_POCKET is not set
+CONFIG_NR_CPUS=4
# CONFIG_PCCARD is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
# CONFIG_PM_DEBUG is not set
diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap
index fd9bcf5..8c11da0 100644
--- a/debian.master/config/armel/config.flavour.omap
+++ b/debian.master/config/armel/config.flavour.omap
@@ -3,6 +3,7 @@
#
# CONFIG_APM_EMULATION is not set
CONFIG_ARCH_OMAP=y
+CONFIG_ARCH_OMAP4=y
# CONFIG_ARCH_VERSATILE is not set
CONFIG_ARM_ERRATA_430973=y
CONFIG_ARM_L1_CACHE_SHIFT=6
@@ -57,6 +58,7 @@ CONFIG_LAPB=m
CONFIG_LLC=m
CONFIG_LLC2=m
CONFIG_LOG_BUF_SHIFT=17
+CONFIG_MACH_DEVKIT8000=y
# CONFIG_MEMSTICK is not set
CONFIG_MFD_ASIC3=y
CONFIG_MFD_T7L66XB=y
@@ -94,6 +96,7 @@ CONFIG_MTD_RAM=m
CONFIG_MTD_REDBOOT_PARTS=m
CONFIG_MTD_ROM=m
CONFIG_MTD_SLRAM=m
+CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
# CONFIG_NET_CLS_CGROUP is not set
# CONFIG_NET_CLS_FLOW is not set
diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile
index 269cc8f..dd0359b 100644
--- a/debian.master/config/armel/config.flavour.versatile
+++ b/debian.master/config/armel/config.flavour.versatile
@@ -3,6 +3,7 @@
#
CONFIG_APM_EMULATION=m
# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_OMAP4 is not set
CONFIG_ARCH_VERSATILE=y
# CONFIG_ARM_ERRATA_430973 is not set
CONFIG_ARM_L1_CACHE_SHIFT=5
@@ -57,6 +58,7 @@ CONFIG_LIRC_DEV=m
CONFIG_LLC=y
# CONFIG_LLC2 is not set
CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_MACH_DEVKIT8000 is not set
CONFIG_MEMSTICK=m
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_T7L66XB is not set
@@ -94,6 +96,7 @@ CONFIG_MTD_NAND_ECC=m
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_SLRAM is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
CONFIG_NET_CLS_CGROUP=y
CONFIG_NET_CLS_FLOW=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index fdee92e..1b218ba 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -186,7 +186,6 @@ CONFIG_ARCH_MEMORY_PROBE=y
CONFIG_ARCH_OMAP2PLUS=y
CONFIG_ARCH_OMAP3=y
CONFIG_ARCH_OMAP3430=y
-# CONFIG_ARCH_OMAP4 is not set
CONFIG_ARCH_OMAP_OTG=y
# CONFIG_ARCH_ORION5X is not set
# CONFIG_ARCH_PNX4008 is not set
@@ -237,6 +236,7 @@ CONFIG_ARM_AMBA=y
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
# CONFIG_ARM_ERRATA_458693 is not set
# CONFIG_ARM_ERRATA_460075 is not set
+CONFIG_ARM_GIC=y
CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_ARM_THUMB=y
# CONFIG_ARM_THUMBEE is not set
@@ -524,6 +524,7 @@ CONFIG_C2PORT_DURAMAR_2150=m
CONFIG_CACHEFILES=m
# CONFIG_CACHEFILES_DEBUG is not set
# CONFIG_CACHEFILES_HISTOGRAM is not set
+CONFIG_CACHE_L2X0=y
CONFIG_CAIF=m
# CONFIG_CAIF_DEBUG is not set
CONFIG_CAIF_NETDEV=m
@@ -1535,6 +1536,8 @@ CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_HAVE_ARCH_KMEMCHECK=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_HAVE_ARM_TWD=y
CONFIG_HAVE_ATOMIC_IOMAP=y
CONFIG_HAVE_CLK=y
CONFIG_HAVE_DMA_API_DEBUG=y
@@ -2393,6 +2396,7 @@ CONFIG_LITELINK_DONGLE=m
CONFIG_LNE390=m
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCAL_TIMERS=y
CONFIG_LOCKD=m
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_LOCKD_V4=y
@@ -2431,7 +2435,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MACHZ_WDT=m
# CONFIG_MACH_CM_T35 is not set
-# CONFIG_MACH_DEVKIT8000 is not set
CONFIG_MACH_IGEP0020=y
CONFIG_MACH_NOKIA_RX51=y
CONFIG_MACH_OMAP3517EVM=y
@@ -2441,6 +2444,7 @@ CONFIG_MACH_OMAP3_PANDORA=y
CONFIG_MACH_OMAP3_TOUCHBOOK=y
CONFIG_MACH_OMAP_3430SDP=y
CONFIG_MACH_OMAP_3630SDP=y
+CONFIG_MACH_OMAP_4430SDP=y
CONFIG_MACH_OMAP_LDP=y
CONFIG_MACH_OMAP_ZOOM2=y
CONFIG_MACH_OMAP_ZOOM3=y
@@ -2622,6 +2626,7 @@ CONFIG_MOUSE_SERIAL=m
CONFIG_MOUSE_SYNAPTICS_I2C=m
CONFIG_MOXA_INTELLIO=m
CONFIG_MOXA_SMARTIO=m
+# CONFIG_MPCORE_WATCHDOG is not set
# CONFIG_MPENTIUM4 is not set
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
@@ -3076,6 +3081,8 @@ CONFIG_OPTPROBES=y
CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
# CONFIG_OTUS is not set
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
CONFIG_P54_COMMON=m
CONFIG_P54_LEDS=y
CONFIG_P54_PCI=m
@@ -3259,6 +3266,7 @@ CONFIG_PHONE_IXJ=m
CONFIG_PHONE_IXJ_PCMCIA=m
CONFIG_PHYLIB=y
CONFIG_PID_NS=y
+# CONFIG_PL310_ERRATA_588369 is not set
# CONFIG_PLAT_SPEAR is not set
CONFIG_PLAT_VERSATILE=y
CONFIG_PLIP=m
@@ -4014,6 +4022,7 @@ CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y
CONFIG_SND_OMAP_SOC_OVERO=y
CONFIG_SND_OMAP_SOC_RX51=m
CONFIG_SND_OMAP_SOC_SDP3430=y
+# CONFIG_SND_OMAP_SOC_SDP4430 is not set
CONFIG_SND_OMAP_SOC_ZOOM2=y
CONFIG_SND_OPL3SA2=m
CONFIG_SND_OPL3_LIB=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e5c00b4..0190ae4 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -7,6 +7,7 @@ CONFIG_AGP=m
CONFIG_AGP_AMD64=m
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+# CONFIG_ARCH_OMAP4 is not set
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_ASYNC_TX_DMA=y
@@ -93,6 +94,7 @@ CONFIG_LIRC_DEV=m
CONFIG_LLC=y
CONFIG_LLC2=m
CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_MACH_DEVKIT8000 is not set
CONFIG_MEMSTICK=m
CONFIG_MFD_JANZ_CMODIO=m
# CONFIG_MFD_TMIO is not set
--
1.7.0.4
More information about the kernel-team
mailing list