giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #262 from g-oikonomou/contrib/default-second-expansion

Browse Source 
Link without using an archive file
This commit is contained in:
Simon Duquennoy 2017-12-18 15:16:12 +01:00 committed by GitHub
commit 26b94bc4c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/cpu/arm/cortex-m/cm3/Makefile.cm3
View File

@ -17,7 +17,9 @@ CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES
### Compilation rules ### Compilation rules
CUSTOM_RULE_LINK = 1 CUSTOM_RULE_LINK = 1
%.elf: $(CPU_STARTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(LDSCRIPT) .SECONDEXPANSION:
%.elf: $(CPU_STARTFILES) $$(CONTIKI_OBJECTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(LDSCRIPT)
$(TRACE_LD) $(TRACE_LD)
$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -lm -o $@ $(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -lm -o $@

2
arch/cpu/cc2538/Makefile.cc2538
View File

@ -36,8 +36,6 @@ CPU_START_SOURCEFILES = startup-gcc.c
CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES) $(DEBUG_IO_SOURCEFILES) CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES) $(DEBUG_IO_SOURCEFILES)
CONTIKI_SOURCEFILES += $(USB_SOURCEFILES) CONTIKI_SOURCEFILES += $(USB_SOURCEFILES)
.SECONDEXPANSION:
### Always re-build ieee-addr.o in case the command line passes a new NODEID ### Always re-build ieee-addr.o in case the command line passes a new NODEID
FORCE: FORCE:

2
arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
View File

@ -209,7 +209,7 @@ static const output_config_t output_power[] = {
#define OUTPUT_POWER_UNKNOWN 0xFFFF #define OUTPUT_POWER_UNKNOWN 0xFFFF
/* Default TX Power - position in output_power[] */ /* Default TX Power - position in output_power[] */
const output_config_t *tx_power_current = &output_power[0]; static const output_config_t *tx_power_current = &output_power[0];
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static volatile int8_t last_rssi = 0; static volatile int8_t last_rssi = 0;
static volatile uint8_t last_corr_lqi = 0; static volatile uint8_t last_corr_lqi = 0;

2
arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
View File

@ -203,7 +203,7 @@ extern const prop_mode_tx_power_config_t TX_POWER_DRIVER[];
#define OUTPUT_POWER_UNKNOWN 0xFFFF #define OUTPUT_POWER_UNKNOWN 0xFFFF
/* Default TX Power - position in output_power[] */ /* Default TX Power - position in output_power[] */
const prop_mode_tx_power_config_t *tx_power_current = &TX_POWER_DRIVER[1]; static const prop_mode_tx_power_config_t *tx_power_current = &TX_POWER_DRIVER[1];
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef PROP_MODE_CONF_LO_DIVIDER #ifdef PROP_MODE_CONF_LO_DIVIDER
#define PROP_MODE_LO_DIVIDER PROP_MODE_CONF_LO_DIVIDER #define PROP_MODE_LO_DIVIDER PROP_MODE_CONF_LO_DIVIDER