-#define CONFIG_SOFT_I2C\r
-#define CFG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
-#define CFG_ENV_OFFSET 0x1000
-#define CFG_ENV_SIZE 0x0700\r
-#define CFG_I2C_EEPROM_ADDR 0x57\r
-#define CFG_FACT_OFFSET 0x1800
-#define CFG_FACT_SIZE 0x0800\r
-#define CFG_I2C_FACT_ADDR 0x57\r
-#define CFG_EEPROM_PAGE_WRITE_BITS 3\r
-#define CFG_I2C_EEPROM_ADDR_LEN 2\r
-#define CFG_EEPROM_SIZE 0x2000
-#define CFG_I2C_SPEED 100000
-#define CFG_I2C_SLAVE 0xFE\r
-#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 12\r
-#define CONFIG_ENV_OVERWRITE\r
-#define CONFIG_MISC_INIT_R\r
-\r
-#if defined (CONFIG_SOFT_I2C)\r
-#define SDA 0x00010\r
-#define SCL 0x00020\r
-#define DIR immr->im_cpm.cp_pbdir\r
-#define DAT immr->im_cpm.cp_pbdat\r
-#define PAR immr->im_cpm.cp_pbpar\r
-#define ODR immr->im_cpm.cp_pbodr\r
-#define I2C_INIT {PAR&=~(SDA|SCL);ODR&=~(SDA|SCL);DAT|=(SDA|SCL);DIR|=(SDA|SCL);}\r
-#define I2C_READ ((DAT&SDA)?1:0)\r
-#define I2C_SDA(x) {if(x)DAT|=SDA;else DAT&=~SDA;}\r
-#define I2C_SCL(x) {if(x)DAT|=SCL;else DAT&=~SCL;}\r
-#define I2C_DELAY {udelay(5);}\r
-#define I2C_ACTIVE {DIR|=SDA;}\r
-#define I2C_TRISTATE {DIR&=~SDA;}\r
+#define CONFIG_SOFT_I2C
+#define CONFIG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
+#define CONFIG_ENV_OFFSET 0x1000
+#define CONFIG_ENV_SIZE 0x0700
+#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57
+#define CONFIG_SYS_FACT_OFFSET 0x1800
+#define CONFIG_SYS_FACT_SIZE 0x0800
+#define CONFIG_SYS_I2C_FACT_ADDR 0x57
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
+#define CONFIG_SYS_EEPROM_SIZE 0x2000
+#define CONFIG_SYS_I2C_SPEED 100000
+#define CONFIG_SYS_I2C_SLAVE 0xFE
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 12
+#define CONFIG_ENV_OVERWRITE
+#define CONFIG_MISC_INIT_R
+
+#if defined (CONFIG_SOFT_I2C)
+#define SDA 0x00010
+#define SCL 0x00020
+#define __I2C_DIR immr->im_cpm.cp_pbdir
+#define __I2C_DAT immr->im_cpm.cp_pbdat
+#define __I2C_PAR immr->im_cpm.cp_pbpar
+#define __I2C_ODR immr->im_cpm.cp_pbodr
+#define I2C_INIT { __I2C_PAR &= ~(SDA|SCL); \
+ __I2C_ODR &= ~(SDA|SCL); \
+ __I2C_DAT |= (SDA|SCL); \
+ __I2C_DIR|=(SDA|SCL); }
+#define I2C_READ ((__I2C_DAT & SDA) ? 1 : 0)
+#define I2C_SDA(x) { if (x) __I2C_DAT |= SDA; else __I2C_DAT &= ~SDA; }
+#define I2C_SCL(x) { if (x) __I2C_DAT |= SCL; else __I2C_DAT &= ~SCL; }
+#define I2C_DELAY { udelay(5); }
+#define I2C_ACTIVE { __I2C_DIR |= SDA; }
+#define I2C_TRISTATE { __I2C_DIR &= ~SDA; }