From 10001b6b69cab9a1500801e1863fd06785b64a26 Mon Sep 17 00:00:00 2001 From: dynfer Date: Fri, 6 Feb 2026 18:01:22 +0100 Subject: [PATCH 1/6] move lwip to submodule --- .gitmodules | 4 ++++ firmware/Makefile | 8 ++++++-- firmware/lwip_path.patch | 9 +++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 firmware/lwip_path.patch diff --git a/.gitmodules b/.gitmodules index 9e5ec1bc80..e9d7052602 100644 --- a/.gitmodules +++ b/.gitmodules @@ -44,3 +44,7 @@ path = firmware/ext/build-tools url = https://github.com/FOME-Tech/build-tools.git branch = main +[submodule "firmware/lwip"] + path = firmware/lwip + url = https://github.com/dynfer/lwip.git + branch = main \ No newline at end of file diff --git a/firmware/Makefile b/firmware/Makefile index ca26461764..f9ba4fbaf0 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -185,11 +185,15 @@ endif ifeq ($(USE_WIFI),yes) include $(PROJECT_DIR)/ext/atwinc1500/atwinc1500.mk - DDEFS += -DEFI_WIFI=1 # -DETH_MODE=1 - # LWIP = yes + DDEFS += -DEFI_WIFI=1 + LWIP = yes + lwip_dir := $(PROJECT_DIR)/lwip/src endif ifeq ($(LWIP),yes) + # Force LWIPDIR used by lwip_bindings/lwip.mk + override LWIPDIR := $(lwip_dir) + include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk endif diff --git a/firmware/lwip_path.patch b/firmware/lwip_path.patch new file mode 100644 index 0000000000..8b17685f9a --- /dev/null +++ b/firmware/lwip_path.patch @@ -0,0 +1,9 @@ +--- a/ChibiOS/os/various/lwip_bindings/lwip.mk ++++ b/ChibiOS/os/various/lwip_bindings/lwip.mk +@@ -1,5 +1,5 @@ + # List of the required lwIP files. +-LWIPDIR = $(CHIBIOS)/ext/lwip/src ++LWIPDIR = $(lwip_dir) + + # The various blocks of files are outlined in Filelists.mk. + include $(LWIPDIR)/Filelists.mk From 2b4ffdefe8bbe170a00f5b9b481e6ee82fe7c389 Mon Sep 17 00:00:00 2001 From: dynfer Date: Fri, 6 Feb 2026 18:02:40 +0100 Subject: [PATCH 2/6] comment out lwip back --- firmware/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/Makefile b/firmware/Makefile index f9ba4fbaf0..a123639528 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -186,7 +186,7 @@ endif ifeq ($(USE_WIFI),yes) include $(PROJECT_DIR)/ext/atwinc1500/atwinc1500.mk DDEFS += -DEFI_WIFI=1 - LWIP = yes + # LWIP = yes lwip_dir := $(PROJECT_DIR)/lwip/src endif From 5ceb14868c3f662c55a60848609039853581fc68 Mon Sep 17 00:00:00 2001 From: dynfer Date: Fri, 6 Feb 2026 18:03:44 +0100 Subject: [PATCH 3/6] revert --- firmware/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/Makefile b/firmware/Makefile index a123639528..3b367c7083 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -185,7 +185,7 @@ endif ifeq ($(USE_WIFI),yes) include $(PROJECT_DIR)/ext/atwinc1500/atwinc1500.mk - DDEFS += -DEFI_WIFI=1 + DDEFS += -DEFI_WIFI=1 # -DETH_MODE=1 # LWIP = yes lwip_dir := $(PROJECT_DIR)/lwip/src endif From 88f7f9b3aca378ef695d4cf2f0575e3bd373123f Mon Sep 17 00:00:00 2001 From: dynfer Date: Fri, 6 Feb 2026 18:06:33 +0100 Subject: [PATCH 4/6] thats not needed --- firmware/lwip_path.patch | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 firmware/lwip_path.patch diff --git a/firmware/lwip_path.patch b/firmware/lwip_path.patch deleted file mode 100644 index 8b17685f9a..0000000000 --- a/firmware/lwip_path.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/ChibiOS/os/various/lwip_bindings/lwip.mk -+++ b/ChibiOS/os/various/lwip_bindings/lwip.mk -@@ -1,5 +1,5 @@ - # List of the required lwIP files. --LWIPDIR = $(CHIBIOS)/ext/lwip/src -+LWIPDIR = $(lwip_dir) - - # The various blocks of files are outlined in Filelists.mk. - include $(LWIPDIR)/Filelists.mk From 4ad261f5acdb9a0f7fb6aba6b2103c05b4595e0d Mon Sep 17 00:00:00 2001 From: dynfer Date: Fri, 6 Feb 2026 18:09:50 +0100 Subject: [PATCH 5/6] cleanup --- firmware/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index 3b367c7083..0adea08fda 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -186,11 +186,11 @@ endif ifeq ($(USE_WIFI),yes) include $(PROJECT_DIR)/ext/atwinc1500/atwinc1500.mk DDEFS += -DEFI_WIFI=1 # -DETH_MODE=1 - # LWIP = yes - lwip_dir := $(PROJECT_DIR)/lwip/src + LWIP = yes endif ifeq ($(LWIP),yes) + lwip_dir := $(PROJECT_DIR)/lwip/src # Force LWIPDIR used by lwip_bindings/lwip.mk override LWIPDIR := $(lwip_dir) From e244a6c1c5b548095c18acdd3a78190715e7eecc Mon Sep 17 00:00:00 2001 From: dynfer Date: Fri, 6 Feb 2026 18:10:09 +0100 Subject: [PATCH 6/6] again --- firmware/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/Makefile b/firmware/Makefile index 0adea08fda..7d9d12afac 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -186,7 +186,7 @@ endif ifeq ($(USE_WIFI),yes) include $(PROJECT_DIR)/ext/atwinc1500/atwinc1500.mk DDEFS += -DEFI_WIFI=1 # -DETH_MODE=1 - LWIP = yes + # LWIP = yes endif ifeq ($(LWIP),yes)