diff options
author | Ash Charles <ashcharles@gmail.com> | 2014-06-10 12:02:36 -0700 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-06-19 17:53:59 -0400 |
commit | 12cc54376768461533b55ada1b0b6d4979f40579 (patch) | |
tree | f188238a233b6ee031a42581a8082149e78f0e83 /include | |
parent | 7a4861fad0f6adc5d59a2c95899e47a0759af2b7 (diff) |
omap3: overo: Select fdtfile for expansion board
The u-boot Overo board actually supports both Overo (OMAP35xx)
and Overo Storm (AM/DM37xx) COMs with a range of different expansion
boards. This provides a mechanism to select the an appropriate device
tree file based on the processor version and, if available, the
expansion board ID written on the expansion board EEPROM. To match the
3.15+ kernels, fdtfile names have this format:
"omap3-overo[-storm]-<expansion board name>.dtb"
By default, we use "omap3-overo-storm-tobi.dtb".
Signed-off-by: Ash Charles <ashcharles@gmail.com>
Conflicts:
include/configs/omap3_overo.h
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/omap3_overo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 1a136339493..f7483a08278 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -83,7 +83,6 @@ /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ - "fdtfile=overo.dtb\0" \ "bootdir=/boot\0" \ "bootfile=zImage\0" \ "usbtty=cdc_acm\0" \ @@ -152,10 +151,11 @@ "run mmcboot;" \ "fi;" \ "if run loadzimage; then " \ - "if test -n $fdtfile; then " \ - "if run loadfdt; then " \ - "run mmcbootfdt;" \ - "fi;" \ + "if test $fdtfile; then " \ + "setenv fdtfile omap3-${boardname}-${expansionname}.dtb;" \ + "fi;" \ + "if run loadfdt; then " \ + "run mmcbootfdt;" \ "fi;" \ "fi;" \ "fi;" \ |