summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-10 17:38:19 -0200
committerStefano Babic <sbabic@denx.de>2014-11-13 16:22:26 +0100
commit4ccaf5ddeb04a7c0ef4f31ce5705a2635606fd72 (patch)
treee3a1ce5bd907a97ece2b83c7de595ca30ba78fd0
parent39c7d5a222c50b6bb0618aa07d9951e730e6ff4b (diff)
downloadu-boot-imx-4ccaf5ddeb04a7c0ef4f31ce5705a2635606fd72.zip
u-boot-imx-4ccaf5ddeb04a7c0ef4f31ce5705a2635606fd72.tar.gz
u-boot-imx-4ccaf5ddeb04a7c0ef4f31ce5705a2635606fd72.tar.bz2
mx53loco: Change 'fdt_file' dynamically
Since kernel 3.15 there are two dtb's for the imx53-qsb board: imx53-qsb.dtb - For the boards with DA9053 PMIC imx53-qsrb.dtb - For the boards with MC34708 PMIC Change the 'fdt_file' dynamically, so that the correct dtb can be used depending on the board variant. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--board/freescale/mx53loco/mx53loco.c4
-rw-r--r--include/configs/mx53loco.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index b32a97f..7569ded 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -242,6 +242,8 @@ static int power_init(void)
if (!p)
return -ENODEV;
+ setenv("fdt_file", "imx53-qsb.dtb");
+
/* Set VDDA to 1.25V */
val = DA9052_BUCKCORE_BCOREEN | DA_BUCKCORE_VBCORE_1_250V;
ret = pmic_reg_write(p, DA9053_BUCKCORE_REG, val);
@@ -283,6 +285,8 @@ static int power_init(void)
if (!p)
return -ENODEV;
+ setenv("fdt_file", "imx53-qsrb.dtb");
+
/* Set VDDGP to 1.25V for 1GHz on SW1 */
pmic_reg_read(p, REG_SW_0, &val);
val = (val & ~SWx_VOLT_MASK_MC34708) | SWx_1_250V_MC34708;
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index a74508c..10fb1f4 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -107,7 +107,6 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
- "fdt_file=imx53-qsb.dtb\0" \
"fdt_addr=0x71000000\0" \
"boot_fdt=try\0" \
"ip_dyn=yes\0" \