---

yaml --- r: 155831 b: refs/heads/master c: ea3fd14 h: refs/heads/master i: 155829: 8c0de22 155827: 9b93df6 155823: 5d71a9b v: v3
git-mirror · Jul 27, 2009 · 6bfaec1 · 6bfaec1
1 parent 6bcb23e
commit 6bfaec1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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)