Merge branch 'stmp' into devel (06099961) · Commits · 戴 / test

arch/arm/Kconfig

+15 −0

Original line number	Diff line number	Diff line
		@@ -298,6 +298,19 @@ config ARCH_MXC
		help
		Support for Freescale MXC/iMX-based family of processors

		config ARCH_STMP3XXX
		bool "Freescale STMP3xxx"
		select CPU_ARM926T
		select HAVE_CLK
		select COMMON_CLKDEV
		select ARCH_REQUIRE_GPIOLIB
		select GENERIC_TIME
		select GENERIC_CLOCKEVENTS
		select GENERIC_GPIO
		select USB_ARCH_HAS_EHCI
		help
		Support for systems based on the Freescale 3xxx CPUs.

		config ARCH_NETX
		bool "Hilscher NetX based"
		select CPU_ARM926T
		@@ -673,6 +686,8 @@ source "arch/arm/mach-s3c6400/Kconfig"
		source "arch/arm/mach-s3c6410/Kconfig"
		endif

		source "arch/arm/plat-stmp3xxx/Kconfig"

		source "arch/arm/mach-lh7a40x/Kconfig"

		source "arch/arm/mach-h720x/Kconfig"

+3 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,8 @@ machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
		machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410
		machine-$(CONFIG_ARCH_SA1100) := sa1100
		machine-$(CONFIG_ARCH_SHARK) := shark
		machine-$(CONFIG_ARCH_STMP378X) := stmp378x
		machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx
		machine-$(CONFIG_ARCH_VERSATILE) := versatile
		machine-$(CONFIG_ARCH_W90X900) := w90x900
		machine-$(CONFIG_FOOTBRIDGE) := footbridge
		@@ -165,6 +167,7 @@ plat-$(CONFIG_PLAT_ORION) := orion
		plat-$(CONFIG_PLAT_PXA) := pxa
		plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c
		plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c
		plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx

		ifeq ($(CONFIG_ARCH_EBSA110),y)
		# This is what happens if you forget the IOCS16 line.

0 → 100644

+1141 −0

File added.

Preview size limit exceeded, changes collapsed.

0 → 100644

+1002 −0

File added.

Preview size limit exceeded, changes collapsed.

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		obj-$(CONFIG_ARCH_STMP378X) += stmp378x.o
		obj-$(CONFIG_MACH_STMP378X) += stmp378x_devb.o