- "if test $board_name = HUMMINGBOARD2 && test $board_rev = MX6Q ; then " \
- "setenv fdtfile imx6q-hummingboard2.dtb; fi; " \
- "if test $board_name = HUMMINGBOARD2 && test $board_rev = MX6DL ; then " \
- "setenv fdtfile imx6dl-hummingboard2.dtb; fi; " \
- "if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \
- "setenv fdtfile imx6q-hummingboard.dtb; fi; " \
- "if test $board_name = HUMMINGBOARD && test $board_rev = MX6DL ; then " \
- "setenv fdtfile imx6dl-hummingboard.dtb; fi; " \
- "if test $board_name = CUBOXI && test $board_rev = MX6Q ; then " \
- "setenv fdtfile imx6q-cubox-i.dtb; fi; " \
- "if test $board_name = CUBOXI && test $board_rev = MX6DL ; then " \
- "setenv fdtfile imx6dl-cubox-i.dtb; fi; " \
- "if test $fdtfile = undefined; then " \
+ "if test ${board_rev} = MX6Q; then " \
+ "setenv fdtprefix imx6q; fi; " \
+ "if test ${board_rev} = MX6DL; then " \
+ "setenv fdtprefix imx6dl; fi; " \
+ "if test ${som_rev} = V15; then " \
+ "setenv fdtsuffix -som-v15; fi; " \
+ "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 " \