mx6cuboxi: Add emmc device tree suffix

Mainline and now the SolidRun 4.9 nxp based tree use the new
reorganization of device-tree files that separate out the emmc
into its own dtb.  u-boot will now look for -emmc in the device
tree name if one is detected.

Signed-off-by: Jon Nettleton <jon@solid-run.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 1f7297d..a647aab 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -71,6 +71,8 @@
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "som_rev=undefined\0" \
+       "has_emmc=undefined\0" \
        "fdtfile=undefined\0" \
        "fdt_addr_r=0x18000000\0" \
        "fdt_addr=0x18000000\0" \
@@ -100,19 +102,21 @@
                        "fi; "  \
                "fi\0" \
        "findfdt="\
-               "if test $board_rev = MX6Q ; then " \
+               "if test ${board_rev} = MX6Q; then " \
                        "setenv fdtprefix imx6q; fi; " \
-               "if test $board_rev = MX6DL ; then " \
+               "if test ${board_rev} = MX6DL; then " \
                        "setenv fdtprefix imx6dl; fi; " \
-               "if test $som_rev = V15 ; then " \
+               "if test ${som_rev} = V15; then " \
                        "setenv fdtsuffix -som-v15; fi; " \
-               "if test $board_name = HUMMINGBOARD2 ; then " \
-                       "setenv fdtfile ${fdtprefix}-hummingboard2${fdtsuffix}.dtb; fi; " \
-               "if test $board_name = HUMMINGBOARD ; then " \
-                       "setenv fdtfile ${fdtprefix}-hummingboard${fdtsuffix}.dtb; fi; " \
-               "if test $board_name = CUBOXI ; then " \
-                       "setenv fdtfile ${fdtprefix}-cubox-i${fdtsuffix}.dtb; fi; " \
-               "if test $fdtfile = undefined; then " \
+               "if test ${has_emmc} = yes; then " \
+                       "setenv emmcsuffix -emmc; fi; " \
+               "if test ${board_name} = HUMMINGBOARD2 ; then " \
+                       "setenv fdtfile ${fdtprefix}-hummingboard2${emmcsuffix}${fdtsuffix}.dtb; fi; " \
+               "if test ${board_name} = HUMMINGBOARD ; then " \
+                       "setenv fdtfile ${fdtprefix}-hummingboard${emmcsuffix}${fdtsuffix}.dtb; fi; " \
+               "if test ${board_name} = CUBOXI ; then " \
+                       "setenv fdtfile ${fdtprefix}-cubox-i${emmcsuffix}${fdtsuffix}.dtb; fi; " \
+               "if test ${fdtfile} = undefined; then " \
                        "echo WARNING: Could not determine dtb to use; fi; \0" \
        BOOTENV