ARM: vexpress: set stdout path
Subsystems (3)
PATCH 1/3 ARM: vexpress: set stdout path
This ensures that the correct console gets activated independent of the device probe order.
--- arch/arm/dts/vexpress-v2p-ca15.dts | 4 ++++ arch/arm/dts/vexpress-v2p-ca9.dts | 4 ++++ 2 files changed, 8 insertions(+)
arch/arm/dts/vexpress-v2p-ca15.dts +4 -0
@@ -5,6 +5,10 @@ compatible = "barebox,environment"; device-path = &barebox_env; }; + + chosen { + stdout-path = &v2m_serial0; + }; }; &nor_flash {
arch/arm/dts/vexpress-v2p-ca9.dts +4 -0
@@ -10,6 +10,10 @@ state = &state; }; + chosen { + stdout-path = &v2m_serial0; + }; + /* State: mutable part */ state: state { magic = <0x4d433230>;
Signature · 7 lines
2.26.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/3 ARM: vexpress: allow to select debug UART address
DEBUG_LL currently doesn't work on the Vexpress platform for multiple
reasons: the addresses defined in the header aren't the real UART base addresses but only the bus base address, also the referenced MP define is never set.
Add two options to allow the user to select the correct debug UART address for both supported Vexpress platforms.
--- arch/arm/mach-vexpress/include/mach/debug_ll.h | 11 +++++------ common/Kconfig | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-)
arch/arm/mach-vexpress/include/mach/debug_ll.h +5 -6
@@ -10,13 +10,12 @@#include <linux/amba/serial.h> #include <io.h> -#define DEBUG_LL_PHYS_BASE 0x10000000 -#define DEBUG_LL_PHYS_BASE_RS1 0x1c000000 +#ifdef CONFIG_DEBUG_VEXPRESS_CA9_UART +#define DEBUG_LL_UART_ADDR 0x10009000 +#endif -#ifdef MP -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE -#else -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE_RS1 +#ifdef CONFIG_DEBUG_VEXPRESS_CA15_UART +#define DEBUG_LL_UART_ADDR 0x1c090000#endif #include <debug_ll/pl011.h>
common/Kconfig +15 -0
@@ -1287,6 +1287,21 @@ config DEBUG_RPI3_MINI_UART help Say Y here if you want low-level debugging support on RaspberryPi 3 board mini UART. + +config DEBUG_VEXPRESS_CA9_UART + bool "Vexpress CA9 debug UART" + depends on ARCH_VEXPRESS + help + Say Y here if you want low-level debugging support on the + Cortex-A9 based Vexpress boards. + +config DEBUG_VEXPRESS_CA15_UART + bool "Vexpress CA15 debug UART" + depends on ARCH_VEXPRESS + help + Say Y here if you want low-level debugging support on the + Cortex-A15 based Vexpress boards. + endchoice config DEBUG_IMX_UART_PORT
Signature · 7 lines
2.26.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 2/3] ARM: vexpress: allow to select debug UART address
Quoted 25 lines · Lucas Stach
DEBUG_LLcurrently doesn't work on the Vexpress platform for multiple
reasons: the addresses defined in the header aren't the real UART base addresses but only the bus base address, also the referenced MP define is never set.Add two options to allow the user to select the correct debug UART address for both supported Vexpress platforms.
Signed-off-by Lucas Stach <[email protected]>--- arch/arm/mach-vexpress/include/mach/debug_ll.h | 11 +++++------ common/Kconfig | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-)arch/arm/mach-vexpress/include/mach/debug_ll.h +1
-2@@ -10,13 +10,12 @@#include <linux/amba/serial.h> #include <io.h> -#define DEBUG_LL_PHYS_BASE 0x10000000 -#define DEBUG_LL_PHYS_BASE_RS1 0x1c000000 +#ifdef CONFIG_DEBUG_VEXPRESS_CA9_UART
arch/arm/mach-vexpress/include/mach/debug_ll.h line 19
Quoted 10 lines
arch/arm/mach-vexpress/include/mach/debug_ll.h +4
-4+#define DEBUG_LL_UART_ADDR 0x10009000 +#endif -#ifdef MP -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE -#else -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE_RS1 +#ifdef CONFIG_DEBUG_VEXPRESS_CA15_UART +#define DEBUG_LL_UART_ADDR 0x1c090000#endif
With this change DEBUG_LL_UART_ADDR is undefined when CONFIG_DEBUG_LL is not set.
arch/arm/mach-vexpress/include/mach/debug_ll.h line 21
Quoted 2 lines
arch/arm/mach-vexpress/include/mach/debug_ll.h +0
-0#include <debug_ll/pl011.h>
in this file DEBUG_LL_UART_ADDR is used in a static inline function, so we may only include it when DEBUG_LL_UART_ADDR is defined.
Not sure what we best do about it, but this breaks compilation of vexpress_defconfig.
Sascha
Signature · 9 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/3 ARM: vexpress: enable KALLSYMS in defconfig
In reply to Lucas StachVexpress is mostly a vehicle to test things in a virtual enviroment, so it makes sense to enable this option which helps a lot when trying to debug where things go wrong.
--- arch/arm/configs/vexpress_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/vexpress_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y +CONFIG_KALLSYMS=y CONFIG_PROMPT="vexpress: " CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y
Signature · 7 lines
2.26.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 8 lines · Lucas Stach
This ensures that the correct console gets activated independent of the device probe order.
Signed-off-by Lucas Stach <[email protected]>--- arch/arm/dts/vexpress-v2p-ca15.dts | 4 ++++ arch/arm/dts/vexpress-v2p-ca9.dts | 4 ++++ 2 files changed, 8 insertions(+)
Applied, thanks
Sascha
Signature · 9 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox