Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / support / make / iris.target

diff --git a/support/make/iris.target b/support/make/iris.target
index 7ce8a075a81f258c14464fd906b91886defe3be6..7fd9d64345f8ed3dc6cfd161b989de1d22437e3f 100644 (file)
--- a/support/make/iris.target
+++ b/support/make/iris.target
@@ -5,11 +5,6 @@ PLATFORM = iris
 SENSORBOARD ?= micasb
 PROGRAMMER ?= avrdude
 
-AVRGCC_SUPPORTS_ATM1281 = $(shell avr-gcc --target-help 2>&1 | grep -c atmega1281)
-ifneq ($(AVRGCC_SUPPORTS_ATM1281),1)
-  $(error Found avr-gcc with no ATMega1281 support. For details on upgrading your toolchain, please see "http://www.isis.vanderbilt.edu/projects/NEST/tinyos-2.x-iris/doc/html/install-tinyos-iris.html")
-endif
-
 ifeq ($(PROGRAMMER),avrdude)
   PROGRAMMER_PART ?= -pm1281 -U efuse:w:0xff:m
 endif
@@ -20,6 +15,11 @@ endif
 
 AVR_FUSE_H ?= 0xd9
 AVR_FUSE_L ?= 0xff
+
+ifdef RF230_CHANNEL
+PFLAGS += -DRF230_DEF_CHANNEL=$(RF230_CHANNEL)
+endif
+
 $(call TOSMake_include_platform,avr)
 
 iris: $(BUILD_DEPS)