Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

U-Boot: move gFDT declaration to shell.S

Browse Source 
* this avoids it falling into the BSS section which we clear quite late,
and allows setting it from asm code if needed.
This commit is contained in:
François Revol 2012-06-02 13:46:45 +02:00
parent cce9d8cf89
commit dc09611aad
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/system/boot/platform/u-boot/arch/arm/shell.S
View File

@ -86,4 +86,7 @@ SYMBOL(gUBootOS):
// .byte 0 // .byte 0
.long 0 .long 0
SYMBOL_END(gUBootOS) SYMBOL_END(gUBootOS)
SYMBOL(gFDT):
.long 0
SYMBOL_END(gFDT)

3
src/system/boot/platform/u-boot/arch/ppc/shell.S
View File

@ -59,4 +59,7 @@ SYMBOL(gUBootOS):
// .byte 0 // .byte 0
.long 0 .long 0
SYMBOL_END(gUBootOS) SYMBOL_END(gUBootOS)
SYMBOL(gFDT):
.long 0
SYMBOL_END(gFDT)

6
src/system/boot/platform/u-boot/start.cpp
View File

@ -52,11 +52,11 @@ extern "C" int start_raw(int argc, const char **argv);
extern "C" void dump_uimage(struct image_header *image); extern "C" void dump_uimage(struct image_header *image);
// declared in shell.S // declared in shell.S
// those are initialized to NULL but not in the BSS
extern struct image_header *gUImage; extern struct image_header *gUImage;
extern uboot_gd *gUBootGlobalData; extern uboot_gd *gUBootGlobalData;
extern uint32 gUBootOS; extern uint32 gUBootOS;
extern void *gFDT;
void * gFDT = NULL;
static uint32 sBootOptions; static uint32 sBootOptions;
@ -184,7 +184,7 @@ start_raw(int argc, const char **argv)
dprintf("argc = %d\n", argc); dprintf("argc = %d\n", argc);
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
dprintf("argv[%d] @%lx = '%s'\n", i, (uint32)argv[i], argv[i]); dprintf("argv[%d] @%lx = '%s'\n", i, (uint32)argv[i], argv[i]);
dprintf("os: %d\n", gUBootOS); dprintf("os: %d\n", (int)gUBootOS);
dprintf("gd @ %p\n", gUBootGlobalData); dprintf("gd @ %p\n", gUBootGlobalData);
dprintf("gd->bd @ %p\n", gUBootGlobalData->bd); dprintf("gd->bd @ %p\n", gUBootGlobalData->bd);
//dprintf("fb_base %p\n", (void*)gUBootGlobalData->fb_base); //dprintf("fb_base %p\n", (void*)gUBootGlobalData->fb_base);