Merge branch 'master' of git://git.denx.de/u-boot-nios

[oweals/u-boot.git] / include / configs / tcm-bf537.h

diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index eefc450b9d226fdcbf9690006131a67819cd7c76..9794e1b90427347d920cee32a8c74fcea010551c 100644 (file)
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -5,7 +5,7 @@
 #ifndef __CONFIG_TCM_BF537_H__
 #define __CONFIG_TCM_BF537_H__
 
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
 
 
 /*
@@ -95,6 +95,21 @@
 #else
 #define ENV_IS_EMBEDDED_CUSTOM
 #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 \
+       cpu/blackfin/traps.o            (.text .text.*); \
+       cpu/blackfin/interrupt.o        (.text .text.*); \
+       cpu/blackfin/serial.o           (.text .text.*); \
+       common/dlmalloc.o               (.text .text.*); \
+       lib_generic/crc32.o             (.text .text.*); \
+       . = DEFINED(env_offset) ? env_offset : .; \
+       common/env_embedded.o           (.text .text.*);
+#endif
 
 
 /*
@@ -120,6 +135,5 @@
  */
 #include <configs/bfin_adi_common.h>
 
-#include <asm/blackfin-config-post.h>
 
 #endif