summaryrefslogtreecommitdiff
path: root/arch/nios2
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-26 14:34:52 +0200
committerWolfgang Denk <wd@denx.de>2010-10-26 21:05:30 +0200
commit25ddd1fb0a2281b182529afbc8fda5de2dc16d96 (patch)
treeb1d57d9d1324fb6b8fddf7ebc976dbe822468649 /arch/nios2
parent16a354f920f3959ed847bd917bdfbc7eba48cf1e (diff)
downloadu-boot-imx-25ddd1fb0a2281b182529afbc8fda5de2dc16d96.zip
u-boot-imx-25ddd1fb0a2281b182529afbc8fda5de2dc16d96.tar.gz
u-boot-imx-25ddd1fb0a2281b182529afbc8fda5de2dc16d96.tar.bz2
Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value
CONFIG_SYS_GBL_DATA_SIZE has always been just a bad workarond for not being able to use "sizeof(struct global_data)" in assembler files. Recent experience has shown that manual synchronization is not reliable enough. This patch renames CONFIG_SYS_GBL_DATA_SIZE into GENERATED_GBL_DATA_SIZE which gets automatically generated by the asm-offsets tool. In the result, all definitions of this value can be deleted from the board config files. We have to make sure that all files that reference such data include the new <asm-offsets.h> file. No other changes have been done yet, but it is obvious that similar changes / simplifications can be done for other, related macro definitions as well. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/cpu/start.S2
-rw-r--r--arch/nios2/lib/board.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S
index 76d3b52..9b0f52d 100644
--- a/arch/nios2/cpu/start.S
+++ b/arch/nios2/cpu/start.S
@@ -21,7 +21,7 @@
* MA 02111-1307 USA
*/
-
+#include <asm-offsets.h>
#include <config.h>
#include <timestamp.h>
#include <version.h>
diff --git a/arch/nios2/lib/board.c b/arch/nios2/lib/board.c
index f83e691..f6c6bc1 100644
--- a/arch/nios2/lib/board.c
+++ b/arch/nios2/lib/board.c
@@ -95,7 +95,7 @@ void board_init (void)
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
- memset( gd, 0, CONFIG_SYS_GBL_DATA_SIZE );
+ memset( gd, 0, GENERATED_GBL_DATA_SIZE );
gd->bd = (bd_t *)(gd+1); /* At end of global data */
gd->baudrate = CONFIG_BAUDRATE;