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

diff --combined include/configs/am335x_evm.h
index 76ce7deb9508716871e6c65e5a38634e8afc86ab,d5e84ab46f10d893be077f83f613d313a2ebd762..f1c270c939093583a8d7b8acdfb26e9125ddd202
--- 1/include/configs/am335x_evm.h
--- 2/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@@ -19,11 -19,13 +19,11 @@@
  #include <configs/ti_am335x_common.h>
  
  #ifndef CONFIG_SPL_BUILD
 +#ifndef CONFIG_FIT
  # define CONFIG_FIT
 +#endif
  # define CONFIG_TIMESTAMP
  # define CONFIG_LZO
 -# ifdef CONFIG_ENABLE_VBOOT
 -#  define CONFIG_FIT_SIGNATURE
 -#  define CONFIG_RSA
 -# endif
  #endif
  
  #define CONFIG_SYS_BOOTM_LEN          (16 << 20)
@@@ -237,6 -239,7 +237,7 @@@
  #define CONFIG_SYS_NAND_BLOCK_SIZE    (128*1024)
  /* NAND: driver related configs */
  #define CONFIG_NAND_OMAP_GPMC
+ #define CONFIG_NAND_OMAP_GPMC_PREFETCH
  #define CONFIG_NAND_OMAP_ELM
  #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS
  #define CONFIG_SYS_NAND_ECCPOS                { 2, 3, 4, 5, 6, 7, 8, 9, \