Commit:     d85ed59524d936f4c2657ba39a483b4ab373a59e
Parent:     ddaca4a26efc0716708f027914bf5508e2d86cc7
Author:     Michael-Luke Jones <[EMAIL PROTECTED]>
AuthorDate: Sat May 26 21:58:07 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Thu Jul 12 11:12:15 2007 +0100

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
 arch/arm/boot/compressed/head-xscale.S |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/compressed/head-xscale.S 
index 73c5d9e..236bbe5 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
-#ifdef  CONFIG_MACH_GTWX5715
-               mov     r7, #(MACH_TYPE_GTWX5715 & 0xff)
-               orr     r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
 #ifdef CONFIG_ARCH_IXP2000
                mov     r1, #-1
                mov     r0, #0xd6000000
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to