blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*

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

diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 798e77350cf74f5a7aaff30280673cd457bd5274..8d0bc1232f001ce1f3d964aec51293b3b002e86c 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -5,7 +5,7 @@
 #ifndef __CONFIG_CM_BF537E_H__
 #define __CONFIG_CM_BF537E_H__
 
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
 
 
 /*
@@ -38,6 +38,9 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        4
 
+/* Decrease core voltage */
+#define CONFIG_VR_CTL_VAL (VLEV_115 | CLKBUFOE | GAIN_20 | FREQ_1000)
+
 
 /*
  * Memory Settings
@@ -79,7 +82,7 @@
 #define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
-#define CONFIG_SYS_MAX_FLASH_SECT      32
+#define CONFIG_SYS_MAX_FLASH_SECT      35
 
 
 /*
@@ -92,7 +95,22 @@
 #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.*); \
+       . = DEFINED(env_offset) ? env_offset : .; \
+       common/env_embedded.o           (.text .text.*);
 #endif
 
 
@@ -112,6 +130,10 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    0
+#define CONFIG_BOOTCOMMAND     "run flashboot"
+#define FLASHBOOT_ENV_SETTINGS \
+       "flashboot=flread 20040000 1000000 300000;" \
+       "bootm 0x1000000\0"
 
 
 /*
@@ -119,6 +141,4 @@
  */
 #include <configs/bfin_adi_common.h>
 
-#include <asm/blackfin-config-post.h>
-
 #endif