summaryrefslogtreecommitdiff
path: root/arch/arm/mach-bcm283x/phys2bus.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2016-03-16 21:40:56 -0600
committerTom Rini <trini@konsulko.com>2016-03-27 09:12:20 -0400
commited7481c7d18fe2c632b6fbe5646b32cefd2dc791 (patch)
treeb3a947abe410f39ca3746791e71b173c878170bd /arch/arm/mach-bcm283x/phys2bus.c
parent7ad260a999d77cec94103b97cb5f51ccc0a0abe5 (diff)
downloadu-boot-ed7481c7d18fe2c632b6fbe5646b32cefd2dc791.tar.gz
ARM: bcm283x: don't always define CONFIG_BCM2835
Currently, CONFIG_BCM2835 is defined for all BCM283x builds and _BCM2836 is defined when building for that SoC. That means there isn't a single define that means "exactly BCM2835". This will complicate future patches where BCM2835-vs-anything-else needs to be determined simply. Modify the code to define one or the other of CONFIG_BCM2835/BCM2836 so future patches are simpler. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/mach-bcm283x/phys2bus.c')
-rw-r--r--arch/arm/mach-bcm283x/phys2bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm283x/phys2bus.c b/arch/arm/mach-bcm283x/phys2bus.c
index fc1c29905d..8e9f49240f 100644
--- a/arch/arm/mach-bcm283x/phys2bus.c
+++ b/arch/arm/mach-bcm283x/phys2bus.c
@@ -9,7 +9,7 @@
unsigned long phys_to_bus(unsigned long phys)
{
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
return 0xc0000000 | phys;
#else
return 0x40000000 | phys;