- fixes a small mistake in support/make/Makedefaults that
prevents the generation on ident information
- updates support/make/tos_image.extra and tools/tinyos/misc/tos-write-image.in
to allow generation of the platform information in the tos_image.xml.
DEFAULT_LOCAL_GROUP ?= 0x7d
OPTFLAGS ?= -Os
NESC_FLAGS ?= -Wnesc-all
DEFAULT_LOCAL_GROUP ?= 0x7d
OPTFLAGS ?= -Os
NESC_FLAGS ?= -Wnesc-all
-GOALS += tos-ident-flags tos_image
+GOALS += ident_flags tos_image
build_tosimage: FORCE
@echo " writing TOS image"
build_tosimage: FORCE
@echo " writing TOS image"
- @$(TOS_IMAGE_PL) $(IDENT_FLAGS) --ihex="$(MAIN_IHEX)" --exe="$(MAIN_EXE)" --objdump="$(OBJDUMP)" > $(BUILDDIR)/tos_image.xml
+ @$(TOS_IMAGE_PL) $(IDENT_FLAGS) --ihex="$(MAIN_IHEX)" --exe="$(MAIN_EXE)" --objdump="$(OBJDUMP)" --platform="$(PLATFORM)" > $(BUILDDIR)/tos_image.xml
my $exe = "";
my $ihex = "";
my $objdump = "avr-objdump";
my $exe = "";
my $ihex = "";
my $objdump = "avr-objdump";
for my $arg (@ARGV) {
if ($arg =~ /^-DIDENT_(.+)=0x(.+)$/) {
$ident_flags{lc($1)} = uc($2);
}
for my $arg (@ARGV) {
if ($arg =~ /^-DIDENT_(.+)=0x(.+)$/) {
$ident_flags{lc($1)} = uc($2);
}
- elsif ($arg =~ /^-DIDENT_(.+)=(.+)$/) {
+ elsif ($arg =~ /^-DIDENT_(.+)="(.+)"$/) {
$ident_flags{lc($1)} = $2;
}
elsif ($arg =~ /^--ihex=(.+)$/) {
$ident_flags{lc($1)} = $2;
}
elsif ($arg =~ /^--ihex=(.+)$/) {
elsif ($arg =~ /^--objdump=(.+)$/) {
$objdump = $1;
}
elsif ($arg =~ /^--objdump=(.+)$/) {
$objdump = $1;
}
+ elsif ($arg =~ /^--platform=(.+)$/) {
+ $platform = $1;
+ }
}
my $deluge_support = "no";
}
my $deluge_support = "no";
}
close(EXE);
$ident_flags{"deluge_support"} = $deluge_support;
}
close(EXE);
$ident_flags{"deluge_support"} = $deluge_support;
+$ident_flags{"platform"} = $platform;
open ( IHEX, $ihex ) or die "Cannot open ihex file: $!\n";
open ( IHEX, $ihex ) or die "Cannot open ihex file: $!\n";