From ccefb06661500884c17a8730a3ffc4aca24a8e7e Mon Sep 17 00:00:00 2001 From: Robin Gong Date: Mon, 9 Sep 2013 13:07:51 +0800 Subject: ENGR00278711: ARM: mx6: use working_fdt instead of 'images.ft_addr' If we use 'bootz' to boot kernel, u-boot will not touch the global 'images', but in both 'bootm' and 'bootz' will use 'working_fdt' as the fdt load address. So we replace 'images.ft_addr' with 'working_fdt' to support 'bootz' and 'bootm'. Signed-off-by: Robin Gong --- arch/arm/cpu/armv7/mx6/soc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index b3e2554..2d348e5 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -456,8 +456,8 @@ int check_ldo_bypass(void) const int *ldo_mode; int node; - /* get the right fdt_addr */ - gd->fdt_blob = images.ft_addr; + /* get the right fdt_blob from the global working_fdt */ + gd->fdt_blob = working_fdt; /* Get the node from FDT for anatop ldo-bypass */ node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "fsl,imx6q-gpc"); -- cgit v1.1