diff mbox

arm: mvebu: update defconfig with 3.7 changes

Message ID 1350980269-6587-1-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Petazzoni Oct. 23, 2012, 8:17 a.m. UTC
The split of 370 and XP into two Kconfig options and the multiplatform
kernel support has changed a few Kconfig symbols, so let's update the
mvebu_defconfig file with the latest changes.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---
As this is a simple defconfig update against 3.7 changes, it should
most likely go into 3.7.
---
 arch/arm/configs/mvebu_defconfig |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Gregory CLEMENT Oct. 24, 2012, 8:39 a.m. UTC | #1
On 10/23/2012 10:17 AM, Thomas Petazzoni wrote:
> The split of 370 and XP into two Kconfig options and the multiplatform
> kernel support has changed a few Kconfig symbols, so let's update the
> mvebu_defconfig file with the latest changes.

Indeed this patch fixes the mvebu_defconfig which was broken.
But as now mvebu is part of multi_v7_defconfig, shouldn't we just
removed mvebu_defconfig ?

If we to keep it, then you can add my Acked-by.

> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 
> ---
> As this is a simple defconfig update against 3.7 changes, it should
> most likely go into 3.7.
> ---
Andrew Lunn Oct. 24, 2012, 9:18 a.m. UTC | #2
On Wed, Oct 24, 2012 at 10:39:42AM +0200, Gregory CLEMENT wrote:
> On 10/23/2012 10:17 AM, Thomas Petazzoni wrote:
> > The split of 370 and XP into two Kconfig options and the multiplatform
> > kernel support has changed a few Kconfig symbols, so let's update the
> > mvebu_defconfig file with the latest changes.
> 
> Indeed this patch fixes the mvebu_defconfig which was broken.
> But as now mvebu is part of multi_v7_defconfig, shouldn't we just
> removed mvebu_defconfig ?

Hi Gregory

It is probably useful for kisskb.

   Andrew
Thomas Petazzoni Oct. 24, 2012, 2:16 p.m. UTC | #3
Dear Gregory CLEMENT,

On Wed, 24 Oct 2012 10:39:42 +0200, Gregory CLEMENT wrote:
> On 10/23/2012 10:17 AM, Thomas Petazzoni wrote:
> > The split of 370 and XP into two Kconfig options and the multiplatform
> > kernel support has changed a few Kconfig symbols, so let's update the
> > mvebu_defconfig file with the latest changes.
> 
> Indeed this patch fixes the mvebu_defconfig which was broken.
> But as now mvebu is part of multi_v7_defconfig, shouldn't we just
> removed mvebu_defconfig ?

I think for now, SoC family specific defconfig files are still
accepted, so I'd prefer to keep mvebu_defconfig around. Multiplatform
is nice for users, but I prefer to build a mvebu-only kernel when I'm
doing kernel development.

Best regards,

Thomas
Arnd Bergmann Oct. 26, 2012, 8:33 p.m. UTC | #4
On Wednesday 24 October 2012, Thomas Petazzoni wrote:
> On Wed, 24 Oct 2012 10:39:42 +0200, Gregory CLEMENT wrote:
> > On 10/23/2012 10:17 AM, Thomas Petazzoni wrote:
> > > The split of 370 and XP into two Kconfig options and the multiplatform
> > > kernel support has changed a few Kconfig symbols, so let's update the
> > > mvebu_defconfig file with the latest changes.
> > 
> > Indeed this patch fixes the mvebu_defconfig which was broken.
> > But as now mvebu is part of multi_v7_defconfig, shouldn't we just
> > removed mvebu_defconfig ?
> 
> I think for now, SoC family specific defconfig files are still
> accepted, so I'd prefer to keep mvebu_defconfig around. Multiplatform
> is nice for users, but I prefer to build a mvebu-only kernel when I'm
> doing kernel development.

I'd certainly like to see that patch get merged. Should I just apply it
to the fixes branch?

	Arnd
Jason Cooper Oct. 26, 2012, 8:49 p.m. UTC | #5
Arnd Bergmann <arnd@arndb.de> wrote:

>On Wednesday 24 October 2012, Thomas Petazzoni wrote:
>> On Wed, 24 Oct 2012 10:39:42 +0200, Gregory CLEMENT wrote:
>> > On 10/23/2012 10:17 AM, Thomas Petazzoni wrote:
>> > > The split of 370 and XP into two Kconfig options and the
>multiplatform
>> > > kernel support has changed a few Kconfig symbols, so let's update
>the
>> > > mvebu_defconfig file with the latest changes.
>> > 
>> > Indeed this patch fixes the mvebu_defconfig which was broken.
>> > But as now mvebu is part of multi_v7_defconfig, shouldn't we just
>> > removed mvebu_defconfig ?
>> 
>> I think for now, SoC family specific defconfig files are still
>> accepted, so I'd prefer to keep mvebu_defconfig around. Multiplatform
>> is nice for users, but I prefer to build a mvebu-only kernel when I'm
>> doing kernel development.
>
>I'd certainly like to see that patch get merged. Should I just apply it
>to the fixes branch?
>
>	Arnd

Please do.  I have a few other fixes for v3.7 to do this w/e, but iirc they aren't fixing build breakage.

thx,

Jason.
Arnd Bergmann Oct. 26, 2012, 8:56 p.m. UTC | #6
On Friday 26 October 2012, Jason wrote:
> 
> Arnd Bergmann <arnd@arndb.de> wrote:
> 
> >On Wednesday 24 October 2012, Thomas Petazzoni wrote:
> >> On Wed, 24 Oct 2012 10:39:42 +0200, Gregory CLEMENT wrote:
> >> > On 10/23/2012 10:17 AM, Thomas Petazzoni wrote:
> >> > > The split of 370 and XP into two Kconfig options and the
> >multiplatform
> >> > > kernel support has changed a few Kconfig symbols, so let's update
> >the
> >> > > mvebu_defconfig file with the latest changes.
> >> > 
> >> > Indeed this patch fixes the mvebu_defconfig which was broken.
> >> > But as now mvebu is part of multi_v7_defconfig, shouldn't we just
> >> > removed mvebu_defconfig ?
> >> 
> >> I think for now, SoC family specific defconfig files are still
> >> accepted, so I'd prefer to keep mvebu_defconfig around. Multiplatform
> >> is nice for users, but I prefer to build a mvebu-only kernel when I'm
> >> doing kernel development.
> >
> >I'd certainly like to see that patch get merged. Should I just apply it
> >to the fixes branch?
> >
> >       Arnd
> 
> Please do.  I have a few other fixes for v3.7 to do this w/e, but iirc they aren't fixing build breakage.
> 

Ok, thanks for the quick reply. Applied now.

	Arnd
diff mbox

Patch

diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 7bcf850..3458752 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -1,6 +1,6 @@ 
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
+CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
@@ -9,10 +9,12 @@  CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_ARCH_MVEBU=y
-CONFIG_MACH_ARMADA_370_XP=y
+CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_XP=y
+# CONFIG_CACHE_L2X0 is not set
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
-CONFIG_USE_OF=y
+# CONFIG_COMPACTION is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
@@ -23,6 +25,8 @@  CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set