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

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

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index ae4f287..9a8e130 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -16,7 +16,6 @@
 
 #include <configs/ti_am335x_common.h>
 
-#undef CONFIG_BOARD_LATE_INIT
 #undef CONFIG_SPI
 #undef CONFIG_OMAP3_SPI
 #undef CONFIG_BOOTCOUNT_LIMIT
@@ -25,9 +24,6 @@
 #undef CONFIG_MAX_RAM_BANK_SIZE
 #define CONFIG_MAX_RAM_BANK_SIZE       (512 << 20)     /* 512MB */
 
-#define CONFIG_OMAP_COMMON
-
-#define MACH_TYPE_CM_T335              4586    /* Until the next sync */
 #define CONFIG_MACH_TYPE               MACH_TYPE_CM_T335
 
 /* Clock Defines */
@@ -96,7 +92,6 @@
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_COM1                0x44e09000      /* UART0 */
 #define CONFIG_SYS_NS16550_COM2                0x48022000      /* UART1 */
-#define CONFIG_BAUDRATE                        115200
 
 /* I2C Configuration */
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* Main EEPROM */
@@ -104,7 +99,7 @@
 #define CONFIG_SYS_I2C_EEPROM_BUS      0
 
 /* SPL */
-#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 
 /* Network. */
 #define CONFIG_PHY_GIGE
@@ -155,14 +150,7 @@
 #define GPIO_PIN(_bank, _pin)          ((_bank << 5) + _pin)
 
 /* Status LED */
-#define CONFIG_STATUS_LED
-#define CONFIG_GPIO_LED
-#define CONFIG_BOARD_SPECIFIC_LED
-#define STATUS_LED_BIT                 GPIO_PIN(2, 0)
 /* Status LED polarity is inversed, so init it in the "off" state */
-#define STATUS_LED_STATE               STATUS_LED_OFF
-#define STATUS_LED_PERIOD              (CONFIG_SYS_HZ / 2)
-#define STATUS_LED_BOOT                        0
 
 /* EEPROM */
 #define CONFIG_CMD_EEPROM