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

diff --combined include/configs/qong.h
index 7f284efe548e1189abebc874a227425f9f710272,b1aca93ddead16f5bf6a0c9ffb77f13768b6e9a7..f26ced1d7f31c2be3ad8cf7c30f4684c1a415fee
--- 1/include/configs/qong.h
--- 2/include/configs/qong.h
+++ b/include/configs/qong.h
@@@ -66,8 -66,11 +66,11 @@@
  #define CONFIG_FSL_PMIC_MODE  (SPI_MODE_0 | SPI_CS_HIGH)
  
  /* FPGA */
+ #define CONFIG_FPGA
  #define CONFIG_QONG_FPGA      1
  #define CONFIG_FPGA_BASE      (CS1_BASE)
+ #define CONFIG_FPGA_LATTICE
+ #define CONFIG_FPGA_COUNT     1
  
  #ifdef CONFIG_QONG_FPGA
  /* Ethernet */
@@@ -86,6 -89,22 +89,22 @@@
  #define CONFIG_BMP_16BPP
  #define CONFIG_DISPLAY_COM57H5M10XRC
  
+ /* USB */
+ #define CONFIG_CMD_USB
+ #ifdef CONFIG_CMD_USB
+ #define CONFIG_USB_EHCI                       /* Enable EHCI USB support */
+ #define CONFIG_USB_EHCI_MXC
+ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+ #define CONFIG_MXC_USB_PORT   2
+ #define CONFIG_MXC_USB_PORTSC (MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT)
+ #define CONFIG_MXC_USB_FLAGS  MXC_EHCI_POWER_PINS_ENABLED
+ #define CONFIG_EHCI_IS_TDI
+ #define CONFIG_USB_STORAGE
+ #define CONFIG_DOS_PARTITION
+ #define CONFIG_SUPPORT_VFAT
+ #define CONFIG_CMD_FAT
+ #endif /* CONFIG_CMD_USB */
+ 
  /*
   * Reducing the ARP timeout from default 5 seconds to 200ms we speed up the
   * initial TFTP transfer, should the user wish one, significantly.
@@@ -247,7 -266,7 +266,7 @@@ extern int qong_nand_rdy(void *chip)
  #define       CONFIG_ENV_IS_IN_FLASH  1
  #define CONFIG_ENV_SECT_SIZE  0x20000
  #define CONFIG_ENV_SIZE               CONFIG_ENV_SECT_SIZE
- #define CONFIG_ENV_ADDR               (CONFIG_SYS_FLASH_BASE + 0x60000)
+ #define CONFIG_ENV_ADDR               (CONFIG_SYS_FLASH_BASE + 0x80000)
  
  /* Address and size of Redundant Environment Sector   */
  #define CONFIG_ENV_OFFSET_REDUND      (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
@@@ -282,7 -301,8 +301,7 @@@
        "mtdparts=physmap-flash.0:384k(U-Boot),128k(env1),"     \
        "128k(env2),2432k(kernel),13m(ramdisk),-(user)"
  
 -/* additions for new relocation code, must added to all boards */
 -#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */
 +/* additions for new relocation code, must be added to all boards */
  #define CONFIG_SYS_SDRAM_BASE         0x80000000
  #define CONFIG_SYS_INIT_RAM_ADDR      IRAM_BASE_ADDR
  #define CONFIG_SYS_INIT_RAM_END               IRAM_SIZE