* [PATCH] cmd: mvebu/bubt: Correct usage of IS_ENABLED() macro
@ 2025-02-26 20:31 Tom Rini
2025-02-27 9:25 ` Stefan Roese
2025-04-16 13:31 ` Stefan Roese
0 siblings, 2 replies; 3+ messages in thread
From: Tom Rini @ 2025-02-26 20:31 UTC (permalink / raw)
To: u-boot; +Cc: Tim Harvey, Stefan Roese
This file was using IS_ENABLED() to test for CONFIG flags but omitted
the CONFIG_ prefix and so did not work as expected.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Stefan Roese <sr@denx.de>
This does change how some platforms are built.
---
cmd/mvebu/bubt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 5e4ffc40d729..6b7d9ee061d5 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -931,7 +931,7 @@ static int check_image_header(void)
size = le32_to_cpu(hdr->blocksize);
if (hdr->blockid == 0x78) { /* SATA id */
- struct blk_desc *blk_dev = IS_ENABLED(BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL;
+ struct blk_desc *blk_dev = IS_ENABLED(CONFIG_BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL;
unsigned long blksz = blk_dev ? blk_dev->blksz : 512;
offset *= blksz;
}
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] cmd: mvebu/bubt: Correct usage of IS_ENABLED() macro
2025-02-26 20:31 [PATCH] cmd: mvebu/bubt: Correct usage of IS_ENABLED() macro Tom Rini
@ 2025-02-27 9:25 ` Stefan Roese
2025-04-16 13:31 ` Stefan Roese
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2025-02-27 9:25 UTC (permalink / raw)
To: Tom Rini, u-boot; +Cc: Tim Harvey
On 26.02.25 21:31, Tom Rini wrote:
> This file was using IS_ENABLED() to test for CONFIG flags but omitted
> the CONFIG_ prefix and so did not work as expected.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Cc: Tim Harvey <tharvey@gateworks.com>
> Cc: Stefan Roese <sr@denx.de>
>
> This does change how some platforms are built.
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> cmd/mvebu/bubt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
> index 5e4ffc40d729..6b7d9ee061d5 100644
> --- a/cmd/mvebu/bubt.c
> +++ b/cmd/mvebu/bubt.c
> @@ -931,7 +931,7 @@ static int check_image_header(void)
> size = le32_to_cpu(hdr->blocksize);
>
> if (hdr->blockid == 0x78) { /* SATA id */
> - struct blk_desc *blk_dev = IS_ENABLED(BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL;
> + struct blk_desc *blk_dev = IS_ENABLED(CONFIG_BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL;
> unsigned long blksz = blk_dev ? blk_dev->blksz : 512;
> offset *= blksz;
> }
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] cmd: mvebu/bubt: Correct usage of IS_ENABLED() macro
2025-02-26 20:31 [PATCH] cmd: mvebu/bubt: Correct usage of IS_ENABLED() macro Tom Rini
2025-02-27 9:25 ` Stefan Roese
@ 2025-04-16 13:31 ` Stefan Roese
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2025-04-16 13:31 UTC (permalink / raw)
To: Tom Rini, u-boot; +Cc: Tim Harvey
On 26.02.25 21:31, Tom Rini wrote:
> This file was using IS_ENABLED() to test for CONFIG flags but omitted
> the CONFIG_ prefix and so did not work as expected.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> Cc: Tim Harvey <tharvey@gateworks.com>
> Cc: Stefan Roese <sr@denx.de>
>
> This does change how some platforms are built.
> ---
> cmd/mvebu/bubt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
> index 5e4ffc40d729..6b7d9ee061d5 100644
> --- a/cmd/mvebu/bubt.c
> +++ b/cmd/mvebu/bubt.c
> @@ -931,7 +931,7 @@ static int check_image_header(void)
> size = le32_to_cpu(hdr->blocksize);
>
> if (hdr->blockid == 0x78) { /* SATA id */
> - struct blk_desc *blk_dev = IS_ENABLED(BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL;
> + struct blk_desc *blk_dev = IS_ENABLED(CONFIG_BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL;
> unsigned long blksz = blk_dev ? blk_dev->blksz : 512;
> offset *= blksz;
> }
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-16 13:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-26 20:31 [PATCH] cmd: mvebu/bubt: Correct usage of IS_ENABLED() macro Tom Rini
2025-02-27 9:25 ` Stefan Roese
2025-04-16 13:31 ` Stefan Roese
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.