mpc83xx: don't disable autoboot

[oweals/u-boot.git] / include / configs / M5275EVB.h

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 599f8dcb4d0fb3610c64068c542516acab88a2dc..b0ef41ec2c8b53a8704c9b166da10ce7066f35b6 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -45,21 +45,21 @@
 
 #define CONFIG_MCFUART
 #define CFG_UART_PORT          (0)
-#define CONFIG_BAUDRATE                19200
+#define CONFIG_BAUDRATE                115200
 #define CFG_BAUDRATE_TABLE     { 9600 , 19200 , 38400 , 57600, 115200 }
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_IS_EMBEDDED    1
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_SECT_SIZE   0x2000
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_EMBEDDED 1
 #else
-#define CFG_ENV_ADDR           0xffe04000
-#define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_ADDR                0xffe04000
+#define CONFIG_ENV_SECT_SIZE   0x2000
+#define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 /*
@@ -89,6 +89,7 @@
 #ifdef CONFIG_MCFFEC
 #define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1
+#define CONFIG_MII_INIT                1
 #define CFG_DISCOVER_PHY
 #define CFG_RX_ETH_BUFFER      8
 #define CFG_FAULT_ECHO_LINK_DOWN
@@ -117,6 +118,9 @@
 #define CFG_I2C_SLAVE          0x7F
 #define CFG_I2C_OFFSET         0x00000300
 #define CFG_IMMR               CFG_MBAR
+#define CFG_I2C_PINMUX_REG     (gpio_reg->par_feci2c)
+#define CFG_I2C_PINMUX_CLR     (0xFFF0)
+#define CFG_I2C_PINMUX_SET     (0x000F)
 
 #ifdef CONFIG_MCFFEC
 #define CONFIG_ETHADDR         00:06:3b:01:41:55
@@ -196,7 +200,7 @@
 #define CFG_FLASH_ERASE_TOUT   1000
 
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_SIZE         0x200000
 
 /*-----------------------------------------------------------------------