From 157dd2f407cc68c513d4dfd95d99b213d51600ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Wed, 18 May 2022 20:50:15 +0200
Subject: [PATCH] [realtek-ambz] Move to external lwIP v1.4.1

---
 README.md                              |  2 +-
 builder/frameworks/realtek-ambz-sdk.py | 43 ++------------------------
 platform.json                          |  5 +++
 3 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index 3217c13..61561db 100644
--- a/README.md
+++ b/README.md
@@ -184,7 +184,7 @@ Wire                | ❗
 Wi-Fi STA/AP/Mixed  | ✔️
 Wi-Fi Client (SSL)  | ✔️ (✔️)
 Wi-Fi Server        | ✔️
-Wi-Fi Events        | ❌
+Wi-Fi Events        | ✔️
 IPv6                | ❌
 HTTP Client (SSL)   | ✔️ (✔️)
 HTTP Server         | ✔️
diff --git a/builder/frameworks/realtek-ambz-sdk.py b/builder/frameworks/realtek-ambz-sdk.py
index ecfa0eb..496b0e9 100644
--- a/builder/frameworks/realtek-ambz-sdk.py
+++ b/builder/frameworks/realtek-ambz-sdk.py
@@ -116,42 +116,7 @@ env.AddLibrary(
         "+<component/common/api/wifi/wifi_simple_config.c>",
         "+<component/common/api/wifi/wifi_util.c>",
         "+<component/common/api/lwip_netconf.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/api_lib.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/api_msg.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/err.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/netbuf.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/netdb.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/netifapi.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/sockets.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/api/tcpip.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/autoip.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/icmp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/igmp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/inet.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/inet_chksum.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/ip.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/ip_addr.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/ip_frag.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/def.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/dhcp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/dns.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/init.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/lwip_timers.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/mem.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/memp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/netif.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/pbuf.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/raw.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/stats.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/sys.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/tcp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/tcp_in.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/tcp_out.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/core/udp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/netif/etharp.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/port/realtek/freertos/ethernetif.c>",
         "+<component/common/drivers/wlan/realtek/src/osdep/lwip_intf.c>",
-        "+<component/common/network/lwip/lwip_v1.4.1/port/realtek/freertos/sys_arch.c>",
         "+<component/common/network/dhcp/dhcps.c>",
         "+<component/common/network/sntp/sntp.c>",
         "+<component/common/network/ssl/ssl_ram_map/ssl_ram_map.c>",
@@ -219,11 +184,6 @@ env.AddLibrary(
         "+<component/common/drivers/wlan/realtek/wlan_ram_map/rom>",
         "+<component/common/file_system>",
         "+<component/common/network>",
-        "+<component/common/network/lwip/lwip_v1.4.1/port/realtek/freertos>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/include>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/include/lwip>",
-        "+<component/common/network/lwip/lwip_v1.4.1/src/include/ipv4>",
-        "+<component/common/network/lwip/lwip_v1.4.1/port/realtek>",
         "+<component/common/network/ssl/mbedtls-2.4.0/include>",
         "+<component/common/network/ssl/ssl_ram_map/rom>",
         "+<component/common/utilities>",
@@ -244,6 +204,9 @@ env.AddLibrary(
     ],
 )
 
+# Sources - lwIP 1.4.1
+env.AddLibraryLwIP(version="1.4.1", port="amb1")
+
 # Sources - mbedTLS
 env.AddLibrary(
     name="ambz_mbedtls",
diff --git a/platform.json b/platform.json
index 07a7191..1cfcf68 100644
--- a/platform.json
+++ b/platform.json
@@ -30,6 +30,11 @@
       "version": "https://github.com/ambiot/amb1_sdk",
       "manifest": {
         "description": "SDK for Ameba1"
+      },
+      "libraries": {
+        "lwip": [
+          "v1.4.1-amb1"
+        ]
       }
     },
     "framework-arduino-api": {