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

Commit 186f93ea authored by Russell King's avatar Russell King
Browse files

Merge branch 'tmpreg' into devel 

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ux500/include/mach/debug-macro.S
parents 3560adf6 4e6d488a

arch/arm/Kconfig

+36 −36
Original line number Diff line number Diff line
@@ -738,14 +738,26 @@ config ARCH_U8500 


endchoice



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



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



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



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



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



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



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



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



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



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



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



source "arch/arm/mach-iop32x/Kconfig"
@@ -760,18 +772,28 @@ source "arch/arm/mach-ixp2000/Kconfig" 


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



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



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



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



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



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



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



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

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

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



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

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



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

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

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



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

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



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



source "arch/arm/plat-omap/Kconfig"
@@ -781,9 +803,14 @@ source "arch/arm/mach-omap2/Kconfig" 


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



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

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

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



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

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



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



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



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

source "arch/arm/plat-s3c24xx/Kconfig"
@@ -811,41 +838,14 @@ if ARCH_S5PC1XX 
source "arch/arm/mach-s5pc100/Kconfig"

endif



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

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



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

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



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



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



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



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



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



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

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



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



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



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



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



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



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



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



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



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



# Definitions to make life easier

config ARCH_ACORN

	bool

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_MX1) := mx1 
machine-$(CONFIG_ARCH_MX2)		:= mx2

machine-$(CONFIG_ARCH_MX25)		:= mx25

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_NS9XXX)		:= ns9xxx
@@ -172,12 +173,12 @@ machine-$(CONFIG_ARCH_VERSATILE) := versatile 
machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_ARCH_NUC93X)		:= nuc93x

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231



# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

plat-$(CONFIG_ARCH_MXC)		:= mxc

plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

plat-$(CONFIG_PLAT_ORION)	:= orion
@@ -185,7 +186,6 @@ plat-$(CONFIG_PLAT_PXA) := pxa 
plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx s3c samsung

plat-$(CONFIG_PLAT_S3C64XX)	:= s3c64xx s3c samsung

plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx s3c samsung

plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

arch/arm/boot/compressed/head.S

+17 −9
Original line number Diff line number Diff line
@@ -22,19 +22,27 @@ 
#if defined(CONFIG_DEBUG_ICEDCC)



#ifdef CONFIG_CPU_V6

		.macro	loadsp, rb

		.macro	loadsp, rb, tmp

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c0, c5, 0

		.endm

#elif defined(CONFIG_CPU_V7)

		.macro	loadsp, rb, tmp

		.endm

		.macro	writeb, ch, rb

wait:		mrc	p14, 0, pc, c0, c1, 0

		bcs	wait

		mcr	p14, 0, \ch, c0, c5, 0

		.endm

#elif defined(CONFIG_CPU_XSCALE)

		.macro	loadsp, rb

		.macro	loadsp, rb, tmp

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c8, c0, 0

		.endm

#else

		.macro	loadsp, rb

		.macro	loadsp, rb, tmp

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c1, c0, 0
@@ -50,7 +58,7 @@ 
		.endm



#if defined(CONFIG_ARCH_SA1100)

		.macro	loadsp, rb

		.macro	loadsp, rb, tmp

		mov	\rb, #0x80000000	@ physical base address

#ifdef CONFIG_DEBUG_LL_SER3

		add	\rb, \rb, #0x00050000	@ Ser3
@@ -59,13 +67,13 @@ 
#endif

		.endm

#elif defined(CONFIG_ARCH_S3C2410)

		.macro loadsp, rb

		.macro loadsp, rb, tmp

		mov	\rb, #0x50000000

		add	\rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT

		.endm

#else

		.macro	loadsp,	rb

		addruart \rb

		.macro	loadsp,	rb, tmp

		addruart \rb, \tmp

		.endm

#endif

#endif
@@ -1017,7 +1025,7 @@ phex: adr r3, phexbuf 
		strb	r2, [r3, r1]

		b	1b



puts:		loadsp	r3

puts:		loadsp	r3, r1

1:		ldrb	r2, [r0], #1

		teq	r2, #0

		moveq	pc, lr
@@ -1034,7 +1042,7 @@ puts: loadsp r3 
putc:

		mov	r2, r0

		mov	r0, #0

		loadsp	r3

		loadsp	r3, r1

		b	2b



memdump:	mov	r12, r0

arch/arm/boot/compressed/misc.c

+12 −1
Original line number Diff line number Diff line
@@ -53,6 +53,18 @@ static void icedcc_putc(int ch) 


	asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch));

}



#elif defined(CONFIG_CPU_V7)



static void icedcc_putc(int ch)

{

	asm(

	"wait:	mrc	p14, 0, pc, c0, c1, 0			\n\

		bcs	wait					\n\

		mcr     p14, 0, %0, c0, c5, 0			"

	: : "r" (ch));

}



#elif defined(CONFIG_CPU_XSCALE)



static void icedcc_putc(int ch)
@@ -88,7 +100,6 @@ static void icedcc_putc(int ch) 
#endif



#define putc(ch)	icedcc_putc(ch)

#define flush()	do { } while (0)

#endif



static void putstr(const char *ptr)

arch/arm/kernel/debug.S

+25 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#if defined(CONFIG_CPU_V6)



		.macro	addruart, rx

		.macro	addruart, rx, tmp

		.endm



		.macro	senduart, rd, rx
@@ -49,9 +49,29 @@ 
1002:

		.endm



#elif defined(CONFIG_CPU_V7)



		.macro	addruart, rx, tmp

		.endm



		.macro	senduart, rd, rx

		mcr	p14, 0, \rd, c0, c5, 0

		.endm



		.macro	busyuart, rd, rx

busy:		mrc	p14, 0, pc, c0, c1, 0

		bcs	busy

		.endm



		.macro	waituart, rd, rx

wait:		mrc	p14, 0, pc, c0, c1, 0

		bcs	wait



		.endm



#elif defined(CONFIG_CPU_XSCALE)



		.macro	addruart, rx

		.macro	addruart, rx, tmp

		.endm



		.macro	senduart, rd, rx
@@ -78,7 +98,7 @@ 


#else



		.macro	addruart, rx

		.macro	addruart, rx, tmp

		.endm



		.macro	senduart, rd, rx
@@ -144,7 +164,7 @@ ENDPROC(printhex2) 
		.ltorg



ENTRY(printascii)

		addruart r3

		addruart r3, r1

		b	2f

1:		waituart r2, r3

		senduart r1, r3
@@ -160,7 +180,7 @@ ENTRY(printascii) 
ENDPROC(printascii)



ENTRY(printch)

		addruart r3

		addruart r3, r1

		mov	r1, r0

		mov	r0, #0

		b	1b