From a4637fd524a456eb998444adc434f56dee555d9d Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@suse.com>
Date: Tue, 19 Nov 2019 16:01:03 +0100
Subject: [PATCH] ARM: bcm283x: Move BCM283x_BASE to a global variable

We move the per SOC define BCM283x_BASE to a global variable.
This is a first step to provide a single binary for several bcm283x
SoCs.

Change-Id: If32915d693b26e9d3ddbbddbcac004140623afd0
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
 arch/arm/mach-bcm283x/init.c | 2 ++
 include/configs/rpi.h        | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index f2a5411..4f122f6 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -116,6 +116,8 @@ static void rpi_update_mem_map(void) {}
 
 unsigned long rpi_bcm283x_base = 0x3f000000;
 
+unsigned long rpi_bcm283x_base;
+
 int arch_cpu_init(void)
 {
 	icache_enable();
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index cfff6b1..d316b5f 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -14,6 +14,9 @@
 #endif
 /* Tizen Specific configuration for RPI */
 #include <samsung/tizen_rpi.h>
+#ifndef __ASSEMBLY__
+#include <asm/arch/base.h>
+#endif
 
 #if defined(CONFIG_TARGET_RPI_2) || defined(CONFIG_TARGET_RPI_3_32B)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-- 
2.7.4