From 5c4e22e02237a8f2b3009ed8798c7132ca51a2c1 Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Tue, 3 Aug 2010 16:47:03 +0100 Subject: [PATCH] --- yaml --- r: 208570 b: refs/heads/master c: 77754410fb8ecd7cf307bcd75d60f3b22b8c3cd2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/compressed/head.S | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b3d2d407aa46..86a27b556eaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81ef806163ebfd4775fc3154e031aad6feaaa192 +refs/heads/master: 77754410fb8ecd7cf307bcd75d60f3b22b8c3cd2 diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index abf4d65acf62..6af9907c3b5c 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -170,9 +170,8 @@ not_angel: .text adr r0, LC0 - ARM( ldmia r0, {r1, r2, r3, r5, r6, r11, ip, sp}) - THUMB( ldmia r0, {r1, r2, r3, r5, r6, r11, ip} ) - THUMB( ldr sp, [r0, #32] ) + ldmia r0, {r1, r2, r3, r5, r6, r11, ip} + ldr sp, [r0, #28] #ifdef CONFIG_AUTO_ZRELADDR @ determine final kernel image address and r4, pc, #0xf8000000