IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers

[u-boot] / include / configs / DASA_SIM.h

diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h
index fc2727ef4731102c5f1915a283ba005cb487c9b3..53229d94b5b34dd48f52b2f5a16159789ff3519a 100644 (file)
--- a/include/configs/DASA_SIM.h
+++ b/include/configs/DASA_SIM.h
@@ -37,6 +37,7 @@
 #define CONFIG_DASA_SIM                1       /* ...on a DASA_SIM board       */
 
 #define        CONFIG_SYS_TEXT_BASE    0xFFFC0000
+#define CONFIG_SYS_LDSCRIPT    "board/esd/dasa_sim/u-boot.lds"
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* call board_early_init_f()    */
 
@@ -115,9 +116,8 @@
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       0x00df0000 /* inside of SDRAM                   */
-#define CONFIG_SYS_INIT_RAM_END        0x0f00  /* End of used area in RAM             */
-#define CONFIG_SYS_GBL_DATA_SIZE       64  /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x0f00  /* Size of used area in RAM            */
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 /*-----------------------------------------------------------------------