aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/compressed/head-xscale.S
diff options
context:
space:
mode:
authorMichael-Luke Jones <mlj28@cam.ac.uk>2007-05-26 21:58:07 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-07-12 11:12:15 +0100
commitd85ed59524d936f4c2657ba39a483b4ab373a59e (patch)
tree2d6ac3952dfaf3300a4024b725c2c3dc988d1ecf /arch/arm/boot/compressed/head-xscale.S
parentddaca4a26efc0716708f027914bf5508e2d86cc7 (diff)
downloadvexpress-lsk-d85ed59524d936f4c2657ba39a483b4ab373a59e.tar.gz
[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>
Diffstat (limited to 'arch/arm/boot/compressed/head-xscale.S')
-rw-r--r--arch/arm/boot/compressed/head-xscale.S5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S
index 73c5d9e0201..236bbe57831 100644
--- a/arch/arm/boot/compressed/head-xscale.S
+++ b/arch/arm/boot/compressed/head-xscale.S
@@ -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