summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gong <b38343@freescale.com>2013-08-30 14:15:28 +0800
committerRobin Gong <b38343@freescale.com>2013-09-02 10:23:03 +0800
commit1b47aae68a6c90f41eb46f5c8ae4390629b32773 (patch)
treeb21077d0f05e273c0a00ef9aba257422f3eecc2d
parent9b8b6f2ac34c795fbb272b31a2d37aea30ba06f6 (diff)
downloadu-boot-imx-1b47aae68a6c90f41eb46f5c8ae4390629b32773.zip
u-boot-imx-1b47aae68a6c90f41eb46f5c8ae4390629b32773.tar.gz
u-boot-imx-1b47aae68a6c90f41eb46f5c8ae4390629b32773.tar.bz2
ENGR00276023-3: ARM: mx6: enable ldo bypass check on mx6 board
Enable ldo bypass check on mx6 and get fdt->blob from 'fdt_addr' which contained the right fdt. Signed-off-by: Robin Gong <b38343@freescale.com>
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c4
-rw-r--r--include/configs/mx6_common.h1
-rw-r--r--include/configs/mx6slevk.h1
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 26279bf..79788b9 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -453,6 +453,10 @@ int check_ldo_bypass(void)
{
int ret = 0;
int node;
+
+ /* get the right fdt_addr */
+ gd->fdt_blob = (void *)getenv_ulong("fdt_addr", 16,
+ (uintptr_t)gd->fdt_blob);
/* Get the node from FDT for anatop ldo-bypass */
node = fdt_node_offset_by_compatible(gd->fdt_blob, -1,
"fsl,imx6q-gpc");
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 674bcd3..95f912d 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -20,5 +20,6 @@
#define CONFIG_ARM_ERRATA_742230
#define CONFIG_ARM_ERRATA_743622
#define CONFIG_ARM_ERRATA_751472
+#define CONFIG_LDO_BYPASS_CHECK
#endif
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index d8eedb0..48cace6 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -18,6 +18,7 @@
#define CONFIG_MX6
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_LDO_BYPASS_CHECK
#define CONFIG_SYS_L2_PL310
#define CONFIG_SYS_PL310_BASE 0x00A02000