Commit d85ed595 authored May 26, 2007 by Michael-Luke Jones Committed by Russell King Jul 12, 2007

[ARM] 4407/1: Remove in-kernel mach id setting for gtwx5715 ixp4xx board



If MACH_GTWX5715 is set in Kconfig, this code sets the mach id
automatically. Howeber, this means that any IXP4xx kernel which
is setup to support the gtwx5715 board will not successfully boot
on any other board.

If the bootloader sets the wrong mach id, it should be set correctly
by a kernel shim.

Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent ddaca4a2

arch/arm/boot/compressed/head-xscale.S

+0 −5

Original line number	Diff line number	Diff line
		@@ -41,11 +41,6 @@ __XScale_start:
		mov r7, #MACH_TYPE_COTULLA_IDP
		#endif

		#ifdef CONFIG_MACH_GTWX5715
		mov r7, #(MACH_TYPE_GTWX5715 & 0xff)
		orr r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
		#endif

		#ifdef CONFIG_ARCH_IXP2000
		mov r1, #-1
		mov r0, #0xd6000000