diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-17 06:57:46 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-20 09:49:36 +0200 |
| commit | c4ccf26cb7808786e15312b41c3055b2da75203b (patch) | |
| tree | f25c7d75c2543e447847e84d978db3d23a433418 /c/src/lib/libbsp/powerpc/qoriq | |
| parent | bsp/motorola_powerpc: Move bspstart.c to bsps (diff) | |
| download | rtems-c4ccf26cb7808786e15312b41c3055b2da75203b.tar.bz2 | |
bsps: Convert all bsp_predriver_hook()
Use RTEMS_SYSINIT_ITEM() instead.
Update #2408.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/qoriq')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/qoriq/startup/bsppredriverhook.c | 31 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c | 10 |
3 files changed, 10 insertions, 32 deletions
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am index baa3016206..b9735779ff 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am @@ -50,7 +50,6 @@ librtemsbsp_a_SOURCES += startup/mmu-tlb1.S librtemsbsp_a_SOURCES += startup/mmu-config.c librtemsbsp_a_SOURCES += startup/portal.c librtemsbsp_a_SOURCES += startup/restart.S -librtemsbsp_a_SOURCES += startup/bsppredriverhook.c librtemsbsp_a_SOURCES += startup/bspstart.c librtemsbsp_a_SOURCES += startup/bspreset.c librtemsbsp_a_SOURCES += startup/bsprestart.c diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/bsppredriverhook.c b/c/src/lib/libbsp/powerpc/qoriq/startup/bsppredriverhook.c deleted file mode 100644 index 26e91250b9..0000000000 --- a/c/src/lib/libbsp/powerpc/qoriq/startup/bsppredriverhook.c +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file - * - * @ingroup QorIQ - * - * @brief bsp_predriver_hook() implementation. - */ - -/* - * Copyright (c) 2011 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Obere Lagerstr. 30 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#include <bsp/bootcard.h> -#include <bsp/intercom.h> - -void bsp_predriver_hook(void) -{ - #ifdef RTEMS_MULTIPROCESSING - qoriq_intercom_init(); - #endif -} diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c b/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c index 9475c6fad5..7d9fa0d3c7 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c @@ -25,6 +25,7 @@ #include <rtems.h> #include <rtems/config.h> #include <rtems/counter.h> +#include <rtems/sysinit.h> #include <libcpu/powerpc-utility.h> @@ -33,6 +34,7 @@ #include <bsp/console-termios.h> #include <bsp/fatal.h> #include <bsp/fdt.h> +#include <bsp/intercom.h> #include <bsp/irq-generic.h> #include <bsp/linker-symbols.h> #include <bsp/mmu.h> @@ -185,3 +187,11 @@ uint32_t bsp_fdt_map_intr(const uint32_t *intr, size_t icells) return intr[0]; #endif } + +#ifdef RTEMS_MULTIPROCESSING +RTEMS_SYSINIT_ITEM( + qoriq_intercom_init, + RTEMS_SYSINIT_BSP_PRE_DRIVERS, + RTEMS_SYSINIT_ORDER_MIDDLE +); +#endif |