Commit Graph

219 Commits

Author SHA1 Message Date
Simon Duquennoy
4b11f8c99e
Merge branch 'develop' into contrib/build/cleanup 2018-04-03 14:50:17 +02:00
George Oikonomou
5d1ed3c17f Fix CONTIKI_VERSION_STRING
Currently, the version string always ends with -dirty. This is related to the logic behind --git-dir, which assumes that the current working dir is the top-level dir of the repo, unless --work-tree is also specified
2018-04-01 16:20:23 +01:00
George Oikonomou
3f4a1f7c54 Extend the usage target and add help target 2018-03-30 21:23:00 +01:00
George Oikonomou
a22324291f Specify a number of targets as .PHONY 2018-03-30 21:22:59 +01:00
George Oikonomou
9a1d34e163 Change distclean to clean all platforms 2018-03-30 21:22:59 +01:00
George Oikonomou
c7e36a3d55 Change clean target to be more explicit
Previously, the clean target would delete a number of file extensions, many of which currently unknown to our build system (old platforms?). This commit changes the target so that it only cleans what we know we are building. Platforms / CPUs can append to the target with platform-specific build artifacts.
2018-03-30 21:22:59 +01:00
George Oikonomou
16d8c5b4f9 Use a variable for the Contiki-NG archive file
Prevents having to hard-code the filename in multiple cpu/platform makefiles and allows us to easily rename it across the board in the future
2018-03-30 21:22:59 +01:00
George Oikonomou
ce540a8bca Harmonise filename pattern for the .map file
All map files are now called example-platform.map (e.g. hello-world-native.map).
2018-03-30 20:24:59 +01:00
George Oikonomou
6ac6e46041 Provide a string define for TARGET and BOARD 2018-03-23 18:24:53 +00:00
Simon Duquennoy
7fe4d913b7
Merge branch 'develop' into contrib/build-all 2018-03-12 14:22:34 +01:00
George Oikonomou
c250cf93b7
Merge branch 'develop' into feature/ipv6_over_ble 2018-03-12 08:52:25 +00:00
Simon Duquennoy
96a818e081 Makefile.include: clearer message in case of compilation attepmts to unsupported boards 2018-03-09 16:29:06 +00:00
Atis Elsts
f677f9c12f clean target in Makefile.include: also remove .o files 2018-03-09 16:29:06 +00:00
Atis Elsts
b024ff46c1 Allow examples to restrict their platforms in Makefile 2018-03-09 16:29:06 +00:00
George Oikonomou
82cbe50d0d Fix build under GNU make v3.81 2018-02-27 22:41:29 +00:00
Simon Duquennoy
2d74971a91 Makefile.include: support assembly file extensions .s in addition to .S 2018-02-26 08:26:49 -08:00
George Oikonomou
73ce7995a3 Add os/net/mac/framer to top-level Makefile MODULES 2018-02-26 00:07:20 +00:00
Simon Duquennoy
65cbc45145 Rename routing module flags 2018-02-02 08:50:17 -08:00
Simon Duquennoy
7adfb92b63 Routing module configuration through netstack.h 2018-02-02 08:50:17 -08:00
Simon Duquennoy
26d51c15d7 Routing API: added more missing functions, homogenize configuration 2018-02-02 08:50:17 -08:00
Simon Duquennoy
4c9f62ebe4 Added NETSTACK_ROUTING for routing protocol selection. Only used for init() so far. 2018-02-02 08:47:21 -08:00
Simon Duquennoy
7ddee2c66a Move rpl-lite and rpl-classic to os/net/routing 2018-02-02 08:47:21 -08:00
Simon Duquennoy
871ee1e34f Added routing module with only routing.h, now included wherever RPL is used 2018-02-02 08:45:02 -08:00
Niclas Finne
ebb329de5c CoAP: added make option to specify CoAP DTLS keystore to use by default.
The currently available options are:

* none   - No keystore registered.
* simple - Keystore using fixed PSK credentials.
* lwm2m  - Keystore based on LWM2M security objects

If an application wants to provide its own keystore, it selects 'none'
and registers its own at startup.
2018-01-12 01:18:41 +01:00
spoerk
604e846ff1 Merge branch 'develop' of github.com:contiki-ng/contiki-ng into feature/ipv6_over_ble 2018-01-03 15:27:42 +01:00
spoerk
35c08597e6 BLE L2CAP moved to the other MAC implementations 2018-01-03 14:36:14 +01:00
Simon Duquennoy
6de6e15ce7 Move RPL border router from example to os/services 2017-12-22 05:21:39 -08:00
Simon Duquennoy
070b493391 Automatically include module-macros.h when provided by modules 2017-12-22 05:21:39 -08:00
Simon Duquennoy
81d1b1bd80 PROJECTDIR now turned into modules via MODULES_REL 2017-12-22 05:21:39 -08:00
Simon Duquennoy
a0961ac2a1 Build system: automatically include Makefiles from PROJECTDIRS 2017-12-22 05:21:39 -08:00
Simon Duquennoy
2fd6fa1fd6 Automatically compile .c files from PROJECTDIRS 2017-12-22 05:21:39 -08:00
Simon Duquennoy
84ea0971bc Remove obsolete flag AUTOSTART_ENABLE, as well as .co and .ce files 2017-12-22 05:21:39 -08:00
George Oikonomou
e73edfaa60 Move target identification code to a separate file
For some cross-platform examples, we need to tweak things based on the target platform. For this reason, target identification needs to happen early, before inclusion of the top-level Makefile.include. Up to now, we have simply replicated the target-identification code to example Makefiles, leading to code-replication and on occasion bugs (incorrect platform identification).

This commits moves the correct working code to a separate file, so that example Makefiles can include this "as a library". The top-level Makefile merely includes this file now.
2017-10-28 22:36:08 +01:00
Niclas Finne
3cb66a5232 Changed version to Contiki-NG and mark the version as modified if
the working tree has local modifications.
2017-10-27 15:15:13 +02:00
Simon Duquennoy
9d1463fac5 Viewconf: distinguish set from unset flags 2017-10-26 17:37:46 +02:00
Simon Duquennoy
b838fc2ebb Fix auto-inclusion of module makefiles 2017-10-12 09:23:44 +02:00
Simon Duquennoy
41967732b1 Added MAKE_ROUTING make variable for cleaner routing protocol selection 2017-10-12 08:42:42 +02:00
Simon Duquennoy
91b8ee860e Makefile.include: added target 'boards' to show the list of boards available for the current target 2017-10-10 21:06:35 +02:00
Simon Duquennoy
3117296ffc Make viewconf: pretty printing 2017-10-10 21:05:48 +02:00
Simon Duquennoy
11de95efea Added make target 'viewconf' to ease debugging of configuration flags 2017-10-10 21:04:38 +02:00
Simon Duquennoy
1d45ab070e Makefile.include: add rules to generate preprocessed versions of C files, or assembly code, for any file 2017-10-10 21:04:33 +02:00
Simon Duquennoy
6745c5f1cc Makefile.include: fix 'usage' 2017-10-10 21:04:31 +02:00
Joakim Eriksson
5d87cd1b5f moved the MAKE_NET code in makefile include so that platform makefiles are before decisions 2017-10-08 00:46:57 +02:00
Simon Duquennoy
a92319bbca Rename PROJECT_CONF_H to PROJECT_CONF_PATH for clarity and so as to avoid possible conflicts with guards in project-conf.h files 2017-10-07 09:45:41 +02:00
Simon Duquennoy
20559fd308 Auto-include project-conf.h whenever found 2017-10-07 09:45:38 +02:00
Simon Duquennoy
543408db68 Re-organzie ip stack implementation 2017-09-22 17:09:54 +02:00
Simon Duquennoy
d9f9138ed2 Added NullNet, a network layer for non-IP-enabled cases 2017-09-22 14:34:20 +02:00
Simon Duquennoy
0aa44c3c22 Homogenize NET layer config with MAC 2017-09-22 14:34:20 +02:00
Simon Duquennoy
ffc94f832c MAC layer configuration done from Makefile instead of .h files 2017-09-22 14:34:20 +02:00
Simon Duquennoy
786cc13a95 Rename old RPL implementation as rpl-classic 2017-09-14 04:55:36 +02:00