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. --- arch/arm/mach-bcm283x/Kconfig | 20 -------------------- arch/arm/mach-bcm283x/include/mach/debug_ll.h | 6 +++--- common/Kconfig | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index bb5f75dc9..9d6a7b2ec 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -33,24 +33,4 @@ config MACH_RPI_CM3 endmenu -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 a625a8bdb..e4a935800 100644 --- a/arch/arm/mach-bcm283x/include/mach/debug_ll.h +++ b/arch/arm/mach-bcm283x/include/mach/debug_ll.h @@ -20,11 +20,11 @@ #include <mach/platform.h> -#ifndef CONFIG_MACH_RPI_DEBUG_UART_BASE -#define CONFIG_MACH_RPI_DEBUG_UART_BASE 0 +#ifndef CONFIG_DEBUG_RPI_UART_BASE +#define CONFIG_DEBUG_RPI_UART_BASE 0 #endif -#define DEBUG_LL_UART_ADDR CONFIG_MACH_RPI_DEBUG_UART_BASE +#define DEBUG_LL_UART_ADDR CONFIG_DEBUG_RPI_UART_BASE #include <asm/debug_ll_pl011.h> diff --git a/common/Kconfig b/common/Kconfig index 21b33f06f..e30f354e6 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1159,6 +1159,19 @@ config DEBUG_SOCFPGA_UART1 Say Y here if you want kernel low-level debugging support on SOCFPGA(Arria 10) based platforms. +config DEBUG_RPI1_UART + bool "RaspberryPi 1 debug UART" + depends on ARCH_BCM283X + help + Say Y here if you want low-level debugging support on + RaspberryPi 1 boards. + +config DEBUG_RPI2_UART + bool "RaspberryPi 2/3 debug UART" + depends on ARCH_BCM283X + help + Say Y here if you want low-level debugging support on + RaspberryPi 2 and 3 boards. endchoice @@ -1209,6 +1222,12 @@ config DEBUG_SOCFPGA_UART_PHYS_ADDR default 0xffc02100 if DEBUG_SOCFPGA_UART1 depends on ARCH_SOCFPGA +config DEBUG_RPI_UART_BASE + hex + default 0x20201000 if DEBUG_RPI1_UART + default 0x3f201000 if DEBUG_RPI2_UART + depends on ARCH_BCM283X + config DEBUG_SOCFPGA_UART_CLOCK int "SoCFPGA UART debug clock" if DEBUG_LL default 100000000 if ARCH_SOCFPGA_CYCLONE5 -- 2.11.0 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox