* [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8
@ 2023-02-05 22:44 Simon Glass
2023-02-05 22:44 ` [PATCH v2 153/169] Correct SPL use of TEE Simon Glass
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_TARGET_PG_WCOM_SELI8 defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
Aleksandar Gerasimovski <aleksandar.gerasimovski@hitachienergy.com>
---
(no changes since v1)
board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
index c65cd9cdc9b..2f1731eea6a 100644
--- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
+++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
@@ -71,7 +71,7 @@ int board_early_init_f(void)
/* QRIO Configuration */
qrio_uprstreq(UPREQ_CORE_RST);
-#if CONFIG_IS_ENABLED(TARGET_PG_WCOM_SELI8)
+#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_SELI8)
qrio_prstcfg(KM_LIU_RST, PRSTCFG_POWUP_UNIT_RST);
qrio_wdmask(KM_LIU_RST, true);
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 153/169] Correct SPL use of TEE
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 155/169] Correct SPL use of TPM_RNG Simon Glass
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_TEE defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
include/tee.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/tee.h b/include/tee.h
index 13f6096b9a6..ab0c5832613 100644
--- a/include/tee.h
+++ b/include/tee.h
@@ -328,7 +328,7 @@ bool tee_shm_is_registered(struct tee_shm *shm, struct udevice *dev);
* Returns a probed TEE device of the first TEE device matched by the
* match() callback or NULL.
*/
-#if CONFIG_IS_ENABLED(TEE)
+#if IS_ENABLED(CONFIG_TEE)
struct udevice *tee_find_device(struct udevice *start,
int (*match)(struct tee_version_data *vers,
const void *data),
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 155/169] Correct SPL use of TPM_RNG
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
2023-02-05 22:44 ` [PATCH v2 153/169] Correct SPL use of TEE Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 156/169] Correct SPL use of UDP_FUNCTION_FASTBOOT Simon Glass
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_TPM_RNG defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
drivers/tpm/tpm-uclass.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 5ff0cd3958c..b2286f7e7ed 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -156,7 +156,7 @@ static int tpm_uclass_post_probe(struct udevice *dev)
const char *drv = TPM_RNG_DRV_NAME;
struct udevice *child;
- if (CONFIG_IS_ENABLED(TPM_RNG)) {
+ if (IS_ENABLED(CONFIG_TPM_RNG)) {
ret = device_find_first_child_by_uclass(dev, UCLASS_RNG,
&child);
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 156/169] Correct SPL use of UDP_FUNCTION_FASTBOOT
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
2023-02-05 22:44 ` [PATCH v2 153/169] Correct SPL use of TEE Simon Glass
2023-02-05 22:44 ` [PATCH v2 155/169] Correct SPL use of TPM_RNG Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 157/169] Correct SPL use of USB_DWC3_MESON_G12A Simon Glass
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass, Mattijs Korpershoek
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_UDP_FUNCTION_FASTBOOT defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
---
(no changes since v1)
cmd/fastboot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index b94dbd54884..17c53bbe277 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -21,7 +21,7 @@ static int do_fastboot_udp(int argc, char *const argv[],
{
int err;
- if (!CONFIG_IS_ENABLED(UDP_FUNCTION_FASTBOOT)) {
+ if (!IS_ENABLED(CONFIG_UDP_FUNCTION_FASTBOOT)) {
pr_err("Fastboot UDP not enabled\n");
return CMD_RET_FAILURE;
}
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 157/169] Correct SPL use of USB_DWC3_MESON_G12A
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (2 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 156/169] Correct SPL use of UDP_FUNCTION_FASTBOOT Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 158/169] Correct SPL uses of USB_DWC3_MESON_GXL Simon Glass
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_USB_DWC3_MESON_G12A defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
arch/arm/mach-meson/board-g12a.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index 2e59eee8f79..d9f1acdef74 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -97,7 +97,7 @@ static struct mm_region g12a_mem_map[] = {
struct mm_region *mem_map = g12a_mem_map;
-#if CONFIG_IS_ENABLED(USB_DWC3_MESON_G12A) && \
+#if IS_ENABLED(CONFIG_USB_DWC3_MESON_G12A) && \
CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
static struct dwc2_plat_otg_data meson_g12a_dwc2_data;
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 158/169] Correct SPL uses of USB_DWC3_MESON_GXL
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (3 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 157/169] Correct SPL use of USB_DWC3_MESON_G12A Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 159/169] Correct SPL use of USB_FUNCTION_FASTBOOT Simon Glass
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_USB_DWC3_MESON_GXL defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
arch/arm/mach-meson/board-axg.c | 2 +-
arch/arm/mach-meson/board-gx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index 236ec815799..8bcb0b3a212 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -91,7 +91,7 @@ static struct mm_region axg_mem_map[] = {
struct mm_region *mem_map = axg_mem_map;
-#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \
+#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \
CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
static struct dwc2_plat_otg_data meson_gx_dwc2_data;
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index 01fafd81c48..41f767302ec 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -109,7 +109,7 @@ static struct mm_region gx_mem_map[] = {
struct mm_region *mem_map = gx_mem_map;
-#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \
+#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \
CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
static struct dwc2_plat_otg_data meson_gx_dwc2_data;
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 159/169] Correct SPL use of USB_FUNCTION_FASTBOOT
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (4 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 158/169] Correct SPL uses of USB_DWC3_MESON_GXL Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 160/169] Correct SPL uses of USB_GADGET_DWC2_OTG Simon Glass
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass, Mattijs Korpershoek
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_USB_FUNCTION_FASTBOOT defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
---
(no changes since v1)
cmd/fastboot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 17c53bbe277..97dc02ce748 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -44,7 +44,7 @@ static int do_fastboot_usb(int argc, char *const argv[],
char *endp;
int ret;
- if (!CONFIG_IS_ENABLED(USB_FUNCTION_FASTBOOT)) {
+ if (!IS_ENABLED(CONFIG_USB_FUNCTION_FASTBOOT)) {
pr_err("Fastboot USB not enabled\n");
return CMD_RET_FAILURE;
}
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 160/169] Correct SPL uses of USB_GADGET_DWC2_OTG
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (5 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 159/169] Correct SPL use of USB_FUNCTION_FASTBOOT Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 162/169] Correct SPL uses of USB_MUSB_HOST Simon Glass
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 3 usages of this option to the non-SPL form, since there is
no SPL_USB_GADGET_DWC2_OTG defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
arch/arm/mach-meson/board-axg.c | 2 +-
arch/arm/mach-meson/board-g12a.c | 2 +-
arch/arm/mach-meson/board-gx.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index 8bcb0b3a212..4baf045d416 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -92,7 +92,7 @@ static struct mm_region axg_mem_map[] = {
struct mm_region *mem_map = axg_mem_map;
#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \
- CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
+ IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG)
static struct dwc2_plat_otg_data meson_gx_dwc2_data;
int board_usb_init(int index, enum usb_init_type init)
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index d9f1acdef74..46507c6a0f9 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -98,7 +98,7 @@ static struct mm_region g12a_mem_map[] = {
struct mm_region *mem_map = g12a_mem_map;
#if IS_ENABLED(CONFIG_USB_DWC3_MESON_G12A) && \
- CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
+ IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG)
static struct dwc2_plat_otg_data meson_g12a_dwc2_data;
int board_usb_init(int index, enum usb_init_type init)
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index 41f767302ec..b850460c26c 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -110,7 +110,7 @@ static struct mm_region gx_mem_map[] = {
struct mm_region *mem_map = gx_mem_map;
#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \
- CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
+ IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG)
static struct dwc2_plat_otg_data meson_gx_dwc2_data;
int board_usb_init(int index, enum usb_init_type init)
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 162/169] Correct SPL uses of USB_MUSB_HOST
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (6 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 160/169] Correct SPL uses of USB_GADGET_DWC2_OTG Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 163/169] Correct SPL uses of VIDEO Simon Glass
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_USB_MUSB_HOST defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
drivers/phy/phy-ab8500-usb.c | 2 +-
drivers/usb/musb-new/omap2430.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/phy/phy-ab8500-usb.c b/drivers/phy/phy-ab8500-usb.c
index 0e04595717b..3d3d48c9733 100644
--- a/drivers/phy/phy-ab8500-usb.c
+++ b/drivers/phy/phy-ab8500-usb.c
@@ -19,7 +19,7 @@ static int ab8500_usb_phy_power_on(struct phy *phy)
struct udevice *dev = phy->dev;
uint set = AB8500_BIT_PHY_CTRL_DEVICE_EN;
- if (CONFIG_IS_ENABLED(USB_MUSB_HOST))
+ if (IS_ENABLED(CONFIG_USB_MUSB_HOST))
set = AB8500_BIT_PHY_CTRL_HOST_EN;
return pmic_clrsetbits(dev->parent, AB8500_USB_PHY_CTRL_REG,
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index 42e7abddbc2..482dfdc6be6 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -231,7 +231,7 @@ static int omap2430_musb_probe(struct udevice *dev)
otg_board_data = &plat->otg_board_data;
- if (CONFIG_IS_ENABLED(USB_MUSB_HOST)) {
+ if (IS_ENABLED(CONFIG_USB_MUSB_HOST)) {
struct musb_host_data *host = dev_get_priv(dev);
struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 163/169] Correct SPL uses of VIDEO
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (7 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 162/169] Correct SPL uses of USB_MUSB_HOST Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 164/169] Correct SPL use of VIDEO_ANSI Simon Glass
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_VIDEO defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
cmd/cls.c | 2 +-
common/fdt_simplefb.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmd/cls.c b/cmd/cls.c
index 18643ec0243..787c7edbee3 100644
--- a/cmd/cls.c
+++ b/cmd/cls.c
@@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc,
/* Send clear screen and home */
printf(CSI "2J" CSI "1;1H");
- if (CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) {
+ if (IS_ENABLED(CONFIG_VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) {
if (uclass_first_device_err(UCLASS_VIDEO, &dev))
return CMD_RET_FAILURE;
if (video_clear(dev))
diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c
index 71d4c8fde90..282c34fe0b9 100644
--- a/common/fdt_simplefb.c
+++ b/common/fdt_simplefb.c
@@ -82,7 +82,7 @@ int fdt_simplefb_enable_existing_node(void *blob)
return fdt_simplefb_configure_node(blob, off);
}
-#if CONFIG_IS_ENABLED(VIDEO)
+#if IS_ENABLED(CONFIG_VIDEO)
int fdt_simplefb_enable_and_mem_rsv(void *blob)
{
struct fdt_memory mem;
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 164/169] Correct SPL use of VIDEO_ANSI
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (8 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 163/169] Correct SPL uses of VIDEO Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 166/169] Correct SPL use of VIDEO_BPP32 Simon Glass
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_VIDEO_ANSI defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
cmd/cls.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/cls.c b/cmd/cls.c
index 787c7edbee3..40a32eeab63 100644
--- a/cmd/cls.c
+++ b/cmd/cls.c
@@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc,
/* Send clear screen and home */
printf(CSI "2J" CSI "1;1H");
- if (IS_ENABLED(CONFIG_VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) {
+ if (IS_ENABLED(CONFIG_VIDEO) && !IS_ENABLED(CONFIG_VIDEO_ANSI)) {
if (uclass_first_device_err(UCLASS_VIDEO, &dev))
return CMD_RET_FAILURE;
if (video_clear(dev))
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 166/169] Correct SPL use of VIDEO_BPP32
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (9 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 164/169] Correct SPL use of VIDEO_ANSI Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 167/169] Correct SPL use of WATCHDOG_AUTOSTART Simon Glass
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_VIDEO_BPP32 defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
drivers/video/video-uclass.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index f36970e0420..6aaacff10df 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -203,7 +203,7 @@ u32 video_index_to_colour(struct video_priv *priv, unsigned int idx)
}
break;
case VIDEO_BPP32:
- if (CONFIG_IS_ENABLED(VIDEO_BPP32)) {
+ if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
if (priv->format == VIDEO_X2R10G10B10)
return (colours[idx].r << 22) |
(colours[idx].g << 12) |
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 167/169] Correct SPL use of WATCHDOG_AUTOSTART
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (10 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 166/169] Correct SPL use of VIDEO_BPP32 Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 168/169] Correct SPL uses of XEN_SERIAL Simon Glass
2023-02-05 22:44 ` [PATCH v2 169/169] Correct SPL uses of ZYNQMP_FIRMWARE Simon Glass
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_WATCHDOG_AUTOSTART defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
board/kontron/sl28/sl28.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c
index e78a0d5dd3c..89948e087f1 100644
--- a/board/kontron/sl28/sl28.c
+++ b/board/kontron/sl28/sl28.c
@@ -157,7 +157,7 @@ int fsl_board_late_init(void)
* If the watchdog isn't enabled at reset (which is a configuration
* option) disabling it doesn't hurt either.
*/
- if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART))
+ if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART))
stop_recovery_watchdog();
return 0;
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 168/169] Correct SPL uses of XEN_SERIAL
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (11 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 167/169] Correct SPL use of WATCHDOG_AUTOSTART Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
2023-02-05 22:44 ` [PATCH v2 169/169] Correct SPL uses of ZYNQMP_FIRMWARE Simon Glass
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 4 usages of this option to the non-SPL form, since there is
no SPL_XEN_SERIAL defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
drivers/xen/events.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 532216fece3..2ebe20dbf26 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -23,9 +23,9 @@
#include <xen/events.h>
#include <xen/hvm.h>
-#if CONFIG_IS_ENABLED(XEN_SERIAL)
+#if IS_ENABLED(CONFIG_XEN_SERIAL)
extern u32 console_evtchn;
-#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */
+#endif /* IS_ENABLED(CONFIG_XEN_SERIAL) */
#define NR_EVS 1024
@@ -53,10 +53,10 @@ void unbind_all_ports(void)
struct vcpu_info *vcpu_info = &s->vcpu_info[cpu];
for (i = 0; i < NR_EVS; i++) {
-#if CONFIG_IS_ENABLED(XEN_SERIAL)
+#if IS_ENABLED(CONFIG_XEN_SERIAL)
if (i == console_evtchn)
continue;
-#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */
+#endif /* IS_ENABLED(CONFIG_XEN_SERIAL) */
if (test_and_clear_bit(i, bound_ports)) {
printf("port %d still bound!\n", i);
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 169/169] Correct SPL uses of ZYNQMP_FIRMWARE
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
` (12 preceding siblings ...)
2023-02-05 22:44 ` [PATCH v2 168/169] Correct SPL uses of XEN_SERIAL Simon Glass
@ 2023-02-05 22:44 ` Simon Glass
13 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-02-05 22:44 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini, Simon Glass
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_ZYNQMP_FIRMWARE defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Rebase to previous series
- Drop patch to add a Kconfig for SPL_EFI_LOADER et al
- Drop patch to add a Kconfig for SPL_GENERATE_ACPI_TABLE
drivers/spi/cadence_ospi_versal.c | 2 +-
drivers/spi/cadence_qspi.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/cadence_ospi_versal.c b/drivers/spi/cadence_ospi_versal.c
index e0d5e6b9e69..434c6038f3b 100644
--- a/drivers/spi/cadence_ospi_versal.c
+++ b/drivers/spi/cadence_ospi_versal.c
@@ -216,7 +216,7 @@ int cadence_qspi_versal_flash_reset(struct udevice *dev)
void cadence_qspi_apb_enable_linear_mode(bool enable)
{
- if (CONFIG_IS_ENABLED(ZYNQMP_FIRMWARE)) {
+ if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) {
if (enable)
/* ahb read mode */
xilinx_pm_request(PM_IOCTL, PM_DEV_OSPI,
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 3ce5f8fb8d8..c7f10c50132 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -215,7 +215,7 @@ static int cadence_spi_probe(struct udevice *bus)
priv->tchsh_ns = plat->tchsh_ns;
priv->tslch_ns = plat->tslch_ns;
- if (CONFIG_IS_ENABLED(ZYNQMP_FIRMWARE))
+ if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE))
xilinx_pm_request(PM_REQUEST_NODE, PM_DEV_OSPI,
ZYNQMP_PM_CAPABILITY_ACCESS, ZYNQMP_PM_MAX_QOS,
ZYNQMP_PM_REQUEST_ACK_NO, NULL);
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-02-05 23:09 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-05 22:44 [PATCH v2 152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 Simon Glass
2023-02-05 22:44 ` [PATCH v2 153/169] Correct SPL use of TEE Simon Glass
2023-02-05 22:44 ` [PATCH v2 155/169] Correct SPL use of TPM_RNG Simon Glass
2023-02-05 22:44 ` [PATCH v2 156/169] Correct SPL use of UDP_FUNCTION_FASTBOOT Simon Glass
2023-02-05 22:44 ` [PATCH v2 157/169] Correct SPL use of USB_DWC3_MESON_G12A Simon Glass
2023-02-05 22:44 ` [PATCH v2 158/169] Correct SPL uses of USB_DWC3_MESON_GXL Simon Glass
2023-02-05 22:44 ` [PATCH v2 159/169] Correct SPL use of USB_FUNCTION_FASTBOOT Simon Glass
2023-02-05 22:44 ` [PATCH v2 160/169] Correct SPL uses of USB_GADGET_DWC2_OTG Simon Glass
2023-02-05 22:44 ` [PATCH v2 162/169] Correct SPL uses of USB_MUSB_HOST Simon Glass
2023-02-05 22:44 ` [PATCH v2 163/169] Correct SPL uses of VIDEO Simon Glass
2023-02-05 22:44 ` [PATCH v2 164/169] Correct SPL use of VIDEO_ANSI Simon Glass
2023-02-05 22:44 ` [PATCH v2 166/169] Correct SPL use of VIDEO_BPP32 Simon Glass
2023-02-05 22:44 ` [PATCH v2 167/169] Correct SPL use of WATCHDOG_AUTOSTART Simon Glass
2023-02-05 22:44 ` [PATCH v2 168/169] Correct SPL uses of XEN_SERIAL Simon Glass
2023-02-05 22:44 ` [PATCH v2 169/169] Correct SPL uses of ZYNQMP_FIRMWARE Simon Glass
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.