Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

[platform/kernel/u-boot.git] / include / configs / MVBLM7.h

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 8f741f5..aa91805 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -33,14 +33,13 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300    1
-#define CONFIG_MPC83XX 1
-#define CONFIG_MPC834X 1
+#define CONFIG_MPC83xx 1
+#define CONFIG_MPC834x 1
 #define CONFIG_MPC8343 1
 
 #define CONFIG_SYS_IMMR                0xE0000000
 
 #define CONFIG_PCI
-#define CONFIG_83XX_GENERIC_PCI
 #define CONFIG_PCI_SKIP_HOST_BRIDGE
 #define CONFIG_HARD_I2C
 #define CONFIG_TSEC_ENET
@@ -53,7 +52,6 @@
 
 #define CONFIG_FSL_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_OFFSET          0x3000
 #define CONFIG_SYS_I2C2_OFFSET         0x3100
 
@@ -194,8 +192,6 @@
 #define CONFIG_SYS_PCI1_IO_PHYS        0xE2000000
 #define CONFIG_SYS_PCI1_IO_SIZE        0x01000000
 
-#define _IO_BASE               0x00000000
-
 #define CONFIG_NET_MULTI       1
 #define CONFIG_NET_RETRY_COUNT 3