diff mbox

[U-Boot,1/4] powerpc/mpc85xx: Ignore FDT pointer for non-QEMU in cpu_init_early_f()

Message ID 1398725562-967-1-git-send-email-yorksun@freescale.com
State Superseded
Delegated to: York Sun
Headers show

Commit Message

York Sun April 28, 2014, 10:52 p.m. UTC 
The pointer of device tree comes from r3 for QEMU. This is not the case
for normal SoCs out of reset. Having gd->fdt_blob as 0 is important for
other functions to detect the non-existence of device tree.

Signed-off-by: York Sun <yorksun@freescale.com>
CC: Alexander Graf <agraf@suse.de>
---
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c |    2 ++
 1 file changed, 2 insertions(+)

Comments

Alexander Graf April 29, 2014, 9:01 a.m. UTC | #1 
On 29.04.14 00:52, York Sun wrote:
> The pointer of device tree comes from r3 for QEMU. This is not the case
> for normal SoCs out of reset. Having gd->fdt_blob as 0 is important for
> other functions to detect the non-existence of device tree.
>
> Signed-off-by: York Sun <yorksun@freescale.com>
> CC: Alexander Graf <agraf@suse.de>

Acked-by: Alexander Graf <agraf@suse.de>


Alex
diff mbox

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
index 998781b..47b712d 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
@@ -102,11 +102,13 @@  void cpu_init_early_f(void *fdt)
 	for (i = 0; i < sizeof(gd_t); i++)
 		((char *)gd)[i] = 0;
 
+#ifdef CONFIG_QEMU_E500
 	/*
 	 * CONFIG_SYS_CCSRBAR_PHYS below may use gd->fdt_blob on ePAPR systems,
 	 * so we need to populate it before it accesses it.
 	 */
 	gd->fdt_blob = fdt;
+#endif
 
 	mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(13);
 	mas1 = MAS1_VALID | MAS1_TID(0) | MAS1_TS | MAS1_TSIZE(BOOKE_PAGESZ_1M);