From 5de5d59d785643fc6dacf2690eadf5890bdb0307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 1 Nov 2014 16:33:09 +0100
Subject: [PATCH] U-Boot: move gUImage and gFDT back to BSS section

No need for this trick anymore.
---
 src/system/boot/platform/u-boot/arch/arm/shell.S | 6 ------
 src/system/boot/platform/u-boot/arch/ppc/shell.S | 6 ------
 src/system/boot/platform/u-boot/start.cpp        | 5 +++--
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/system/boot/platform/u-boot/arch/arm/shell.S b/src/system/boot/platform/u-boot/arch/arm/shell.S
index aad2a96a15..5bac9579bd 100644
--- a/src/system/boot/platform/u-boot/arch/arm/shell.S
+++ b/src/system/boot/platform/u-boot/arch/arm/shell.S
@@ -75,16 +75,10 @@ SYMBOL_END(_start_common)
 SYMBOL(gUBootGlobalData):
 	.long   0
 SYMBOL_END(gUBootGlobalData)
-SYMBOL(gUImage):
-	.long   0
-SYMBOL_END(gUImage)
 SYMBOL(gUBootOS):
 //XXX: bug? Using .byte makes the next asm symbol
 // to be at the same address
 //	.byte	0
 	.long   0
 SYMBOL_END(gUBootOS)
-SYMBOL(gFDT):
-	.long   0
-SYMBOL_END(gFDT)
 
diff --git a/src/system/boot/platform/u-boot/arch/ppc/shell.S b/src/system/boot/platform/u-boot/arch/ppc/shell.S
index f7df58639e..bb99d97b21 100644
--- a/src/system/boot/platform/u-boot/arch/ppc/shell.S
+++ b/src/system/boot/platform/u-boot/arch/ppc/shell.S
@@ -50,16 +50,10 @@ SYMBOL_END(_start_common)
 SYMBOL(gUBootGlobalData):
 	.long   0
 SYMBOL_END(gUBootGlobalData)
-SYMBOL(gUImage):
-	.long   0
-SYMBOL_END(gUImage)
 SYMBOL(gUBootOS):
 //XXX: bug? Using .byte makes the next asm symbol
 // to be at the same address
 //	.byte	0
 	.long   0
 SYMBOL_END(gUBootOS)
-SYMBOL(gFDT):
-	.long   0
-SYMBOL_END(gFDT)
 
diff --git a/src/system/boot/platform/u-boot/start.cpp b/src/system/boot/platform/u-boot/start.cpp
index 5ad940eb3c..1481e41190 100644
--- a/src/system/boot/platform/u-boot/start.cpp
+++ b/src/system/boot/platform/u-boot/start.cpp
@@ -63,10 +63,11 @@ extern "C" void dump_fdt(const void *fdt);
 
 // declared in shell.S
 // those are initialized to NULL but not in the BSS
-extern struct image_header *gUImage;
 extern uboot_gd *gUBootGlobalData;
 extern uint32 gUBootOS;
-extern void *gFDT;
+
+struct image_header *gUImage;
+void *gFDT;
 
 static uint32 sBootOptions;