Patchwork UBUNTU: [Config] Enable OMAP4 support in master

login
register
mail settings
Submitter Amit Kucheria
Date July 15, 2010, 8:43 a.m.
Message ID <20100715084352.GB3013@matterhorn.lan>
Download mbox | patch
Permalink /patch/58966/
State Rejected
Delegated to: Leann Ogasawara
Headers show

Comments

Amit Kucheria - July 15, 2010, 8:43 a.m.
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
Bryan Wu - July 15, 2010, 9:08 a.m.
Amit,

I'm OK for enabling the OMAP4 in our master -omap flavor, but got one concern
about the patches we need to back port from Tony Lindgren's linux-omap tree. We
still missing some omap4 code in our 2.6.35 based master branch, although
backporting the Panda board supporting is not very hard.

How big are these patches and how many of them?

Thanks,
-Bryan

On 07/15/2010 04:43 PM, Amit Kucheria wrote:
> 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 - July 15, 2010, 10:38 a.m.
On 10 Jul 15, Bryan Wu wrote:
> Amit,
> 
> I'm OK for enabling the OMAP4 in our master -omap flavor, but got one concern
> about the patches we need to back port from Tony Lindgren's linux-omap tree. We
> still missing some omap4 code in our 2.6.35 based master branch, although
> backporting the Panda board supporting is not very hard.
> 
> How big are these patches and how many of them?
> 
> Thanks,
> -Bryan

As discussed on IRC, it shoud be only a few patches (2-3) in Tony's for-next
branch to enable basic panda support.

Regards,
Amit
Tim Gardner - July 22, 2010, 7:54 a.m.
On 07/15/2010 12:38 PM, Amit Kucheria wrote:
> On 10 Jul 15, Bryan Wu wrote:
>> Amit,
>>
>> I'm OK for enabling the OMAP4 in our master -omap flavor, but got one concern
>> about the patches we need to back port from Tony Lindgren's linux-omap tree. We
>> still missing some omap4 code in our 2.6.35 based master branch, although
>> backporting the Panda board supporting is not very hard.
>>
>> How big are these patches and how many of them?
>>
>> Thanks,
>> -Bryan
>
> As discussed on IRC, it shoud be only a few patches (2-3) in Tony's for-next
> branch to enable basic panda support.
>
> Regards,
> Amit

So, whats going on with this? Are you going to forward the necessary 
patches?
Dechesne, Nicolas - July 22, 2010, 2:01 p.m.
On 07/15/2010 10:43 AM, Amit Kucheria wrote:
> 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.
>
>    
amit, OMAP4 support in mainline is very basic for now (no display, no 
audio). only headless images will boot. I haven't tried lately with 
mainline, do you know exactly what works from mainline with OMAP4 (SD 
Card, network, USB, ...?)
> 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 - July 27, 2010, 8:40 a.m.
On 10 Jul 22, Tim Gardner wrote:
> On 07/15/2010 12:38 PM, Amit Kucheria wrote:
> >On 10 Jul 15, Bryan Wu wrote:
> >>Amit,
> >>
> >>I'm OK for enabling the OMAP4 in our master -omap flavor, but got one concern
> >>about the patches we need to back port from Tony Lindgren's linux-omap tree. We
> >>still missing some omap4 code in our 2.6.35 based master branch, although
> >>backporting the Panda board supporting is not very hard.
> >>
> >>How big are these patches and how many of them?
> >>
> >>Thanks,
> >>-Bryan
> >
> >As discussed on IRC, it shoud be only a few patches (2-3) in Tony's for-next
> >branch to enable basic panda support.
> >
> >Regards,
> >Amit
> 
> So, whats going on with this? Are you going to forward the necessary
> patches?
> 

Bryan already looked at a few panda enablement patches in Tony's branch for the
next merge window. I think he will push it in.

Regards,
Amit
Amit Kucheria - July 27, 2010, 8:42 a.m.
On 10 Jul 22, Dechesne, Nicolas wrote:
> 
> 
> On 07/15/2010 10:43 AM, Amit Kucheria wrote:
> >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.
> >
> amit, OMAP4 support in mainline is very basic for now (no display,
> no audio). only headless images will boot. I haven't tried lately
> with mainline, do you know exactly what works from mainline with
> OMAP4 (SD Card, network, USB, ...?)

Due to lack of HW, I can't confirm any of this. But what I'm interested in is
a headless kernel for Panda. So pulling back the panda-enablement patches
from Tony's branch for the next merge window would be nice.

