RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsp/leon3: Use sysinit for bsp_debug_uart_init()

Browse Source
This commit is contained in:
Sebastian Huber
2016-06-20 08:16:54 +02:00
parent a4fa007be9
commit 40b80d86ef
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
c/src/lib/libbsp/sparc/leon3/console/printk_support.c
View File

@@ -18,6 +18,7 @@
#include <bsp.h> #include <bsp.h>
#include <leon.h> #include <leon.h>
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/sysinit.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
@@ -38,7 +39,7 @@ static int pre_printk_pos = 0;
/* Initialize the BSP system debug console layer. It will scan AMBA Plu&Play /* Initialize the BSP system debug console layer. It will scan AMBA Plu&Play
* for a debug APBUART and enable RX/TX for that UART. * for a debug APBUART and enable RX/TX for that UART.
*/ */
void bsp_debug_uart_init(void) static void bsp_debug_uart_init(void)
{ {
int i; int i;
struct ambapp_dev *adev; struct ambapp_dev *adev;
@@ -76,6 +77,12 @@ void bsp_debug_uart_init(void)
} }
} }
RTEMS_SYSINIT_ITEM(
bsp_debug_uart_init,
RTEMS_SYSINIT_BSP_START,
RTEMS_SYSINIT_ORDER_THIRD
);
/* putchar/getchar for printk */ /* putchar/getchar for printk */
static void bsp_out_char(char c) static void bsp_out_char(char c)
{ {

2
c/src/lib/libbsp/sparc/leon3/include/leon.h
View File

@@ -392,8 +392,6 @@ void leon3_cpu_counter_initialize(void);
/* GRLIB extended IRQ controller register */ /* GRLIB extended IRQ controller register */
void leon3_ext_irq_init(void); void leon3_ext_irq_init(void);
void bsp_debug_uart_init(void);
void leon3_power_down_loop(void) RTEMS_NO_RETURN; void leon3_power_down_loop(void) RTEMS_NO_RETURN;
static inline uint32_t leon3_get_cpu_count( static inline uint32_t leon3_get_cpu_count(

4
c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
View File

@@ -18,7 +18,6 @@
#include <bsp.h> #include <bsp.h>
#include <leon.h> #include <leon.h>
#include <rtems/bspIo.h>
#include <bsp/bootcard.h> #include <bsp/bootcard.h>
#if defined(RTEMS_SMP) || defined(RTEMS_MULTIPROCESSING) #if defined(RTEMS_SMP) || defined(RTEMS_MULTIPROCESSING)
@@ -67,7 +66,4 @@ void bsp_start( void )
LEON3_Cpu_Index = _LEON3_Get_current_processor(); LEON3_Cpu_Index = _LEON3_Get_current_processor();
leon3_cpu_counter_initialize(); leon3_cpu_counter_initialize();
/* find debug UART for printk() */
bsp_debug_uart_init();
} }