From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: [PATCH] arm/dt: Fix booting non-dt versatile Date: Fri, 23 Jul 2010 14:14:14 -0600 Message-ID: <20100723201336.20683.88973.stgit@angua> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org List-Id: devicetree@vger.kernel.org Without this patch, versatilepb will not boot in qemu Signed-off-by: Grant Likely --- Hi Jeremy, I'm not sure if this is the best fix or not, but without it I cannot boot versatilepb anymore in QEMU. g. arch/arm/kernel/head.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 8683b3b..049d533 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -93,7 +93,7 @@ ENTRY(stext) * Also, we don't need to call __vet_atags. */ add r3, r1, #1 - bcs 1f + beq 1f bl __lookup_machine_type @ r5=machinfo movs r8, r5 @ invalid machine (r5=0)?