diff options
| author | Tom Rini <[email protected]> | 2022-12-07 18:08:01 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-12-07 18:08:01 -0500 |
| commit | 2b2e9127ccdacdd1170dfcd2a4f1794ff9446fb1 (patch) | |
| tree | c43505efa6b8a29f4382024c6ef606e9a9d34d94 /cmd | |
| parent | b071de98433c9bcc5a44e005a7c7b7cda1333bb9 (diff) | |
| parent | e524f3a449f58e2ef967fb9b64b01db3d099a27a (diff) | |
Merge branch '2022-12-07-Kconfig-migrations' into next
- Import another batch of Kconfig migrations and in this case, also
legacy code removal.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/net.c | 2 | ||||
| -rw-r--r-- | cmd/usb.c | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/cmd/net.c b/cmd/net.c index 0e9f200ca97..dd50930a362 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -597,7 +597,6 @@ U_BOOT_CMD( #endif /* CONFIG_CMD_LINK_LOCAL */ -#ifdef CONFIG_DM_ETH static int do_net_list(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { const struct udevice *current = eth_get_dev(); @@ -640,7 +639,6 @@ U_BOOT_CMD( "NET sub-system", "list - list available devices\n" ); -#endif // CONFIG_DM_ETH #if defined(CONFIG_CMD_NCSI) static int do_ncsi(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) diff --git a/cmd/usb.c b/cmd/usb.c index 2ba056982c3..73addb04c49 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -591,16 +591,6 @@ static void do_usb_start(void) drv_usb_kbd_init(); # endif #endif /* !CONFIG_DM_USB */ -#ifdef CONFIG_USB_HOST_ETHER -# ifdef CONFIG_DM_ETH -# ifndef CONFIG_DM_USB -# error "You must use CONFIG_DM_USB if you want to use CONFIG_USB_HOST_ETHER with CONFIG_DM_ETH" -# endif -# else - /* try to recognize ethernet devices immediately */ - usb_ether_curr_dev = usb_host_eth_scan(1); -# endif -#endif } #ifdef CONFIG_DM_USB |