diff options
author | Tom Rini <trini@ti.com> | 2013-06-22 07:38:12 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-06-22 07:38:12 -0400 |
commit | 348e47f766ac228fb02d1af562b2e9a4c69355db (patch) | |
tree | 778ffb90bb670f45fa7a0dae78010c8128c4d84d /include/configs/omap5_common.h | |
parent | 5707233880090f785c33df32c04549ea1aeef61e (diff) | |
parent | fbf87b1823dd5ebc2a384711ea2c677543019ece (diff) | |
download | u-boot-imx-348e47f766ac228fb02d1af562b2e9a4c69355db.zip u-boot-imx-348e47f766ac228fb02d1af562b2e9a4c69355db.tar.gz u-boot-imx-348e47f766ac228fb02d1af562b2e9a4c69355db.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/omap5_common.h')
-rw-r--r-- | include/configs/omap5_common.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h index ddf2ad4..b87ee42 100644 --- a/include/configs/omap5_common.h +++ b/include/configs/omap5_common.h @@ -136,9 +136,10 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ - "console=ttyO2,115200n8\0" \ + "console=" CONSOLEDEV ",115200n8\0" \ "fdt_high=0xffffffff\0" \ "fdtaddr=0x80f80000\0" \ + "fdtfile=undefined\0" \ "bootpart=0:2\0" \ "bootdir=/boot\0" \ "bootfile=zImage\0" \ @@ -166,7 +167,11 @@ "bootz ${loadaddr} - ${fdtaddr}\0" \ "findfdt="\ "if test $board_name = omap5_uevm; then " \ - "setenv fdtfile omap5-uevm.dtb; fi;\0 " \ + "setenv fdtfile omap5-uevm.dtb; fi; " \ + "if test $board_name = dra7xx; then " \ + "setenv fdtfile dra7-evm.dtb; fi;" \ + "if test $fdtfile = undefined; then " \ + "echo WARNING: Could not determine device tree to use; fi; \0" \ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \ #define CONFIG_BOOTCOMMAND \ |