From: Ravi Gunasekaran <r-gunasekaran@ti.com>
To: MD Danish Anwar <danishanwar@ti.com>, Nishanth Menon <nm@ti.com>,
Igor Opaniuk <igor.opaniuk@foundries.io>,
Andrew Davis <afd@ti.com>, Tom Rini <trini@konsulko.com>
Cc: <u-boot@lists.denx.de>, <srk@ti.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
Roger Quadros <rogerq@kernel.org>,
Ravi Gunasekaran <r-gunasekaran@ti.com>
Subject: Re: [PATCH] arm: mach-k3: Fix config check for FS_LOADER
Date: Mon, 18 Mar 2024 14:42:56 +0530 [thread overview]
Message-ID: <cb640669-643d-cbde-9f55-b0ebd969669c@ti.com> (raw)
In-Reply-To: <20240314143311.259568-1-danishanwar@ti.com>
On 3/14/24 8:03 PM, MD Danish Anwar wrote:
> load_firmware() API calls fs-loader APIs and checks for CONFIG_FS_LOADER
> before calling those APIs. The if check only checks for CONFIG_FS_LOADER
> but not for CONFIG_SPL_FS_LOADER.
>
> When CONFIG_FS_LOADER is enabled, load_firmware() API calls fs-loader APIs
> but this is done at SPL stage and at this time FS_LOADER is not built yet
> as a result we see below build error.
>
> AR spl/boot/built-in.o
> LD spl/u-boot-spl
> arm-none-linux-gnueabihf-ld.bfd: arch/arm/mach-k3/common.o: in function
> `load_firmware':
> /home/danish/workspace/u-boot/arch/arm/mach-k3/common.c:184: undefined
> reference to `get_fs_loader'
> arm-none-linux-gnueabihf-ld.bfd:
> /home/danish/workspace/u-boot/arch/arm/mach-k3/common.c:185: undefined
> reference to `request_firmware_into_buf'
> make[2]: *** [/home/danish/workspace/u-boot/scripts/Makefile.spl:527:
> spl/u-boot-spl] Error 1
> make[1]: *** [/home/danish/workspace/u-boot/Makefile:2055:
> spl/u-boot-spl] Error 2
> make[1]: Leaving directory '/home/danish/uboot_images/am64x/r5'
> make: *** [Makefile:177: sub-make] Error 2
>
> Fix this by modifying the if check to CONFIG_IS_ENABLED(FS_LOADER) instead
> of IS_ENABLED(CONFIG_FS_LOADER) as the former will check for the
> appropriate config option (CONFIG_SPL_FS_LOADER / CONFIG_FS_LOADER) based
> on the build stage.
>
> Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
> ---
> arch/arm/mach-k3/r5/common.c | 2 +-
> arch/arm/mach-omap2/boot-common.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-k3/r5/common.c b/arch/arm/mach-k3/r5/common.c
> index 7309573a3f..c02f8d3309 100644
> --- a/arch/arm/mach-k3/r5/common.c
> +++ b/arch/arm/mach-k3/r5/common.c
> @@ -70,7 +70,7 @@ int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr)
> char *name = NULL;
> int size = 0;
>
> - if (!IS_ENABLED(CONFIG_FS_LOADER))
> + if (!CONFIG_IS_ENABLED(FS_LOADER))
> return 0;
>
> *loadaddr = 0;
> diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
> index 57917da25c..aa0ab13d5f 100644
> --- a/arch/arm/mach-omap2/boot-common.c
> +++ b/arch/arm/mach-omap2/boot-common.c
> @@ -190,7 +190,7 @@ int load_firmware(char *name_fw, u32 *loadaddr)
> struct udevice *fsdev;
> int size = 0;
>
> - if (!IS_ENABLED(CONFIG_FS_LOADER))
> + if (!CONFIG_IS_ENABLED(FS_LOADER))
> return 0;
>
> if (!*loadaddr)
Acked-by: Ravi Gunasekaran <r-gunasekaran@ti.com>
--
Regards,
Ravi
next prev parent reply other threads:[~2024-03-18 9:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-14 14:33 [PATCH] arm: mach-k3: Fix config check for FS_LOADER MD Danish Anwar
2024-03-14 14:33 ` MD Danish Anwar
2024-03-18 9:12 ` Ravi Gunasekaran [this message]
2024-03-20 12:42 ` Tom Rini
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=cb640669-643d-cbde-9f55-b0ebd969669c@ti.com \
--to=r-gunasekaran@ti.com \
--cc=afd@ti.com \
--cc=danishanwar@ti.com \
--cc=igor.opaniuk@foundries.io \
--cc=nm@ti.com \
--cc=rogerq@kernel.org \
--cc=srk@ti.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=vigneshr@ti.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox