Merge pull request #1448 from bthebaudeau/cc2538-fix-build-issues

cc2538: Fix build issues

cpu/cc2538/dev/bignum-driver.c

@@ -50,12 +50,12 @@
  * bignum_divide_start    bignum_divide_get_result   (division)
  * bignum_cmp_start       bignum_cmp_get_result      (comparison)
  */
-#include "bignum-driver.h"
+#include "dev/bignum-driver.h"
 
-#include "stdio.h"
+#include <stdio.h>
 
 #include "reg.h"
-#include "nvic.h"
+#include "dev/nvic.h"
 
 #define ASSERT(IF) if(!(IF)) { return PKA_STATUS_INVALID_PARAM; }
 

cpu/cc2538/dev/bignum-driver.h

@@ -59,7 +59,7 @@
 #define BIGNUM_DRIVER_H_
 
 #include "contiki.h"
-#include "pka.h"
+#include "dev/pka.h"
 
 #include <stdint.h>
 

cpu/cc2538/dev/ecc-algorithm.c

@@ -35,15 +35,15 @@
  * \file
  * Implementation of the cc2538 ECC Algorithms
  */
-#include <contiki.h>
-#include <process.h>
+#include "contiki.h"
+#include "sys/process.h"
 
 #include <limits.h>
 #include <stdio.h>
 
-#include "ecc-algorithm.h"
-#include "ecc-driver.h"
-#include "pka.h"
+#include "dev/ecc-algorithm.h"
+#include "dev/ecc-driver.h"
+#include "dev/pka.h"
 
 #define CHECK_RESULT(...)                                                  \
   state->result = __VA_ARGS__;                                             \

cpu/cc2538/dev/ecc-algorithm.h

@@ -49,8 +49,8 @@
 #ifndef ECC_ALGORITHM_H_
 #define ECC_ALGORITHM_H_
 
-#include "bignum-driver.h"
-#include "ecc-driver.h"
+#include "dev/bignum-driver.h"
+#include "dev/ecc-driver.h"
 
 typedef struct  {
   /* Containers for the State */

cpu/cc2538/dev/ecc-curve.c

@@ -32,8 +32,8 @@
  * \addtogroup c2538-ecc-curves
  * @{
  */
-#include <contiki.h>
-#include <ecc-driver.h>
+#include "contiki.h"
+#include "dev/ecc-driver.h"
 
 /* [NIST P-256, X9.62 prime256v1] */
 static const uint32_t nist_p_256_p[8] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,

cpu/cc2538/dev/ecc-driver.c

@@ -39,7 +39,7 @@
  * \file
  * Implementation of the cc2538 ECC driver
  */
-#include "ecc-driver.h"
+#include "dev/ecc-driver.h"
 #include "reg.h"
 #include "dev/nvic.h"
 

cpu/cc2538/dev/ecc-driver.h

@@ -48,7 +48,7 @@
 #define ECC_DRIVER_H_
 
 #include "contiki.h"
-#include "pka.h"
+#include "dev/pka.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/

cpu/cc2538/dev/udma.c

@@ -56,7 +56,7 @@ static volatile struct channel_ctrl channel_config[UDMA_CONF_MAX_CHANNEL + 1]
 void
 udma_init()
 {
-  memset(&channel_config, 0, sizeof(channel_config));
+  memset((void *)&channel_config, 0, sizeof(channel_config));
 
   REG(UDMA_CFG) = UDMA_CFG_MASTEN;
 

examples/cc2538dk/pka/Makefile.target

@@ -0,0 +1 @@
+TARGET = cc2538dk

examples/cc2538dk/pka/ecc-ecdh.c

@@ -45,11 +45,11 @@
  *     Example demonstrating ECDH on the cc2538dk platform
  */
 #include "contiki.h"
-#include "ecc-algorithm.h"
-#include "ecc-curve.h"
-#include "random.h"
-#include "rtimer.h"
-#include "pt.h"
+#include "dev/ecc-algorithm.h"
+#include "dev/ecc-curve.h"
+#include "lib/random.h"
+#include "sys/rtimer.h"
+#include "sys/pt.h"
 
 #include <string.h>
 #include <stdio.h>

examples/cc2538dk/pka/ecc-sign.c

@@ -45,10 +45,10 @@
  *     Example demonstrating ECDSA-Sign on the cc2538dk platform
  */
 #include "contiki.h"
-#include "ecc-algorithm.h"
-#include "ecc-curve.h"
-#include "rtimer.h"
-#include "pt.h"
+#include "dev/ecc-algorithm.h"
+#include "dev/ecc-curve.h"
+#include "sys/rtimer.h"
+#include "sys/pt.h"
 
 #include <string.h>
 #include <stdio.h>

examples/cc2538dk/pka/ecc-verify.c

@@ -45,10 +45,10 @@
  *     Example demonstrating ECDSA-Verify on the cc2538dk platform
  */
 #include "contiki.h"
-#include "ecc-algorithm.h"
-#include "ecc-curve.h"
-#include "rtimer.h"
-#include "pt.h"
+#include "dev/ecc-algorithm.h"
+#include "dev/ecc-curve.h"
+#include "sys/rtimer.h"
+#include "sys/pt.h"
 
 #include <string.h>
 #include <stdio.h>

regression-tests/18-compile-arm-ports/Makefile

@@ -17,6 +17,8 @@ cc2538dk/cc2538dk \
 cc2538dk/udp-ipv6-echo-server/cc2538dk \
 cc2538dk/sniffer/cc2538dk \
 cc2538dk/mqtt-demo/cc2538dk \
+cc2538dk/crypto/cc2538dk \
+cc2538dk/pka/cc2538dk \
 ipv6/multicast/cc2538dk \
 zolertia/zoul/zoul \
 zolertia/zoul/cc1200-demo/zoul \