Commit graph

10759 commits

Author SHA1 Message Date
George Oikonomou a30154c43e Fix code style: zoul examples 2015-11-24 21:15:34 +01:00
George Oikonomou be1bd9a619 Fix code style: Z1 websense example 2015-11-24 21:15:34 +01:00
George Oikonomou e1f6d39857 Fix code style: Z1 main examples 2015-11-24 21:15:34 +01:00
Antonio Lignan afa5ab1ae4 Updated README 2015-11-24 21:15:34 +01:00
Antonio Lignan daa3ce415c Fixed typos 2015-11-24 21:15:33 +01:00
Antonio Lignan 27fd1a5eb8 Updated RE-Mote revision A support and cleaning up Zolertia platforms 2015-11-24 21:15:33 +01:00
Antonio Lignan b25117a8b8 Merge pull request #1361 from JelmerT/feature/cc2538-bsl_update_2.0
cc2538-bsl update to 2.0, cc13xx and cc26xx support
2015-11-24 20:44:42 +01:00
Jelmer Tiete ff6e559be2 Merge pull request #1 from g-oikonomou/contrib/change-bsl-addr-calculation
Remove duplicate block and define the argument of -a using $(shell)
2015-11-24 10:18:22 -08:00
George Oikonomou e75bdd00e7 Remove duplicate block and define the argument of -a using $(shell) 2015-11-24 13:10:10 +00:00
Antonio Lignan c62455dabd Merge pull request #1393 from alignan/contikimac-tab
Replaced tabs leftover in previous commit
2015-11-24 10:23:10 +01:00
Antonio Lignan d31ba8dfdc Replaced tabs leftover in previous commit 2015-11-24 10:21:23 +01:00
Jelmer Tiete 1efeda4283 Added the PORT make variable to the cc2538dk and Remote makefile. Fixed bug in these makefiles on OSX introduced in #1162 2015-11-23 11:28:34 -08:00
Jelmer Tiete 715946ece3 Restructured cc26xx readme, included use of .upload and PORT variable. Added sleepy demo example to examples section. 2015-11-23 11:09:06 -08:00
Jelmer Tiete 6a40a4b749 Updated cc2538-bsl submodule to 6185d8b, small bugfix 2015-11-23 11:09:06 -08:00
Jelmer Tiete 9a8e749f6f Updated cc26xx Readme to mention serial upload script 2015-11-23 11:09:05 -08:00
Jelmer Tiete d01d53978c Removed forced upload speed for the RE-MOTE platform 2015-11-23 11:09:05 -08:00
Jelmer Tiete 97095c8bb5 Updated makefiles of srf06 platform to support uploading via cc2538-bsl script 2015-11-23 11:07:19 -08:00
Jelmer Tiete 80e29ad6a0 Pulled in cc2538-bsl submodule v2.0 (f1f070d) 2015-11-23 11:07:19 -08:00
Antonio Lignan 1c1bbf31c1 Merge pull request #1391 from alignan/contikimac
Made ContikiMAC more configurable (on uknoblic behalf)
2015-11-23 17:08:09 +01:00
Antonio Lignan e2cf8f9868 Made ContikiMAC more configurable (on uknoblic behalf) 2015-11-23 14:03:51 +01:00
George Oikonomou 41ea0308a3 Merge pull request #1390 from tsparber/fix-doxygen-whitespace
Cleanup some trailing spaces and convert tabs to spaces
2015-11-22 11:53:01 +00:00
Simon Duquennoy ba8552555a Merge pull request #1389 from simonduq/pr/update-jn516x
JN516x: minor fixes
2015-11-21 12:12:55 +01:00
Simon Duquennoy 673d1d103b JN516x: minor fixes 2015-11-21 10:23:15 +01:00
Antonio Lignan 6e481d56fa Merge pull request #1162 from bthebaudeau/cc2538-add-coffee
cc2538: Add support for Coffee
2015-11-21 07:51:32 +01:00
Simon Duquennoy 8369ee3ce5 Merge pull request #1194 from atiselsts/rime_chameleon_bit_endian
Fix Rime attribute serialization in chameleon-bitopts for big endian systems
2015-11-21 00:19:04 +01:00
Simon Duquennoy f83242825d Merge pull request #1275 from bkozak-scanimetrics/gitignore_additions
Ignore various build and temporary files
2015-11-20 23:59:33 +01:00
Billy Kozak 339559288a Ignore various build and temporary files
Ignore:
- .cooja
- .swp (vim editor temporary files)
- doc/latex/
- various build & temporary files generated in regression-tests
2015-11-20 15:52:15 -07:00
Fredrik Österlind 9effff6526 Merge pull request #1370 from g-oikonomou/contrib/cc13xx/prop-mode
Improve the CC13xx sub-ghz driver
2015-11-20 16:30:34 +01:00
Benoît Thébaudeau 5d98cb71e2 cc2538: Add support for Coffee
Coffee is placed by default at the beginning of the flash memory, right
before the firmware. This avoids the memory gaps that there could be
before and after Coffee if it were placed after the firmware, because it
is unlikely that the end of the firmware is aligned with a flash page
boundary, and the CCA is not flash-page-aligned. Thanks to that, Coffee
is also always in the same flash area if its size remains unchanged,
even if the firmware changes, which makes it possible to keep the Coffee
files when reprogramming the firmware after a partial flash erase
command.

