diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 16:42:47 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 16:42:47 +0100 |
| commit | 86fff036fe95600dab337f37577b77742b89833c (patch) | |
| tree | 6b429820a622ca0614d9081949f9252f81c13fd5 /arch/arm/configs | |
| parent | d0b6342df0201c9a53629e59b67513fa72d82c58 (diff) | |
| parent | 93b2d7b15af2805ae10db76c651684c5b88b1e9d (diff) | |
| download | linux-86fff036fe95600dab337f37577b77742b89833c.tar.bz2 | |
Merge tag 'realview-multiplatform-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/multiplatform
Pull "Multiplatform support for the RealView" from Linus Walleij:
Here is the result of my application of the second part of Arnds
patchset, actually enabling multiplatform and getting the RealView
off the ground as a multiplatform target.
It is dependent on an outstanding patch to the irqchips tree bumping
the number of GICs to 2 for the RealView platform. I cannot say I will
be sleepless if these go in side by side: each branch will compile but
will not boot until both trees have been pulled hurting bisectability a
bit.
- Tested on the ARM PB11MPCore
- Tested with boardfile boot
- Tested with DeviceTree boot
* tag 'realview-multiplatform-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: realview: select apropriate targets
ARM: realview: clean up header files
ARM: realview: make all header files local
ARM: no longer make CPU targets visible separately
ARM: integrator: use explicit core module options
ARM: realview: enable multiplatform
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/realview-smp_defconfig | 9 | ||||
| -rw-r--r-- | arch/arm/configs/realview_defconfig | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig index 1da5d9e48224..bff0754bf2c1 100644 --- a/arch/arm/configs/realview-smp_defconfig +++ b/arch/arm/configs/realview-smp_defconfig @@ -8,10 +8,19 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_REALVIEW=y +CONFIG_REALVIEW_DT=y CONFIG_MACH_REALVIEW_EB=y +CONFIG_REALVIEW_EB_ARM1136=y +CONFIG_REALVIEW_EB_ARM1176=y +CONFIG_REALVIEW_EB_A9MP=y CONFIG_REALVIEW_EB_ARM11MP=y +CONFIG_REALVIEW_EB_ARM11MP_REVB=y CONFIG_MACH_REALVIEW_PB11MP=y +CONFIG_MACH_REALVIEW_PB1176=y +CONFIG_MACH_REALVIEW_PBA8=y +CONFIG_MACH_REALVIEW_PBX=y CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y CONFIG_AEABI=y diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig index d02e9d911bb7..bc6bef864b36 100644 --- a/arch/arm/configs/realview_defconfig +++ b/arch/arm/configs/realview_defconfig @@ -8,11 +8,19 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_REALVIEW=y +CONFIG_REALVIEW_DT=y CONFIG_MACH_REALVIEW_EB=y +CONFIG_REALVIEW_EB_ARM1136=y +CONFIG_REALVIEW_EB_ARM1176=y +CONFIG_REALVIEW_EB_A9MP=y CONFIG_REALVIEW_EB_ARM11MP=y +CONFIG_REALVIEW_EB_ARM11MP_REVB=y CONFIG_MACH_REALVIEW_PB11MP=y CONFIG_MACH_REALVIEW_PB1176=y +CONFIG_MACH_REALVIEW_PBA8=y +CONFIG_MACH_REALVIEW_PBX=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 |