Regards,
Amit
Bryan Wu - July 30, 2010, 9:50 a.m.
On 07/27/2010 04:42 PM, Amit Kucheria wrote:
> On 10 Jul 22, Dechesne, Nicolas wrote:
>>
>>
>> On 07/15/2010 10:43 AM, Amit Kucheria wrote:
>>> 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.
>>>
>> amit, OMAP4 support in mainline is very basic for now (no display,
>> no audio). only headless images will boot. I haven't tried lately
>> with mainline, do you know exactly what works from mainline with
>> OMAP4 (SD Card, network, USB, ...?)
> 
> Due to lack of HW, I can't confirm any of this. But what I'm interested in is
> a headless kernel for Panda. So pulling back the panda-enablement patches
> from Tony's branch for the next merge window would be nice.
> 
> Regards,
> Amit
> 

Amit,

I did some investigation today and found that even upstream Tony's for-next
branch cannot support a single kernel for OMAP2/3/4. I tried to compile it but
building failed. I just built for ARCH_OMAP4, the kernel can boots and serial
port works fine. Hope we can fix this single kernel issue in the future.

So I'm afraid that we can't simply enable OMAP4 in our master branch omap
flavor, since our omap flavor is for OMAP3. In the future, after all the OMAP4
stuff are merged into mainline, we can remove ti-omap4 topic branch but still
need an additional armel flavor - omap4 in master branch.

-Thanks,
Amit Kucheria - July 30, 2010, 12:20 p.m.
On 10 Jul 30, Bryan Wu wrote:
> 
> I did some investigation today and found that even upstream Tony's for-next
> branch cannot support a single kernel for OMAP2/3/4. I tried to compile it but
> building failed. I just built for ARCH_OMAP4, the kernel can boots and serial
> port works fine. Hope we can fix this single kernel issue in the future.

