diff options
| author | Tom Rini <[email protected]> | 2025-07-08 09:34:47 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-07-08 09:34:47 -0600 |
| commit | f75eaf7356933661ae13b1f5c815ac6ed475eab3 (patch) | |
| tree | fa5b17e5a5b2bad591c4e44a06bd6bef6cae778e /lib | |
| parent | b379335f141e3ddca0cdbb5d9d39af0444530542 (diff) | |
| parent | 203be3197de1016236f55652ce8ee4cbfe3035ad (diff) | |
Merge tag 'net-next-20250708' of https://source.denx.de/u-boot/custodians/u-boot-net
Pull request net-next-20250708
lwip:
- Call sys_check_timeouts() and schedule() on RX to fix an issue on
boards with a watchdog and simplify the code
- Enable IP_FRAG and IP_REASSEMBLY
- Add support for setting the TFTP blocksize at runtime
- Fix DNS initialization in wget
- Add the sntp command
- Move code from net/lwip/${cmd}.c to cmd/lwip/${cmd}.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lwip/Makefile | 1 | ||||
| -rw-r--r-- | lib/lwip/u-boot/arch/cc.h | 4 | ||||
| -rw-r--r-- | lib/lwip/u-boot/lwipopts.h | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/lib/lwip/Makefile b/lib/lwip/Makefile index e9e8caee93a..c3f0e916f66 100644 --- a/lib/lwip/Makefile +++ b/lib/lwip/Makefile @@ -13,6 +13,7 @@ obj-y += \ lwip/src/api/sockets.o \ lwip/src/api/tcpip.o \ lwip/src/apps/http/http_client.o \ + lwip/src/apps/sntp/sntp.o \ lwip/src/apps/tftp/tftp.o \ lwip/src/core/altcp_alloc.o \ lwip/src/core/altcp.o \ diff --git a/lib/lwip/u-boot/arch/cc.h b/lib/lwip/u-boot/arch/cc.h index 6104c296f6f..f91127ac565 100644 --- a/lib/lwip/u-boot/arch/cc.h +++ b/lib/lwip/u-boot/arch/cc.h @@ -43,4 +43,8 @@ #define BYTE_ORDER BIG_ENDIAN #endif +#define SNTP_STARTUP_DELAY 0 +void sntp_set_system_time(uint32_t sec); +#define SNTP_SET_SYSTEM_TIME(sec) sntp_set_system_time(sec) + #endif /* LWIP_ARCH_CC_H */ diff --git a/lib/lwip/u-boot/lwipopts.h b/lib/lwip/u-boot/lwipopts.h index edac74ff7a2..46af91f9410 100644 --- a/lib/lwip/u-boot/lwipopts.h +++ b/lib/lwip/u-boot/lwipopts.h @@ -72,8 +72,8 @@ #define IP_FORWARD 0 #define IP_OPTIONS_ALLOWED 1 -#define IP_REASSEMBLY 0 -#define IP_FRAG 0 +#define IP_REASSEMBLY 1 +#define IP_FRAG 1 #define IP_REASS_MAXAGE 3 #define IP_REASS_MAX_PBUFS 4 #define IP_FRAG_USES_STATIC_BUF 0 @@ -162,4 +162,8 @@ #define LWIP_ALTCP_TLS_MBEDTLS 1 #endif +#if defined(CONFIG_CMD_SNTP) +#define LWIP_DHCP_GET_NTP_SRV 1 +#endif + #endif /* LWIP_UBOOT_LWIPOPTS_H */ |