Convert CONFIG_CMD_IDE to Kconfig

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

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index ab1d9f1..02ac7b3 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -33,11 +33,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_BEDBUG
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_DTT
-#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_IDE
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO
@@ -47,7 +42,6 @@
  */
 #define CONFIG_PSC_CONSOLE     1       /* console is on PSC1 */
 #define CONFIG_NETCONSOLE      1       /* network console */
-#define CONFIG_BAUDRATE                115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
@@ -259,21 +253,6 @@
 #define CONFIG_SYS_ATA_STRIDE          4
 
 /*
- * I2C configuration
- */
-#define CONFIG_HARD_I2C                1       /* I2C with hardware support */
-#define CONFIG_SYS_I2C_MODULE          2       /* select I2C module #2 */
-#define CONFIG_SYS_I2C_SPEED           100000  /* 100 kHz */
-#define CONFIG_SYS_I2C_SLAVE           0x7F
-
-/*
- * EEPROM configuration
- */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         1
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      1       /* 2 bytes per write cycle */
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  5       /* 2ms/cycle + 3ms extra */
-
-/*
  * RTC configuration
  */
 #define CONFIG_RTC_DS1337      1
@@ -287,12 +266,13 @@
 #define LED_ON                 0x00000010
 
 /*
+<<<<<<< 4ba57299158b7a7020d2bd3b8d8369884696a0ae
+=======
  * Temperature sensor
  */
-#define CONFIG_DTT_LM75                1
-#define CONFIG_DTT_SENSORS     { 0x49 }
 
 /*
+>>>>>>> Drop digital thermometer and thermostat (DTT) drivers
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH 1