aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJerome Forissier <jerome.forissier@linaro.org>2024-10-16 12:04:03 +0200
committerTom Rini <trini@konsulko.com>2024-10-16 11:11:56 -0600
commit98ad145db61a51308abb9de3212d4e3078d145c0 (patch)
tree6a7cef76b36dca65a3ba6e0daadaa930592b1bf5 /common
parent1c41a7afaa15dded7cc4c42be61fa811e034e97b (diff)
downloadu-boot-98ad145db61a51308abb9de3212d4e3078d145c0.zip
u-boot-98ad145db61a51308abb9de3212d4e3078d145c0.tar.gz
u-boot-98ad145db61a51308abb9de3212d4e3078d145c0.tar.bz2
net: lwip: add DHCP support and dhcp commmand
Add what it takes to enable NETDEVICES with NET_LWIP and enable DHCP as well as the dhcp command. CMD_TFTPBOOT is selected by BOOTMETH_EFI due to this code having an implicit dependency on do_tftpb(). Note that PXE is likely non-fonctional with NET_LWIP (or at least not 100% functional) because DHCP option 209 is not supported by the lwIP library. Therefore, BOOTP_PXE_DHCP_OPTION cannot be enabled. Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Tested-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c4
-rw-r--r--common/usb_kbd.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 1acad06..e5f33f4 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -484,7 +484,7 @@ static int initr_boot_led_on(void)
return 0;
}
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET)
static int initr_net(void)
{
puts("Net: ");
@@ -749,7 +749,7 @@ static init_fnc_t init_sequence_r[] = {
#ifdef CONFIG_PCI_ENDPOINT
pci_ep_init,
#endif
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET)
INIT_FUNC_WATCHDOG_RESET
initr_net,
#endif
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index bbfee23..36107a3 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -423,7 +423,7 @@ static int usb_kbd_testc(struct stdio_dev *sdev)
*/
unsigned long poll_delay = CONFIG_SYS_HZ / 50;
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_LWIP)
/*
* If net_busy_flag is 1, NET transfer is running,
* then we check key-pressed every second (first check may be