The default configuration of Coffee is set to use sensible values for a
typical usage on this SoC, i.e. for sensor data logging.

The default size of Coffee is set to 0 in order not to waste flash if
Coffee is unused.

COFFEE_CONF_CUSTOM_PORT can be defined to a header file to be used with
"#include" in order to override the default CC2538 port of Coffee. This
makes it possible to use Coffee with an external memory device rather
than with the internal flash memory, without having to alter the Contiki
files.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-11-19 01:22:58 +01:00
Benoît Thébaudeau cbcf1262d6 cc2538: upload: Support .bin not starting at beginning of flash
Depending on the linker script, the generated .bin file may start beyond
the beginning of the flash memory. However, no target address was passed
to cc2538-bsl.py by the upload make target, so it used the beginning of
the flash memory in all cases.

The load address of the lowest loadable output section is now passed to
cc2538-bsl.py. The start address of the .text output section or the
address of the _text symbol could have been used too, but this would not
have been compatible with all the possible custom linker scripts.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-11-19 01:22:58 +01:00
Benoît Thébaudeau ee3ee049e4 cc2538: Set the entry point to the CCA
No entry point was defined, so it defaulted to the beginning of the
.text output section where the vector table is located by default in
Contiki. Actually, the vector table may be located elsewhere, and the
ROM-based boot loader first reads the CCA to find the vector table.

Consequently, this commit sets the entry point to the CCA, which fixes
both the entry point and the initial symbol reference, so this commit
also removes the now-unneeded "__used__" and "KEEP" keywords from the
CCA.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-11-19 01:18:34 +01:00
Benoît Thébaudeau 96dd24836c cc2538: Use &vectors instead of flash/.text start address
The current CC2538 linker script in Contiki places the vector table at
the beginning of the flash memory / .text output section. However, this
location is arbitrary (the only requirement is that the vector table is
512-byte aligned), and custom linker scripts may be used with Contiki,
which means that Contiki may be used with a vector table placed
elsewhere. Thus, using the flash/.text start address in the CCA and as
the default NVIC VTABLE value was wrong.

This commit rather uses the address of the vectors[] array from
startup-gcc.c, which makes it possible to freely move around the vector
table without breaking anything or having to use a custom startup-gcc.c
and to configure the NVIC driver for that. Moreover, referencing the
vectors[] array naturally prevents it and its input section from being
garbage-collected by the linker, so this commit also removes the
now-unneeded "used" and "KEEP" keywords from the vector table.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-11-19 01:18:33 +01:00
Benoît Thébaudeau a191fcdb84 cc2538: nvic: Simplify VTABLE configuration
The only thing needed for VTABLE is the absolute address of the vector
table. Splitting it between code/SRAM base and offset complicates things
and brings nothing.

Consequently, this commit merges the NVIC VTABLE configurations into a
single one giving the vector table absolute address.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-11-19 01:18:33 +01:00
Benoît Thébaudeau efb4b858e2 cc2538: Define the flash memory organization
Define the flash memory page and word sizes. These definitions are
grouped with the flash lock bit page and CCA definitions, so flash-cca.h
is renamed to flash.h.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-11-19 01:18:33 +01:00
Benoît Thébaudeau 790c253d6d cc2538: Define and use device features
Define the available CC2538 devices and their features, and use them to
define the linker script memory regions. The .nrdata output section is
now always defined in order to trigger an error if it is used but no
memory is available for it. The CC2538 device used by Contiki is made a
configuration option, the CC2538SF53 device being the default.

This makes more sense than defining the flash memory address and size as
configuration options like previously, all the more not all values are
possible and all the features are linked by each device.

This change also makes it possible to:
 - use the correct SRAM parameters for the CC2538NF11,
 - know at build time if the AES, SHA, ECC and RSA hardware features are
   available on the selected CC2538 device.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-11-19 01:18:33 +01:00
George Oikonomou 513d8bc9d5 Merge pull request #1382 from simonduq/pr/compile-test-fix
Compile-test: show make variables in log output
2015-11-18 17:41:47 +00:00
Nicolas Tsiftes 500a74a057 Merge pull request #1378 from simonduq/pr/rpl-dao-delay-naming
RPL: clearer naming and documentation of DAO delay constants
2015-11-18 17:56:35 +01:00
Simon Duquennoy b9281e2faa Compile-test: show make variables in log output 2015-11-18 17:39:42 +01:00
Simon Duquennoy 33f8db0dd3 RPL: clearer naming and documentation of DAO delay constants 2015-11-18 14:06:18 +01:00
Tommy Sparber 938a425949 Cleanup trailing spaces and convert tabs to spaces
This commit removes trailing spaces and converts
tabs to spaces in all files affected by fix-doxygen PR.
2015-11-18 11:09:43 +11:00
Oliver Schmidt 9bb3a3a235 Merge pull request #1377 from oliverschmidt/master
Build the webserver as done in tools/6502/Makefile.
2015-11-17 21:49:17 +01:00
Oliver Schmidt 9dac1edae9 Build the webserver as done in tools/6502/Makefile. 2015-11-17 21:08:25 +01:00
Nicolas Tsiftes e642dfc671 Merge pull request #1311 from arurke/dis-config
Add configuration of DIS start delay and interval in RPL conf.
2015-11-17 17:48:18 +01:00
Nicolas Tsiftes b3b22756b7 Merge pull request #1327 from nfi/compile-test-with-make-variables
Add option to specify make variables for regression compile tests
2015-11-17 17:25:51 +01:00
Niclas Finne 43d26d9d83 Moved STM32W_CPUREV to the relevant compile regression test 2015-11-17 15:07:47 +01:00
Niclas Finne 2dd75d8384 Added option to specify make variables in the compile regression test 2015-11-17 15:07:04 +01:00
George Oikonomou b4393e861f Only set CC13xx prop mode channel if a new channel is being requested 2015-11-14 01:38:24 +01:00
George Oikonomou 320a753666 Turn CC13xx RF back off after prop TX if it was off to start with 2015-11-14 01:38:24 +01:00
George Oikonomou e0e20aa3fd Turn off ENERGEST_TYPE_LISTEN in CC13xx prop mode off() 2015-11-14 01:38:24 +01:00
Nicolas Tsiftes a161dc2959 Merge pull request #1365 from simonduq/pr/warning-free-no-frag
sicslowpan.c: warning-free compilation even with fragmentation disabled
2015-11-11 13:24:14 +01:00