Merge branch 'release/v14.1.0'

Sprintmike · Jul 30, 2021 · 83a0c97 · 83a0c97
2 parents 645729a + 377e623
commit 83a0c97
Show file tree

Hide file tree

Showing 24 changed files with 30,319 additions and 136 deletions.
diff --git a/boards/armed_v1.json b/boards/armed_v1.json
@@ -27,7 +27,7 @@
   ],
   "name": "3D Printer Controller",
   "upload": {
-    "maximum_ram_size": 196608,
+    "maximum_ram_size": 131072,
     "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/disco_f303vc.json b/boards/disco_f303vc.json
@@ -34,7 +34,7 @@
   ],
   "name": "ST STM32F3DISCOVERY",
   "upload": {
-    "maximum_ram_size": 49152,
+    "maximum_ram_size": 40960,
     "maximum_size": 262144,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/disco_f413zh.json b/boards/disco_f413zh.json
@@ -35,7 +35,7 @@
   ],
   "name": "ST 32F413HDISCOVERY",
   "upload": {
-    "maximum_ram_size": 131072,
+    "maximum_ram_size": 327680,
     "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/disco_g071rb.json b/boards/disco_g071rb.json
@@ -0,0 +1,45 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DSTM32G0xx -DSTM32G071xx",
+    "f_cpu": "64000000L",
+    "mcu": "stm32g071rbt6",
+    "product_line": "STM32G071xx",
+    "zephyr": {
+       "variant": "stm32g071b_disco"
+    }
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32G071RB",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_target": "stm32g0x",
+    "svd_path": "STM32G071.svd"
+  },
+  "frameworks": [
+    "cmsis",
+    "libopencm3",
+    "stm32cube",
+    "zephyr"
+  ],
+  "name": "ST STM32G071B Discovery",
+  "upload": {
+    "maximum_ram_size": 36864,
+    "maximum_size": 131072,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "jlink",
+      "cmsis-dap",
+      "blackmagic",
+      "mbed"
+    ]
+  },
+  "url": "https://www.st.com/en/evaluation-tools/stm32g071b-disco.html",
+  "vendor": "ST"
+}
diff --git a/boards/diymore_f407vgt.json b/boards/diymore_f407vgt.json
@@ -25,7 +25,7 @@
   "name": "F407VG",
   "upload": {
     "maximum_ram_size": 131072,
-    "maximum_size": 524288,
+    "maximum_size": 1048576,
     "protocol": "stlink",
     "protocols": [
       "jlink",

diff --git a/boards/maple_mini_origin.json b/boards/maple_mini_origin.json
@@ -35,7 +35,7 @@
   "name": "Maple Mini Original",
   "upload": {
     "boot_version": 1,
-    "maximum_ram_size": 17408,
+    "maximum_ram_size": 20480,
     "maximum_size": 110592,
     "protocol": "dfu",
     "protocols": [

diff --git a/boards/microduino32_flash.json b/boards/microduino32_flash.json
@@ -33,7 +33,7 @@
   "upload": {
     "boot_version": 1,
     "disable_flushing": false,
-    "maximum_ram_size": 17000,
+    "maximum_ram_size": 20480,
     "maximum_size": 108000,
     "protocol": "dfu",
     "protocols": [

diff --git a/boards/mkr_sharky.json b/boards/mkr_sharky.json
@@ -20,7 +20,7 @@
   ],
   "name": "MKR Sharky",
   "upload": {
-    "maximum_ram_size": 196604,
+    "maximum_ram_size": 196608,
     "maximum_size": 524288,
     "protocol": "mbed",
     "protocols": [

diff --git a/boards/netduino2plus.json b/boards/netduino2plus.json
@@ -35,7 +35,7 @@
   "name": "N2+",
   "upload": {
     "disable_flushing": false,
-    "maximum_ram_size": 196608,
+    "maximum_ram_size": 131072,
     "maximum_size": 1048576,
     "protocol": "dfu",
     "protocols": [

diff --git a/boards/nucleo_f031k6.json b/boards/nucleo_f031k6.json
@@ -25,7 +25,8 @@
     "cmsis",
     "mbed",
     "stm32cube",
-    "libopencm3"
+    "libopencm3",
+    "zephyr"
   ],
   "name": "ST Nucleo F031K6",
   "upload": {

diff --git a/boards/nucleo_f429zi.json b/boards/nucleo_f429zi.json
@@ -34,7 +34,7 @@
   ],
   "name": "ST Nucleo F429ZI",
   "upload": {
-    "maximum_ram_size": 262144,
+    "maximum_ram_size": 196608,
     "maximum_size": 2097152,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/nucleo_h753zi.json b/boards/nucleo_h753zi.json
@@ -0,0 +1,45 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m7",
+    "extra_flags": "-DSTM32H7xx -DSTM32H753xx",
+    "f_cpu": "400000000L",
+    "mcu": "stm32h753zit6",
+    "product_line": "STM32H753xx"
+  },
+  "connectivity": [
+    "can",
+    "ethernet"
+  ],
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32H753ZI",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_target": "stm32h7x",
+    "svd_path": "STM32H753.svd"
+  },
+  "frameworks": [
+    "cmsis",
+    "stm32cube",
+    "zephyr"
+  ],
+  "name": "ST Nucleo H753ZI",
+  "upload": {
+    "maximum_ram_size": 884736,
+    "maximum_size": 2097152,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "cmsis-dap",
+      "stlink",
+      "blackmagic",
+      "mbed"
+    ]
+  },
+  "url": "https://www.st.com/en/evaluation-tools/nucleo-h753zi.html",
+  "vendor": "ST"
+}
diff --git a/boards/nucleo_l412rb_p.json b/boards/nucleo_l412rb_p.json
@@ -20,7 +20,8 @@
   },
   "frameworks": [
     "cmsis",
-    "stm32cube"
+    "stm32cube",
+    "zephyr"
   ],
   "name": "ST Nucleo L412RB-P",
   "upload": {

diff --git a/boards/nucleo_wb55rg_p.json b/boards/nucleo_wb55rg_p.json
@@ -26,7 +26,7 @@
   ],
   "name": "P-Nucleo WB55RG",
   "upload": {
-    "maximum_ram_size": 196604,
+    "maximum_ram_size": 196608,
     "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/nucleo_wl55jc.json b/boards/nucleo_wl55jc.json
@@ -0,0 +1,38 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32WL55JC1",
+    "f_cpu": "48000000L",
+    "mcu": "stm32wl55jc",
+    "product_line": "STM32WL55xx"
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32WL55JC",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_target": "stm32wlx",
+    "svd_path": "STM32WL5x_CM4.svd"
+  },
+  "frameworks": [
+    "zephyr"
+  ],
+  "name": "ST Nucleo WL55JC",
+  "upload": {
+    "maximum_ram_size": 65536,
+    "maximum_size": 262144,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "cmsis-dap",
+      "stlink",
+      "mbed"
+    ]
+  },
+  "url": "https://www.st.com/en/evaluation-tools/nucleo-wl55jc.html",
+  "vendor": "ST"
+}
diff --git a/boards/olimex_p405.json b/boards/olimex_p405.json
@@ -25,7 +25,7 @@
   ],
   "name": "Olimex STM32-P405",
   "upload": {
-    "maximum_ram_size": 196608,
+    "maximum_ram_size": 131072,
     "maximum_size": 1048576,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/prntr_v2.json b/boards/prntr_v2.json
@@ -27,7 +27,7 @@
   ],
   "name": "PrntrBoard V2",
   "upload": {
-    "maximum_ram_size": 196608,
+    "maximum_ram_size": 131072,
     "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/stm32f4stamp.json b/boards/stm32f4stamp.json
@@ -35,7 +35,7 @@
   "name": "STM32F4Stamp F405",
   "upload": {
     "disable_flushing": false,
-    "maximum_ram_size": 196608,
+    "maximum_ram_size": 131072,
     "maximum_size": 1048576,
     "protocol": "dfu",
     "protocols": [

diff --git a/boards/vccgnd_f407zg_mini.json b/boards/vccgnd_f407zg_mini.json
@@ -24,7 +24,7 @@
   ],
   "name": "VCCGND F407ZGT6 Mini",
   "upload": {
-    "maximum_ram_size": 65536,
+    "maximum_ram_size": 131072,
     "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [

diff --git a/examples/zephyr-net-civetweb/src/libc_extensions.c b/examples/zephyr-net-civetweb/src/libc_extensions.c
@@ -159,11 +159,6 @@ long long strtoll(const char *str, char **endptr, int base)
 	return (long long)strtol(str, endptr, base);
 }
 
-time_t time(time_t *t)
-{
-	return 0;
-}
-
 /*
  * Most of the wrappers below are copies of the wrappers in net/sockets.h,
  * but they are available only if CONFIG_NET_SOCKETS_POSIX_NAMES is enabled

diff --git a/examples/zephyr-net-civetweb/zephyr/prj.conf b/examples/zephyr-net-civetweb/zephyr/prj.conf
@@ -30,3 +30,7 @@ CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 
 # logging
 CONFIG_NET_LOG=y
+
+# Do not include mbedtls via this option as civetweb does not
+# work properly with mbedtls.
+CONFIG_NET_TCP_ISN_RFC6528=n