Cleanup MCC200 board configuration; omit non-existent stuff.

diff --git a/CHANGELOG b/CHANGELOG
index 08595d52e036cd01f21f736b34fbd9bbee5b7186..f96f3f9f2265ef926078f21aef17dfa16602c49f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Cleanup MCC200 board configuration; omit non-existent stuff.
+
 * Add support for MPC859/866 Rev. A.0
 
 * Add command for handling DDR ECC registers on MPC8349EE MDS board.

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index d4dee3b77a1c5b85ec363b71ee61232bf4d9faf9..b9b54eb879f5a88b1a0f717481933816acc7c35e 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -67,13 +67,8 @@
 #define CONFIG_COMMANDS               (CONFIG_CMD_DFL  | \
                                ADD_USB_CMD     | \
                                CFG_CMD_BEDBUG  | \
-                               CFG_CMD_DATE    | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_EEPROM  | \
                                CFG_CMD_FAT     | \
-                               CFG_CMD_I2C     | \
-                               CFG_CMD_NFS     | \
-                               CFG_CMD_SNTP    )
+                               CFG_CMD_I2C)
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -131,25 +126,11 @@
  * I2C configuration
  */
 #define CONFIG_HARD_I2C                1       /* I2C with hardware support */
-#define CFG_I2C_MODULE         2       /* Select I2C module #1 or #2 */
+#define CFG_I2C_MODULE         1       /* Select I2C module #1 or #2 */
 
 #define CFG_I2C_SPEED          100000 /* 100 kHz */
 #define CFG_I2C_SLAVE          0x7F
 
-/*
- * EEPROM configuration
- */
-#define CFG_I2C_EEPROM_ADDR            0x58
-#define CFG_I2C_EEPROM_ADDR_LEN                1
-#define CFG_EEPROM_PAGE_WRITE_BITS     4
-#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
-
-/*
- * RTC configuration
- */
-#define CONFIG_RTC_PCF8563
-#define CFG_I2C_RTC_ADDR               0x51
-
 /*
  * Flash configuration (8,16 or 32 MB)
  * TEXT base always at 0xFFF00000
@@ -231,7 +212,7 @@
  */
 /* 0x10000004 = 32MB SDRAM */
 /* 0x90000004 = 64MB SDRAM */
-#define CFG_GPS_PORT_CONFIG    0x10000004
+#define CFG_GPS_PORT_CONFIG    0x00000004
 
 /*
  * Miscellaneous configurable options