summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/colibri_vf.h4
-rw-r--r--include/configs/dh_imx6.h12
-rw-r--r--include/configs/opos6uldev.h1
-rw-r--r--include/configs/pcm052.h4
-rw-r--r--include/configs/vf610twr.h4
-rw-r--r--include/configs/wandboard.h2
6 files changed, 21 insertions, 6 deletions
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 8166aa4afb..bf3bbffe24 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -75,8 +75,8 @@
#define CONFIG_FDTADDR 0x84000000
/* We boot from the gfxRAM area of the OCRAM. */
-#define CONFIG_SYS_TEXT_BASE 0x3f408000
-#define CONFIG_BOARD_SIZE_LIMIT 524288
+#define CONFIG_SYS_TEXT_BASE 0x3f401000
+#define CONFIG_BOARD_SIZE_LIMIT 520192
#define SD_BOOTCMD \
"sdargs=root=/dev/mmcblk0p2 rw rootwait\0" \
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 0595f60e32..11a01d476f 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -115,6 +115,18 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */
+
+/* USB Gadget (DFU, UMS) */
+#if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
+#define CONFIG_USB_FUNCTION_MASS_STORAGE
+
+#define CONFIG_SYS_DFU_DATA_BUF_SIZE (16 * 1024 * 1024)
+#define DFU_DEFAULT_POLL_TIMEOUT 300
+
+/* USB IDs */
+#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
+#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
+#endif
#endif
/* Watchdog */
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index d01898465b..04fc602ce4 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -17,6 +17,7 @@
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_GPIO
#undef CONFIG_DM_MMC
+#undef CONFIG_BLK
#define CONFIG_MXC_UART_BASE UART1_BASE
#endif
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 8144a83db2..060928bd30 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -89,8 +89,8 @@
#define CONFIG_LOADADDR 0x82000000
/* We boot from the gfxRAM area of the OCRAM. */
-#define CONFIG_SYS_TEXT_BASE 0x3f408000
-#define CONFIG_BOARD_SIZE_LIMIT 524288
+#define CONFIG_SYS_TEXT_BASE 0x3f401000
+#define CONFIG_BOARD_SIZE_LIMIT 520192
/* if no target-specific extra environment settings were defined by the
target, define an empty one */
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 3430f27c40..ddfcd6f618 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -79,8 +79,8 @@
#define CONFIG_SYS_LOAD_ADDR 0x82000000
/* We boot from the gfxRAM area of the OCRAM. */
-#define CONFIG_SYS_TEXT_BASE 0x3f408000
-#define CONFIG_BOARD_SIZE_LIMIT 524288
+#define CONFIG_SYS_TEXT_BASE 0x3f401000
+#define CONFIG_BOARD_SIZE_LIMIT 520192
/*
* We do have 128MB of memory on the Vybrid Tower board. Leave the last
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index ba88d02b88..8fdfc0277d 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -109,6 +109,8 @@
"fi; " \
"fi\0" \
"findfdt="\
+ "if test $board_name = D1 && test $board_rev = MX6QP ; then " \
+ "setenv fdtfile imx6qp-wandboard-revd1.dtb; fi; " \
"if test $board_name = D1 && test $board_rev = MX6Q ; then " \
"setenv fdtfile imx6q-wandboard-revd1.dtb; fi; " \
"if test $board_name = D1 && test $board_rev = MX6DL ; then " \