Merge https://source.denx.de/u-boot/custodians/u-boot-marvell

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

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 8b7e0da..ac9afa1 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -28,7 +28,6 @@
 
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_SYS_PCI_64BIT   1       /* enable 64-bit PCI resources */
-#define CONFIG_ENV_OVERWRITE
 
 /*
  * sysclk for MPC85xx
@@ -207,7 +206,7 @@
 /*
  * I2C
  */
-#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_LEGACY
 #define CONFIG_SYS_I2C_FSL
 #define CONFIG_SYS_FSL_I2C_SPEED       400000
 #define CONFIG_SYS_FSL_I2C_SLAVE       0x7F
@@ -242,7 +241,6 @@
 #endif
 
 #undef CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup */
-#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1057  /* Motorola */
 
 #endif /* CONFIG_PCI */