Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

diff --combined include/configs/at91sam9x5ek.h
index 131758279ca9b7547d91d2c4be1d9f3673e77eb0,915714f0299ba5dfbfc61097d141ac98a1869caf..f9e5a4a707e41384819b468ae3a282d15c2aa3db
--- 1/include/configs/at91sam9x5ek.h
--- 2/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@@ -90,6 -90,14 +90,14 @@@
  #define CONFIG_CMD_NAND
  #define CONFIG_CMD_SF
  #define CONFIG_CMD_MMC
+ #define CONFIG_CMD_FAT
+ #define CONFIG_CMD_USB
+ 
+ /*
+  * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0)
+  * NB: in this case, USB 1.1 devices won't be recognized.
+  */
+ 
  
  /* SDRAM */
  #define CONFIG_NR_DRAM_BANKS          1
@@@ -142,9 -150,12 +150,12 @@@
  /* MMC */
  #ifdef CONFIG_CMD_MMC
  #define CONFIG_MMC
- #define CONFIG_CMD_FAT
  #define CONFIG_GENERIC_MMC
  #define CONFIG_GENERIC_ATMEL_MCI
+ #endif
+ 
+ /* FAT */
+ #ifdef CONFIG_CMD_FAT
  #define CONFIG_DOS_PARTITION
  #endif
  
@@@ -154,6 -165,22 +165,22 @@@
  #define CONFIG_NET_RETRY_COUNT                20
  #define CONFIG_MACB_SEARCH_PHY
  
+ /* USB */
+ #ifdef CONFIG_CMD_USB
+ #ifdef CONFIG_USB_EHCI
+ #define CONFIG_USB_EHCI_ATMEL
+ #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS    2
+ #else
+ #define CONFIG_USB_OHCI_NEW
+ #define CONFIG_SYS_USB_OHCI_CPU_INIT
+ #define CONFIG_SYS_USB_OHCI_REGS_BASE         ATMEL_BASE_OHCI
+ #define CONFIG_SYS_USB_OHCI_SLOT_NAME         "at91sam9x5"
+ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS    3
+ #endif
+ #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_STORAGE
+ #endif
+ 
  #define CONFIG_SYS_LOAD_ADDR          0x22000000      /* load address */
  
  #define CONFIG_SYS_MEMTEST_START      CONFIG_SYS_SDRAM_BASE
@@@ -168,7 -195,8 +195,7 @@@
  #define CONFIG_BOOTCOMMAND    "nand read " \
                                "0x22000000 0x200000 0x300000; " \
                                "bootm 0x22000000"
 -#else
 -#ifdef CONFIG_SYS_USE_SPIFLASH
 +#elif defined(CONFIG_SYS_USE_SPIFLASH)
  /* bootstrap + u-boot + env + linux in spi flash */
  #define CONFIG_ENV_IS_IN_SPI_FLASH
  #define CONFIG_ENV_OFFSET     0x5000
@@@ -178,28 -206,14 +205,28 @@@
  #define CONFIG_BOOTCOMMAND    "sf probe 0; " \
                                "sf read 0x22000000 0x100000 0x300000; " \
                                "bootm 0x22000000"
 -#endif
 +#else /* CONFIG_SYS_USE_MMC */
 +/* bootstrap + u-boot + env + linux in mmc */
 +#define CONFIG_ENV_IS_IN_MMC
 +/* For FAT system, most cases it should be in the reserved sector */
 +#define CONFIG_ENV_OFFSET     0x2000
 +#define CONFIG_ENV_SIZE               0x1000
 +#define CONFIG_SYS_MMC_ENV_DEV        0
  #endif
  
 +#ifdef CONFIG_SYS_USE_MMC
 +#define CONFIG_BOOTARGS               "mem=128M console=ttyS0,115200 " \
 +                              "mtdparts=atmel_nand:" \
 +                              "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
 +                              "root=/dev/mmcblk0p2 " \
 +                              "rw rootfstype=ext4 rootwait"
 +#else
  #define CONFIG_BOOTARGS               "mem=128M console=ttyS0,115200 " \
                                "mtdparts=atmel_nand:" \
                                "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
                                "root=/dev/mtdblock1 rw " \
                                "rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"
 +#endif
  
  #define CONFIG_BAUDRATE               115200