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

Merge pull request #318 from g-oikonomou/contrib/build/framer

Browse Source 
Tidy-up MODULES
This commit is contained in:
Simon Duquennoy 2018-02-26 10:04:38 +01:00 committed by GitHub
commit a581261e2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -52,7 +52,7 @@ ifneq ("$(wildcard project-conf.h)","")
CFLAGS += -DPROJECT_CONF_PATH=\"project-conf.h\" CFLAGS += -DPROJECT_CONF_PATH=\"project-conf.h\"
endif endif
MODULES += os os/net os/net/mac os/net/routing os/storage MODULES += os os/net os/net/mac os/net/mac/framer os/net/routing os/storage
oname = ${patsubst %.c,%.o,${patsubst %.S,%.o,$(1)}} oname = ${patsubst %.c,%.o,${patsubst %.S,%.o,$(1)}}

3
arch/platform/cc2538dk/Makefile.cc2538dk
View File

@ -19,8 +19,7 @@ CLEAN += *.cc2538dk
CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc2538 CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538 include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += os/net os/net/mac os/net/mac/framer \ MODULES += os/storage/cfs
os/storage/cfs
PYTHON = python PYTHON = python
BSL_FLAGS += -e -w -v BSL_FLAGS += -e -w -v

3
arch/platform/cooja/Makefile.cooja
View File

@ -40,9 +40,6 @@ ARCHIVE = $(OBJECTDIR)/$(LIBNAME).a
JNILIB = $(OBJECTDIR)/$(LIBNAME).$(TARGET) JNILIB = $(OBJECTDIR)/$(LIBNAME).$(TARGET)
CONTIKI_APP_OBJ = $(CONTIKI_APP).o CONTIKI_APP_OBJ = $(CONTIKI_APP).o
# Modules
MODULES += os/net os/net/mac os/net/mac/framer
### COOJA platform sources ### COOJA platform sources
COOJA = $(CONTIKI)/arch/platform/$(TARGET) COOJA = $(CONTIKI)/arch/platform/$(TARGET)
CONTIKI_TARGET_DIRS = . dev lib sys cfs net CONTIKI_TARGET_DIRS = . dev lib sys cfs net

2
arch/platform/jn516x/Makefile.jn516x
View File

@ -143,8 +143,6 @@ endif
CLEAN += *.jn516x CLEAN += *.jn516x
CLEAN += *.jn516x.bin CLEAN += *.jn516x.bin
MODULES += os/net os/net/mac os/net/mac/framer
CONTIKI_TARGET_SOURCEFILES += $(ARCH) CONTIKI_TARGET_SOURCEFILES += $(ARCH)
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES) CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)

2
arch/platform/native/Makefile.native
View File

@ -33,5 +33,3 @@ MAKE_MAC ?= MAKE_MAC_NULLMAC
### Define the CPU directory ### Define the CPU directory
CONTIKI_CPU=$(CONTIKI)/arch/cpu/native CONTIKI_CPU=$(CONTIKI)/arch/cpu/native
include $(CONTIKI)/arch/cpu/native/Makefile.native include $(CONTIKI)/arch/cpu/native/Makefile.native
MODULES+=os/net os/net/mac os/net/mac/framer

2
arch/platform/nrf52dk/Makefile.nrf52dk
View File

@ -27,5 +27,3 @@ SMALL ?= 0
### Define the CPU directory and pull in the correct CPU makefile. ### Define the CPU directory and pull in the correct CPU makefile.
CONTIKI_CPU=$(CONTIKI)/arch/cpu/nrf52832 CONTIKI_CPU=$(CONTIKI)/arch/cpu/nrf52832
include $(CONTIKI_CPU)/Makefile.nrf52832 include $(CONTIKI_CPU)/Makefile.nrf52832
MODULES += os/net os/net/mac os/net/mac/framer

3
arch/platform/openmote-cc2538/Makefile.openmote-cc2538
View File

@ -26,8 +26,7 @@ CLEAN += *.openmote-cc2538
CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc2538 CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538 include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += os/net os/net/mac os/net/mac/framer \ MODULES += os/storage/cfs
os/storage/cfs
PYTHON = python PYTHON = python
BSL_FLAGS += -e --bootloader-invert-lines -w -v -b 450000 BSL_FLAGS += -e --bootloader-invert-lines -w -v -b 450000

4
arch/platform/sky/Makefile.sky
View File

@ -6,6 +6,4 @@ CONTIKI_TARGET_SOURCEFILES += contiki-sky-platform.c \
include $(CONTIKI)/arch/platform/sky/Makefile.common include $(CONTIKI)/arch/platform/sky/Makefile.common
MODULES += os/net/mac os/net/mac/framer os/net \ MODULES += arch/dev/cc2420 arch/dev/sht11 arch/dev/ds2411 os/storage/cfs
arch/dev/cc2420 arch/dev/sht11 arch/dev/ds2411 \
os/storage/cfs

2
arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx
View File

@ -30,5 +30,3 @@ SMALL ?= 0
### Makefile.cc26xx or Makefile.cc13xx ### Makefile.cc26xx or Makefile.cc13xx
CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc26xx-cc13xx CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc26xx-cc13xx
include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY) include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)
MODULES += os/net os/net/mac os/net/mac/framer

4
arch/platform/zoul/Makefile.zoul
View File

@ -44,9 +44,7 @@ CLEAN += *.zoul
CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc2538 CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538 include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += os/net os/net/mac os/net/mac/framer \ MODULES += arch/dev/cc1200 os/storage/cfs
arch/dev/cc1200 \
os/storage/cfs
BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py