Patchwork [U-Boot,v6,25/31] blackfin: Fix up board_type global data

login
register
mail settings
Submitter Simon Glass
Date March 6, 2013, 12:39 a.m.
Message ID <1362530405-10824-26-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/225232/
State Accepted, archived
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - March 6, 2013, 12:39 a.m.
This should be in arch_global_data but was dropped in the change-over.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v6:
- Add new patch to fix up blackfin's board_type global_data

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/blackfin/include/asm/global_data.h | 1 +
 arch/blackfin/lib/board.c               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/arch/blackfin/include/asm/global_data.h b/arch/blackfin/include/asm/global_data.h
index c2c4d4d..44245b4 100644
--- a/arch/blackfin/include/asm/global_data.h
+++ b/arch/blackfin/include/asm/global_data.h
@@ -32,6 +32,7 @@ 
 
 /* Architecture-specific global data */
 struct arch_global_data {
+	unsigned long board_type;
 };
 
 #include <asm-generic/global_data.h>
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index 288dc82..75b6c46 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -77,7 +77,7 @@  static void display_global_data(void)
 	bd = gd->bd;
 	printf(" gd: %p\n", gd);
 	printf(" |-flags: %lx\n", gd->flags);
-	printf(" |-board_type: %lx\n", gd->board_type);
+	printf(" |-board_type: %lx\n", gd->arch.board_type);
 	printf(" |-baudrate: %u\n", gd->baudrate);
 	printf(" |-have_console: %lx\n", gd->have_console);
 	printf(" |-ram_size: %lx\n", gd->ram_size);