summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-03 16:36:27 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-03 16:36:27 +0000
commit6c45275ae0af113ed9bac580aef1f72582fe20a4 (patch)
tree5de6e320971f7044d7db281ffa5811df59185f28 /c/src/lib/libbsp
parentupdate to current PPC exception and memory map structure (diff)
downloadrtems-6c45275ae0af113ed9bac580aef1f72582fe20a4.tar.bz2
2008-09-03 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, bestcomm/load_task.c, bestcomm/task_api/tasksetup_general.h: Eliminate requirement to build bestcomm as a relocatable lump. This should reduce the minimum footprint considerably.
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r--c/src/lib/libbsp/powerpc/gen5200/ChangeLog7
-rw-r--r--c/src/lib/libbsp/powerpc/gen5200/Makefile.am10
-rw-r--r--c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c2
-rw-r--r--c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h2
4 files changed, 12 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
index 4844d1bc71..6d05e01a48 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-03 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * Makefile.am, bestcomm/load_task.c,
+ bestcomm/task_api/tasksetup_general.h: Eliminate requirement to build
+ bestcomm as a relocatable lump. This should reduce the minimum
+ footprint considerably.
+
2008-09-03 Sebastian Huber <sebastian.huber@embedded-brains.de>
* irq/irq.h, irq/irq_asm.h, irq/irq_init.c, vectors/vectors.S,
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index ae514dd18e..1ed91960b9 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -42,8 +42,7 @@ dist_project_lib_DATA += startup/linkcmds \
startup/linkcmds.icecube \
startup/linkcmds.pm520
-noinst_PROGRAMS += bestcomm.rel
-bestcomm_rel_SOURCES = bestcomm/include/ppctypes.h \
+bestcomm_SOURCES = bestcomm/include/ppctypes.h \
bestcomm/include/mgt5200/mgt5200.h bestcomm/include/mgt5200/sdma.h \
bestcomm/bestcomm_api.c bestcomm/bestcomm_api.h bestcomm/bestcomm_glue.c \
bestcomm/bestcomm_glue.h bestcomm/dma_image.c bestcomm/dma_image.capi.h \
@@ -60,8 +59,6 @@ bestcomm_rel_SOURCES = bestcomm/include/ppctypes.h \
bestcomm/task_api/bestcomm_api_mem.h bestcomm/task_api/bestcomm_cntrl.h \
bestcomm/task_api/tasksetup_bdtable.h \
bestcomm/task_api/tasksetup_general.h
-bestcomm_rel_CPPFLAGS = $(AM_CPPFLAGS) -DMPC5200_BAPI_LIBC_HEADERS
-bestcomm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
clock_SOURCES = clock/clock.c
console_SOURCES = console/console.c
@@ -123,7 +120,7 @@ endif
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES = $(clock_SOURCES) $(console_SOURCES) $(i2c_SOURCES) \
$(ide_SOURCES) $(irq_SOURCES) $(mscan_SOURCES) $(nvram_SOURCES) \
- $(slicetimer_SOURCES) $(tod_SOURCES) $(startup_SOURCES)
+ $(slicetimer_SOURCES) $(tod_SOURCES) $(startup_SOURCES) $(bestcomm_SOURCES)
libbsp_a_LIBADD = $(libcpudir)/shared/cpuIdent.rel \
$(libcpudir)/shared/cache.rel \
@@ -132,8 +129,7 @@ libbsp_a_LIBADD = $(libcpudir)/shared/cpuIdent.rel \
$(libcpudir)/@exceptions@/raw_exception.rel \
$(libcpudir)/@exceptions@/exc_bspsupport.rel \
$(libcpudir)/mpc6xx/mmu.rel \
- $(libcpudir)/mpc6xx/timer.rel \
- bestcomm.rel
+ $(libcpudir)/mpc6xx/timer.rel
if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c
index 3c859046a3..91bb319b67 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c
@@ -22,7 +22,7 @@
*
******************************************************************************/
-#ifdef MPC5200_BAPI_LIBC_HEADERS
+#if defined(__rtems__) || defined(MPC5200_BAPI_LIBC_HEADERS)
#include <string.h>
#endif
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h
index 319f305bb6..c163f0a3fd 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h
@@ -122,7 +122,7 @@
*
**********************************************************/
-#ifdef MPC5200_BAPI_LIBC_HEADERS
+#if defined(__rtems__) || defined(MPC5200_BAPI_LIBC_HEADERS)
#include <stdlib.h>
#endif