sunxi: Fix reset hang on sun5i

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

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 006d53d345669617a6cbec0433c3b11a20e839a1..7fd12d3fbc6e355e5e65f85f802facba8c1acdca 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -30,7 +30,6 @@
 
 #define        CONFIG_SYS_TEXT_BASE    0x40000000
 
-#define CONFIG_MPC8260         1       /* This is a MPC8260 CPU                */
 
 #if 0
 #define CONFIG_TQM8260         100     /* ...on a TQM8260 module Rev.100       */
@@ -73,10 +72,10 @@
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
 /* enable I2C and select the hardware/software driver */
-#undef  CONFIG_HARD_I2C                        /* I2C with hardware support    */
-#define CONFIG_SOFT_I2C                1       /* I2C bit-banged               */
-#define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
-#define CONFIG_SYS_I2C_SLAVE           0x7F
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT            /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED      400000
+#define CONFIG_SYS_I2C_SOFT_SLAVE      0x7F
 
 /*
  * Software (bit-bang) I2C driver configuration
@@ -228,7 +227,6 @@
  * Miscellaneous configurable options
  */
 #define        CONFIG_SYS_LONGHELP                     /* undef to save memory         */
-#define        CONFIG_SYS_PROMPT       "=> "           /* Monitor Command Prompt       */
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
 #define CONFIG_SYS_HUSH_PARSER         1       /* Use the HUSH parser          */
@@ -247,8 +245,6 @@
 
 #define        CONFIG_SYS_LOAD_ADDR    0x100000        /* default load address */
 
-#define        CONFIG_SYS_HZ           1000            /* decrementer freq: 1 ms ticks */
-
 #define        CONFIG_SYS_RESET_ADDRESS 0xFFFFFFFC     /* "bad" address                */
 
 /*