summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm283x
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2017-03-01 15:31:36 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-03-02 09:11:24 +0100
commite0e2a4d8cc4732d7dc320cf07b9213ded6875b6d (patch)
tree6075a740d48624a0f0286e080abb7c0ae5567d00 /arch/arm/mach-bcm283x
parentcf2448a5840ac2c7b4ec400b9357e2a9b8e81b67 (diff)
downloadbarebox-e0e2a4d8cc4732d7dc320cf07b9213ded6875b6d.tar.gz
barebox-e0e2a4d8cc4732d7dc320cf07b9213ded6875b6d.tar.xz
ARM: rpi: move debug UART base selection to Kconfig
To let the user select the right base, when building multi-image. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-bcm283x')
-rw-r--r--arch/arm/mach-bcm283x/Kconfig20
-rw-r--r--arch/arm/mach-bcm283x/include/mach/debug_ll.h6
2 files changed, 25 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
index d9be1a9b65..bb4fe95ab2 100644
--- a/arch/arm/mach-bcm283x/Kconfig
+++ b/arch/arm/mach-bcm283x/Kconfig
@@ -22,4 +22,24 @@ config MACH_RPI2
endchoice
+config MACH_RPI_DEBUG_UART_BASE
+ hex
+ default 0x20201000 if MACH_RPI_DEBUG_UART_RPI
+ default 0x3f201000 if MACH_RPI_DEBUG_UART_RPI2
+
+if DEBUG_LL
+
+choice
+ prompt "Lowlevel debug UART"
+
+config MACH_RPI_DEBUG_UART_RPI
+ bool "use RaspberryPi 1 compatible base"
+
+config MACH_RPI_DEBUG_UART_RPI2
+ bool "use RaspberryPi 2 and 3 compatible base"
+
+endchoice
+
+endif
+
endif
diff --git a/arch/arm/mach-bcm283x/include/mach/debug_ll.h b/arch/arm/mach-bcm283x/include/mach/debug_ll.h
index be93cd95ad..a625a8bdb7 100644
--- a/arch/arm/mach-bcm283x/include/mach/debug_ll.h
+++ b/arch/arm/mach-bcm283x/include/mach/debug_ll.h
@@ -20,7 +20,11 @@
#include <mach/platform.h>
-#define DEBUG_LL_UART_ADDR BCM2835_UART0_BASE
+#ifndef CONFIG_MACH_RPI_DEBUG_UART_BASE
+#define CONFIG_MACH_RPI_DEBUG_UART_BASE 0
+#endif
+
+#define DEBUG_LL_UART_ADDR CONFIG_MACH_RPI_DEBUG_UART_BASE
#include <asm/debug_ll_pl011.h>