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

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

[PATCH] ARM: Make the magic values in head.S more obvious 



Make the magic address values in head.S more obvious as to where
they came from.  Wrap all debug code in CONFIG_DEBUG_LL.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e695f604

arch/arm/kernel/head.S

+8 −12
Original line number Diff line number Diff line
@@ -344,9 +344,9 @@ __create_page_tables: 
	str	r6, [r0]

#endif



#ifdef CONFIG_DEBUG_LL

	bic	r7, r7, #0x0c			@ turn off cacheable

						@ and bufferable bits

#ifdef CONFIG_DEBUG_LL

	/*

	 * Map in IO space for serial debugging.

	 * This allows debug messages to be output
@@ -372,27 +372,23 @@ __create_page_tables: 
	teq	r1, #MACH_TYPE_NETWINDER

	teqne	r1, #MACH_TYPE_CATS

	bne	1f

	add	r0, r4, #0x3fc0			@ ff000000

	mov	r3, #0x7c000000

	orr	r3, r3, r7

	str	r3, [r0], #4

	add	r3, r3, #1 << 20

	str	r3, [r0], #4

	add	r0, r4, #0xff000000 >> 18

	orr	r3, r7, #0x7c000000

	str	r3, [r0]

1:

#endif

#endif

#ifdef CONFIG_ARCH_RPC

	/*

	 * Map in screen at 0x02000000 & SCREEN2_BASE

	 * Similar reasons here - for debug.  This is

	 * only for Acorn RiscPC architectures.

	 */

	add	r0, r4, #0x80			@ 02000000

	mov	r3, #0x02000000

	orr	r3, r3, r7

	add	r0, r4, #0x02000000 >> 18

	orr	r3, r7, #0x02000000

	str	r3, [r0]

	add	r0, r4, #0x3600			@ d8000000

	add	r0, r4, #0xd8000000 >> 18

	str	r3, [r0]

#endif

#endif

	mov	pc, lr

	.ltorg