Commit d85ed595 authored by Michael-Luke Jones's avatar Michael-Luke Jones Committed by Russell King

[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: default avatarMichael-Luke Jones <mlj28@cam.ac.uk>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ddaca4a2
...@@ -41,11 +41,6 @@ __XScale_start: ...@@ -41,11 +41,6 @@ __XScale_start:
mov r7, #MACH_TYPE_COTULLA_IDP mov r7, #MACH_TYPE_COTULLA_IDP
#endif #endif
#ifdef CONFIG_MACH_GTWX5715
mov r7, #(MACH_TYPE_GTWX5715 & 0xff)
orr r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
#endif
#ifdef CONFIG_ARCH_IXP2000 #ifdef CONFIG_ARCH_IXP2000
mov r1, #-1 mov r1, #-1
mov r0, #0xd6000000 mov r0, #0xd6000000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment