diff --git a/configure/os/CONFIG.Common.RTEMS-beatnik b/configure/os/CONFIG.Common.RTEMS-beatnik index f3260fc5f..a606e2dc3 100644 --- a/configure/os/CONFIG.Common.RTEMS-beatnik +++ b/configure/os/CONFIG.Common.RTEMS-beatnik @@ -1,17 +1,19 @@ # # CONFIG.Common.RTEMS-beatnik -# A migration from Eric Norum's CONFIG.Common.RTEMS-mvme5500 -# Author: Dayle Kotturi -# SLAC -# dayle@slac.stanford.edu +# Revision-Id: anj@aps.anl.gov-20110426174446-11te76tq9ieughhv +# Author: Dayle Kotturi # # All RTEMS targets use the same Makefile fragment # -override EXE=.elf +EXE = .elf RTEMS_TARGET_CPU = powerpc -GNU_TARGET=powerpc-rtems +GNU_TARGET = powerpc-rtems ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD +ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_MBUF_SPACE=2048 +ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120 + +OP_SYS_LDLIBS += -lbspExt MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) @@ -19,16 +21,13 @@ define MUNCH_CMD $(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@ endef -CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik - include $(CONFIG)/os/CONFIG.Common.RTEMS + RTEMSSYMS=$(PRODNAME:%$(EXE)=%.sym) RTEMSIMGS=$(PRODNAME:%$(EXE)=%.bin) INSTALL_RTEMSSYMS=$(RTEMSSYMS:%=$(INSTALL_BIN)/%) INSTALL_RTEMSIMGS=$(RTEMSIMGS:%=$(INSTALL_BIN)/%) -OP_SYS_LDLIBS += -lbspExt - %.sym: %$(EXE) $(XSYMS) $^ $@ diff --git a/configure/os/CONFIG.Common.RTEMS-mvme2100 b/configure/os/CONFIG.Common.RTEMS-mvme2100 index 064f2a01b..47cece485 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme2100 +++ b/configure/os/CONFIG.Common.RTEMS-mvme2100 @@ -1,15 +1,18 @@ # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd -# Author: W. Eric Norum -# Canadian Light Source -# eric@cls.usask.ca +# CONFIG.Common.RTEMS-mvme3100 +# Revision-Id: anj@aps.anl.gov-20110426174446-11te76tq9ieughhv +# Author: W. Eric Norum # # All RTEMS targets use the same Makefile fragment # +EXE = .elf RTEMS_TARGET_CPU = powerpc +GNU_TARGET = powerpc-rtems ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL ARCH_DEP_CFLAGS += -DHAVE_PPCBUG +OP_SYS_LDLIBS += -lbspExt + MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) define MUNCH_CMD @@ -24,6 +27,4 @@ define MUNCH_CMD rm -f rtems.gz endef -OP_SYS_LDLIBS += -lbspExt - include $(CONFIG)/os/CONFIG.Common.RTEMS diff --git a/configure/os/CONFIG.Common.RTEMS-mvme3100 b/configure/os/CONFIG.Common.RTEMS-mvme3100 index bea023374..0da00208a 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme3100 +++ b/configure/os/CONFIG.Common.RTEMS-mvme3100 @@ -1,11 +1,19 @@ # +# CONFIG.Common.RTEMS-mvme3100 +# Revision-Id: anj@aps.anl.gov-20110426174446-11te76tq9ieughhv +# Author: W. Eric Norum +# # All RTEMS targets use the same Makefile fragment # -override EXE=.elf +EXE = .elf RTEMS_TARGET_CPU = powerpc -GNU_TARGET=powerpc-rtems +GNU_TARGET = powerpc-rtems ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD +ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_MBUF_SPACE=2048 +ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120 + +OP_SYS_LDLIBS += -lbspExt MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) @@ -13,16 +21,13 @@ define MUNCH_CMD $(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@ endef -CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik - include $(CONFIG)/os/CONFIG.Common.RTEMS + RTEMSSYMS=$(PRODNAME:%$(EXE)=%.sym) RTEMSIMGS=$(PRODNAME:%$(EXE)=%.bin) INSTALL_RTEMSSYMS=$(RTEMSSYMS:%=$(INSTALL_BIN)/%) INSTALL_RTEMSIMGS=$(RTEMSIMGS:%=$(INSTALL_BIN)/%) -OP_SYS_LDLIBS += -lbspExt - %.sym: %$(EXE) $(XSYMS) $^ $@ diff --git a/configure/os/CONFIG.Common.RTEMS-mvme5500 b/configure/os/CONFIG.Common.RTEMS-mvme5500 index d28829987..9fcc0837e 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme5500 +++ b/configure/os/CONFIG.Common.RTEMS-mvme5500 @@ -1,16 +1,21 @@ # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd -# Author: W. Eric Norum -# Advanced Photon Source -# norume@aps.anl.gov +# CONFIG.Common.RTEMS-mvme5500 +# Revision-Id: anj@aps.anl.gov-20110426174446-11te76tq9ieughhv +# Author: W. Eric Norum # # All RTEMS targets use the same Makefile fragment # +EXE = .elf RTEMS_TARGET_CPU = powerpc +GNU_TARGET = powerpc-rtems ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD +ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_MBUF_SPACE=2048 +ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120 ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000 +OP_SYS_LDLIBS += -lbspExt + MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) define MUNCH_CMD diff --git a/configure/os/CONFIG.Common.iosCommon b/configure/os/CONFIG.Common.iosCommon index 6df8410a8..647b913b4 100644 --- a/configure/os/CONFIG.Common.iosCommon +++ b/configure/os/CONFIG.Common.iosCommon @@ -1,6 +1,6 @@ # CONFIG.Common.iosCommon # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20110405172700-pjvcru7gjw9sfkc5 # This file is maintained by the build community. # # Definitions for iOS target archs @@ -55,7 +55,7 @@ CCC = $(GNU_BIN)/c++ #------------------------------------------------------- # Linker flags -OP_SYS_LDFLAGS += -dynamic -Z -L$(SDK_DIR)/usr/lib +OP_SYS_LDFLAGS += -dynamic -Z -L$(SDK_DIR)/usr/lib -L$(SDK_DIR)/usr/lib/system #------------------------------------------------------- # Shared libraries diff --git a/configure/os/CONFIG.Common.vxWorks-mpc8540 b/configure/os/CONFIG.Common.vxWorks-mpc8540 index d3296602e..141c0ccc1 100644 --- a/configure/os/CONFIG.Common.vxWorks-mpc8540 +++ b/configure/os/CONFIG.Common.vxWorks-mpc8540 @@ -1,9 +1,10 @@ -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# CONFIG.Common.vxWorks-mpc8540 # -# Definitions for vxWorks-mpc8540 targets: MPC8540 CPU with >32MB RAM. -# Site-specific overrides go in CONFIG_SITE.Common.vxWorks-mpc8540 +# Revision-Id: anj@aps.anl.gov-20110215221926-fx2lar4mhcbfav2s +# This file is maintained by the build community. # -# This file is maintained by the EPICS build community. +# Definitions for vxWorks-mpc8540 target archs +# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8540 #------------------------------------------------------- # Include definitions common to all vxWorks target archs diff --git a/configure/os/CONFIG_SITE.Common.iosCommon b/configure/os/CONFIG_SITE.Common.iosCommon index 006931563..324810753 100644 --- a/configure/os/CONFIG_SITE.Common.iosCommon +++ b/configure/os/CONFIG_SITE.Common.iosCommon @@ -1,6 +1,6 @@ # CONFIG_SITE.Common.iosCommon # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20110405172700-pjvcru7gjw9sfkc5 # This file is maintained by the build community. # # Site-specific settings for Apple iOS builds @@ -9,7 +9,8 @@ # iOS Version number #IOS_VERSION = 3.2 -IOS_VERSION = 4.1 +#IOS_VERSION = 4.1 +IOS_VERSION = 4.3 # Most sites will want shared libraries