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

[oweals/u-boot.git] / include / configs / mccmon6.h

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 7bda977c972f01ce931eaa088b88a1a2ebd5f0e5..fca1af9d2bb9695f3e0ef0326a592d19c7d9971a 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -14,7 +14,6 @@
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #include "imx6_spl.h"
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
 #define CONFIG_SPL_OS_BOOT
@@ -98,8 +97,6 @@
        "128k@0x19C0000(swupdate-kernel-dtb.nor)"
 
 /* USB Configs */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
@@ -265,6 +262,14 @@
                "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
                    "run nor_update;" \
                "fi\0" \
+       "tftp_nor_dtb="\
+               "echo 'Update mccmon6 NOR DTB via TFTP'; " \
+               "setenv nor_img_file imx6q-mccmon6.dtb; " \
+               "setenv nor_img_size 0x20000; " \
+               "setenv nor_bank_start 0x09980000; " \
+               "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
+                   "run nor_update;" \
+               "fi\0" \
        "tftp_nor_img="\
                "echo 'Update mccmon6 NOR image via TFTP'; " \
                "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \