Initial support for Zephyr 2.5.0

valeros · valeros · commit 3016fe77789f · 2021-02-24T16:30:29.000+02:00
diff --git a/boards/nucleo_f303k8.json b/boards/nucleo_f303k8.json
@@ -27,7 +27,8 @@
     "cmsis",
     "mbed",
     "stm32cube",
-    "libopencm3"
+    "libopencm3",
+    "zephyr"
   ],
   "name": "ST Nucleo F303K8",
   "upload": {
diff --git a/boards/nucleo_f410rb.json b/boards/nucleo_f410rb.json
@@ -22,7 +22,8 @@
     "cmsis",
     "mbed",
     "stm32cube",
-    "libopencm3"
+    "libopencm3",
+    "zephyr"
   ],
   "name": "ST Nucleo F410RB",
   "upload": {
diff --git a/boards/nucleo_h723zg.json b/boards/nucleo_h723zg.json
@@ -0,0 +1,45 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m7",
+    "extra_flags": "-DSTM32H7xx -DSTM32H723xx",
+    "f_cpu": "550000000L",
+    "mcu": "stm32h723zgt6",
+    "product_line": "STM32H723xx"
+  },
+  "connectivity": [
+    "can",
+    "ethernet"
+  ],
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32H723ZG",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_target": "stm32h7x",
+    "svd_path": "STM32H7x3.svd"
+  },
+  "frameworks": [
+    "cmsis",
+    "stm32cube",
+    "zephyr"
+  ],
+  "name": "ST Nucleo H723ZG",
+  "upload": {
+    "maximum_ram_size": 442368,
+    "maximum_size": 1048576,
+    "protocol": "stlink",
+    "protocols": [
+      "blackmagic",
+      "cmsis-dap",
+      "jlink",
+      "stlink",
+      "mbed"
+    ]
+  },
+  "url": "https://www.st.com/en/evaluation-tools/nucleo-h723zg.html",
+  "vendor": "ST"
+}
diff --git a/boards/nucleo_l011k4.json b/boards/nucleo_l011k4.json
@@ -20,7 +20,8 @@
   "frameworks": [
     "cmsis",
     "stm32cube",
-    "libopencm3"
+    "libopencm3",
+    "zephyr"
   ],
   "name": "ST Nucleo L011K4",
   "upload": {
diff --git a/boards/nucleo_l031k6.json b/boards/nucleo_l031k6.json
@@ -23,7 +23,8 @@
     "cmsis",
     "mbed",
     "stm32cube",
-    "libopencm3"
+    "libopencm3",
+    "zephyr"
   ],
   "name": "ST Nucleo L031K6",
   "upload": {
diff --git a/boards/nucleo_l433rc_p.json b/boards/nucleo_l433rc_p.json
@@ -25,7 +25,8 @@
     "cmsis",
     "mbed",
     "stm32cube",
-    "libopencm3"
+    "libopencm3",
+    "zephyr"
   ],
   "name": "ST Nucleo L433RC-P",
   "upload": {
diff --git a/examples/zephyr-blink/src/main.c b/examples/zephyr-blink/src/main.c
@@ -9,7 +9,6 @@
 #include <devicetree.h>
 #include <drivers/gpio.h>
 
-
 /* 1000 msec = 1 sec */
 #define SLEEP_TIME_MS   1000
 
@@ -19,25 +18,20 @@
 #if DT_NODE_HAS_STATUS(LED0_NODE, okay)
 #define LED0	DT_GPIO_LABEL(LED0_NODE, gpios)
 #define PIN	DT_GPIO_PIN(LED0_NODE, gpios)
-#if DT_PHA_HAS_CELL(LED0_NODE, gpios, flags)
 #define FLAGS	DT_GPIO_FLAGS(LED0_NODE, gpios)
-#endif
 #else
 /* A build error here means your board isn't set up to blink an LED. */
 #error "Unsupported board: led0 devicetree alias is not defined"
 #define LED0	""
 #define PIN	0
-#endif
-
-#ifndef FLAGS
 #define FLAGS	0
 #endif
 
 void main(void)
 {
-	struct device *dev;
+	const struct device *dev;
 	bool led_is_on = true;
-	int ret = 0;
+	int ret;
 
 	dev = device_get_binding(LED0);
 	if (dev == NULL) {
diff --git a/examples/zephyr-cpp-synchronization/src/main.cpp b/examples/zephyr-cpp-synchronization/src/main.cpp
@@ -133,7 +133,7 @@ void coop_thread_entry(void)
 	}
 }
 
-void main(void)
+int main(void)
 {
 	struct k_timer timer;
 
@@ -154,4 +154,6 @@ void main(void)
 		/* Wait for coop thread to let us have a turn */
 		sem_main.wait();
 	}
+
+	return 0;
 }
diff --git a/examples/zephyr-drivers-can/src/main.c b/examples/zephyr-drivers-can/src/main.c
@@ -55,9 +55,9 @@ void rx_thread(void *arg1, void *arg2, void *arg3)
 	const struct zcan_filter filter = {
 		.id_type = CAN_EXTENDED_IDENTIFIER,
 		.rtr = CAN_DATAFRAME,
-		.ext_id = COUNTER_MSG_ID,
+		.id = COUNTER_MSG_ID,
 		.rtr_mask = 1,
-		.ext_id_mask = CAN_EXT_ID_MASK
+		.id_mask = CAN_EXT_ID_MASK
 	};
 	struct zcan_frame msg;
 	int filter_id;
@@ -177,20 +177,20 @@ void main(void)
 	const struct zcan_filter change_led_filter = {
 		.id_type = CAN_STANDARD_IDENTIFIER,
 		.rtr = CAN_DATAFRAME,
-		.std_id = LED_MSG_ID,
+		.id = LED_MSG_ID,
 		.rtr_mask = 1,
-		.std_id_mask = CAN_STD_ID_MASK
+		.id_mask = CAN_STD_ID_MASK
 	};
 	struct zcan_frame change_led_frame = {
 		.id_type = CAN_STANDARD_IDENTIFIER,
 		.rtr = CAN_DATAFRAME,
-		.std_id = LED_MSG_ID,
+		.id = LED_MSG_ID,
 		.dlc = 1
 	};
 	struct zcan_frame counter_frame = {
 		.id_type = CAN_EXTENDED_IDENTIFIER,
 		.rtr = CAN_DATAFRAME,
-		.ext_id = COUNTER_MSG_ID,
+		.id = COUNTER_MSG_ID,
 		.dlc = 2
 	};
 	uint8_t toggle = 1;
@@ -206,7 +206,7 @@ void main(void)
 	}
 
 #ifdef CONFIG_LOOPBACK_MODE
-	can_configure(can_dev, CAN_LOOPBACK_MODE, 125000);
+	can_set_mode(can_dev, CAN_LOOPBACK_MODE);
 #endif
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(led0), gpios, pin) && \
diff --git a/examples/zephyr-drivers-can/zephyr/CMakeLists.txt b/examples/zephyr-drivers-can/zephyr/CMakeLists.txt
@@ -5,6 +5,4 @@ cmake_minimum_required(VERSION 3.13.1)
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(CAN)
 
-set (CONF_FILE "prj.mcp2515.conf")
-
 target_sources(app PRIVATE ../src/main.c)
diff --git a/examples/zephyr-drivers-can/zephyr/prj.mcp2515.conf b/examples/zephyr-drivers-can/zephyr/prj.mcp2515.conf
diff --git a/examples/zephyr-net-civetweb/include/external_log_access.inl b/examples/zephyr-net-civetweb/include/external_log_access.inl
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Antmicro Ltd
+ * Copyright (c) 2020 Alexander Kozhinov <AlexanderKozhinov@yandex.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,12 +18,12 @@ static void log_access(const struct mg_connection *conn)
 
 	sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa);
 
-	printf("%s - \"%s %s%s%s HTTP/%s\" %d\n",
-	       src_addr,
-	       ri->request_method ? ri->request_method : "-",
-	       ri->request_uri ? ri->request_uri : "-",
-	       ri->query_string ? "?" : "",
-	       ri->query_string ? ri->query_string : "",
-	       ri->http_version,
-	       conn->status_code);
+	LOG_DBG("%s - \"%s %s%s%s HTTP/%s\" %d\n",
+		STR_LOG_ALLOC(src_addr),
+		STR_LOG_ALLOC(ri->request_method),
+		STR_LOG_ALLOC(ri->request_uri),
+		(ri->query_string == NULL) ? log_strdup("?") : log_strdup(""),
+		STR_LOG_ALLOC(ri->query_string),
+		STR_LOG_ALLOC(ri->http_version),
+		conn->status_code);
 }
diff --git a/examples/zephyr-net-civetweb/include/external_mg_cry_internal_impl.inl b/examples/zephyr-net-civetweb/include/external_mg_cry_internal_impl.inl
@@ -1,9 +1,15 @@
 /*
  * Copyright (c) 2019 Antmicro Ltd
+ * Copyright (c) 2020 Alexander Kozhinov <AlexanderKozhinov@yandex.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <logging/log.h>
+LOG_MODULE_REGISTER(mg_cry_internal_impl, LOG_LEVEL_DBG);
+
+#include "helper.h"
+
 static void mg_cry_internal_impl(const struct mg_connection *conn,
                                  const char *func,
                                  unsigned line,
@@ -12,7 +18,6 @@ static void mg_cry_internal_impl(const struct mg_connection *conn,
 {
 	(void)conn;
 
-	printf("[INTERNAL ERROR]: %s @ %d\n", func, line);
+	LOG_ERR("%s @ %d in civetweb.c", STR_LOG_ALLOC(func), line);
 	vprintf(fmt, ap);
-	printf("\n");
 }
diff --git a/examples/zephyr-net-civetweb/include/helper.h b/examples/zephyr-net-civetweb/include/helper.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2020 Alexander Kozhinov Mail: <AlexanderKozhinov@yandex.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __HELPER__
+#define __HELPER__
+
+#include <logging/log.h>
+
+#define STR_LOG_ALLOC(str)	((str == NULL) ? log_strdup("null") :\
+						  log_strdup(str))
+
+#endif  /* __HELPER__ */
diff --git a/examples/zephyr-net-civetweb/include/libc_extensions.h b/examples/zephyr-net-civetweb/include/libc_extensions.h
@@ -26,10 +26,10 @@ size_t strspn(const char *s1, const char *s2);
 int iscntrl(int c);
 
 double atof(const char *str);
-long long int strtoll(const char *str, char **endptr, int base);
+long long strtoll(const char *str, char **endptr, int base);
 int sscanf(const char *s, const char *format, ...);
 char *strerror(int err);
-unsigned long long int strtoull(const char *str, char **endptr, int base);
+unsigned long long strtoull(const char *str, char **endptr, int base);
 
 time_t time(time_t *t);
 struct tm *gmtime(const time_t *ptime);
diff --git a/examples/zephyr-net-civetweb/src/libc_extensions.c b/examples/zephyr-net-civetweb/src/libc_extensions.c
@@ -4,14 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <logging/log.h>
+LOG_MODULE_REGISTER(lib_extensions, LOG_LEVEL_DBG);
+
 #include <zephyr.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "libc_extensions.h"
 
-#define FN_MISSING() printf("[IMPLEMENTATION MISSING : %s]\n", __func__)
+#define FN_MISSING() LOG_DBG("[IMPLEMENTATION MISSING : %s]\n", __func__)
 
 int iscntrl(int c)
 {
@@ -150,10 +153,10 @@ double atof(const char *str)
 	return (double)atoi(str);
 }
 
-long long int strtoll(const char *str, char **endptr, int base)
+long long strtoll(const char *str, char **endptr, int base)
 {
 	/* XXX good enough for civetweb uses */
-	return (long long int)strtol(str, endptr, base);
+	return (long long)strtol(str, endptr, base);
 }
 
 time_t time(time_t *t)
diff --git a/examples/zephyr-net-civetweb/src/main.c b/examples/zephyr-net-civetweb/src/main.c
@@ -10,7 +10,13 @@
 
 #include "civetweb.h"
 
-#define CIVETWEB_MAIN_THREAD_STACK_SIZE 4096
+#define HTTP_PORT	8080
+#define HTTPS_PORT	4443
+
+#define CIVETWEB_MAIN_THREAD_STACK_SIZE		CONFIG_MAIN_STACK_SIZE
+
+/* Use samllest possible value of 1024 (see the line 18619 of civetweb.c) */
+#define MAX_REQUEST_SIZE_BYTES			1024
 
 K_THREAD_STACK_DEFINE(civetweb_stack, CIVETWEB_MAIN_THREAD_STACK_SIZE);
 
@@ -139,12 +145,12 @@ void *main_pthread(void *arg)
 {
 	static const char * const options[] = {
 		"listening_ports",
-		"8080",
+		STRINGIFY(HTTP_PORT),
 		"num_threads",
 		"1",
 		"max_request_size",
-		"2048",
-		0
+		STRINGIFY(MAX_REQUEST_SIZE_BYTES),
+		NULL
 	};
 
 	struct mg_callbacks callbacks;
diff --git a/examples/zephyr-net-civetweb/zephyr/prj.conf b/examples/zephyr-net-civetweb/zephyr/prj.conf
@@ -13,20 +13,20 @@ CONFIG_NET_IPV4=y
 # CONFIG_NET_IPV6 is not set
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=131072
-CONFIG_NET_TX_STACK_SIZE=8192
-CONFIG_NET_RX_STACK_SIZE=8192
-CONFIG_ISR_STACK_SIZE=8192
-CONFIG_MAIN_STACK_SIZE=8192
-CONFIG_IDLE_STACK_SIZE=2048
+CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=16384
+CONFIG_NET_TX_STACK_SIZE=2048
+CONFIG_NET_RX_STACK_SIZE=2048
+CONFIG_ISR_STACK_SIZE=2048
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_IDLE_STACK_SIZE=1024
 
 CONFIG_DNS_RESOLVER=y
 
 CONFIG_NET_CONFIG_SETTINGS=y
-CONFIG_NET_CONFIG_MY_IPV4_ADDR="10.0.0.111"
+CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 CONFIG_NET_CONFIG_MY_IPV4_NETMASK="255.255.255.0"
-CONFIG_NET_CONFIG_MY_IPV4_GW="10.0.0.116"
-CONFIG_NET_CONFIG_PEER_IPV4_ADDR="10.0.0.116"
+CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"
+CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 
 # logging
 CONFIG_NET_LOG=y
diff --git a/examples/zephyr-net-https-client/src/main.c b/examples/zephyr-net-https-client/src/main.c
diff --git a/examples/zephyr-net-https-client/zephyr/Kconfig b/examples/zephyr-net-https-client/zephyr/Kconfig
diff --git a/examples/zephyr-net-https-client/zephyr/prj.conf b/examples/zephyr-net-https-client/zephyr/prj.conf
diff --git a/platform.json b/platform.json

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ void coop_thread_entry(void)`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
`136`		`-void main(void)`
	`136`	`+int main(void)`
`137`	`137`	`{`
`138`	`138`	`struct k_timer timer;`
`139`	`139`
`@@ -154,4 +154,6 @@ void main(void)`
`154`	`154`	`/* Wait for coop thread to let us have a turn */`
`155`	`155`	`sem_main.wait();`
`156`	`156`	`}`
	`157`	`+`
	`158`	`+ return 0;`
`157`	`159`	`}`