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 Diff line number Diff line
@@ -598,6 +598,20 @@ config ARCH_LH7A40X 
	  core with a wide array of integrated devices for

	  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

	bool "TI DaVinci"

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


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



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



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



# Definitions to make life easier

arch/arm/Makefile

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

machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x

machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_VERSATILE)	:= versatile

machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge

arch/arm/configs/u300_defconfig

0 → 100644
+1115 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-u300/Kconfig

0 → 100644
+105 −0
Original line number Diff line number Diff line 
if ARCH_U300



menu "ST-Ericsson AB U300/U330/U335/U365 Platform"



comment "ST-Ericsson Mobile Platform Products"



config MACH_U300

	bool "U300"



comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"



choice

	prompt "U300/U330/U335/U365 system type"

	default MACH_U300_BS2X

	---help---

	You need to select the target system, i.e. the

	U300/U330/U335/U365 board that you want to compile your kernel

	for.



config MACH_U300_BS2X

	bool "S26/S26/B25/B26 Test Products"

	depends on MACH_U300

	help

		Select this if you're developing on the

		S26/S25 test products. (Also works on

		B26/B25 big boards.)



config MACH_U300_BS330

	bool "S330/B330 Test Products"

	depends on MACH_U300

	help

		Select this if you're developing on the

		S330/B330 test products.



config MACH_U300_BS335

	bool "S335/B335 Test Products"

	depends on MACH_U300

	help

		Select this if you're developing on the

		S335/B335 test products.



config MACH_U300_BS365

	bool "S365/B365 Test Products"

	depends on MACH_U300

	help

		Select this if you're developing on the

		S365/B365 test products.



endchoice



choice

	prompt "Memory configuration"

	default MACH_U300_SINGLE_RAM

	---help---

	You have to config the kernel according to the physical memory

	configuration.



config MACH_U300_SINGLE_RAM

	bool "Single RAM"

	help

		Select this if you want support for Single RAM phones.



config MACH_U300_DUAL_RAM

	bool "Dual RAM"

	help

		Select this if you want support for Dual RAM phones.

		This is two RAM memorys on different EMIFs.

endchoice



config U300_DEBUG

	bool "Debug support for U300"

	depends on PM

	help

		Debug support for U300 in sysfs, procfs etc.



config MACH_U300_SEMI_IS_SHARED

	bool "The SEMI is used by both the access and application side"

	depends on MACH_U300

	help

		This makes it possible to use the SEMI (Shared External

		Memory Interface) from both from access and application

		side.



comment "All the settings below must match the bootloader's settings"



config MACH_U300_ACCESS_MEM_SIZE

       int "Access CPU memory allocation"

       range 7 25

       depends on MACH_U300_SINGLE_RAM

       default 13

       help

		How much memory in MiB that the Access side CPU has allocated



config MACH_U300_2MB_ALIGNMENT_FIX

       bool "2MiB alignment fix"

       depends on MACH_U300_SINGLE_RAM

       default y

       help

		If yes and the Access side CPU has allocated an odd size in

		MiB, this fix gives you one MiB extra that would otherwise be

		lost due to Linux 2 MiB alignment policy.



endmenu



endif

arch/arm/mach-u300/Makefile

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

# Makefile for the linux kernel, U300 machine.

#



obj-y		:= core.o clock.o timer.o gpio.o padmux.o

obj-m		:=

obj-n		:=

obj-		:=



obj-$(CONFIG_ARCH_U300)	          += u300.o

obj-$(CONFIG_MMC)                 += mmc.o