i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop ARM-specific register pointer

Browse Source 
* the global data is already stored in a variable from shell.S anyway when available
This commit is contained in:
François Revol
2012-05-12 19:50:03 +02:00
parent 5409323add
commit 229e112eb4
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/u-boot/start.cpp
+4 -6
View File
@@ -48,13 +48,11 @@ extern "C" void _start(void);
extern "C" int start_raw(int argc, const char **argv); 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
extern struct image_header *gUImage; extern struct image_header *gUImage;
extern uboot_arm_gd *gUBootGlobalData; extern uboot_arm_gd *gUBootGlobalData;
extern uint32 gUBootOS; extern uint32 gUBootOS;
register volatile uboot_arm_gd *gGD asm ("r8");
static uint32 sBootOptions; static uint32 sBootOptions;
@@ -181,9 +179,9 @@ start_raw(int argc, const char **argv)
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", gUBootOS);
dprintf("gd @ %p\n", gGD); dprintf("gd @ %p\n", gUBootGlobalData);
dprintf("gd->bd @ %p\n", gGD->bd); dprintf("gd->bd @ %p\n", gUBootGlobalData->bd);
dprintf("fb_base %p\n", (void*)gGD->fb_base); dprintf("fb_base %p\n", (void*)gUBootGlobalData->fb_base);
dprintf("uimage @ %p\n", gUImage); dprintf("uimage @ %p\n", gUImage);
if (gUImage) if (gUImage)
dump_uimage(gUImage); dump_uimage(gUImage);