diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 23:58:01 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 23:58:01 +0200 |
| commit | c2543a21df335484fa86bd652b5564d0ca90d5f6 (patch) | |
| tree | 99dd2883487480688fbfcfb00a07d8cd21b85060 /include/configs/am335x_evm.h | |
| parent | 69f14dc2fd64307f012381dd333a06001dec75dc (diff) | |
| parent | bf3b98a1886ef18d7e2e4f83fec17f6c8cc51eaf (diff) | |
| download | talos-obmc-uboot-c2543a21df335484fa86bd652b5564d0ca90d5f6.tar.gz talos-obmc-uboot-c2543a21df335484fa86bd652b5564d0ca90d5f6.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/am335x_evm.h')
| -rw-r--r-- | include/configs/am335x_evm.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index b286ffc8d4..7cc3ef24ac 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -60,7 +60,7 @@ "rdaddr=0x81000000\0" \ "bootdir=/boot\0" \ "bootfile=uImage\0" \ - "fdtfile=\0" \ + "fdtfile=undefined\0" \ "console=ttyO0,115200n8\0" \ "optargs=\0" \ "mtdids=" MTDIDS_DEFAULT "\0" \ @@ -145,8 +145,9 @@ "if test $board_name = A33515BB; then " \ "setenv fdtfile am335x-evm.dtb; fi; " \ "if test $board_name = A335X_SK; then " \ - "setenv fdtfile am335x-evmsk.dtb; fi\0" \ - + "setenv fdtfile am335x-evmsk.dtb; fi " \ + "if test $fdtfile = undefined; then " \ + "echo WARNING: Could not determine device tree to use; fi; \0" #endif #define CONFIG_BOOTCOMMAND \ |
