Convert CONFIG_SYS_I2C_LEGACY to Kconfig and add CONFIG_[ST]PL_SYS_I2C_LEGACY

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

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 98e0ce1..7dff0f4 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -48,7 +48,7 @@
                " boardid=0x${IVM_BoardId} hwkey=0x${IVM_HWKey}"
 
 #define CONFIG_KM_DEF_ENV_CPU                                          \
-       "u-boot="CONFIG_HOSTNAME "/u-boot.kwb\0"                \
+       "u-boot=" CONFIG_HOSTNAME "/u-boot.kwb\0"               \
        CONFIG_KM_UPDATE_UBOOT                                          \
        "set_fdthigh=setenv fdt_high ${kernelmem}\0"                    \
        "checkfdt="                                                     \
@@ -90,8 +90,6 @@
  * I2C related stuff
  */
 #undef CONFIG_I2C_MVTWSI
-#define CONFIG_SYS_I2C
-#define        CONFIG_SYS_I2C_SOFT     /* I2C bit-banged       */
 #define CONFIG_SYS_I2C_INIT_BOARD
 
 #define        CONFIG_KIRKWOOD_GPIO            /* Enable GPIO Support */
@@ -110,10 +108,6 @@
 #include <linux/delay.h>
 #include <linux/stringify.h>
 extern void __set_direction(unsigned pin, int high);
-void set_sda(int state);
-void set_scl(int state);
-int get_sda(void);
-int get_scl(void);
 #define KM_KIRKWOOD_SDA_PIN    8
 #define KM_KIRKWOOD_SCL_PIN    9
 #define KM_KIRKWOOD_SOFT_I2C_GPIOS     0x0300
@@ -129,16 +123,8 @@ int get_scl(void);
 #define I2C_DELAY      udelay(1)
 #define I2C_SOFT_DECLARATIONS
 
-#define        CONFIG_SYS_I2C_SOFT_SLAVE       0x0
-#define        CONFIG_SYS_I2C_SOFT_SPEED       100000
-
 /* EEprom support 24C128, 24C256 valid for environment eeprom */
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      6 /* 64 Byte write page */
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
-
-#define CONFIG_SYS_I2C_EEPROM_ADDR     0x50
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 
 /*
  *  Environment variables configurations
@@ -146,8 +132,6 @@ int get_scl(void);
 #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
 #define CONFIG_ENV_TOTAL_SIZE          0x20000     /* no bracets! */
 #else
-#define CONFIG_SYS_DEF_EEPROM_ADDR     0x50
-#define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_EEPROM_WREN
 #define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */
 #endif
@@ -169,9 +153,9 @@ int get_scl(void);
        "newenv=setenv addr 0x100000 && "                               \
                "i2c dev " __stringify(CONFIG_I2C_ENV_EEPROM_BUS) "; "  \
                "mw.b ${addr} 0 4 && "                                  \
-               "eeprom write " __stringify(CONFIG_SYS_DEF_EEPROM_ADDR) \
+               "eeprom write " __stringify(CONFIG_SYS_I2C_EEPROM_ADDR) \
                " ${addr} " __stringify(CONFIG_ENV_OFFSET) " 4 && "     \
-               "eeprom write " __stringify(CONFIG_SYS_DEF_EEPROM_ADDR) \
+               "eeprom write " __stringify(CONFIG_SYS_I2C_EEPROM_ADDR) \
                " ${addr} " __stringify(CONFIG_ENV_OFFSET_REDUND) " 4\0"
 #endif