From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>,
Jagan Teki <jagan@amarulasolutions.com>,
Matteo Lisi <matteo.lisi@engicam.com>,
Patrice Chotard <patrice.chotard@foss.st.com>,
Patrick Delaunay <patrick.delaunay@foss.st.com>,
uboot-stm32@st-md-mailman.stormreply.com
Subject: [PATCH 081/171] Correct SPL uses of ENV_IS_IN_UBI
Date: Mon, 30 Jan 2023 07:41:54 -0700 [thread overview]
Message-ID: <20230130144324.206208-82-sjg@chromium.org> (raw)
In-Reply-To: <20230130144324.206208-1-sjg@chromium.org>
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_ENV_IS_IN_UBI defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
board/engicam/stm32mp1/stm32mp1.c | 2 +-
board/st/stm32mp1/stm32mp1.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/engicam/stm32mp1/stm32mp1.c b/board/engicam/stm32mp1/stm32mp1.c
index 0a3e580f5b4..5223e9bae8d 100644
--- a/board/engicam/stm32mp1/stm32mp1.c
+++ b/board/engicam/stm32mp1/stm32mp1.c
@@ -68,7 +68,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
case BOOT_FLASH_NAND:
case BOOT_FLASH_SPINAND:
- if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI))
+ if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI))
return ENVL_UBI;
else
return ENVL_NOWHERE;
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index b9fc240d5b6..7cff9e3d860 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -831,7 +831,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
case BOOT_FLASH_NAND:
case BOOT_FLASH_SPINAND:
- if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI))
+ if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI))
return ENVL_UBI;
else
return ENVL_NOWHERE;
--
2.39.1.456.gfc5497dd1b-goog
next prev parent reply other threads:[~2023-01-30 15:13 UTC|newest]
Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 14:40 [PATCH 000/171] Kconfig: More cleanup of CONFIG options Simon Glass
2023-01-30 14:40 ` [PATCH 001/171] moveconfig: Update to detect / correct missing SPL Kconfigs Simon Glass
2023-01-30 14:40 ` [PATCH 002/171] x86: Correct Chrromebook typo Simon Glass
2023-01-30 14:40 ` [PATCH 003/171] boot: Add a Kconfig for SPL_FIT_CIPHER Simon Glass
2023-01-30 14:40 ` [PATCH 004/171] boot: Add a Kconfig for SPL_BOOTSTD_FULL Simon Glass
2023-01-30 14:40 ` [PATCH 005/171] boot: Add Kconfigs for BOOTMETH_VBE_REQUEST Simon Glass
2023-01-30 14:40 ` [PATCH 006/171] boot: Add a Kconfig for SPL_BOOTDEV_SPI_FLASH Simon Glass
2023-01-30 14:40 ` [PATCH 007/171] boot: Add a Kconfig for SPL_BOOTDEV_ETH Simon Glass
2023-01-30 14:40 ` [PATCH 008/171] dm: Add a Kconfig for SPL_DEVRES Simon Glass
2023-01-30 14:40 ` [PATCH 009/171] dm: Add a Kconfig for SPL_DM_HWSPINLOCK Simon Glass
2023-01-30 14:40 ` [PATCH 010/171] boot: Add a Kconfig for SPL_OF_LIVE Simon Glass
2023-01-30 14:40 ` [PATCH 011/171] cmd: Add a Kconfig for SPL_CRC32_VERIFY Simon Glass
2023-01-30 14:40 ` [PATCH 012/171] console: Add a Kconfig for SPL_CONSOLE_MUX et al Simon Glass
2023-01-30 14:40 ` [PATCH 013/171] button: Add a Kconfig for SPL_BUTTON Simon Glass
2023-01-30 14:40 ` [PATCH 014/171] lib: Add a Kconfig for SPL_ERRNO_STR Simon Glass
2023-01-30 14:51 ` Heinrich Schuchardt
2023-01-30 14:53 ` Tom Rini
2023-01-31 14:16 ` Simon Glass
2023-01-30 14:40 ` [PATCH 015/171] iommu: Add a Kconfig for SPL_IOMMU Simon Glass
2023-01-30 16:23 ` Mark Kettenis
2023-02-05 1:21 ` Simon Glass
2023-01-30 14:40 ` [PATCH 016/171] iommu: Add a Kconfig for SPL_PINCTRL_ARMADA_38X Simon Glass
2023-01-30 16:19 ` Mark Kettenis
2023-01-30 16:29 ` Tom Rini
2023-01-30 18:16 ` Pali Rohár
2023-01-30 18:25 ` Tom Rini
2023-01-30 18:28 ` Pali Rohár
2023-01-30 18:59 ` Tom Rini
2023-01-30 19:02 ` Pali Rohár
2023-01-30 14:40 ` [PATCH 017/171] virtio: Add a Kconfig for SPL_VIRTIO Simon Glass
2023-01-30 14:40 ` [PATCH 018/171] lib: Add a Kconfig for SPL_BZIP2 Simon Glass
2023-01-30 14:40 ` [PATCH 019/171] lib: Add a Kconfig for SPL_GENERATE_ACPI_TABLE Simon Glass
2023-01-30 14:50 ` Heinrich Schuchardt
2023-01-30 14:52 ` Tom Rini
2023-01-30 15:18 ` Mark Kettenis
2023-01-30 15:27 ` Tom Rini
2023-01-30 15:29 ` Simon Glass
2023-01-30 15:38 ` Mark Kettenis
2023-02-05 1:21 ` Simon Glass
2023-02-05 2:01 ` Tom Rini
2023-01-30 14:40 ` [PATCH 020/171] efi: Add a Kconfig for SPL_EFI_LOADER et all Simon Glass
2023-01-30 14:48 ` Heinrich Schuchardt
2023-01-30 14:51 ` Tom Rini
2023-02-05 1:21 ` Simon Glass
2023-02-05 2:01 ` Tom Rini
2023-01-30 14:40 ` [PATCH 021/171] acpi: Add a Kconfig for SPL_ACPIGEN Simon Glass
2023-01-30 14:40 ` [PATCH 022/171] rockchip: Add a Kconfig for SPL_RESET_ROCKCHIP Simon Glass
2023-01-30 14:40 ` [PATCH 023/171] mediatek: Add a Kconfig for SPL_RESET_MEDIATEK Simon Glass
2023-01-30 14:40 ` [PATCH 024/171] Correct SPL use of A003399_NOR_WORKAROUND Simon Glass
2023-01-30 14:40 ` [PATCH 025/171] Correct SPL use of AHCI Simon Glass
2023-01-30 14:40 ` [PATCH 026/171] Correct SPL uses of ALLEYCAT_5 Simon Glass
2023-01-30 14:41 ` [PATCH 027/171] Correct SPL uses of ARCH_MVEBU Simon Glass
2023-01-30 14:41 ` [PATCH 028/171] Correct SPL use of ARCH_VERSAL Simon Glass
2023-01-30 14:41 ` [PATCH 029/171] Correct SPL use of ARCH_ZYNQ Simon Glass
2023-01-30 14:41 ` [PATCH 030/171] Correct SPL use of ARM64 Simon Glass
2023-01-30 14:41 ` [PATCH 031/171] Correct SPL uses of ARMADA_3700 Simon Glass
2023-01-30 14:41 ` [PATCH 032/171] Correct SPL uses of ARMADA_8K Simon Glass
2023-01-30 14:41 ` [PATCH 033/171] Correct SPL use of ATMEL_PIO4 Simon Glass
2023-01-30 14:41 ` [PATCH 034/171] Correct SPL use of BNXT_ETH Simon Glass
2023-01-30 14:41 ` [PATCH 035/171] Correct SPL use of BOOTSTAGE_FDT Simon Glass
2023-01-30 14:41 ` [PATCH 036/171] Correct SPL uses of BOOTSTAGE_REPORT Simon Glass
2023-01-30 14:41 ` [PATCH 037/171] Correct SPL use of CMD_BCB Simon Glass
2023-01-30 14:41 ` [PATCH 038/171] Correct SPL uses of CMD_BOOTEFI_BOOTMGR Simon Glass
2023-01-30 14:41 ` [PATCH 039/171] Correct SPL use of CMD_BOOTI Simon Glass
2023-01-30 14:41 ` [PATCH 040/171] Correct SPL uses of CMD_BOOTM_PRE_LOAD Simon Glass
2023-01-30 14:41 ` [PATCH 041/171] Correct SPL use of CMD_BOOTZ Simon Glass
2023-01-30 14:41 ` [PATCH 042/171] Correct SPL uses of CMD_CLK Simon Glass
2023-01-30 14:54 ` Sean Anderson
2023-01-30 14:41 ` [PATCH 043/171] Correct SPL uses of CMD_DHCP Simon Glass
2023-01-30 14:41 ` [PATCH 044/171] Correct SPL uses of CMD_EFICONFIG Simon Glass
2023-01-30 14:41 ` [PATCH 045/171] Correct SPL use of CMD_ERASEENV Simon Glass
2023-01-30 14:41 ` [PATCH 046/171] Correct SPL uses of CMD_FDT Simon Glass
2023-01-30 14:41 ` [PATCH 047/171] Correct SPL use of CMD_FRU Simon Glass
2023-01-30 14:41 ` [PATCH 048/171] Correct SPL use of CMD_HASH Simon Glass
2023-01-30 14:41 ` [PATCH 049/171] Correct SPL use of CMD_MBR Simon Glass
2023-01-30 14:41 ` [PATCH 050/171] Correct SPL uses of CMD_MMC Simon Glass
2023-01-30 14:41 ` [PATCH 051/171] Correct SPL use of CMD_NET Simon Glass
2023-01-30 14:41 ` [PATCH 052/171] Correct SPL use of CMD_NVEDIT_EFI Simon Glass
2023-01-30 14:41 ` [PATCH 053/171] Correct SPL uses of CMD_NVME Simon Glass
2023-01-30 14:41 ` [PATCH 054/171] Correct SPL use of CMD_PSTORE Simon Glass
2023-01-30 14:41 ` [PATCH 055/171] Correct SPL uses of CMD_PXE Simon Glass
2023-01-30 14:41 ` [PATCH 056/171] Correct SPL uses of CMD_SCSI Simon Glass
2023-01-30 14:41 ` [PATCH 057/171] Correct SPL uses of CMD_SF Simon Glass
2023-01-30 14:41 ` [PATCH 058/171] Correct SPL use of CMD_SHA1SUM Simon Glass
2023-01-30 14:41 ` [PATCH 059/171] Correct SPL use of CMD_STBOARD Simon Glass
2023-01-30 14:41 ` [PATCH 060/171] Correct SPL use of CMD_STM32PROG Simon Glass
2023-01-30 14:41 ` [PATCH 061/171] Correct SPL uses of CMD_TFTPPUT Simon Glass
2023-01-30 14:41 ` [PATCH 062/171] Correct SPL uses of CMD_USB Simon Glass
2023-01-30 14:41 ` [PATCH 063/171] Correct SPL use of CMD_VIRTIO Simon Glass
2023-01-30 14:41 ` [PATCH 064/171] Correct SPL uses of CPU_MICROBLAZE Simon Glass
2023-01-30 14:41 ` [PATCH 065/171] Correct SPL use of DEBUG_UART_ZYNQ Simon Glass
2023-01-30 14:41 ` [PATCH 066/171] Correct SPL uses of DFU_VIRT Simon Glass
2023-01-30 14:41 ` [PATCH 067/171] Correct SPL uses of DISPLAY_AER_BRIEF Simon Glass
2023-01-30 14:41 ` [PATCH 068/171] Correct SPL uses of DISPLAY_AER_FULL Simon Glass
2023-01-30 14:41 ` [PATCH 069/171] Correct SPL use of DISPLAY_CPUINFO Simon Glass
2023-01-30 14:41 ` [PATCH 070/171] Correct SPL use of DM_RNG Simon Glass
2023-01-30 14:41 ` [PATCH 071/171] Correct SPL uses of DTB_RESELECT Simon Glass
2023-01-30 14:41 ` [PATCH 072/171] Correct SPL uses of DWC_ETH_QOS Simon Glass
2023-01-30 14:41 ` [PATCH 073/171] Correct SPL use of EFI_APP Simon Glass
2023-01-30 14:41 ` [PATCH 074/171] Correct SPL use of EFI_DEVICE_PATH_UTIL Simon Glass
2023-01-30 14:41 ` [PATCH 075/171] Correct SPL uses of EFI_HAVE_CAPSULE_SUPPORT Simon Glass
2023-01-30 14:41 ` [PATCH 076/171] Correct SPL use of EFI_LOADER_HII Simon Glass
2023-01-30 14:41 ` [PATCH 077/171] Correct SPL use of EFI_MM_COMM_TEE Simon Glass
2023-01-30 14:41 ` [PATCH 078/171] Correct SPL use of EFI_SECURE_BOOT Simon Glass
2023-01-30 14:41 ` [PATCH 079/171] Correct SPL use of EFI_TCG2_PROTOCOL Simon Glass
2023-01-30 14:41 ` [PATCH 080/171] Correct SPL use of EFI_UNICODE_COLLATION_PROTOCOL2 Simon Glass
2023-01-30 14:41 ` Simon Glass [this message]
2023-01-30 14:41 ` [PATCH 082/171] Correct SPL uses of ENV_VARS_UBOOT_RUNTIME_CONFIG Simon Glass
2023-01-30 14:41 ` [PATCH 083/171] Correct SPL use of ENV_WRITEABLE_LIST Simon Glass
2023-01-30 14:41 ` [PATCH 084/171] Correct SPL use of EXYNOS7420 Simon Glass
2023-01-30 14:41 ` [PATCH 085/171] Correct SPL uses of FASTBOOT Simon Glass
2023-01-30 14:41 ` [PATCH 086/171] Correct SPL uses of FASTBOOT_FLASH Simon Glass
2023-01-31 16:56 ` Mattijs Korpershoek
2023-01-30 14:42 ` [PATCH 087/171] Correct SPL uses of FASTBOOT_FLASH_MMC Simon Glass
2023-01-31 16:57 ` Mattijs Korpershoek
2023-01-30 14:42 ` [PATCH 088/171] Correct SPL uses of FASTBOOT_FLASH_NAND Simon Glass
2023-01-31 16:58 ` Mattijs Korpershoek
2023-01-30 14:42 ` [PATCH 089/171] Correct SPL use of FASTBOOT_MMC_USER_SUPPORT Simon Glass
2023-01-30 14:42 ` [PATCH 090/171] Correct SPL use of FDT_SIMPLEFB Simon Glass
2023-01-30 14:42 ` [PATCH 091/171] Correct SPL uses of FEC_MXC Simon Glass
2023-01-30 14:42 ` [PATCH 092/171] Correct SPL use of FSL_CAAM Simon Glass
2023-01-30 14:42 ` [PATCH 093/171] Correct SPL uses of FSL_ISBC_KEY_EXT Simon Glass
2023-01-30 14:42 ` [PATCH 094/171] Correct SPL use of FSL_MC_ENET Simon Glass
2023-01-30 14:42 ` [PATCH 095/171] Correct SPL use of FSP_VERSION2 Simon Glass
2023-01-30 14:42 ` [PATCH 096/171] Correct SPL use of FS_EROFS Simon Glass
2023-01-30 14:42 ` Simon Glass
2023-01-31 2:57 ` Huang Jianan
2023-01-30 14:42 ` [PATCH 097/171] Correct SPL use of GENERATE_SMBIOS_TABLE Simon Glass
2023-01-30 14:42 ` [PATCH 098/171] Correct SPL uses of GMAC_ROCKCHIP Simon Glass
2023-01-30 14:42 ` [PATCH 099/171] Correct SPL use of HUSH_PARSER Simon Glass
2023-01-30 14:42 ` [PATCH 100/171] Correct SPL uses of HW_WATCHDOG Simon Glass
2023-01-31 1:14 ` ChiaWei Wang
2023-01-30 15:10 ` [PATCH 000/171] Kconfig: More cleanup of CONFIG options Tom Rini
2023-01-31 14:16 ` 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=20230130144324.206208-82-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=jagan@amarulasolutions.com \
--cc=matteo.lisi@engicam.com \
--cc=patrice.chotard@foss.st.com \
--cc=patrick.delaunay@foss.st.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=uboot-stm32@st-md-mailman.stormreply.com \
/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.