From 229e112eb4a2e83edd4e7bb44f3a265f1b4681fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 12 May 2012 19:50:03 +0200 Subject: [PATCH] Drop ARM-specific register pointer * the global data is already stored in a variable from shell.S anyway when available --- src/system/boot/platform/u-boot/start.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/system/boot/platform/u-boot/start.cpp b/src/system/boot/platform/u-boot/start.cpp index 8c1911f889..175039e5e4 100644 --- a/src/system/boot/platform/u-boot/start.cpp +++ b/src/system/boot/platform/u-boot/start.cpp @@ -48,13 +48,11 @@ extern "C" void _start(void); extern "C" int start_raw(int argc, const char **argv); extern "C" void dump_uimage(struct image_header *image); +// declared in shell.S extern struct image_header *gUImage; extern uboot_arm_gd *gUBootGlobalData; extern uint32 gUBootOS; - -register volatile uboot_arm_gd *gGD asm ("r8"); - static uint32 sBootOptions; @@ -181,9 +179,9 @@ start_raw(int argc, const char **argv) for (i = 0; i < argc; i++) dprintf("argv[%d] @%lx = '%s'\n", i, (uint32)argv[i], argv[i]); dprintf("os: %d\n", gUBootOS); - dprintf("gd @ %p\n", gGD); - dprintf("gd->bd @ %p\n", gGD->bd); - dprintf("fb_base %p\n", (void*)gGD->fb_base); + dprintf("gd @ %p\n", gUBootGlobalData); + dprintf("gd->bd @ %p\n", gUBootGlobalData->bd); + dprintf("fb_base %p\n", (void*)gUBootGlobalData->fb_base); dprintf("uimage @ %p\n", gUImage); if (gUImage) dump_uimage(gUImage);