On Thu, 6 Jun 2024 at 16:36, Jerome Forissier
<jerome.foriss...@linaro.org> wrote:
>
> Build the lwIP library when NET_LWIP is enabled. The following files
> are adaptation layers written specially for U-Boot:
>
> lib/lwip/u-boot/arch/cc.h
> lib/lwip/u-boot/arch/sys_arch.h (empty)
> lib/lwip/u-boot/limits.h (empty)
> lib/lwip/u-boot/lwipopts.h
>
> They were initially contributed by Maxim in a previous RFC patch series.
>
> Signed-off-by: Jerome Forissier <jerome.foriss...@linaro.org>
> Co-developed-by: Maxim Uvarov <muva...@gmail.com>
> Cc: Maxim Uvarov <muva...@gmail.com>
> ---
> lib/Makefile | 2 +
> lib/lwip/Makefile | 57 +++++++++
> lib/lwip/u-boot/arch/cc.h | 43 +++++++
> lib/lwip/u-boot/arch/sys_arch.h | 0
> lib/lwip/u-boot/limits.h | 0
> lib/lwip/u-boot/lwipopts.h | 197 ++++++++++++++++++++++++++++++++
> 6 files changed, 299 insertions(+)
> create mode 100644 lib/lwip/Makefile
> create mode 100644 lib/lwip/u-boot/arch/cc.h
> create mode 100644 lib/lwip/u-boot/arch/sys_arch.h
> create mode 100644 lib/lwip/u-boot/limits.h
> create mode 100644 lib/lwip/u-boot/lwipopts.h
>
> diff --git a/lib/Makefile b/lib/Makefile
> index 2a76acf100d..c35786a0576 100644
> --- a/lib/Makefile
> +++ b/lib/Makefile
> @@ -94,6 +94,8 @@ obj-$(CONFIG_LIBAVB) += libavb/
> obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += libfdt/
> obj-$(CONFIG_$(SPL_TPL_)OF_REAL) += fdtdec_common.o fdtdec.o
>
> +obj-$(CONFIG_NET_LWIP) += lwip/
> +
> ifdef CONFIG_SPL_BUILD
> obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16-ccitt.o
> obj-$(CONFIG_$(SPL_TPL_)HASH) += crc16-ccitt.o
> diff --git a/lib/lwip/Makefile b/lib/lwip/Makefile
> new file mode 100644
> index 00000000000..158e59b91fc
> --- /dev/null
> +++ b/lib/lwip/Makefile
> @@ -0,0 +1,57 @@
> +# SPDX-License-Identifier: GPL-2.0+
> +#
> +# Copyright (C) 2024 Linaro Ltd.
> +
> +ccflags-y += -I$(srctree)/lib/lwip/lwip/src/include
> -I$(srctree)/lib/lwip/u-boot
> +
> +obj-y += \
> + lwip/src/api/api_lib.o \
> + lwip/src/api/api_msg.o \
> + lwip/src/api/err.o \
> + lwip/src/api/if_api.o \
> + lwip/src/api/netbuf.o \
> + lwip/src/api/netdb.o \
> + lwip/src/api/netifapi.o \
> + lwip/src/api/sockets.o \
> + lwip/src/api/tcpip.o \
> + lwip/src/apps/http/http_client.o \
> + lwip/src/apps/tftp/tftp.o \
> + lwip/src/core/altcp_alloc.o \
> + lwip/src/core/altcp.o \
> + lwip/src/core/altcp_tcp.o \
> + lwip/src/core/def.o \
> + lwip/src/core/dns.o \
> + lwip/src/core/inet_chksum.o \
> + lwip/src/core/init.o \
> + lwip/src/core/ip.o \
> + lwip/src/core/ipv4/acd.o \
> + lwip/src/core/ipv4/autoip.o \
> + lwip/src/core/ipv4/dhcp.o \
> + lwip/src/core/ipv4/etharp.o \
> + lwip/src/core/ipv4/icmp.o \
> + lwip/src/core/ipv4/igmp.o \
> + lwip/src/core/ipv4/ip4_addr.o \
> + lwip/src/core/ipv4/ip4.o \
> + lwip/src/core/ipv4/ip4_frag.o \
> + lwip/src/core/ipv6/dhcp6.o \
> + lwip/src/core/ipv6/ethip6.o \
> + lwip/src/core/ipv6/icmp6.o \
> + lwip/src/core/ipv6/inet6.o \
> + lwip/src/core/ipv6/ip6_addr.o \
> + lwip/src/core/ipv6/ip6.o \
> + lwip/src/core/ipv6/ip6_frag.o \
> + lwip/src/core/ipv6/mld6.o \
> + lwip/src/core/ipv6/nd6.o \
> + lwip/src/core/mem.o \
> + lwip/src/core/memp.o \
> + lwip/src/core/netif.o \
> + lwip/src/core/pbuf.o \
> + lwip/src/core/raw.o \
> + lwip/src/core/stats.o \
> + lwip/src/core/sys.o \
> + lwip/src/core/tcp.o \
> + lwip/src/core/tcp_in.o \
> + lwip/src/core/tcp_out.o \
> + lwip/src/core/timeouts.o \
> + lwip/src/core/udp.o \
> + lwip/src/netif/ethernet.o
> diff --git a/lib/lwip/u-boot/arch/cc.h b/lib/lwip/u-boot/arch/cc.h
> new file mode 100644
> index 00000000000..31c036dc0c5
> --- /dev/null
> +++ b/lib/lwip/u-boot/arch/cc.h
> @@ -0,0 +1,43 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/* Copyright (C) 2023 Linaro Ltd. <maxim.uva...@linaro.org> */
> +
> +#ifndef LWIP_ARCH_CC_H
> +#define LWIP_ARCH_CC_H
> +
> +#include <linux/types.h>
> +#include <linux/kernel.h>
> +#include <vsprintf.h>
> +#include <rand.h>
> +
> +#define LWIP_ERRNO_INCLUDE <errno.h>
> +
> +#define LWIP_ERRNO_STDINCLUDE 1
> +#define LWIP_NO_UNISTD_H 1
> +#define LWIP_TIMEVAL_PRIVATE 1
> +
> +#ifdef CONFIG_LIB_RAND
> +#define LWIP_RAND() ((u32_t)rand())
> +#endif
> +
> +/* different handling for unit test, normally not needed */
> +#ifdef LWIP_NOASSERT_ON_ERROR
> +#define LWIP_ERROR(message, expression, handler) do { if (!(expression)) { \
> + handler; }} while (0)
> +#endif
> +
> +#define LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
> +
> +#define LWIP_PLATFORM_ASSERT(x) do {printf("Assertion \"%s\" failed at line
> %d in %s\n", \
> + x, __LINE__, __FILE__); } while (0)
> +
> +#define atoi(str) (int)dectoul(str, NULL)
> +#define lwip_strnstr(a, b) strnstr(a, b)
> +
> +#define LWIP_ERR_T int
> +#define LWIP_CONST_CAST(target_type, val) ((target_type)((uintptr_t)val))
> +
> +#if defined(CONFIG_SYS_BIG_ENDIAN)
> +#define BYTE_ORDER BIG_ENDIAN
> +#endif
> +
> +#endif /* LWIP_ARCH_CC_H */
> diff --git a/lib/lwip/u-boot/arch/sys_arch.h b/lib/lwip/u-boot/arch/sys_arch.h
> new file mode 100644
> index 00000000000..e69de29bb2d
> diff --git a/lib/lwip/u-boot/limits.h b/lib/lwip/u-boot/limits.h
> new file mode 100644
> index 00000000000..e69de29bb2d
> diff --git a/lib/lwip/u-boot/lwipopts.h b/lib/lwip/u-boot/lwipopts.h
> new file mode 100644
> index 00000000000..aac0a6259fd
> --- /dev/null
> +++ b/lib/lwip/u-boot/lwipopts.h
> @@ -0,0 +1,197 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +
> +/* Copyright (C) 2023 Linaro Ltd. <maxim.uva...@linaro.org> */
> +
> +#ifndef LWIP_UBOOT_LWIPOPTS_H
> +#define LWIP_UBOOT_LWIPOPTS_H
> +
> +#if defined(CONFIG_LWIP_DEBUG)
> +#define LWIP_DEBUG 1
> +#define LWIP_DBG_MIN_LEVEL LWIP_DBG_LEVEL_ALL
> +#define LWIP_DBG_TYPES_ON LWIP_DBG_ON
> +#define ETHARP_DEBUG LWIP_DBG_ON
> +#define NETIF_DEBUG LWIP_DBG_ON
> +#define PBUF_DEBUG LWIP_DBG_OFF
> +#define API_LIB_DEBUG LWIP_DBG_ON
> +#define API_MSG_DEBUG LWIP_DBG_OFF
> +#define SOCKETS_DEBUG LWIP_DBG_OFF
> +#define ICMP_DEBUG LWIP_DBG_OFF
> +#define IGMP_DEBUG LWIP_DBG_OFF
> +#define INET_DEBUG LWIP_DBG_OFF
> +#define IP_DEBUG LWIP_DBG_ON
> +#define IP_REASS_DEBUG LWIP_DBG_OFF
> +#define RAW_DEBUG LWIP_DBG_OFF
> +#define MEM_DEBUG LWIP_DBG_OFF
> +#define MEMP_DEBUG LWIP_DBG_OFF
> +#define SYS_DEBUG LWIP_DBG_OFF
> +#define TIMERS_DEBUG LWIP_DBG_ON
> +#define TCP_DEBUG LWIP_DBG_OFF
> +#define TCP_INPUT_DEBUG LWIP_DBG_OFF
> +#define TCP_FR_DEBUG LWIP_DBG_OFF
> +#define TCP_RTO_DEBUG LWIP_DBG_OFF
> +#define TCP_CWND_DEBUG LWIP_DBG_OFF
> +#define TCP_WND_DEBUG LWIP_DBG_OFF
> +#define TCP_OUTPUT_DEBUG LWIP_DBG_OFF
> +#define TCP_RST_DEBUG LWIP_DBG_OFF
> +#define TCP_QLEN_DEBUG LWIP_DBG_OFF
> +#define UDP_DEBUG LWIP_DBG_OFF
> +#define TCPIP_DEBUG LWIP_DBG_OFF
> +#define SLIP_DEBUG LWIP_DBG_OFF
> +#define DHCP_DEBUG LWIP_DBG_ON
> +#define AUTOIP_DEBUG LWIP_DBG_ON
> +#define DNS_DEBUG LWIP_DBG_ON
> +#define IP6_DEBUG LWIP_DBG_OFF
> +#define DHCP6_DEBUG LWIP_DBG_OFF
> +#else
> +#define LWIP_DBG_MIN_LEVEL LWIP_DBG_LEVEL_ALL
> +#define LWIP_DBG_TYPES_ON LWIP_DBG_OFF
> +#define ETHARP_DEBUG LWIP_DBG_OFF
> +#define NETIF_DEBUG LWIP_DBG_OFF
> +#define PBUF_DEBUG LWIP_DBG_OFF
> +#define API_LIB_DEBUG LWIP_DBG_OFF
> +#define API_MSG_DEBUG LWIP_DBG_OFF
> +#define SOCKETS_DEBUG LWIP_DBG_OFF
> +#define ICMP_DEBUG LWIP_DBG_OFF
> +#define IGMP_DEBUG LWIP_DBG_OFF
> +#define INET_DEBUG LWIP_DBG_OFF
> +#define IP_DEBUG LWIP_DBG_OFF
> +#define IP_REASS_DEBUG LWIP_DBG_OFF
> +#define RAW_DEBUG LWIP_DBG_OFF
> +#define MEM_DEBUG LWIP_DBG_OFF
> +#define MEMP_DEBUG LWIP_DBG_OFF
> +#define SYS_DEBUG LWIP_DBG_OFF
> +#define TIMERS_DEBUG LWIP_DBG_OFF
> +#define TCP_DEBUG LWIP_DBG_OFF
> +#define TCP_INPUT_DEBUG LWIP_DBG_OFF
> +#define TCP_FR_DEBUG LWIP_DBG_OFF
> +#define TCP_RTO_DEBUG LWIP_DBG_OFF
> +#define TCP_CWND_DEBUG LWIP_DBG_OFF
> +#define TCP_WND_DEBUG LWIP_DBG_OFF
> +#define TCP_OUTPUT_DEBUG LWIP_DBG_OFF
> +#define TCP_RST_DEBUG LWIP_DBG_OFF
> +#define TCP_QLEN_DEBUG LWIP_DBG_OFF
> +#define UDP_DEBUG LWIP_DBG_OFF
> +#define TCPIP_DEBUG LWIP_DBG_OFF
> +#define SLIP_DEBUG LWIP_DBG_OFF
> +#define DHCP_DEBUG LWIP_DBG_OFF
> +#define AUTOIP_DEBUG LWIP_DBG_OFF
> +#define DNS_DEBUG LWIP_DBG_OFF
> +#define IP6_DEBUG LWIP_DBG_OFF
> +#define DHCP6_DEBUG LWIP_DBG_OFF
> +#endif
> +#define LWIP_TESTMODE 0
> +
> +#if !defined(CONFIG_LWIP_ASSERT)
> +#define LWIP_NOASSERT 1
> +#define LWIP_ASSERT(message, assertion)
> +#endif
> +
> +#include "lwip/debug.h"
> +
> +#define SYS_LIGHTWEIGHT_PROT 0
> +#define NO_SYS 1
> +
> +#define LWIP_IPV4 1
> +#define LWIP_IPV6 0
> +
> +#define MEM_ALIGNMENT 1
> +#define MEM_SIZE 1600
> +
> +#define MEMP_NUM_PBUF 4
> +#define MEMP_NUM_RAW_PCB 2
> +#define MEMP_NUM_UDP_PCB 4
> +#define MEMP_NUM_TCP_PCB 2
> +#define MEMP_NUM_TCP_PCB_LISTEN 2
> +#define MEMP_NUM_TCP_SEG 16
> +#define MEMP_NUM_REASSDATA 1
> +#define MEMP_NUM_ARP_QUEUE 2
> +#define MEMP_NUM_SYS_TIMEOUT 4
> +#define MEMP_NUM_NETBUF 2
> +#define MEMP_NUM_NETCONN 32
> +#define MEMP_NUM_TCPIP_MSG_API 8
> +#define MEMP_NUM_TCPIP_MSG_INPKT 8
> +#define PBUF_POOL_SIZE 8
> +
> +#define LWIP_ARP 1
> +#define ARP_TABLE_SIZE 1
> +#define ARP_QUEUEING 0
> +
> +#define IP_FORWARD 0
> +#define IP_OPTIONS_ALLOWED 1
> +#define IP_REASSEMBLY 0
> +#define IP_FRAG 0
> +#define IP_REASS_MAXAGE 3
> +#define IP_REASS_MAX_PBUFS 4
> +#define IP_FRAG_USES_STATIC_BUF 0
> +
> +#define IP_DEFAULT_TTL 255
> +
> +#define LWIP_ICMP 0
> +
> +#if defined(CONFIG_PROT_RAW_LWIP)
> +#define LWIP_RAW 1
> +#else
> +#define LWIP_RAW 0
> +#endif
> +
> +#if defined(CONFIG_PROT_DHCP_LWIP)
> +#define LWIP_DHCP 1
> +#define LWIP_DHCP_BOOTP_FILE 1
> +#else
> +#define LWIP_DHCP 0
> +#endif
> +
> +#define LWIP_DHCP_DOES_ACD_CHECK 0
> +
> +#define LWIP_AUTOIP 0
> +
> +#define LWIP_SNMP 0
> +
> +#define LWIP_IGMP 0
> +
> +#if defined(CONFIG_PROT_DNS_LWIP)
> +#define LWIP_DNS 1
> +#define DNS_TABLE_SIZE 1
> +#else
> +#define LWIP_DNS 0
> +#endif
> +
> +#if defined(CONFIG_PROT_UDP_LWIP)
> +#define LWIP_UDP 1
> +#else
> +#define LWIP_UDP 0
> +#endif
> +
> +#if defined(CONFIG_PROT_TCP_LWIP)
> +#define LWIP_TCP 1
> +#else
> +#define LWIP_TCP 0
> +#endif
> +
> +#define LWIP_LISTEN_BACKLOG 0
> +
> +#define PBUF_LINK_HLEN 14
> +#define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 +
> PBUF_LINK_HLEN)
> +
> +#define LWIP_HAVE_LOOPIF 0
> +
> +#define LWIP_NETCONN 0
> +#define LWIP_DISABLE_MEMP_SANITY_CHECKS 1
> +
> +#define LWIP_SOCKET 0
> +#define SO_REUSE 0
> +
> +#define LWIP_STATS 0
> +
> +#define PPP_SUPPORT 0
> +
> +#define LWIP_TCPIP_CORE_LOCKING 0
> +
> +#define LWIP_NETIF_LOOPBACK 0
> +
> +/* use malloc instead of pool */
> +#define MEMP_MEM_MALLOC 1
> +#define MEMP_MEM_INIT 1
> +#define MEM_LIBC_MALLOC 1
> +
> +#endif /* LWIP_UBOOT_LWIPOPTS_H */
> --
> 2.40.1
>
Acked-by: Ilias Apalodimas <ilias.apalodi...@linaro.org>
