Commit fed9b63c authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branch 'mx51-baseport-sascha' of git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master

parents d2831d1f 3d48e1d0

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -663,6 +663,12 @@ T: git://git.pengutronix.de/git/imx/linux-2.6.git 
F:	arch/arm/mach-mx*/

F:	arch/arm/plat-mxc/



ARM/FREESCALE IMX51

M:	Amit Kucheria <amit.kucheria@canonical.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-mx5/



ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_MX1) := mx1 
machine-$(CONFIG_ARCH_MX2)		:= mx2

machine-$(CONFIG_ARCH_MX25)		:= mx25

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_NS9XXX)		:= ns9xxx

arch/arm/configs/mx51_defconfig

0 → 100644
+1286 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-mx5/Kconfig

0 → 100644
+18 −0
Original line number Diff line number Diff line 
if ARCH_MX5



config ARCH_MX51

	bool

	default y

	select MXC_TZIC

	select ARCH_MXC_IOMUX_V3



comment "MX5 platforms:"



config MACH_MX51_BABBAGE

	bool "Support MX51 BABBAGE platforms"

	help

	  Include support for MX51 Babbage platform, also known as MX51EVK in

	  u-boot. This includes specific configurations for the board and its

	  peripherals.



endif

arch/arm/mach-mx5/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#



# Object file lists.

obj-y   := cpu.o mm.o clock-mx51.o devices.o



obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE