Merge branch 'master' of /home/wd/git/u-boot/master

[u-boot] / include / configs / cm-bf537e.h

diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index d86409fcd302d5ac781ae56cbccf54ad97f6d33c..742df9c0199159fe6b4b9399d7d27ac3323935ac 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -104,9 +104,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .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.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
@@ -119,8 +119,6 @@
  */
 #define CONFIG_BFIN_TWI_I2C    1
 #define CONFIG_HARD_I2C                1
-#define CONFIG_SYS_I2C_SPEED   50000
-#define CONFIG_SYS_I2C_SLAVE   0
 
 
 /*