Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 94aad25..c21c944 100644 (file)
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -234,9 +234,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_I2C_RTC_ADDR                0x68
 #define CONFIG_SYS_M41T11_BASE_YEAR    2000
 
-/* GPIO/EEPROM/SRAM */
-#define CONFIG_SYS_I2C_DS4510_ADDR     0x51
-
 /* GPIO */
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR0   0x18
@@ -487,10 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Command configuration.
  */
-#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NAND
 #define CONFIG_CMD_PCA953X
 #define CONFIG_CMD_PCA953X_INFO
 #define CONFIG_CMD_PCI
@@ -523,7 +516,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Environment Configuration
  */
-#define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_SECT_SIZE   0x20000         /* 128k (one sector) for env */
 #define CONFIG_ENV_SIZE                0x8000
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)