From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 8 Apr 2013 18:08:43 +0000 (+0200)
Subject: Merge tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v3.10-rc1~122^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5f29151588744ea2e283971cb0ad403ee04e3e2;p=thirdparty%2Flinux.git

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>
---

f5f29151588744ea2e283971cb0ad403ee04e3e2
diff --cc arch/arm/Kconfig
index 6423b587fa23b,0d3daa62e8a8a..e4bbc8bca03c8
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -361,26 -362,17 +361,6 @@@ config ARCH_AT9
  	  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
 -config ARCH_CNS3XXX
 -	bool "Cavium Networks CNS3XXX family"
 -	select ARM_GIC
 -	select CPU_V6K
--	select GENERIC_CLOCKEVENTS
- 	select MULTI_IRQ_HANDLER
- 	select PINCTRL
- 	select PINCTRL_BCM2835
- 	select SPARSE_IRQ
- 	select USE_OF
 -	select MIGHT_HAVE_CACHE_L2X0
 -	select MIGHT_HAVE_PCI
 -	select PCI_DOMAINS if PCI
--	help
- 	  This enables support for the Broadcom BCM2835 SoC. This SoC is
- 	  use in the Raspberry Pi, and Roku 2 devices.
 -	  Support for Cavium Networks CNS3XXX platform.
--
  config ARCH_CLPS711X
  	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
  	select ARCH_REQUIRE_GPIOLIB
diff --cc arch/arm/Kconfig.debug
index fd17127b41887,a877d5135d2e6..5f6c665b00d2c
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -593,7 -583,7 +597,8 @@@ endchoic
  
  config DEBUG_LL_INCLUDE
  	string
+ 	default "debug/bcm2835.S" if DEBUG_BCM2835
 +	default "debug/cns3xxx.S" if DEBUG_CNS3XXX
  	default "debug/icedcc.S" if DEBUG_ICEDCC
  	default "debug/imx.S" if DEBUG_IMX1_UART || \
  				 DEBUG_IMX25_UART || \