Merge branch 'master' of git://git.denx.de/u-boot-arm

diff --combined config.mk
index b55ed563a5e0307edc26c5369cb74c4a424c8d27,39b20baf0857755ce86a4f96c44ff2165f1a1978..48913f6659f101e9009d54b5886bab44f0fafccd
--- 1/config.mk
--- 2/config.mk
+++ b/config.mk
@@@ -220,6 -220,15 +220,15 @@@ LDFLAGS_FINAL += --gc-section
  endif
  
  # TODO(sjg@chromium.org): Is this correct on Mac OS?
+ 
+ # MXSImage needs LibSSL
+ ifneq ($(CONFIG_MX23)$(CONFIG_MX28),)
+ HOSTLIBS      += -lssl -lcrypto
+ # Add CONFIG_MXS into host CFLAGS, so we can check whether or not register
+ # the mxsimage support within tools/mxsimage.c .
+ HOSTCFLAGS    += -DCONFIG_MXS
+ endif
+ 
  ifdef CONFIG_FIT_SIGNATURE
  HOSTLIBS      += -lssl -lcrypto
  
@@@ -232,6 -241,22 +241,6 @@@ ifneq ($(CONFIG_SYS_TEXT_BASE),
  CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)
  endif
  
 -ifneq ($(CONFIG_SPL_TEXT_BASE),)
 -CPPFLAGS += -DCONFIG_SPL_TEXT_BASE=$(CONFIG_SPL_TEXT_BASE)
 -endif
 -
 -ifneq ($(CONFIG_SPL_PAD_TO),)
 -CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO)
 -endif
 -
 -ifneq ($(CONFIG_TPL_PAD_TO),)
 -CPPFLAGS += -DCONFIG_TPL_PAD_TO=$(CONFIG_TPL_PAD_TO)
 -endif
 -
 -ifneq ($(CONFIG_UBOOT_PAD_TO),)
 -CPPFLAGS += -DCONFIG_UBOOT_PAD_TO=$(CONFIG_UBOOT_PAD_TO)
 -endif
 -
  ifeq ($(CONFIG_SPL_BUILD),y)
  CPPFLAGS += -DCONFIG_SPL_BUILD
  ifeq ($(CONFIG_TPL_BUILD),y)
@@@ -247,6 -272,10 +256,6 @@@ Please undefined CONFIG_SYS_GENERIC_BOA
  endif
  endif
  
 -ifneq ($(RESET_VECTOR_ADDRESS),)
 -CPPFLAGS += -DRESET_VECTOR_ADDRESS=$(RESET_VECTOR_ADDRESS)
 -endif
 -
  ifneq ($(OBJTREE),$(SRCTREE))
  CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include
  endif

diff --combined include/configs/am335x_evm.h
index 7969e0746a29e61183920c291694bb45c2a32a70,eae5a19f2ab391911107e6ab1a31c9d39e1d4a98..3de30fc28019f37a52d97bb4806a45d65a7f4384
--- 1/include/configs/am335x_evm.h
--- 2/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@@ -132,9 -132,7 +132,9 @@@
                                "echo Running uenvcmd ...;" \
                                "run uenvcmd;" \
                        "fi;" \
 -                      "run mmcloados;" \
 +                      "if run loaduimage; then " \
 +                              "run mmcloados;" \
 +                      "fi;" \
                "fi;\0" \
        "spiboot=echo Booting from spi ...; " \
                "run spiargs; " \
@@@ -173,44 -171,6 +173,6 @@@
        "run mmcboot;" \
        "run nandboot;"
  
- /* USB Composite download gadget - g_dnl */
- #define CONFIG_USB_GADGET
- #define CONFIG_USBDOWNLOAD_GADGET
- 
- /* USB TI's IDs */
- #define CONFIG_G_DNL_VENDOR_NUM 0x0403
- #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
- #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
- 
- /* USB Device Firmware Update support */
- #define CONFIG_DFU_FUNCTION
- #define CONFIG_DFU_MMC
- #define CONFIG_CMD_DFU
- #define DFU_ALT_INFO_MMC \
-       "boot part 0 1;" \
-       "rootfs part 0 2;" \
-       "MLO fat 0 1;" \
-       "MLO.raw mmc 100 100;" \
-       "u-boot.img.raw mmc 300 400;" \
-       "spl-os-args.raw mmc 80 80;" \
-       "spl-os-image.raw mmc 900 2000;" \
-       "spl-os-args fat 0 1;" \
-       "spl-os-image fat 0 1;" \
-       "u-boot.img fat 0 1;" \
-       "uEnv.txt fat 0 1"
- #ifdef CONFIG_NAND
- #define CONFIG_DFU_NAND
- #define DFU_ALT_INFO_NAND \
-       "SPL part 0 1;" \
-       "SPL.backup1 part 0 2;" \
-       "SPL.backup2 part 0 3;" \
-       "SPL.backup3 part 0 4;" \
-       "u-boot part 0 5;" \
-       "u-boot-spl-os part 0 6;" \
-       "kernel part 0 8;" \
-       "rootfs part 0 9"
- #endif
- 
  /* NS16550 Configuration */
  #define CONFIG_SYS_NS16550_COM1               0x44e09000      /* Base EVM has UART0 */
  #define CONFIG_SYS_NS16550_COM2               0x48022000      /* UART1 */
