[PATCH 13/26] net: Fix compiling SPL when fastboot is enabled

[Heinrich Schuchardt]

On 10/12/23 03:56, Sean Anderson wrote:
> When fastboot is enabled in U-Boot proper and SPL_NET is enabled, we will
> try to (unsuccessfully) reference it in SPL. Fix these linker errors by
> conditioning on SPL_UDP/TCP_FUNCTION_FASTBOOT.
>
> Signed-off-by: Sean Anderson <seanga2 at gmail.com>
> ---
>
>   net/Makefile | 4 ++--
>   net/net.c    | 4 ++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/Makefile b/net/Makefile
> index 3e2d061338d..5ea58eef7e4 100644
> --- a/net/Makefile
> +++ b/net/Makefile
> @@ -27,8 +27,8 @@ obj-$(CONFIG_CMD_PCAP) += pcap.o
>   obj-$(CONFIG_CMD_RARP) += rarp.o
>   obj-$(CONFIG_CMD_SNTP) += sntp.o
>   obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
> -obj-$(CONFIG_UDP_FUNCTION_FASTBOOT)  += fastboot_udp.o
> -obj-$(CONFIG_TCP_FUNCTION_FASTBOOT)  += fastboot_tcp.o
> +obj-$(CONFIG_$(SPL_)UDP_FUNCTION_FASTBOOT)  += fastboot_udp.o
> +obj-$(CONFIG_$(SPL_)TCP_FUNCTION_FASTBOOT)  += fastboot_tcp.o

Please, use $(SPL_TPL) so that we don't have to revisit this should we
ever decide to enable fastboot in SPL in future.

Best regards

Heinrich

>   obj-$(CONFIG_CMD_WOL)  += wol.o
>   obj-$(CONFIG_PROT_UDP) += udp.o
>   obj-$(CONFIG_PROT_TCP) += tcp.o
> diff --git a/net/net.c b/net/net.c
> index e6f61f0f8f6..8357f084101 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -511,12 +511,12 @@ restart:
>   			tftp_start_server();
>   			break;
>   #endif
> -#if defined(CONFIG_UDP_FUNCTION_FASTBOOT)
> +#if CONFIG_IS_ENABLED(UDP_FUNCTION_FASTBOOT)
>   		case FASTBOOT_UDP:
>   			fastboot_udp_start_server();
>   			break;
>   #endif
> -#if defined(CONFIG_TCP_FUNCTION_FASTBOOT)
> +#if CONFIG_IS_ENABLED(TCP_FUNCTION_FASTBOOT)
>   		case FASTBOOT_TCP:
>   			fastboot_tcp_start_server();
>   			break;