From: Troy Kisky <troykiskyboundary@gmail.com>
To: sjg@chromium.org, trini@konsulko.com, u-boot@lists.denx.de
Cc: gary.bisson@lairdconnect.com,
"Troy Kisky" <troykiskyboundary@gmail.com>,
"Marek Vasut" <marex@denx.de>,
"Matwey V. Kornilov" <matwey.kornilov@gmail.com>,
"Pali Rohár" <pali@kernel.org>,
"Peter Hoyes" <Peter.Hoyes@arm.com>
Subject: [PATCH v2 11/26] config_distro_bootcmd: remove booting environment variables from SPL environment
Date: Fri, 24 Feb 2023 10:10:32 -0800 [thread overview]
Message-ID: <20230224181047.2775829-12-troykiskyboundary@gmail.com> (raw)
In-Reply-To: <20230224181047.2775829-1-troykiskyboundary@gmail.com>
SPL environments don't need commands that they can never use.
Avoid errors with CONFIG_IS_ENABLED conversions by skipping them now.
Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
include/config_distro_bootcmd.h | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 9d2a225e7eb..2a136b96a6d 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -35,11 +35,15 @@
#devtypel "_boot=" \
BOOTENV_SHARED_BLKDEV_BODY(devtypel)
+#define BOOTENV_DEV_BLKDEV_NONE(devtypeu, devtypel, instance)
+
#define BOOTENV_DEV_BLKDEV(devtypeu, devtypel, instance) \
"bootcmd_" #devtypel #instance "=" \
"devnum=" #instance "; " \
"run " #devtypel "_boot\0"
+#define BOOTENV_DEV_NAME_BLKDEV_NONE(devtypeu, devtypel, instance)
+
#define BOOTENV_DEV_NAME_BLKDEV(devtypeu, devtypel, instance) \
#devtypel #instance " "
@@ -59,6 +63,10 @@
#define BOOTENV_SHARED_MMC BOOTENV_SHARED_BLKDEV(mmc)
#define BOOTENV_DEV_MMC BOOTENV_DEV_BLKDEV
#define BOOTENV_DEV_NAME_MMC BOOTENV_DEV_NAME_BLKDEV
+#elif defined(CONFIG_SPL_BUILD)
+#define BOOTENV_SHARED_MMC
+#define BOOTENV_DEV_MMC BOOTENV_DEV_BLKDEV_NONE
+#define BOOTENV_DEV_NAME_MMC BOOTENV_DEV_NAME_BLKDEV_NONE
#else
#define BOOTENV_SHARED_MMC
#define BOOTENV_DEV_MMC \
@@ -190,6 +198,10 @@
#define BOOTENV_SHARED_SATA BOOTENV_SHARED_BLKDEV(sata)
#define BOOTENV_DEV_SATA BOOTENV_DEV_BLKDEV
#define BOOTENV_DEV_NAME_SATA BOOTENV_DEV_NAME_BLKDEV
+#elif defined(CONFIG_SPL_BUILD)
+#define BOOTENV_SHARED_SATA
+#define BOOTENV_DEV_SATA BOOTENV_DEV_BLKDEV_NONE
+#define BOOTENV_DEV_NAME_SATA BOOTENV_DEV_NAME_BLKDEV_NONE
#else
#define BOOTENV_SHARED_SATA
#define BOOTENV_DEV_SATA \
@@ -293,6 +305,11 @@
BOOTENV_SHARED_BLKDEV_BODY(usb)
#define BOOTENV_DEV_USB BOOTENV_DEV_BLKDEV
#define BOOTENV_DEV_NAME_USB BOOTENV_DEV_NAME_BLKDEV
+#elif defined(CONFIG_SPL_BUILD)
+#define BOOTENV_RUN_NET_USB_START
+#define BOOTENV_SHARED_USB
+#define BOOTENV_DEV_USB BOOTENV_DEV_BLKDEV_NONE
+#define BOOTENV_DEV_NAME_USB BOOTENV_DEV_NAME_BLKDEV_NONE
#else
#define BOOTENV_RUN_NET_USB_START
#define BOOTENV_SHARED_USB
@@ -395,6 +412,9 @@
"\0"
#define BOOTENV_DEV_NAME_DHCP(devtypeu, devtypel, instance) \
"dhcp "
+#elif defined(CONFIG_SPL_BUILD)
+#define BOOTENV_DEV_DHCP BOOTENV_DEV_BLKDEV_NONE
+#define BOOTENV_DEV_NAME_DHCP BOOTENV_DEV_NAME_BLKDEV_NONE
#else
#define BOOTENV_DEV_DHCP \
BOOT_TARGET_DEVICES_references_DHCP_without_CONFIG_CMD_DHCP
@@ -413,6 +433,9 @@
"fi\0"
#define BOOTENV_DEV_NAME_PXE(devtypeu, devtypel, instance) \
"pxe "
+#elif defined(CONFIG_SPL_BUILD)
+#define BOOTENV_DEV_PXE BOOTENV_DEV_BLKDEV_NONE
+#define BOOTENV_DEV_NAME_PXE BOOTENV_DEV_NAME_BLKDEV_NONE
#else
#define BOOTENV_DEV_PXE \
BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE
--
2.34.1
next prev parent reply other threads:[~2023-02-24 18:13 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 18:10 [PATCH v2 00/26] CONFIG_IS_ENABLED vs IS_ENABLED Troy Kisky
2023-02-24 18:10 ` [PATCH v2 01/26] kconfig: add IS_ENABLED_NOCHECK to bypass usage_of_is_enabled_check Troy Kisky
2023-02-26 14:56 ` Simon Glass
2023-02-24 18:10 ` [PATCH v2 02/26] cmd: nvedit: check for ENV_SUPPORT Troy Kisky
2023-03-01 15:33 ` Tom Rini
2023-03-09 19:20 ` Troy Kisky
2023-03-09 19:36 ` Tom Rini
2023-03-09 20:45 ` Troy Kisky
2023-03-10 23:29 ` Tom Rini
2023-02-24 18:10 ` [PATCH v2 03/26] lib: crc32: prepare for CONFIG_IS_ENABLED changes Troy Kisky
2023-03-01 15:33 ` Tom Rini
2023-02-24 18:10 ` [PATCH v2 04/26] lib: md5: " Troy Kisky
2023-02-24 18:10 ` [PATCH v2 05/26] lib: sha1: " Troy Kisky
2023-02-24 18:10 ` [PATCH v2 06/26] lib: sha256: " Troy Kisky
2023-02-24 18:10 ` [PATCH v2 07/26] lib: sha512: " Troy Kisky
2023-02-24 18:10 ` [PATCH v2 08/26] tools: prevent CONFIG_IS_ENABLED errors by including linux/kconfig.h Troy Kisky
2023-03-01 15:33 ` Tom Rini
2023-02-24 18:10 ` [PATCH v2 09/26] tools: Makefile: prepare for CONFIG_IS_ENABLED changes by adding CONFIG_TOOLS_xxx Troy Kisky
2023-03-01 15:33 ` Tom Rini
2023-03-02 18:21 ` Troy Kisky
2023-03-02 19:19 ` Tom Rini
2023-02-24 18:10 ` [PATCH v2 10/26] x86: cpu: qemu: qemu: remove SPL use with CONFIG_IS_ENABLED Troy Kisky
2023-02-24 18:10 ` Troy Kisky [this message]
2023-02-24 18:10 ` [PATCH v2 12/26] ofnode: fdt_support definitions needed if OF_CONTROL is enabled Troy Kisky
2023-02-24 18:10 ` [PATCH v2 13/26] ringneck-px30: use IS_ENABLED_NOCHECK to avoid CI test failure for ENV_IS_NOWHERE Troy Kisky
2023-02-26 14:56 ` Simon Glass
2023-02-24 18:10 ` [PATCH v2 14/26] puma-rk3399: " Troy Kisky
2023-02-26 14:56 ` Simon Glass
2023-03-01 15:33 ` Tom Rini
2023-02-24 18:10 ` [PATCH v2 15/26] fdt_support: always define fdt_fixup_mtdparts Troy Kisky
2023-02-24 18:10 ` [PATCH v2 16/26] m53menlo: define ft_board_setup only if CONFIG_IS_ENABLED(OF_LIBFDT) Troy Kisky
2023-02-24 18:10 ` [PATCH v2 17/26] freescale: common: pfuze: define pfuze_mode_init only if defined(CONFIG_DM_PMIC) Troy Kisky
2023-02-24 18:10 ` [PATCH v2 18/26] ns16550: match when to define bdf with uart code Troy Kisky
2023-02-24 18:10 ` [PATCH v2 19/26] solidrun: mx6cuboxi: use CONFIG_IS_ENABLED(SATA) instead of CONFIG_CMD_SATA Troy Kisky
2023-02-26 14:56 ` Simon Glass
2023-02-24 18:10 ` [PATCH v2 20/26] wandboard: use CONFIG_IS_ENABLED(SATA) instead of ifdef CONFIG_SATA Troy Kisky
2023-02-26 14:56 ` Simon Glass
2023-02-24 18:10 ` [PATCH v2 21/26] arm: mach-imx: use CONFIG_$(SPL_)SATA instead of CONFIG_SATA Troy Kisky
2023-02-24 18:10 ` [PATCH v2 22/26] x86: cpu: i386: cpu: only set pci_ram_top if CONFIG_IS_ENABLED(PCI) Troy Kisky
2023-02-26 14:56 ` Simon Glass
2023-02-24 18:10 ` [PATCH v2 23/26] gateworks: venice: Always define setup_fec and setup_eqos Troy Kisky
2023-02-26 14:56 ` Simon Glass
2023-02-24 18:10 ` [PATCH v2 24/26] power: pmic: add dm style definitions if not CONFIG_IS_ENABLED(POWER_LEGACY) Troy Kisky
2023-02-24 18:10 ` [PATCH v2 25/26] arm: cpu: armv7: ls102xa: fdt: remove eth_device support Troy Kisky
2023-02-24 18:10 ` [PATCH v2 26/26] CI: add test/usage_of_is_enabled_check.sh Troy Kisky
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=20230224181047.2775829-12-troykiskyboundary@gmail.com \
--to=troykiskyboundary@gmail.com \
--cc=Peter.Hoyes@arm.com \
--cc=gary.bisson@lairdconnect.com \
--cc=marex@denx.de \
--cc=matwey.kornilov@gmail.com \
--cc=pali@kernel.org \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.