@@@ -230,17 -190,26 +192,26 @@@
  /* SPL */
  #ifndef CONFIG_NOR_BOOT
  #define CONFIG_SPL_YMODEM_SUPPORT
+ 
+ /* CPSW support */
+ #define CONFIG_SPL_ETH_SUPPORT
+ 
+ /* USB gadget RNDIS */
+ #define CONFIG_SPL_MUSB_NEW_SUPPORT
+ 
+ /* General network SPL, both CPSW and USB gadget RNDIS */
  #define CONFIG_SPL_NET_SUPPORT
  #define CONFIG_SPL_ENV_SUPPORT
  #define CONFIG_SPL_NET_VCI_STRING     "AM335x U-Boot SPL"
- #define CONFIG_SPL_ETH_SUPPORT
+ 
+ /* SPI flash. */
  #define CONFIG_SPL_SPI_SUPPORT
  #define CONFIG_SPL_SPI_FLASH_SUPPORT
  #define CONFIG_SPL_SPI_LOAD
  #define CONFIG_SPL_SPI_BUS            0
  #define CONFIG_SPL_SPI_CS             0
  #define CONFIG_SYS_SPI_U_BOOT_OFFS    0x20000
- #define CONFIG_SPL_MUSB_NEW_SUPPORT
+ 
  #define CONFIG_SPL_LDSCRIPT           "$(CPUDIR)/am33xx/u-boot-spl.lds"
  
  #ifdef CONFIG_NAND
@@@ -276,13 -245,19 +247,19 @@@
  #endif
  
  /*
-  * USB configuration
+  * USB configuration.  We enable MUSB support, both for host and for
+  * gadget.  We set USB0 as peripheral and USB1 as host, based on the
+  * board schematic and physical port wired to each.  Then for host we
+  * add mass storage support and for gadget we add both RNDIS ethernet
+  * and DFU.
   */
  #define CONFIG_USB_MUSB_DSPS
  #define CONFIG_ARCH_MISC_INIT
  #define CONFIG_MUSB_GADGET
  #define CONFIG_MUSB_PIO_ONLY
  #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
+ #define CONFIG_USB_GADGET
+ #define CONFIG_USBDOWNLOAD_GADGET
  #define CONFIG_USB_GADGET_DUALSPEED
  #define CONFIG_USB_GADGET_VBUS_DRAW   2
  #define CONFIG_MUSB_HOST
@@@ -300,6 -275,11 +277,11 @@@
  #define CONFIG_USB_ETHER
  #define CONFIG_USB_ETH_RNDIS
  #define CONFIG_USBNET_HOST_ADDR       "de:ad:be:af:00:00"
+ 
+ /* USB TI's IDs */
+ #define CONFIG_G_DNL_VENDOR_NUM 0x0403
+ #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
+ #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
  #endif /* CONFIG_MUSB_GADGET */
  
  #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
@@@ -311,6 -291,35 +293,35 @@@
  #undef CONFIG_SPL_ETH_SUPPORT
  #endif
  
+ /* USB Device Firmware Update support */
+ #define CONFIG_DFU_FUNCTION
+ #define CONFIG_DFU_MMC
+ #define CONFIG_CMD_DFU
+ #define DFU_ALT_INFO_MMC \
+       "boot part 0 1;" \
+       "rootfs part 0 2;" \
+       "MLO fat 0 1;" \
+       "MLO.raw mmc 100 100;" \
+       "u-boot.img.raw mmc 300 400;" \
+       "spl-os-args.raw mmc 80 80;" \
+       "spl-os-image.raw mmc 900 2000;" \
+       "spl-os-args fat 0 1;" \
+       "spl-os-image fat 0 1;" \
+       "u-boot.img fat 0 1;" \
+       "uEnv.txt fat 0 1"
+ #ifdef CONFIG_NAND
+ #define CONFIG_DFU_NAND
+ #define DFU_ALT_INFO_NAND \
+       "SPL part 0 1;" \
+       "SPL.backup1 part 0 2;" \
+       "SPL.backup2 part 0 3;" \
+       "SPL.backup3 part 0 4;" \
+       "u-boot part 0 5;" \
+       "u-boot-spl-os part 0 6;" \
+       "kernel part 0 8;" \
+       "rootfs part 0 9"
+ #endif
+ 
  /*
   * Default to using SPI for environment, etc.
   * 0x000000 - 0x020000 : SPL (128KiB)