Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cccf59ab authored by Kevin Wells's avatar Kevin Wells
Browse files

Merge branch 'test' of ../test/linux-2.6-lpc2 into wells/lpc32xx-arch_v2

parents fc0f5ac8 40805949

arch/arm/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -482,6 +482,19 @@ config ARCH_LOKI 
	help

	  Support for the Marvell Loki (88RC8480) SoC.



config ARCH_LPC32XX

	bool "NXP LPC32XX"

	select CPU_ARM926T

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_IDE

	select ARM_AMBA

	select USB_ARCH_HAS_OHCI

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for the NXP LPC32XX family of processors



config ARCH_MV78XX0

	bool "Marvell MV78xx0"

	select CPU_FEROCEON
@@ -845,6 +858,8 @@ source "arch/arm/mach-lh7a40x/Kconfig" 


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



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



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



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

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ machine-$(CONFIG_ARCH_KS8695) := ks8695 
machine-$(CONFIG_ARCH_L7200)		:= l7200

machine-$(CONFIG_ARCH_LH7A40X)		:= lh7a40x

machine-$(CONFIG_ARCH_LOKI) 		:= loki

machine-$(CONFIG_ARCH_LPC32XX)		:= lpc32xx

machine-$(CONFIG_ARCH_MMP)		:= mmp

machine-$(CONFIG_ARCH_MSM)		:= msm

machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

arch/arm/mach-lpc32xx/Kconfig

0 → 100644
+33 −0
Original line number Diff line number Diff line 
if ARCH_LPC32XX



menu "Individual UART enable selections"



config ARCH_LPC32XX_UART3_SELECT

	bool "Add support for standard UART3"

	help

	 Adds support for standard UART 3 when the 8250 serial support

	 is enabled.



config ARCH_LPC32XX_UART4_SELECT

	bool "Add support for standard UART4"

	help

	 Adds support for standard UART 4 when the 8250 serial support

	 is enabled.



config ARCH_LPC32XX_UART5_SELECT

	bool "Add support for standard UART5"

	default y

	help

	 Adds support for standard UART 5 when the 8250 serial support

	 is enabled.



config ARCH_LPC32XX_UART6_SELECT

	bool "Add support for standard UART6"

	help

	 Adds support for standard UART 6 when the 8250 serial support

	 is enabled.



endmenu



endif

arch/arm/mach-lpc32xx/Makefile

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

# Makefile for the linux kernel.

#



obj-y	:= timer.o irq.o common.o serial.o clock.o

obj-y	+= gpiolib.o pm.o suspend.o

obj-y	+= phy3250.o

arch/arm/mach-lpc32xx/Makefile.boot

0 → 100644
+4 −0
Original line number Diff line number Diff line 
   zreladdr-y	:= 0x80008000

params_phys-y	:= 0x80000100

initrd_phys-y	:= 0x82000000