ppc: qemu: Drop a custom env variable 'fdt_addr_r'

Now that we have switched to CONFIG_OF_CONTROL, and we can use the
env variable 'fdtcontroladdr' directly instead of creating one that
is duplicated.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index 480776a21d1a110f0aa53d8220bcf72db606d7bc..202b7f657debd48e66deeed9f023ed46da4bc987 100644 (file)
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -168,9 +168,6 @@ int last_stage_init(void)
        if (prop && (len >= 8))
                env_set_hex("qemu_kernel_addr", *prop);
 
-       /* Give the user a variable for the host fdt */
-       env_set_hex("fdt_addr_r", (ulong)fdt);
-
        return 0;
 }
 

diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 7c65e64d756cc6fe49a54cb6c5c9f87fdb2283b1..b2e1204e0fadbe537159ba3c031856dd814250b1 100644 (file)
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -106,6 +106,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 #define CONFIG_LOADADDR                1000000
 
 #define CONFIG_BOOTCOMMAND             \
-       "test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdt_addr_r\0"
+       "test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdtcontroladdr\0"
 
 #endif /* __QEMU_PPCE500_H */