diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-06 10:09:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-06 10:27:03 +0100 |
| commit | b4db05f2cb2addf8b6f5933cab7903b18e966227 (patch) | |
| tree | 4c0e559b5df3216b1bcd179c5a8673a4b1da80ac /arch/arm/mach-bcm283x/include | |
| parent | 85b7864a3d619e9d2fa839a784c0800773621f3b (diff) | |
| download | barebox-b4db05f2cb2addf8b6f5933cab7903b18e966227.tar.gz barebox-b4db05f2cb2addf8b6f5933cab7903b18e966227.tar.xz | |
ARM: rpi: move debug UART Kconfig settings
In contrast to other architectures, R.Pi debug UART config was placed
under the "System Type" menu, not under the "Debugging -> low-level
debugging port". This made this setting easy to miss when enabling low
level debug mesages.
While at it use the existing base address defines rather than defining
them again in Kconfig.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-bcm283x/include')
| -rw-r--r-- | arch/arm/mach-bcm283x/include/mach/debug_ll.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-bcm283x/include/mach/debug_ll.h b/arch/arm/mach-bcm283x/include/mach/debug_ll.h index 2e95bf8320..2d2103e338 100644 --- a/arch/arm/mach-bcm283x/include/mach/debug_ll.h +++ b/arch/arm/mach-bcm283x/include/mach/debug_ll.h @@ -20,12 +20,16 @@ #include <mach/platform.h> -#ifndef CONFIG_MACH_RPI_DEBUG_UART_BASE -#define CONFIG_MACH_RPI_DEBUG_UART_BASE 0 -#endif +#ifdef CONFIG_DEBUG_RPI1_UART + +#define DEBUG_LL_UART_ADDR BCM2835_PL011_BASE +#include <debug_ll/pl011.h> -#define DEBUG_LL_UART_ADDR CONFIG_MACH_RPI_DEBUG_UART_BASE +#elif defined CONFIG_DEBUG_RPI2_3_UART +#define DEBUG_LL_UART_ADDR BCM2836_PL011_BASE #include <debug_ll/pl011.h> +#endif + #endif /* __MACH_BCM2835_DEBUG_LL_H__ */ |