From b0257596655f86f7439da6361ec346cd47f8a54d Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Tue, 6 Aug 2013 17:02:38 +0100 Subject: [PATCH] Don't redirect sdld output to dev/null This was used in the past because sdld was very verbose when linking banked hex files. New sdld versions do not exhibit this level of verbosity and therefore the redirect can be stopped --- cpu/cc2430/Makefile.cc2430 | 4 ++-- cpu/cc253x/Makefile.cc253x | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cpu/cc2430/Makefile.cc2430 b/cpu/cc2430/Makefile.cc2430 index b83e3cc80..764403d28 100644 --- a/cpu/cc2430/Makefile.cc2430 +++ b/cpu/cc2430/Makefile.cc2430 @@ -147,14 +147,14 @@ $(OBJECTDIR)/%.app.rel: %.c $(SEGMENT_RULES) | $(OBJECTDIR) ifeq ($(HAVE_BANKING),1) @echo "\nFirst Link" @echo "===============" - $(CC) $(LDFLAGS) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib > /dev/null + $(CC) $(LDFLAGS) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib @echo "\nBank Allocation" @echo "===============" python $(BANK_ALLOC) $(basename $(@F)) $(SEGMENT_RULES) $(OFFSET_FIRMWARE) @echo "\nFinal Link" @echo "===============" endif - $(CC) $(LDFLAGS) $(LD_POST_FLAGS) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib > /dev/null + $(CC) $(LDFLAGS) $(LD_POST_FLAGS) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib # Pack the hex file for programmers which dislike SDCC output hex format %.hex: %.ihx diff --git a/cpu/cc253x/Makefile.cc253x b/cpu/cc253x/Makefile.cc253x index ff8b61648..232b4c52a 100644 --- a/cpu/cc253x/Makefile.cc253x +++ b/cpu/cc253x/Makefile.cc253x @@ -168,7 +168,7 @@ ifeq ($(HAVE_BANKING),1) %.ihx: $(OBJECTDIR)/%.app.rel $(CONTIKI_TARGET_MAIN) contiki-$(TARGET).lib @echo "\nFirst Link" @echo "===============" - $(CC) $(LDFLAGS) $(LD_PRE_FLAGS) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib > /dev/null + $(CC) $(LDFLAGS) $(LD_PRE_FLAGS) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib %.flags: %.ihx ### Allocate modules to banks and relocate object files @@ -180,7 +180,7 @@ ifeq ($(HAVE_BANKING),1) ### Link again with new bank allocations @echo "\nFinal Link" @echo "===============" - $(CC) $(LDFLAGS) $(shell cat $<) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib > /dev/null + $(CC) $(LDFLAGS) $(shell cat $<) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib %.hex: %.banked-hex ### Post-process the hex file for programmers which dislike SDCC output hex format @@ -202,7 +202,7 @@ ifeq ($(HAVE_BANKING),1) else ### Build non-banked firmware %.ihx: $(OBJECTDIR)/%.app.rel $(CONTIKI_TARGET_MAIN) contiki-$(TARGET).lib - $(CC) $(LDFLAGS) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib > /dev/null + $(CC) $(LDFLAGS) -o $@ $(CONTIKI_TARGET_MAIN) $(OBJECTDIR)/$*.app.rel -llibsdcc.lib -lcontiki-$(TARGET).lib %.hex: %.ihx $(PACKIHX) $< > $@