redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

sandbox: Move ram_buf to arch_global_data 

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
utp
Simon Glass 2012-12-13 20:49:11 +00:00 committed by Tom Rini
parent 3d0f8c8f80
commit 8ee666a76f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sandbox/cpu/cpu.c
View File

@ -54,7 +54,7 @@ int cleanup_before_linux(void)
void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
{ {
return (void *)(gd->ram_buf + paddr); return (void *)(gd->arch.ram_buf + paddr);
} }
void flush_dcache_range(unsigned long start, unsigned long stop) void flush_dcache_range(unsigned long start, unsigned long stop)

2
arch/sandbox/include/asm/global_data.h
View File

@ -28,6 +28,7 @@
/* Architecture-specific global data */ /* Architecture-specific global data */
struct arch_global_data { struct arch_global_data {
u8 *ram_buf; /* emulated RAM buffer */
}; };
/* /*
@ -46,7 +47,6 @@ typedef struct global_data {
unsigned long env_addr; /* Address of Environment struct */ unsigned long env_addr; /* Address of Environment struct */
unsigned long env_valid; /* Checksum of Environment valid? */ unsigned long env_valid; /* Checksum of Environment valid? */
unsigned long fb_base; /* base address of frame buffer */ unsigned long fb_base; /* base address of frame buffer */
u8 *ram_buf; /* emulated RAM buffer */
phys_size_t ram_size; /* RAM size */ phys_size_t ram_size; /* RAM size */
const void *fdt_blob; /* Our device tree, NULL if none */ const void *fdt_blob; /* Our device tree, NULL if none */
void **jt; /* jump table */ void **jt; /* jump table */

6
arch/sandbox/lib/board.c
View File

@ -174,7 +174,7 @@ void board_init_f(ulong bootflag)
mem = os_malloc(CONFIG_SYS_SDRAM_SIZE); mem = os_malloc(CONFIG_SYS_SDRAM_SIZE);
assert(mem); assert(mem);
gd->ram_buf = mem; gd->arch.ram_buf = mem;
addr = (ulong)(mem + size); addr = (ulong)(mem + size);
/* /*
@ -227,8 +227,8 @@ void board_init_r(gd_t *id, ulong dest_addr)
#endif #endif
/* The Malloc area is at the top of simulated DRAM */ /* The Malloc area is at the top of simulated DRAM */
mem_malloc_init((ulong)gd->ram_buf + gd->ram_size - TOTAL_MALLOC_LEN, mem_malloc_init((ulong)gd->arch.ram_buf + gd->ram_size -
TOTAL_MALLOC_LEN); TOTAL_MALLOC_LEN, TOTAL_MALLOC_LEN);
/* initialize environment */ /* initialize environment */
env_relocate(); env_relocate();