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

Commit d98aac75 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

[ARM] 5480/1: U300-v5 integrate into the ARM architecture 



This hooks the U300 support into Kbuild and makes a small hook
in mmu.c for supporting an odd memory alignment with shared memory
on these systems.

This is rebased to RMK:s GIT HEAD. This patch tries to add the
Kconfig option in alphabetic order by option text and the Makefile
entry after config symbol.

Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bb3cee2b

arch/arm/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -594,6 +594,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
@@ -705,6 +719,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
@@ -149,6 +149,7 @@ machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 
machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_VERSATILE)	:= versatile

machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge

arch/arm/mm/mmu.c

+14 −0
Original line number Diff line number Diff line
@@ -839,6 +839,20 @@ void __init reserve_node_zero(pg_data_t *pgdat) 
		reserve_bootmem_node(pgdat, 0xa0200000, 0x1000,

				BOOTMEM_EXCLUSIVE);



	/*

	 * U300 - This platform family can share physical memory

	 * between two ARM cpus, one running Linux and the other

	 * running another OS.

	 */

	if (machine_is_u300()) {

#ifdef CONFIG_MACH_U300_SINGLE_RAM

#if ((CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1) == 1) &&	\

	CONFIG_MACH_U300_2MB_ALIGNMENT_FIX

		res_size = 0x00100000;

#endif

#endif

	}



#ifdef CONFIG_SA1111

	/*

	 * Because of the SA1111 DMA bug, we want to preserve our