Merge branch 'release-4.1' into fix-default-file-size
This commit is contained in:
commit
b32618c432
@ -3,7 +3,7 @@ CONTIKI = ../../..
|
|||||||
MODULES += os/storage/antelope os/services/unit-test
|
MODULES += os/storage/antelope os/services/unit-test
|
||||||
|
|
||||||
# does not fit on Sky
|
# does not fit on Sky
|
||||||
PLATFORMS_ONLY= cc2538
|
PLATFORMS_ONLY= cc2538dk zoul
|
||||||
|
|
||||||
CONTIKI_PROJECT = shell-db
|
CONTIKI_PROJECT = shell-db
|
||||||
all: $(CONTIKI_PROJECT)
|
all: $(CONTIKI_PROJECT)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
CONTIKI = ../../..
|
CONTIKI = ../../..
|
||||||
|
|
||||||
PLATFORMS_ONLY= cc2538 sky
|
PLATFORMS_ONLY= cc2538dk zoul sky
|
||||||
|
|
||||||
MODULES += os/services/unit-test
|
MODULES += os/services/unit-test
|
||||||
MODULES += os/storage/cfs
|
MODULES += os/storage/cfs
|
||||||
|
Loading…
Reference in New Issue
Block a user