Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

diff --combined arch/arm/cpu/armv7/omap3/board.c
index e252e7fd950604375917b9670201fba12d02bcf3,2f9c93951e54a22f764b5dfccab6f466429f5785..667e77ff05ba22429fdf101e0884856e5eb54e62
--- 1/arch/arm/cpu/armv7/omap3/board.c
--- 2/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@@ -147,7 -147,7 +147,7 @@@ void secure_unlock_mem(void
   *            configure secure registers and exit secure world
   *              general use.
   *****************************************************************************/
- void secureworld_exit()
+ void secureworld_exit(void)
  {
        unsigned long i;
  
@@@ -178,7 -178,7 +178,7 @@@
   * Description: If chip is GP/EMU(special) type, unlock the SRAM for
   *              general use.
   *****************************************************************************/
- void try_unlock_memory()
+ void try_unlock_memory(void)
  {
        int mode;
        int in_sdram = is_running_in_sdram();
@@@ -478,3 -478,11 +478,3 @@@ void omap3_outer_cache_disable(void
        omap3_update_aux_cr(0, 0x2);
  }
  #endif /* !CONFIG_SYS_L2CACHE_OFF */
 -
 -#ifndef CONFIG_SYS_DCACHE_OFF
 -void enable_caches(void)
 -{
 -      /* Enable D-cache. I-cache is already enabled in start.S */
 -      dcache_enable();
 -}
 -#endif /* !CONFIG_SYS_DCACHE_OFF */

diff --combined board/ait/cam_enc_4xx/cam_enc_4xx.c
index 9aa1d7aece41f56fa1451f18e23274b9a84eaeba,1f816b3df6ef2cfc6aebedd380b33439d0192a31..290dc1984ab3a9508e2dc3a2b6c0e393838691c3
--- 1/board/ait/cam_enc_4xx/cam_enc_4xx.c
--- 2/board/ait/cam_enc_4xx/cam_enc_4xx.c
+++ b/board/ait/cam_enc_4xx/cam_enc_4xx.c
@@@ -8,15 -8,15 +8,15 @@@
   */
  
  #include <common.h>
 +#include <cli.h>
  #include <errno.h>
 -#include <hush.h>
  #include <linux/mtd/nand.h>
  #include <nand.h>
  #include <miiphy.h>
  #include <netdev.h>
  #include <asm/io.h>
  #include <asm/arch/hardware.h>
- #include <asm/arch/nand_defs.h>
+ #include <asm/ti-common/davinci_nand.h>
  #include <asm/arch/davinci_misc.h>
  #ifdef CONFIG_DAVINCI_MMC
  #include <mmc.h>
@@@ -777,7 -777,7 +777,7 @@@ static void ait_menu_read_env(char *nam
  
        sprintf(output, "%s old: %s value: ", name, getenv(name));
        memset(cbuf, 0, CONFIG_SYS_CBSIZE);
 -      readret = readline_into_buffer(output, cbuf, 0);
 +      readret = cli_readline_into_buffer(output, cbuf, 0);
  
        if (readret >= 0) {
                ret = setenv(name, cbuf);