From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 19 Jan 2010 20:39:07 +0000 (-0500)
Subject: Blackfin: drop reference to gd->reloc_off
X-Git-Tag: v2010.06-rc1~108^2~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=03f7053f70bc55b50c9d23e54f90d772419300a6;p=oweals%2Fu-boot.git

Blackfin: drop reference to gd->reloc_off

The reloc_off member no longer exists, so drop it.  Also change this
function so that it is always compiled and prevents latent issues like
this in the future.

Reported-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c
index 21fff334a0..b0b52b2ba8 100644
--- a/lib_blackfin/board.c
+++ b/lib_blackfin/board.c
@@ -73,8 +73,12 @@ static int init_baudrate(void)
 
 static void display_global_data(void)
 {
-#ifdef CONFIG_DEBUG_EARLY_SERIAL
 	bd_t *bd;
+
+#ifndef CONFIG_DEBUG_EARLY_SERIAL
+	return;
+#endif
+
 	bd = gd->bd;
 	printf(" gd: %p\n", gd);
 	printf(" |-flags: %lx\n", gd->flags);
@@ -82,7 +86,6 @@ static void display_global_data(void)
 	printf(" |-baudrate: %lu\n", gd->baudrate);
 	printf(" |-have_console: %lx\n", gd->have_console);
 	printf(" |-ram_size: %lx\n", gd->ram_size);
-	printf(" |-reloc_off: %lx\n", gd->reloc_off);
 	printf(" |-env_addr: %lx\n", gd->env_addr);
 	printf(" |-env_valid: %lx\n", gd->env_valid);
 	printf(" |-jt(%p): %p\n", gd->jt, *(gd->jt));
@@ -95,7 +98,6 @@ static void display_global_data(void)
 	printf("   |-bi_flashstart: %lx\n", bd->bi_flashstart);
 	printf("   |-bi_flashsize: %lx\n", bd->bi_flashsize);
 	printf("   \\-bi_flashoffset: %lx\n", bd->bi_flashoffset);
-#endif
 }
 
 #define CPLB_PAGE_SIZE (4 * 1024 * 1024)