--- bsps/sparc/leon3/console/printk_support.c | 37 +++++++++++++++---- bsps/sparc/leon3/include/bsp/leon3.h | 5 +++ bsps/sparc/leon3/include/leon.h | 2 + spec/build/bsps/sparc/leon3/grp.yml | 2 + .../build/bsps/sparc/leon3/optapbuartbase.yml | 20 ++++++++++ 5 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 spec/build/bsps/sparc/leon3/optapbuartbase.yml
diff --git a/bsps/sparc/leon3/console/printk_support.c b/bsps/sparc/leon3/console/printk_support.c index cb77c66a96..9e260d2eac 100644 --- a/bsps/sparc/leon3/console/printk_support.c +++ b/bsps/sparc/leon3/console/printk_support.c @@ -38,20 +38,27 @@ #include <bsp/leon3.h> #include <rtems/bspIo.h> #include <rtems/sysinit.h> -#include <rtems/score/thread.h> #include <grlib/apbuart.h> #include <grlib/io.h> +#if !defined(LEON3_APBUART_BASE) #include <grlib/ambapp.h> int leon3_debug_uart_index __attribute__((weak)) = 0; + apbuart *leon3_debug_uart = NULL; +#endif static void bsp_debug_uart_init(void); -static void bsp_debug_uart_discard(char c) +static void apbuart_enable_receive_and_transmit(apbuart *regs) { - (void) c; + uint32_t ctrl; + + ctrl = grlib_load_32(®s->ctrl); + ctrl |= APBUART_CTRL_RE | APBUART_CTRL_TE; + grlib_store_32(®s->ctrl, ctrl); + grlib_store_32(®s->status, 0); } static void bsp_debug_uart_output_char(char c) @@ -71,6 +78,22 @@ static void bsp_debug_uart_pre_init_out(char c) (*BSP_output_char)(c); } +#if defined(LEON3_APBUART_BASE) + +static void bsp_debug_uart_init(void) +{ + apbuart_enable_receive_and_transmit(leon3_debug_uart); + BSP_poll_char = bsp_debug_uart_poll_char; + BSP_output_char = bsp_debug_uart_output_char; +} + +#else /* !LEON3_APBUART_BASE */ + +static void bsp_debug_uart_discard(char c) +{ + (void) c; +} + /* Initialize the BSP system debug console layer. It will scan AMBA Plu&Play * for a debug APBUART and enable RX/TX for that UART. */ @@ -108,7 +131,6 @@ static void bsp_debug_uart_init(void) ambapp_find_by_idx, (void *)&i); if (adev != NULL) { struct ambapp_apb_info *apb; - uint32_t ctrl; /* * Found a matching debug console, initialize debug UART if present for @@ -116,16 +138,15 @@ static void bsp_debug_uart_init(void) */ apb = (struct ambapp_apb_info *)adev->devinfo; leon3_debug_uart = (apbuart *)apb->start; - ctrl = grlib_load_32(&leon3_debug_uart->ctrl); - ctrl |= APBUART_CTRL_RE | APBUART_CTRL_TE; - grlib_store_32(&leon3_debug_uart->ctrl, ctrl); - grlib_store_32(&leon3_debug_uart->status, 0); + apbuart_enable_receive_and_transmit(leon3_debug_uart); BSP_poll_char = bsp_debug_uart_poll_char; BSP_output_char = bsp_debug_uart_output_char; } } +#endif /* LEON3_APBUART_BASE */ + RTEMS_SYSINIT_ITEM( bsp_debug_uart_init, RTEMS_SYSINIT_BSP_START, diff --git a/bsps/sparc/leon3/include/bsp/leon3.h b/bsps/sparc/leon3/include/bsp/leon3.h index a8e900eef4..649d8ab41e 100644 --- a/bsps/sparc/leon3/include/bsp/leon3.h +++ b/bsps/sparc/leon3/include/bsp/leon3.h @@ -36,6 +36,7 @@ #ifndef _BSP_LEON3_H #define _BSP_LEON3_H +#include <bspopts.h> #include <rtems.h> #include <grlib/apbuart-regs.h> #include <grlib/gptimer-regs.h> @@ -348,7 +349,11 @@ static inline uint32_t leon3_up_counter_frequency( void ) /** * @brief This pointer provides the debug APBUART register block address. */ +#if defined(LEON3_APBUART_BASE) +#define leon3_debug_uart ((struct apbuart *) LEON3_APBUART_BASE) +#else extern apbuart *leon3_debug_uart; +#endif /** @} */ diff --git a/bsps/sparc/leon3/include/leon.h b/bsps/sparc/leon3/include/leon.h index be3819737a..7aa26b43b9 100644 --- a/bsps/sparc/leon3/include/leon.h +++ b/bsps/sparc/leon3/include/leon.h @@ -323,6 +323,7 @@ static inline unsigned int leon_r32_no_cache(uintptr_t addr) */ extern int syscon_uart_index; +#if !defined(LEON3_APBUART_BASE) /* Let user override which on-chip APBUART will be debug UART * 0 = Default APBUART. On MP system CPU0=APBUART0, CPU1=APBUART1... * 1 = APBUART[0] @@ -331,6 +332,7 @@ extern int syscon_uart_index; * ... */ extern int leon3_debug_uart_index; +#endif /* Let user override which on-chip TIMER core will be used for system clock * timer. This controls which timer core will be accociated with diff --git a/spec/build/bsps/sparc/leon3/grp.yml b/spec/build/bsps/sparc/leon3/grp.yml index ab72d911c5..48da9acba8 100644 --- a/spec/build/bsps/sparc/leon3/grp.yml +++ b/spec/build/bsps/sparc/leon3/grp.yml @@ -32,6 +32,8 @@ links: uid: objmpci - role: build-dependency uid: objsmp +- role: build-dependency + uid: optapbuartbase - role: build-dependency uid: optconirq - role: build-dependency diff --git a/spec/build/bsps/sparc/leon3/optapbuartbase.yml b/spec/build/bsps/sparc/leon3/optapbuartbase.yml new file mode 100644 index 0000000000..f0548687c3 --- /dev/null +++ b/spec/build/bsps/sparc/leon3/optapbuartbase.yml @@ -0,0 +1,20 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +copyrights: +- Copyright (C) 2021 embedded brains GmbH & Co. KG +actions: +- get-integer: null +- format-and-define: null +build-type: option +default: null +- enabled-by: sparc/gr712rc + value: 0x80000100 +- enabled-by: sparc/gr740 + value: 0xff900000 +enabled-by: true +format: '{:#010x}' +links: [] +name: LEON3_APBUART_BASE +description: | + This option defines the base address of the debug/console APBUART register + block. +type: build -- 2.35.3 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel