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

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

diff --git a/include/configs/atc.h b/include/configs/atc.h
index bf1f2028012bd55f8e4c383cfc740fc8d8ed858e..538a1675286505a4d7844cfb3906fed36f3d525e 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -171,8 +171,6 @@
 
 #define        CONFIG_SYS_HZ           1000            /* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 #define        CONFIG_SYS_RESET_ADDRESS 0xFFF00100     /* "bad" address                */
 
 #define CONFIG_SYS_ALLOC_DPRAM
@@ -484,6 +482,7 @@
  *-----------------------------------------------------------------------
  */
 
+#define CONFIG_IDE_PREINIT     1       /* Use preinit IDE hook */
 #define CONFIG_IDE_8xx_PCCARD  1       /* Use IDE with PC Card Adapter */
 
 #undef CONFIG_IDE_8xx_DIRECT           /* Direct IDE    not supported  */