Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

[u-boot] / include / configs / bf561-ezkit.h

diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index ef2019f39dd06526389a1835f954d3cc14d99bea..1557e14f5237a219091c262507353a842044f54c 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -5,13 +5,12 @@
 #ifndef __CONFIG_BF561_EZKIT_H__
 #define __CONFIG_BF561_EZKIT_H__
 
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
 
 
 /*
  * Processor Settings
  */
-#define CONFIG_BFIN_CPU             bf561-0.3
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_BYPASS
 
 
@@ -60,7 +59,8 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_DRIVER_SMC91111 1
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x2C010300
 #define CONFIG_SMC_USE_32_BIT  1
 #define CONFIG_HOSTNAME                bf561-ezkit
@@ -86,7 +86,24 @@
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
 #define ENV_IS_EMBEDDED
 #else
-#define ENV_IS_EMBEDDED_CUSTOM
+#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
+#endif
+#ifdef ENV_IS_EMBEDDED
+/* WARNING - the following is hand-optimized to fit within
+ * the sector before the environment sector. If it throws
+ * an error during compilation remove an object here to get
+ * it linked after the configuration sector.
+ */
+# define LDS_BOARD_TEXT \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \
+       common/dlmalloc.o               (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
+       lib/zlib.o              (.text .text.*); \
+       board/bf561-ezkit/bf561-ezkit.o (.text .text.*); \
+       . = DEFINED(env_offset) ? env_offset : .; \
+       common/env_embedded.o           (.text .text.*);
 #endif
 
 
@@ -94,48 +111,8 @@
  * I2C Settings
  */
 #define CONFIG_SOFT_I2C
-#ifdef CONFIG_SOFT_I2C
-#define PF_SCL PF0
-#define PF_SDA PF1
-#define I2C_INIT \
-       do { \
-               *pFIO0_DIR |= PF_SCL; \
-               SSYNC(); \
-       } while (0)
-#define I2C_ACTIVE \
-       do { \
-               *pFIO0_DIR |= PF_SDA; \
-               *pFIO0_INEN &= ~PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_TRISTATE \
-       do { \
-               *pFIO0_DIR &= ~PF_SDA; \
-               *pFIO0_INEN |= PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_READ ((*pFIO0_FLAG_D & PF_SDA) != 0)
-#define I2C_SDA(bit) \
-       do { \
-               if (bit) \
-                       *pFIO0_FLAG_S = PF_SDA; \
-               else \
-                       *pFIO0_FLAG_C = PF_SDA; \
-               SSYNC(); \
-       } while (0)
-#define I2C_SCL(bit) \
-       do { \
-               if (bit) \
-                       *pFIO0_FLAG_S = PF_SCL; \
-               else \
-                       *pFIO0_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
 
 
 /*
@@ -149,6 +126,4 @@
  */
 #include <configs/bfin_adi_common.h>
 
-#include <asm/blackfin-config-post.h>
-
-#endif                         /* __CONFIG_EZKIT561_H__ */
+#endif