Merge remote-tracking branch 'upstream/master' into pr/2227

2024-04-28 19:44:10 +02:00
parent f1d3663d24 1c04d5992a
commit a29852320a
863 changed files with 56582 additions and 16833 deletions
--- a/examples/device/net_lwip_webserver/Makefile
+++ b/examples/device/net_lwip_webserver/Makefile
@@ -1,6 +1,6 @@
 DEPS_SUBMODULES += lib/lwip

-include ../../make.mk
+include ../../build_system/make/make.mk

 # suppress warning caused by lwip
 CFLAGS_GCC += \
@@ -67,4 +67,4 @@ SRC_C += \
  lib/networking/dnserver.c \
  lib/networking/rndis_reports.c

-include ../../rules.mk
+include ../../build_system/make/rules.mk
--- a/examples/device/net_lwip_webserver/skip.txt
+++ b/examples/device/net_lwip_webserver/skip.txt
@@ -9,3 +9,4 @@ family:broadcom_64bit
 family:broadcom_32bit
 board:curiosity_nano
 board:frdm_kl25z
+family:espressif