diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:11:18 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:11:18 +0200 |
commit | e99f30e105a253ee64bef1ef83b86a47e0d3b6f1 (patch) | |
tree | 847e087ca50c1d0a02b750577b13af45aa498361 /include/configs/ti_omap4_common.h | |
parent | d6694aff569a0838a9d0ef352128f5aa309d73ff (diff) | |
parent | 12cc54376768461533b55ada1b0b6d4979f40579 (diff) | |
download | u-boot-imx-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.zip u-boot-imx-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.tar.gz u-boot-imx-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.tar.bz2 |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/ti_omap4_common.h')
-rw-r--r-- | include/configs/ti_omap4_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 44b3718..30b02f6 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -126,7 +126,7 @@ "if test $board_name = panda-es; then " \ "setenv fdtfile omap4-panda-es.dtb; fi;" \ "if test $board_name = duovero; then " \ - "setenv fdtfile omap4-duovero.dtb; fi;" \ + "setenv fdtfile omap4-duovero-parlor.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" \ |