deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

x86: Only add elfloader-x86.c to the platforms using it

Browse source 
Currently there are only one platform using CPU x86: Cooja. The
elfloader-x86.c is rather a POSIX implementation, so the Galileo port
won't use it for now. This patch fixes this by moving this source file to
be included by the platforms using it instead of the cpu's Makefile.
This commit is contained in:
Jesus Sanchez-Palencia 2015-03-20 09:18:13 -03:00
parent 5a0e2a7654
commit 3a26d9dbc7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/x86/Makefile.x86
View file

@ -1,6 +1,6 @@
CONTIKI_CPU_DIRS = . CONTIKI_CPU_DIRS = .
CONTIKI_SOURCEFILES += mtarch.c elfloader-x86.c CONTIKI_SOURCEFILES += mtarch.c
### Compiler definitions ### Compiler definitions
CC = gcc CC = gcc

2
platform/cooja/Makefile.cooja
View file

@ -47,7 +47,7 @@ CONTIKI_TARGET_DIRS = . dev lib sys cfs net
# (COOJA_SOURCEDIRS contains additional sources dirs set from simulator) # (COOJA_SOURCEDIRS contains additional sources dirs set from simulator)
vpath %.c $(COOJA_SOURCEDIRS) vpath %.c $(COOJA_SOURCEDIRS)
COOJA_BASE = simEnvChange.c cooja_mt.c cooja_mtarch.c rtimer-arch.c slip.c watchdog.c rimestats.c COOJA_BASE = simEnvChange.c cooja_mt.c cooja_mtarch.c rtimer-arch.c slip.c watchdog.c rimestats.c elfloader-x86.c
COOJA_INTFS = beep.c button-sensor.c ip.c leds-arch.c moteid.c \ COOJA_INTFS = beep.c button-sensor.c ip.c leds-arch.c moteid.c \
pir-sensor.c rs232.c vib-sensor.c \ pir-sensor.c rs232.c vib-sensor.c \