Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform

Enable initial ARM multi-platform support for highbank, mvebu,
socfpga, picoxcell, and vexpress.

Multi-platform support is dependent on mach/gpio.h removal and
restructuring of DEBUG_LL and dtb build rules included in this branch.

This has been built for all defconfigs, and booted on highbank with
all 5 platforms enabled.

By Rob Herring (18) and Arnd Bergmann (1)
via Rob Herring
* tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux:
  ARM: vexpress: convert to multi-platform
  ARM: initial multiplatform support
  ARM: mvebu: move armada-370-xp.h in mach dir
  ARM: vexpress: remove dependency on mach/* headers
  ARM: picoxcell: remove dependency on mach/* headers
  ARM: move all dtb targets out of Makefile.boot
  ARM: picoxcell: move debug macros to include/debug
  ARM: socfpga: move debug macros to include/debug
  ARM: mvebu: move debug macros to include/debug
  ARM: vexpress: move debug macros to include/debug
  ARM: highbank: move debug macros to include/debug
  ARM: move debug macros to common location
  ARM: make mach/gpio.h headers optional
  ARM: orion: move custom gpio functions to orion-gpio.h
  ARM: shmobile: move custom gpio functions to sh-gpio.h
  ARM: pxa: use gpio_to_irq for sharppm_sl
  net: pxaficp_ir: add irq resources
  usb: pxa27x_udc: remove IRQ_USB define
  staging: ste_rmi4: remove gpio.h include

Conflicts due to addition of bcm2835 and removal of pnx4008 in:
	arch/arm/Kconfig
	arch/arm/Makefile

Conflicts due to new dtb targets, moved to arch/arm/boot/dts/Makefile in:
	arch/arm/mach-imx/Makefile.boot
	arch/arm/mach-mxs/Makefile.boot
	arch/arm/mach-tegra/Makefile.boot

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 75 insertions, 75 deletions

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index f47618252e5d..1c974cf9db1b 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -135,84 +135,79 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
 
 # Machine directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.
-machine-$(CONFIG_ARCH_AT91)             := at91
-machine-$(CONFIG_ARCH_BCM2835)          := bcm2835
-machine-$(CONFIG_ARCH_BCMRING)          := bcmring
-machine-$(CONFIG_ARCH_CLPS711X)         := clps711x
-machine-$(CONFIG_ARCH_CNS3XXX)          := cns3xxx
-machine-$(CONFIG_ARCH_DAVINCI)          := davinci
-machine-$(CONFIG_ARCH_DOVE)             := dove
-machine-$(CONFIG_ARCH_EBSA110)          := ebsa110
-machine-$(CONFIG_ARCH_EP93XX)           := ep93xx
-machine-$(CONFIG_ARCH_GEMINI)           := gemini
-machine-$(CONFIG_ARCH_H720X)            := h720x
-machine-$(CONFIG_ARCH_HIGHBANK)         := highbank
-machine-$(CONFIG_ARCH_INTEGRATOR)       := integrator
-machine-$(CONFIG_ARCH_IOP13XX)          := iop13xx
-machine-$(CONFIG_ARCH_IOP32X)           := iop32x
-machine-$(CONFIG_ARCH_IOP33X)           := iop33x
-machine-$(CONFIG_ARCH_IXP4XX)           := ixp4xx
-machine-$(CONFIG_ARCH_KIRKWOOD)         := kirkwood
-machine-$(CONFIG_ARCH_KS8695)           := ks8695
-machine-$(CONFIG_ARCH_LPC32XX)          := lpc32xx
-machine-$(CONFIG_ARCH_MMP)              := mmp
-machine-$(CONFIG_ARCH_MSM)              := msm
-machine-$(CONFIG_ARCH_MV78XX0)          := mv78xx0
-machine-$(CONFIG_ARCH_IMX_V4_V5)        := imx
-machine-$(CONFIG_ARCH_IMX_V6_V7)        := imx
-machine-$(CONFIG_ARCH_MXS)              := mxs
-machine-$(CONFIG_ARCH_MVEBU)            := mvebu
-machine-$(CONFIG_ARCH_NETX)             := netx
-machine-$(CONFIG_ARCH_NOMADIK)          := nomadik
-machine-$(CONFIG_ARCH_OMAP1)            := omap1
-machine-$(CONFIG_ARCH_OMAP2PLUS)        := omap2
-machine-$(CONFIG_ARCH_ORION5X)          := orion5x
-machine-$(CONFIG_ARCH_PICOXCELL)        := picoxcell
-machine-$(CONFIG_ARCH_PRIMA2)           := prima2
-machine-$(CONFIG_ARCH_PXA)              := pxa
-machine-$(CONFIG_ARCH_REALVIEW)         := realview
-machine-$(CONFIG_ARCH_RPC)              := rpc
-machine-$(CONFIG_ARCH_S3C24XX)          := s3c24xx s3c2412 s3c2440
-machine-$(CONFIG_ARCH_S3C64XX)          := s3c64xx
-machine-$(CONFIG_ARCH_S5P64X0)          := s5p64x0
-machine-$(CONFIG_ARCH_S5PC100)          := s5pc100
-machine-$(CONFIG_ARCH_S5PV210)          := s5pv210
-machine-$(CONFIG_ARCH_EXYNOS4)          := exynos
-machine-$(CONFIG_ARCH_EXYNOS5)          := exynos
-machine-$(CONFIG_ARCH_SA1100)           := sa1100
-machine-$(CONFIG_ARCH_SHARK)            := shark
-machine-$(CONFIG_ARCH_SHMOBILE)         := shmobile
-machine-$(CONFIG_ARCH_TEGRA)            := tegra
-machine-$(CONFIG_ARCH_U300)             := u300
-machine-$(CONFIG_ARCH_U8500)            := ux500
-machine-$(CONFIG_ARCH_VERSATILE)        := versatile
-machine-$(CONFIG_ARCH_VEXPRESS)         := vexpress
-machine-$(CONFIG_ARCH_VT8500)           := vt8500
-machine-$(CONFIG_ARCH_W90X900)          := w90x900
-machine-$(CONFIG_FOOTBRIDGE)            := footbridge
-machine-$(CONFIG_ARCH_SOCFPGA)          := socfpga
-machine-$(CONFIG_MACH_SPEAR1310)        := spear13xx
-machine-$(CONFIG_MACH_SPEAR1340)        := spear13xx
-machine-$(CONFIG_MACH_SPEAR300)         := spear3xx
-machine-$(CONFIG_MACH_SPEAR310)         := spear3xx
-machine-$(CONFIG_MACH_SPEAR320)         := spear3xx
-machine-$(CONFIG_MACH_SPEAR600)         := spear6xx
-machine-$(CONFIG_ARCH_ZYNQ)             := zynq
+machine-$(CONFIG_ARCH_AT91)             += at91
+machine-$(CONFIG_ARCH_BCM2835)          += bcm2835
+machine-$(CONFIG_ARCH_BCMRING)          += bcmring
+machine-$(CONFIG_ARCH_CLPS711X)         += clps711x
+machine-$(CONFIG_ARCH_CNS3XXX)          += cns3xxx
+machine-$(CONFIG_ARCH_DAVINCI)          += davinci
+machine-$(CONFIG_ARCH_DOVE)             += dove
+machine-$(CONFIG_ARCH_EBSA110)          += ebsa110
+machine-$(CONFIG_ARCH_EP93XX)           += ep93xx
+machine-$(CONFIG_ARCH_GEMINI)           += gemini
+machine-$(CONFIG_ARCH_H720X)            += h720x
+machine-$(CONFIG_ARCH_HIGHBANK)         += highbank
+machine-$(CONFIG_ARCH_INTEGRATOR)       += integrator
+machine-$(CONFIG_ARCH_IOP13XX)          += iop13xx
+machine-$(CONFIG_ARCH_IOP32X)           += iop32x
+machine-$(CONFIG_ARCH_IOP33X)           += iop33x
+machine-$(CONFIG_ARCH_IXP4XX)           += ixp4xx
+machine-$(CONFIG_ARCH_KIRKWOOD)         += kirkwood
+machine-$(CONFIG_ARCH_KS8695)           += ks8695
+machine-$(CONFIG_ARCH_LPC32XX)          += lpc32xx
+machine-$(CONFIG_ARCH_MMP)              += mmp
+machine-$(CONFIG_ARCH_MSM)              += msm
+machine-$(CONFIG_ARCH_MV78XX0)          += mv78xx0
+machine-$(CONFIG_ARCH_MXC)              += imx
+machine-$(CONFIG_ARCH_MXS)              += mxs
+machine-$(CONFIG_ARCH_MVEBU)            += mvebu
+machine-$(CONFIG_ARCH_NETX)             += netx
+machine-$(CONFIG_ARCH_NOMADIK)          += nomadik
+machine-$(CONFIG_ARCH_OMAP1)            += omap1
+machine-$(CONFIG_ARCH_OMAP2PLUS)        += omap2
+machine-$(CONFIG_ARCH_ORION5X)          += orion5x
+machine-$(CONFIG_ARCH_PICOXCELL)        += picoxcell
+machine-$(CONFIG_ARCH_PRIMA2)           += prima2
+machine-$(CONFIG_ARCH_PXA)              += pxa
+machine-$(CONFIG_ARCH_REALVIEW)         += realview
+machine-$(CONFIG_ARCH_RPC)              += rpc
+machine-$(CONFIG_ARCH_S3C24XX)          += s3c24xx s3c2412 s3c2440
+machine-$(CONFIG_ARCH_S3C64XX)          += s3c64xx
+machine-$(CONFIG_ARCH_S5P64X0)          += s5p64x0
+machine-$(CONFIG_ARCH_S5PC100)          += s5pc100
+machine-$(CONFIG_ARCH_S5PV210)          += s5pv210
+machine-$(CONFIG_ARCH_EXYNOS)           += exynos
+machine-$(CONFIG_ARCH_SA1100)           += sa1100
+machine-$(CONFIG_ARCH_SHARK)            += shark
+machine-$(CONFIG_ARCH_SHMOBILE)         += shmobile
+machine-$(CONFIG_ARCH_TEGRA)            += tegra
+machine-$(CONFIG_ARCH_U300)             += u300
+machine-$(CONFIG_ARCH_U8500)            += ux500
+machine-$(CONFIG_ARCH_VERSATILE)        += versatile
+machine-$(CONFIG_ARCH_VEXPRESS)         += vexpress
+machine-$(CONFIG_ARCH_VT8500)           += vt8500
+machine-$(CONFIG_ARCH_W90X900)          += w90x900
+machine-$(CONFIG_FOOTBRIDGE)            += footbridge
+machine-$(CONFIG_ARCH_SOCFPGA)          += socfpga
+machine-$(CONFIG_ARCH_SPEAR13XX)        += spear13xx
+machine-$(CONFIG_ARCH_SPEAR3XX)         += spear3xx
+machine-$(CONFIG_MACH_SPEAR600)         += spear6xx
+machine-$(CONFIG_ARCH_ZYNQ)             += zynq
 
 # Platform directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.
-plat-$(CONFIG_ARCH_MXC)         := mxc
-plat-$(CONFIG_ARCH_OMAP)        := omap
-plat-$(CONFIG_ARCH_S3C64XX)     := samsung
-plat-$(CONFIG_ARCH_ZYNQ)        := versatile
-plat-$(CONFIG_PLAT_IOP)         := iop
-plat-$(CONFIG_PLAT_NOMADIK)     := nomadik
-plat-$(CONFIG_PLAT_ORION)       := orion
-plat-$(CONFIG_PLAT_PXA)         := pxa
-plat-$(CONFIG_PLAT_S3C24XX)     := s3c24xx samsung
-plat-$(CONFIG_PLAT_S5P)         := samsung
-plat-$(CONFIG_PLAT_SPEAR)       := spear
-plat-$(CONFIG_PLAT_VERSATILE)   := versatile
+plat-$(CONFIG_ARCH_MXC)         += mxc
+plat-$(CONFIG_ARCH_OMAP)        += omap
+plat-$(CONFIG_ARCH_S3C64XX)     += samsung
+plat-$(CONFIG_ARCH_ZYNQ)        += versatile
+plat-$(CONFIG_PLAT_IOP)         += iop
+plat-$(CONFIG_PLAT_NOMADIK)     += nomadik
+plat-$(CONFIG_PLAT_ORION)       += orion
+plat-$(CONFIG_PLAT_PXA)         += pxa
+plat-$(CONFIG_PLAT_S3C24XX)     += s3c24xx samsung
+plat-$(CONFIG_PLAT_S5P)         += samsung
+plat-$(CONFIG_PLAT_SPEAR)       += spear
+plat-$(CONFIG_PLAT_VERSATILE)   += versatile
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)
 # This is what happens if you forget the IOCS16 line.
@@ -230,15 +225,20 @@ MACHINE  := arch/arm/mach-$(word 1,$(machine-y))/
 else
 MACHINE  :=
 endif
+ifeq ($(CONFIG_ARCH_MULTIPLATFORM),y)
+MACHINE  :=
+endif
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
 platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y))
 
+ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)
 ifeq ($(KBUILD_SRC),)
 KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))
 else
 KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))
 endif
+endif
 
 export  TEXT_OFFSET GZFLAGS MMUEXT