karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / include / configs / wandboard.h

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 2b7ffecb80a06d4e38ace92023c11ed544683f3e..f4e9cf20c53c3520758b8d7dd4fde6e80351c55d 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -84,11 +84,6 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
-#define CONFIG_CMD_FUSE
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
-
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
@@ -103,7 +98,7 @@
        "ip_dyn=yes\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=1\0" \
-       "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \
+       "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
        "update_sd_firmware_filename=u-boot.imx\0" \
        "update_sd_firmware=" \
                "if test ${ip_dyn} = yes; then " \
@@ -192,10 +187,14 @@
                        "bootz; " \
                "fi;\0" \
        "findfdt="\
-               "if test $board_rev = MX6Q ; then " \
+               "if test $board_name = C1 && test $board_rev = MX6Q ; then " \
                        "setenv fdtfile imx6q-wandboard.dtb; fi; " \
-               "if test $board_rev = MX6DL ; then " \
+               "if test $board_name = C1 && test $board_rev = MX6DL ; then " \
                        "setenv fdtfile imx6dl-wandboard.dtb; fi; " \
+               "if test $board_name = B1 && test $board_rev = MX6Q ; then " \
+                       "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \
+               "if test $board_name = B1 && test $board_rev = MX6DL ; then " \
+                       "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \
                "if test $fdtfile = undefined; then " \
                        "echo WARNING: Could not determine dtb to use; fi; \0" \