diff options
| author | Robin Gong <b38343@freescale.com> | 2013-09-09 13:07:51 +0800 |
|---|---|---|
| committer | Robin Gong <b38343@freescale.com> | 2013-09-09 14:36:18 +0800 |
| commit | 3d9f60d512bffece36f61d82b91bee8b6bf29c02 (patch) | |
| tree | 21b984a48b85661bccbfdeb8e6e8659f7cee5916 | |
| parent | feb0a76c531f6e07fe8ea7efe4ab02be8e0a0a44 (diff) | |
| download | u-boot-imx-3d9f60d512bffece36f61d82b91bee8b6bf29c02.zip u-boot-imx-3d9f60d512bffece36f61d82b91bee8b6bf29c02.tar.gz u-boot-imx-3d9f60d512bffece36f61d82b91bee8b6bf29c02.tar.bz2 | |
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 <b38343@freescale.com>
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 4 |
1 files 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"); |