Merge branch 'next' of ../custodians into next

[u-boot] / include / configs / TQM834x.h

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 4c909e61ad0cb1010c6fef9c7cdfce3f179d17d2..9193b5107ff8a4348834c2e5981b3543c0129c2e 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -101,10 +101,6 @@
  * defined as tqm834x_num_flash_banks.
  */
 #define CONFIG_SYS_MAX_FLASH_BANKS_DETECT      2
-#ifndef __ASSEMBLY__
-extern int tqm834x_num_flash_banks;
-#endif
-#define CONFIG_SYS_MAX_FLASH_BANKS (tqm834x_num_flash_banks)
 
 #define CONFIG_SYS_MAX_FLASH_SECT              512     /* max sectors per device */
 
@@ -332,6 +328,8 @@ extern int tqm834x_num_flash_banks;
 #define CONFIG_SYS_PROMPT              "=> "           /* Monitor Command Prompt */
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
+#define CONFIG_AUTO_COMPLETE           /* add autocompletion support   */
+
 #define CONFIG_SYS_HUSH_PARSER         1       /* Use the HUSH parser          */
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
@@ -403,7 +401,8 @@ extern int tqm834x_num_flash_banks;
 
 /* i-cache and d-cache disabled */
 #define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  CONFIG_SYS_HID0_INIT
+#define CONFIG_SYS_HID0_FINAL  (CONFIG_SYS_HID0_INIT | \
+                                HID0_ENABLE_INSTRUCTION_CACHE)
 #define CONFIG_SYS_HID2        HID2_HBE
 
 #define CONFIG_HIGH_BATS       1       /* High BATs supported */