diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 20:08:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 12:06:28 +0200 |
| commit | f5f29151588744ea2e283971cb0ad403ee04e3e2 (patch) | |
| tree | afdeceebd1e5413508d35fded1dd3363e931071f /arch/arm/Kconfig | |
| parent | 806a94f20c8d78c96601878393a49fab577dcf2e (diff) | |
| parent | f1ac922dec7ed36659344eadc65b9c06efe14d7f (diff) | |
| download | kernel_goldelico_gta04-f5f29151588744ea2e283971cb0ad403ee04e3e2.zip kernel_goldelico_gta04-f5f29151588744ea2e283971cb0ad403ee04e3e2.tar.gz kernel_goldelico_gta04-f5f29151588744ea2e283971cb0ad403ee04e3e2.tar.bz2 | |
Merge tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/multiplatform
From Stephen Warren <swarren@wwwdotorg.org>:
ARM: bcm2835: convert to multi-platform
This branch (patch) converts BCM2835 to support being built into a
multi-platform single zImage. This mostly entails a few small Kconfig
tweaks, move the earlyprintk implementation to the standard multi-
platform location, and deleting some unnecessary files.
* tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
ARM: bcm2835: convert to multi-platform
Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6423b58..e4bbc8b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -361,26 +361,6 @@ config ARCH_AT91 This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. -config ARCH_BCM2835 - bool "Broadcom BCM2835 family" - select ARCH_REQUIRE_GPIOLIB - select ARM_AMBA - select ARM_ERRATA_411920 - select ARM_TIMER_SP804 - select CLKDEV_LOOKUP - select CLKSRC_OF - select COMMON_CLK - select CPU_V6 - select GENERIC_CLOCKEVENTS - select MULTI_IRQ_HANDLER - select PINCTRL - select PINCTRL_BCM2835 - select SPARSE_IRQ - select USE_OF - help - This enables support for the Broadcom BCM2835 SoC. This SoC is - use in the Raspberry Pi, and Roku 2 devices. - config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" select ARCH_REQUIRE_GPIOLIB @@ -981,6 +961,8 @@ source "arch/arm/mach-at91/Kconfig" source "arch/arm/mach-bcm/Kconfig" +source "arch/arm/mach-bcm2835/Kconfig" + source "arch/arm/mach-clps711x/Kconfig" source "arch/arm/mach-cns3xxx/Kconfig" |