That sounds like a bug in the for-next branch. I just compiled the tip of
linux-omap (Tony's tree) with omap3_defconfig and it compiled fine. On
looking at the for-next error I realised it was fixed in master. (So
eventually Tony will put it into for-next as well)

> So I'm afraid that we can't simply enable OMAP4 in our master branch omap
> flavor, since our omap flavor is for OMAP3. In the future, after all the OMAP4
> stuff are merged into mainline, we can remove ti-omap4 topic branch but still
> need an additional armel flavor - omap4 in master branch.

No, this is all wrong!

Cherry-picking c040fd888b448a227c14e686eb67c09b625f75ac from the master
branch to for-next fixes the compile of an omap2/3/4 kernel.

Could you please try adding b970ecd55364ba3be1b6a500bf16abda3c8ec7e2 to our
maverick tree (master branch), compiling an -omap flavour and testing on your
panda?

/Amit
Bryan Wu - July 30, 2010, 2:34 p.m.
On 07/30/2010 08:20 PM, Amit Kucheria wrote:
> On 10 Jul 30, Bryan Wu wrote:
>>
>> I did some investigation today and found that even upstream Tony's for-next
>> branch cannot support a single kernel for OMAP2/3/4. I tried to compile it but
>> building failed. I just built for ARCH_OMAP4, the kernel can boots and serial
>> port works fine. Hope we can fix this single kernel issue in the future.
> 
> That sounds like a bug in the for-next branch. I just compiled the tip of
> linux-omap (Tony's tree) with omap3_defconfig and it compiled fine. On
> looking at the for-next error I realised it was fixed in master. (So
> eventually Tony will put it into for-next as well)
> 

I realized that I am trying omap_4430sdp_defconfig instead of omap3_defconfig.
If I enabled ARCH_OMAP3 + omap_4430sdp_defconfig, building will fail due some
assemble code undefined error.

>> So I'm afraid that we can't simply enable OMAP4 in our master branch omap
>> flavor, since our omap flavor is for OMAP3. In the future, after all the OMAP4
>> stuff are merged into mainline, we can remove ti-omap4 topic branch but still
>> need an additional armel flavor - omap4 in master branch.
> 
> No, this is all wrong!
> 
> Cherry-picking c040fd888b448a227c14e686eb67c09b625f75ac from the master
> branch to for-next fixes the compile of an omap2/3/4 kernel.
> 

OK, I found omap3_defconfig enabled all OMAP2/3/4 and after cherry-picking
c040fd888b448a227c14e686eb67c09b625f75ac, building omap2/3/4 kernel works fine.

> Could you please try adding b970ecd55364ba3be1b6a500bf16abda3c8ec7e2 to our
> maverick tree (master branch), compiling an -omap flavour and testing on your
> panda?
> 

No problem, I will try to enable that soon. Since we can get a single kernel for
omap2/3/4, one -omap flavor will be our goal.

Thanks a lot,
-Bryan
Bryan Wu - Aug. 2, 2010, 6:09 a.m.
Amit,

I back-ported b970ecd55364ba3be1b6a500bf16abda3c8ec7e2 to our master tree and
built the kernel. Kernel works fine on my Panda board with console=ttyS2 instead
of ttyO2 and the rootfs is maverick.

Please find the kernel package here:
http://people.canonical.com/~roc/kernel/master-omap4/

I also pushed patches here:
http://kernel.ubuntu.com/git?p=roc/ubuntu-maverick.git;a=shortlog;h=refs/heads/master-omap4

But I do find the conflict issue between OMAP2/3 and OMAP4. As we got 2 core in
OMAP4 processor first time, we need CONFIG_SMP=y to activate the second CPU
core. But in omap3_defconfig and upstream single kernel config, CONFIG_SMP is off.

If we enable CONFIG_SMP=y in OMAP2/3/4 single kernel config, we will got
following building error:
---
  AS      arch/arm/kernel/entry-armv.o
arch/arm/kernel/entry-armv.S: Assembler messages:
arch/arm/kernel/entry-armv.S:47: Error: bad instruction `test_for_ipi r0,r6,r5,lr'
arch/arm/kernel/entry-armv.S:47: Error: bad instruction `test_for_ltirq r0,r6,r5,lr'
arch/arm/kernel/entry-armv.S:47: Error: bad instruction `test_for_ipi r0,r6,r5,lr'
arch/arm/kernel/entry-armv.S:47: Error: bad instruction `test_for_ltirq r0,r6,r5,lr'
make[1]: *** [arch/arm/kernel/entry-armv.o] Error 1
make: *** [arch/arm/kernel] Error 2
---

I will try to fix this.

So currently, if we wanna enable OMAP4 in our master tree, we need turn off the
CONFIG_SMP. Kernel works fine, but we just got 1 core.

In our -omap4 branch, we got dual core with CONFIG_SMP=y.

Thanks,
-Bryan


On 07/30/2010 10:34 PM, Bryan Wu wrote:
> On 07/30/2010 08:20 PM, Amit Kucheria wrote:
>> On 10 Jul 30, Bryan Wu wrote:
>>>
>>> I did some investigation today and found that even upstream Tony's for-next
>>> branch cannot support a single kernel for OMAP2/3/4. I tried to compile it but
>>> building failed. I just built for ARCH_OMAP4, the kernel can boots and serial
>>> port works fine. Hope we can fix this single kernel issue in the future.
>>
>> That sounds like a bug in the for-next branch. I just compiled the tip of
>> linux-omap (Tony's tree) with omap3_defconfig and it compiled fine. On
>> looking at the for-next error I realised it was fixed in master. (So
>> eventually Tony will put it into for-next as well)
>>
> 
> I realized that I am trying omap_4430sdp_defconfig instead of omap3_defconfig.
> If I enabled ARCH_OMAP3 + omap_4430sdp_defconfig, building will fail due some
> assemble code undefined error.
> 
>>> So I'm afraid that we can't simply enable OMAP4 in our master branch omap
>>> flavor, since our omap flavor is for OMAP3. In the future, after all the OMAP4
>>> stuff are merged into mainline, we can remove ti-omap4 topic branch but still
>>> need an additional armel flavor - omap4 in master branch.
>>
>> No, this is all wrong!
>>
>> Cherry-picking c040fd888b448a227c14e686eb67c09b625f75ac from the master
>> branch to for-next fixes the compile of an omap2/3/4 kernel.
>>
> 
> OK, I found omap3_defconfig enabled all OMAP2/3/4 and after cherry-picking
> c040fd888b448a227c14e686eb67c09b625f75ac, building omap2/3/4 kernel works fine.
> 
>> Could you please try adding b970ecd55364ba3be1b6a500bf16abda3c8ec7e2 to our
>> maverick tree (master branch), compiling an -omap flavour and testing on your
>> panda?
>>
> 
> No problem, I will try to enable that soon. Since we can get a single kernel for
> omap2/3/4, one -omap flavor will be our goal.
> 
> Thanks a lot,
> -Bryan
>

Patch

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