summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYork Sun <yorksun@freescale.com>2014-04-30 14:43:45 -0700
committerYork Sun <yorksun@freescale.com>2014-05-13 08:31:22 -0700
commit73a56b6e9f3f1cc2412b5b8a75a3c71f48586c94 (patch)
treea6ac1ba5e887547b4f883fec0f4ec9830a20da1a
parent18025756b5e79ae96f67e1b5ac87d5ff6467d1cc (diff)
downloadu-boot-imx-73a56b6e9f3f1cc2412b5b8a75a3c71f48586c94.zip
u-boot-imx-73a56b6e9f3f1cc2412b5b8a75a3c71f48586c94.tar.gz
u-boot-imx-73a56b6e9f3f1cc2412b5b8a75a3c71f48586c94.tar.bz2
powerpc/mpc85xx: Ignore FDT pointer for non-QEMU in cpu_init_early_f()
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>
-rw-r--r--arch/powerpc/cpu/mpc85xx/cpu_init_early.c2
1 files changed, 2 insertions, 0 deletions
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);