From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de, Tom Rini <trini@konsulko.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
Harald Seiler <hws@denx.de>, Simon Glass <sjg@chromium.org>,
Sean Anderson <seanga2@gmail.com>,
Joe Hershberger <joe.hershberger@ni.com>,
Ramon Fried <rfried.dev@gmail.com>
Subject: [PATCH 13/26] net: Fix compiling SPL when fastboot is enabled
Date: Wed, 11 Oct 2023 21:56:13 -0400 [thread overview]
Message-ID: <20231012015626.3487451-14-seanga2@gmail.com> (raw)
In-Reply-To: <20231012015626.3487451-1-seanga2@gmail.com>
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@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
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;
--
2.37.1
next prev parent reply other threads:[~2023-10-12 2:24 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 1:56 [PATCH 00/26] test: spl: Test some load methods Sean Anderson
2023-10-12 1:56 ` [PATCH 01/26] spl: legacy: Fix referencing _image_binary_end Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:30 ` Sean Anderson
2023-10-12 15:28 ` Simon Glass
2023-10-12 1:56 ` [PATCH 02/26] spl: nor: Don't allocate header on stack Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 7:26 ` Michael Nazzareno Trimarchi
2023-10-12 1:56 ` [PATCH 03/26] spl: fit: Fix entry point for SPL_LOAD_FIT_FULL Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:28 ` Sean Anderson
2023-10-12 15:20 ` Tom Rini
2023-10-12 15:28 ` Simon Glass
2023-10-12 1:56 ` [PATCH 04/26] arm: imx: Fix i.MX8 container load address Sean Anderson
2023-10-12 1:56 ` [PATCH 05/26] arm: imx: Add newlines after error messages Sean Anderson
2023-10-12 7:33 ` Heinrich Schuchardt
2023-10-12 1:56 ` [PATCH 06/26] arm: imx: Add function to validate i.MX8 containers Sean Anderson
2023-10-12 1:56 ` [PATCH 07/26] arm: imx: Check header before calling spl_load_imx_container Sean Anderson
2023-10-12 7:44 ` Heinrich Schuchardt
2023-10-13 0:48 ` Sean Anderson
2023-10-12 16:40 ` Tom Rini
2023-10-13 1:39 ` Sean Anderson
2023-10-13 12:55 ` Tom Rini
2023-10-12 1:56 ` [PATCH 08/26] Move i.MX8 container image loading support to common/spl Sean Anderson
2023-10-12 1:56 ` [PATCH 09/26] spl: Allow enabling SPL_OF_REAL and SPL_OF_PLATDATA at the same time Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:22 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 10/26] lib: acpi: Fix linking SPL when ACPIGEN is enabled Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 11/26] fs: ext4: Fix building ext4 in SPL if write " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 12/26] fs: Compile in sandbox filesystem in SPL if it " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 6:39 ` Heinrich Schuchardt
2023-10-12 14:15 ` Sean Anderson
2023-10-12 14:50 ` Tom Rini
2023-10-12 14:52 ` Tom Rini
2023-10-12 1:56 ` Sean Anderson [this message]
2023-10-12 3:41 ` [PATCH 13/26] net: Fix compiling SPL when fastboot " Simon Glass
2023-10-12 6:52 ` Heinrich Schuchardt
2023-10-12 14:16 ` Sean Anderson
2023-10-12 14:52 ` Tom Rini
2023-10-12 1:56 ` [PATCH 14/26] net: bootp: Move port numbers to header Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 6:53 ` Heinrich Schuchardt
2023-10-12 1:56 ` [PATCH 15/26] net: bootp: Fall back to BOOTP from DHCP when unit testing Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 7:16 ` Heinrich Schuchardt
2023-10-12 14:18 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 16/26] spl: Don't cache devices when UNIT_TEST is enabled Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:18 ` Sean Anderson
2023-10-12 7:23 ` Heinrich Schuchardt
2023-10-12 14:19 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 17/26] spl: Use map_sysmem where appropriate Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 18/26] test: spl: Split tests up and use some configs Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 19/26] test: spl: Fix spl_test_load not failing if fname doesn't exist Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 20/26] test: spl: Add functions to create images Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-13 19:44 ` [SPAM] " Xavier Drudis Ferran
2023-10-14 14:37 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 21/26] test: spl: Add functions to create filesystems Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:11 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 22/26] test: spl: Add a test for spl_blk_load_image Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 23/26] test: spl: Add a test for the MMC load method Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:12 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 24/26] test: spl: Add a test for the NET " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:11 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 25/26] test: spl: Add a test for the NOR " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:16 ` Sean Anderson
2023-10-12 15:28 ` Simon Glass
2023-10-12 1:56 ` [PATCH 26/26] test: spl: Add a test for the SPI " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:59 ` [PATCH 00/26] test: spl: Test some load methods Sean Anderson
2023-10-12 3:41 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231012015626.3487451-14-seanga2@gmail.com \
--to=seanga2@gmail.com \
--cc=hws@denx.de \
--cc=joe.hershberger@ni.com \
--cc=rfried.dev@gmail.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox