mpc83xx/mvBLM7: add usb commands and cleanup.

Add USB commands.
Rename autoscript to bootscript.
Add automatic bootscript image generation to makefile.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

diff --git a/board/matrix_vision/mvblm7/Makefile b/board/matrix_vision/mvblm7/Makefile
index 504935f3b64865572d010114b82ad0139864623e..b3e3e0bbf40775b85807af3297d446fbf1eae8d8 100644 (file)
--- a/board/matrix_vision/mvblm7/Makefile
+++ b/board/matrix_vision/mvblm7/Makefile
@@ -32,6 +32,7 @@ SOBJS := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(obj).depend $(OBJS)
        $(AR) $(ARFLAGS) $@ $(OBJS)
+       @mkimage -T script -C none -n M7_script -d bootscript bootscript.img
 
 clean:
        rm -f $(SOBJS) $(OBJS)

diff --git a/board/matrix_vision/mvblm7/mvblm7_autoscript b/board/matrix_vision/mvblm7/bootscript
similarity index 100%
rename from board/matrix_vision/mvblm7/mvblm7_autoscript
rename to board/matrix_vision/mvblm7/bootscript

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 26897c69aff0635216b25f86dc4bb6a38f78a108..c28eb64fb17c0f36706d6f7e0dcea54142e92e99 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -234,7 +234,11 @@
 #define CONFIG_BOOTP_SEND_HOSTNAME
 
 /* USB */
+#define CONFIG_SYS_USB_HOST
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_FSL
 #define CONFIG_HAS_FSL_DR_USB
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
 /*
  * Environment
@@ -267,6 +271,8 @@
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_FPGA
+#define CONFIG_CMD_USB
+#define CONFIG_DOS_PARTITION
 
 #undef CONFIG_WATCHDOG