summaryrefslogtreecommitdiffstats
path: root/board/raspberrypi
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 /board/raspberrypi
parent7ad260a999d77cec94103b97cb5f51ccc0a0abe5 (diff)
downloadblackbird-obmc-uboot-ed7481c7d18fe2c632b6fbe5646b32cefd2dc791.tar.gz
blackbird-obmc-uboot-ed7481c7d18fe2c632b6fbe5646b32cefd2dc791.zip
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 'board/raspberrypi')
-rw-r--r--board/raspberrypi/rpi/rpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index da4b6ff234..1fd7591f33 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -31,7 +31,7 @@ U_BOOT_DEVICE(bcm2835_gpios) = {
};
static const struct pl01x_serial_platdata serial_platdata = {
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
.base = 0x3f201000,
#else
.base = 0x20201000,
OpenPOWER on IntegriCloud