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

Commit b7c11ec9 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'u300' into devel 

Conflicts:
	arch/arm/Makefile
Updates:
	arch/arm/mach-u300/core.c
	arch/arm/mach-u300/timer.c
parents 06099961 7666c17e

arch/arm/Kconfig

+16 −0
Original line number Original line Diff line number Diff line
@@ -598,6 +598,20 @@ config ARCH_LH7A40X 
	  core with a wide array of integrated devices for

	  core with a wide array of integrated devices for

	  hand-held and low-power applications.

	  hand-held and low-power applications.





config ARCH_U300

	bool "ST-Ericsson U300 Series"

	depends on MMU

	select CPU_ARM926T

	select ARM_AMBA

	select ARM_VIC

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_GPIO

	help

	  Support for ST-Ericsson U300 series mobile platforms.



config ARCH_DAVINCI

config ARCH_DAVINCI

	bool "TI DaVinci"

	bool "TI DaVinci"

	select CPU_ARM926T

	select CPU_ARM926T
@@ -712,6 +726,8 @@ source "arch/arm/mach-ks8695/Kconfig" 




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

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





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



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

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





# Definitions to make life easier

# Definitions to make life easier

arch/arm/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -154,6 +154,7 @@ machine-$(CONFIG_ARCH_SA1100) := sa1100 
machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x

machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x

machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx

machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_VERSATILE)	:= versatile

machine-$(CONFIG_ARCH_VERSATILE)	:= versatile

machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge