Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / bf533-ezkit.h

diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index eb0889078b624c1dc21377eb09d302d80b7b0809..c1a5ecda7ed5ece2c59b1e35f0d45bace1841526 100644 (file)
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -5,7 +5,7 @@
 #ifndef __CONFIG_BF533_EZKIT_H__
 #define __CONFIG_BF533_EZKIT_H__
 
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
 
 
 /*
@@ -65,12 +65,13 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_DRIVER_SMC91111 1
+#define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x20310300
 #define SMC91111_EEPROM_INIT() \
        do { \
-               *pFIO_DIR |= PF1; \
-               *pFIO_FLAG_S = PF1; \
+               bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF1 | PF0); \
+               bfin_write_FIO_FLAG_C(PF1); \
+               bfin_write_FIO_FLAG_S(PF0); \
                SSYNC(); \
        } while (0)
 #define CONFIG_HOSTNAME                bf533-ezkit
@@ -85,58 +86,17 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS     3
 #define CONFIG_SYS_MAX_FLASH_SECT      40
 #define CONFIG_ENV_IS_IN_FLASH
-#define CONFIG_ENV_ADDR                0x20020000
+#define CONFIG_ENV_ADDR                0x20030000
 #define CONFIG_ENV_SECT_SIZE   0x10000
 #define FLASH_TOT_SECT         40
 
 
 /*
  * I2C Settings
- * By default PF1 is used as SDA and PF0 as SCL on the Stamp board
  */
 #define CONFIG_SOFT_I2C
-#ifdef CONFIG_SOFT_I2C
-#define PF_SCL PF0
-#define PF_SDA PF1
-#define I2C_INIT \
-       do { \
-               *pFIO_DIR |= PF_SCL; \
-               SSYNC(); \
-       } while (0)
-#define I2C_ACTIVE \
-       do { \
-               *pFIO_DIR |= PF_SDA; \
-               *pFIO_INEN &= ~PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_TRISTATE \
-       do { \
-               *pFIO_DIR &= ~PF_SDA; \
-               *pFIO_INEN |= PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_READ ((*pFIO_FLAG_D & PF_SDA) != 0)
-#define I2C_SDA(bit) \
-       do { \
-               if (bit) \
-                       *pFIO_FLAG_S = PF_SDA; \
-               else \
-                       *pFIO_FLAG_C = PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_SCL(bit) \
-       do { \
-               if (bit) \
-                       *pFIO_FLAG_S = PF_SCL; \
-               else \
-                       *pFIO_FLAG_C = PF_SCL; \
-               SSYNC(); \
-       } while (0)
-#define I2C_DELAY              udelay(5)       /* 1/4 I2C clock duration */
-
-#define CONFIG_SYS_I2C_SPEED           50000
-#define CONFIG_SYS_I2C_SLAVE           0
-#endif
+#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF0
+#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF1
 
 
 /*
@@ -152,6 +112,4 @@
  */
 #include <configs/bfin_adi_common.h>
 
-#include <asm/blackfin-config-post.h>
-
 #endif