diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS index c6e2d5a3c..cf970095b 100644 --- a/configure/os/CONFIG.Common.RTEMS +++ b/configure/os/CONFIG.Common.RTEMS @@ -32,13 +32,13 @@ include $(CONFIG.CC) #------------------------------------------------------- # RTEMS cross-development tools -CC = $(RTEMS_BASE)/bin/$(CC_FOR_TARGET) $(GCCSPECS) -fasm -CCC = $(RTEMS_BASE)/bin/$(CXX) -CPP = $(RTEMS_BASE)/bin/$(CC_FOR_TARGET) -x c -E -AR = $(RTEMS_BASE)/bin/$(AR_FOR_TARGET) -LD = $(RTEMS_BASE)/bin/$(LD_FOR_TARGET) -r +CC = $(RTEMS_TOOLS)/bin/$(CC_FOR_TARGET) $(GCCSPECS) -fasm +CCC = $(RTEMS_TOOLS)/bin/$(CXX) +CPP = $(RTEMS_TOOLS)/bin/$(CC_FOR_TARGET) -x c -E +AR = $(RTEMS_TOOLS)/bin/$(AR_FOR_TARGET) +LD = $(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -r -RANLIB := $(RTEMS_BASE)/bin/$(RANLIB) +RANLIB := $(RTEMS_TOOLS)/bin/$(RANLIB) #------------------------------------------------------- # Build types diff --git a/configure/os/CONFIG.Common.RTEMS-beatnik b/configure/os/CONFIG.Common.RTEMS-beatnik index 2d929f410..f3260fc5f 100644 --- a/configure/os/CONFIG.Common.RTEMS-beatnik +++ b/configure/os/CONFIG.Common.RTEMS-beatnik @@ -16,7 +16,7 @@ ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) define MUNCH_CMD - $(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@ + $(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@ endef CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik diff --git a/configure/os/CONFIG.Common.RTEMS-mvme2100 b/configure/os/CONFIG.Common.RTEMS-mvme2100 index 98f293791..77f451d24 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme2100 +++ b/configure/os/CONFIG.Common.RTEMS-mvme2100 @@ -13,9 +13,9 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) define MUNCH_CMD - $(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems + $(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems gzip -f9 rtems - $(RTEMS_BASE)/bin/$(LD_FOR_TARGET) -o $@ \ + $(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -o $@ \ $(PROJECT_RELEASE)/lib/bootloader.o \ --just-symbols=$< \ -b binary rtems.gz \ diff --git a/configure/os/CONFIG.Common.RTEMS-mvme2700 b/configure/os/CONFIG.Common.RTEMS-mvme2700 index 9874e6065..f45e321c4 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme2700 +++ b/configure/os/CONFIG.Common.RTEMS-mvme2700 @@ -9,9 +9,9 @@ ARCH_DEP_CFLAGS += -DNVRAM_INDIRECT MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) define MUNCH_CMD - $(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems + $(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems gzip -f9 rtems - $(RTEMS_BASE)/bin/$(LD_FOR_TARGET) -o $@ \ + $(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -o $@ \ $(PROJECT_RELEASE)/lib/bootloader.o \ --just-symbols=$< \ -b binary rtems.gz \ diff --git a/configure/os/CONFIG.Common.RTEMS-mvme3100 b/configure/os/CONFIG.Common.RTEMS-mvme3100 index 8dbf7f029..bea023374 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme3100 +++ b/configure/os/CONFIG.Common.RTEMS-mvme3100 @@ -10,7 +10,7 @@ ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) define MUNCH_CMD - $(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@ + $(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@ endef CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik diff --git a/configure/os/CONFIG.Common.RTEMS-mvme5500 b/configure/os/CONFIG.Common.RTEMS-mvme5500 index eec1a0584..aed43b4da 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme5500 +++ b/configure/os/CONFIG.Common.RTEMS-mvme5500 @@ -14,7 +14,7 @@ ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000 MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) define MUNCH_CMD - $(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@ + $(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@ endef include $(CONFIG)/os/CONFIG.Common.RTEMS diff --git a/configure/os/CONFIG.Common.RTEMS-pc386 b/configure/os/CONFIG.Common.RTEMS-pc386 index c7122019e..3c54bb6a2 100644 --- a/configure/os/CONFIG.Common.RTEMS-pc386 +++ b/configure/os/CONFIG.Common.RTEMS-pc386 @@ -11,7 +11,7 @@ RTEMS_TARGET_CPU=i386 MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) define MUNCH_CMD - $(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin + $(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin $(PROJECT_RELEASE)/build-tools/bin2boot $@ 0x00097E00 \ $(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 temp.bin 0x00100000 0 rm -f temp.bin diff --git a/configure/os/CONFIG.Common.RTEMS-uC5282 b/configure/os/CONFIG.Common.RTEMS-uC5282 index 8a79d8206..c7b1b2a79 100644 --- a/configure/os/CONFIG.Common.RTEMS-uC5282 +++ b/configure/os/CONFIG.Common.RTEMS-uC5282 @@ -12,7 +12,7 @@ ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL MUNCH_SUFFIX = .boot MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX)) define MUNCH_CMD - $(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@ + $(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@ endef include $(CONFIG)/os/CONFIG.Common.RTEMS diff --git a/configure/os/CONFIG_SITE.Common.RTEMS b/configure/os/CONFIG_SITE.Common.RTEMS index b6fa1221e..cf79e32de 100644 --- a/configure/os/CONFIG_SITE.Common.RTEMS +++ b/configure/os/CONFIG_SITE.Common.RTEMS @@ -8,6 +8,10 @@ RTEMS_BASE=/usr/local/rtems/rtems-4.9.2 RTEMS_VERSION=4.9.2 +# Cross-compile toolchain in $(RTEMS_TOOLS)/bin +# +RTEMS_TOOLS=$(RTEMS_BASE) + # If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC # network configuration you must uncomment and specify your Internet