• Olof Johansson's avatar
    Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux... · 5ae8d15f
    Olof Johansson authored
    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: default avatarOlof Johansson <olof@lixom.net>
    5ae8d15f
Kconfig.debug 14.4 KB