diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index 0696e3e..4abc05e 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -122,15 +122,31 @@ GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION)) #-------------------------------------------------- -# Wind River moved nm out of GNU_BIN in some versions - +# Wind River moved nm out of GNU_BIN in later versions + +WORKBENCH_VERSION_6.2 = 2.4 +WORKBENCH_VERSION_6.3 = 2.5 +WORKBENCH_VERSION_6.4 = 2.6 +WORKBENCH_VERSION_6.5 = 2.7 +WORKBENCH_VERSION_6.6 = 3.0 +WORKBENCH_VERSION_6.7 = 3.0 +WORKBENCH_VERSION_6.8 = 3.2 +WORKBENCH_VERSION_6.9 = 3.3 +WORKBENCH_VERSION = $(WORKBENCH_VERSION_$(VXWORKS_VERSION)) WORKBENCH_BIN = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin + +UTILITIES_VERSION_6.7 = 1.0 +UTILITIES_VERSION_6.8 = 1.0 +UTILITIES_VERSION_6.9 = 1.0 +UTILITIES_VERSION = $(UTILITIES_VERSION_$(VXWORKS_VERSION)) UTILITIES_BIN = $(WIND_BASE)/utilities-$(UTILITIES_VERSION)/$(WIND_HOST_TYPE)/bin +NM_DIR_6.2 = $(WORKBENCH_BIN) +NM_DIR_6.3 = $(WORKBENCH_BIN) NM_DIR_6.4 = $(WORKBENCH_BIN) NM_DIR_6.5 = $(WORKBENCH_BIN) NM_DIR_6.6 = $(WORKBENCH_BIN) -NM_DIR_6.7 = $(GNU_BIN) +NM_DIR_6.7 = $(UTILITIES_BIN) NM_DIR_6.8 = $(UTILITIES_BIN) NM_DIR_6.9 = $(UTILITIES_BIN) NM_DIR = $(firstword $(NM_DIR_$(VXWORKS_VERSION)) $(GNU_BIN)) @@ -146,10 +162,11 @@ MUNCH_LDFLAGS_6 = -T $(VX_DIR)/target/h/tool/gnu/ldscripts/link.OUT MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION)) #-------------------------------------------------- -# The follow 2 exports prevent gnu cross-compiler +# The follow exports prevent gnu cross-compiler # from finding wrong assembler (as). export WIND_BASE export WIND_HOST_TYPE +export WIND_HOME = $(WIND_BASE) #-------------------------------------------------- # Tornado2.2 diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon index 17696fd..7e8610c 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorksCommon +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -10,7 +10,7 @@ # Note: vxWorks 5.3 (Tornado 1.x) is not supported #VXWORKS_VERSION = 5.4 -VXWORKS_VERSION = 5.5 +#VXWORKS_VERSION = 5.5 #VXWORKS_VERSION = 6.0 #VXWORKS_VERSION = 6.1 #VXWORKS_VERSION = 6.2 @@ -20,7 +20,7 @@ VXWORKS_VERSION = 5.5 #VXWORKS_VERSION = 6.6 #VXWORKS_VERSION = 6.7 #VXWORKS_VERSION = 6.8 -#VXWORKS_VERSION = 6.9 +VXWORKS_VERSION = 6.9 # Sites may override the following path for a particular host @@ -31,19 +31,15 @@ VXWORKS_VERSION = 5.5 # Under vxWorks 6.x this is *not* the same as the old VX_DIR setting #WIND_BASE = /usr/local/vw/tornado202p1 -WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS) -#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION) +#WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS) +WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION) #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION) -# WorkBench Version number, required for vxWorks 6.x - -#WORKBENCH_VERSION = 2.6 -#WORKBENCH_VERSION = 3.0 -#WORKBENCH_VERSION = 3.2 +# WorkBench Version number override, only uncomment and set if +# you have an unusual installation of VxWorks and WorkBench. #WORKBENCH_VERSION = 3.3 - -# Utilities Version number, required from vxWorks 6.8 and later - +# Utilities Version number override, only uncomment and set if +# you have an unusual installation of VxWorks and WorkBench. #UTILITIES_VERSION = 1.0