diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-05-12 08:53:11 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-05-12 09:01:40 +0200 |
commit | 64a04ac3c71c55020b18f22be754ddb3ea23b9fa (patch) | |
tree | 4d0c2a95a6a1413b759354461713806454800622 | |
parent | bsp/leon3: Delete unused function (diff) | |
download | rtems-64a04ac3c71c55020b18f22be754ddb3ea23b9fa.tar.bz2 |
bsps: Use standard file name for BSP support
-rw-r--r-- | c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/qoriq/startup/bspsmp.c (renamed from c/src/lib/libbsp/powerpc/qoriq/startup/smp.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/shared/bspsmp.c (renamed from c/src/lib/libbsp/shared/smp/smp_stub.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/shared/bspsmpgetcurrentprocessor.c (renamed from c/src/lib/libbsp/shared/smp/getcpuid.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/Makefile.am | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon2/Makefile.am | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/Makefile.am | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c | 23 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c (renamed from c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c) | 7 |
9 files changed, 13 insertions, 28 deletions
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am index 4a541af910..24da4d23f4 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am @@ -126,7 +126,7 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tsec.rel endif if HAS_SMP -libbsp_a_SOURCES += startup/smp.c +libbsp_a_SOURCES += startup/bspsmp.c endif include $(srcdir)/preinstall.am diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c b/c/src/lib/libbsp/powerpc/qoriq/startup/bspsmp.c index 5b4c12a2db..5b4c12a2db 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c +++ b/c/src/lib/libbsp/powerpc/qoriq/startup/bspsmp.c diff --git a/c/src/lib/libbsp/shared/smp/smp_stub.c b/c/src/lib/libbsp/shared/bspsmp.c index 3dc44b1d3a..3dc44b1d3a 100644 --- a/c/src/lib/libbsp/shared/smp/smp_stub.c +++ b/c/src/lib/libbsp/shared/bspsmp.c diff --git a/c/src/lib/libbsp/shared/smp/getcpuid.c b/c/src/lib/libbsp/shared/bspsmpgetcurrentprocessor.c index f62a807331..f62a807331 100644 --- a/c/src/lib/libbsp/shared/smp/getcpuid.c +++ b/c/src/lib/libbsp/shared/bspsmpgetcurrentprocessor.c diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index 28fe82af41..abf8eca618 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -77,7 +77,8 @@ libbsp_a_SOURCES += \ ../../shared/src/irq-shell.c if HAS_SMP -libbsp_a_SOURCES += ../../shared/smp/getcpuid.c ../../shared/smp/smp_stub.c +libbsp_a_SOURCES += ../../shared/bspsmp.c +libbsp_a_SOURCES += ../../shared/bspsmpgetcurrentprocessor.c endif if HAS_NETWORKING diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index 70a4784f94..f913462a41 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -129,7 +129,8 @@ libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c libbsp_a_SOURCES += timer/timer.c if HAS_SMP -libbsp_a_SOURCES += ../../shared/smp/getcpuid.c ../../shared/smp/smp_stub.c +libbsp_a_SOURCES += ../../shared/bspsmp.c +libbsp_a_SOURCES += ../../shared/bspsmpgetcurrentprocessor.c endif if HAS_NETWORKING diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index a9c14489ed..71d54d5779 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am @@ -124,8 +124,7 @@ libbsp_a_SOURCES += include/cache_.h libbsp_a_CPPFLAGS = -I$(srcdir)/include if HAS_SMP -libbsp_a_SOURCES += smp/getcpuid.c -libbsp_a_SOURCES += smp/smp_leon3.c +libbsp_a_SOURCES += startup/bspsmp.c endif if HAS_NETWORKING diff --git a/c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c b/c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c deleted file mode 100644 index 2ff31ebc8d..0000000000 --- a/c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * @ingroup sparc_leon3 - * @brief LEON3 SMP Obtain CPU Core Number - */ - -/* - * COPYRIGHT (c) 1989-2011. - * On-Line Applications Research Corporation (OAR). - * - * 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 <rtems/score/cpu.h> - -#if !defined(__leon__) -uint32_t _CPU_SMP_Get_current_processor( void ) -{ - return _LEON3_Get_current_processor(); -} -#endif diff --git a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c b/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c index 6681525861..bb5313201c 100644 --- a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c +++ b/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c @@ -19,6 +19,13 @@ #include <rtems/score/smpimpl.h> #include <stdlib.h> +#if !defined(__leon__) +uint32_t _CPU_SMP_Get_current_processor( void ) +{ + return _LEON3_Get_current_processor(); +} +#endif + static rtems_isr bsp_inter_processor_interrupt( rtems_vector_number vector ) |