Merge git://git.denx.de/u-boot

[u-boot] / include / configs / mx6sabre_common.h

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 98eb0427aa5c5e3ebcfb86c2a6814c58f72893ce..3e045ef7a64fd9ca6090258af96edc1bfb24c822 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -80,6 +80,10 @@
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
        "console=" CONFIG_CONSOLE_DEV "\0" \
+       "dfuspi=dfu 0 sf 0:0:10000000:0\0" \
+       "dfu_alt_info_spl=spl raw 0x400\0" \
+       "dfu_alt_info_img=u-boot raw 0x10000\0" \
+       "dfu_alt_info=spl raw 0x400\0" \
        "fdt_high=0xffffffff\0"   \
        "initrd_high=0xffffffff\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
@@ -154,6 +158,8 @@
                                        "setenv fdt_file imx6q-sabreauto.dtb; fi; " \
                                "if test $board_name = SABREAUTO && test $board_rev = MX6DL; then " \
                                        "setenv fdt_file imx6dl-sabreauto.dtb; fi; " \
+                               "if test $board_name = SABRESD && test $board_rev = MX6QP; then " \
+                                       "setenv fdt_file imx6qp-sabresd.dtb; fi; " \
                                "if test $board_name = SABRESD && test $board_rev = MX6Q; then " \
                                        "setenv fdt_file imx6q-sabresd.dtb; fi; " \
                                "if test $board_name = SABRESD && test $board_rev = MX6DL; then " \
@@ -238,6 +244,18 @@
 #define CONFIG_G_DNL_VENDOR_NUM                0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM       0xa4a5
 #define CONFIG_G_DNL_MANUFACTURER      "FSL"
+
+#define CONFIG_USB_FUNCTION_FASTBOOT
+#define CONFIG_CMD_FASTBOOT
+#define CONFIG_ANDROID_BOOT_IMAGE
+#define CONFIG_FASTBOOT_BUF_ADDR   CONFIG_SYS_LOAD_ADDR
+#define CONFIG_FASTBOOT_BUF_SIZE   0x07000000
+
+/* USB Device Firmware Update support */
+#define CONFIG_CMD_DFU
+#define CONFIG_USB_FUNCTION_DFU
+#define CONFIG_DFU_MMC
+#define CONFIG_DFU_SF
 #endif
 
 #endif                         /* __MX6QSABRE_COMMON_CONFIG_H */