diff options
| author | Stefano Babic <sbabic@denx.de> | 2013-02-23 10:13:40 +0100 | 
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-02-23 10:13:40 +0100 | 
| commit | 9cd9b34dc7f247fd0fce08ab688bf8197f1bfdbc (patch) | |
| tree | 89561497322fff78d3d2e4a8e736f18ab4e0ddfb /arch/sandbox/lib/board.c | |
| parent | bec0160e9f5adab1d451ded3a95b0114b14e1970 (diff) | |
| parent | a5627914daad144727655a72bd3c8a8958fbcdcf (diff) | |
| download | olio-uboot-2014.01-9cd9b34dc7f247fd0fce08ab688bf8197f1bfdbc.tar.xz olio-uboot-2014.01-9cd9b34dc7f247fd0fce08ab688bf8197f1bfdbc.zip  | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/sandbox/lib/board.c')
| -rw-r--r-- | arch/sandbox/lib/board.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sandbox/lib/board.c b/arch/sandbox/lib/board.c index 83858c1ff..3752fab50 100644 --- a/arch/sandbox/lib/board.c +++ b/arch/sandbox/lib/board.c @@ -174,7 +174,7 @@ void board_init_f(ulong bootflag)  	mem = os_malloc(CONFIG_SYS_SDRAM_SIZE);  	assert(mem); -	gd->ram_buf = mem; +	gd->arch.ram_buf = mem;  	addr = (ulong)(mem + size);  	/* @@ -227,8 +227,8 @@ void board_init_r(gd_t *id, ulong dest_addr)  #endif  	/* The Malloc area is at the top of simulated DRAM */ -	mem_malloc_init((ulong)gd->ram_buf + gd->ram_size - TOTAL_MALLOC_LEN, -			TOTAL_MALLOC_LEN); +	mem_malloc_init((ulong)gd->arch.ram_buf + gd->ram_size - +			TOTAL_MALLOC_LEN, TOTAL_MALLOC_LEN);  	/* initialize environment */  	env_relocate();  |