From 6bfaec19e2e964f0ab58e6e79c52e2622a225fc4 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 22 Jun 2009 12:31:55 +0200 Subject: [PATCH] --- yaml --- r: 155831 b: refs/heads/master c: ea3fd1466f81a851452bf7f34ccb9b5058e4793c h: refs/heads/master i: 155829: 8c0de2233168defac4abfdd7c0a33be115342b8a 155827: 9b93df62de6a6cf584df29ef16f48aaf1fdc84ff 155823: 5d71a9b98fd0f73cdc0b11f0ffbd4f90370b7d35 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/head.S | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3f7695a7d785..fc4fb4a71352 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a69cb8c4662dd0a7b01b32a9165b1a1697068f19 +refs/heads/master: ea3fd1466f81a851452bf7f34ccb9b5058e4793c diff --git a/trunk/arch/microblaze/kernel/head.S b/trunk/arch/microblaze/kernel/head.S index 3c4d4a2803e2..e41c6ce2a7be 100644 --- a/trunk/arch/microblaze/kernel/head.S +++ b/trunk/arch/microblaze/kernel/head.S @@ -62,7 +62,10 @@ ENTRY(_start) beqi r7, no_fdt_arg /* NULL pointer? don't copy */ lw r11, r0, r7 /* Does r7 point to a */ rsubi r11, r11, OF_DT_HEADER /* valid FDT? */ + beqi r11, _prepare_copy_fdt + or r7, r0, r0 /* clear R7 when not valid DTB */ bnei r11, no_fdt_arg /* No - get out of here */ +_prepare_copy_fdt: or r11, r0, r0 /* incremment */ ori r4, r0, TOPHYS(_fdt_start) ori r3, r0, (0x4000 - 4)