diff options
| author | Tom Rini <[email protected]> | 2025-04-23 08:53:23 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-04-23 08:53:23 -0600 |
| commit | 5d4a6995bb4311203a024200a402508fdf5d7dfb (patch) | |
| tree | 6410ca5d2528856f84e425630d9109ea2961070b /common | |
| parent | 4446bc331c65d3efb8a9321d6368c61edb56479b (diff) | |
| parent | 49ae68536f234c423c78e89913c64ae9b87ed0e8 (diff) | |
Merge tag 'net-20250423' of https://source.denx.de/u-boot/custodians/u-boot-net
Pull request net-20250423
net:
- Make initr_net() invocation command line agnostic
net-legacy:
- net: dhcpv6: remove excluded middle expression
- net: dhcp6: Send DHCPv6 using multicast MAC
net-lwip:
- lwIP sandbox tests
misc:
- cmd: Remove CMD_NET protection
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c index 65d74e3c092..bc6fd6448c2 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -509,7 +509,7 @@ static int initr_boot_led_on(void) return 0; } -#if defined(CONFIG_CMD_NET) +#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP) static int initr_net(void) { puts("Net: "); @@ -779,7 +779,7 @@ static void initcall_run_r(void) #if CONFIG_IS_ENABLED(PCI_ENDPOINT) INITCALL(pci_ep_init); #endif -#if CONFIG_IS_ENABLED(CMD_NET) +#if CONFIG_IS_ENABLED(NET) || CONFIG_IS_ENABLED(NET_LWIP) WATCHDOG_RESET(); INITCALL(initr_net); #endif |