From: Michal Simek <monstr@monstr.eu>
To: Simon Glass <sjg@chromium.org>, u-boot@lists.denx.de, git@xilinx.com
Cc: Alexandru Gagniuc <mr.nuke.me@gmail.com>,
Jan Kiszka <jan.kiszka@siemens.com>, Leo <ycliang@andestech.com>,
Marek Vasut <marex@denx.de>, Peter Hoyes <Peter.Hoyes@arm.com>,
Rick Chen <rick@andestech.com>, Tom Rini <trini@konsulko.com>
Subject: Re: [PATCH] arm: riscv: Remove additional ifdef from code guarded by CONFIG_IS_ENABLED
Date: Fri, 15 Jul 2022 09:42:34 +0200 [thread overview]
Message-ID: <d745c152-92bd-e91b-52dc-44d97f15da66@monstr.eu> (raw)
In-Reply-To: <f8e3ff9124195cbd957874de9a65ef79760ef5e7.1657183634.git.michal.simek@amd.com>
On 7/7/22 10:47, Michal Simek wrote:
> CONFIG_OF_LIBFDT is used twice for guarding the same code. It is enough to
> do it once that's why remove additional ifdefs from arm and risc-v code.
>
> Fixes: 0c303f9a6628 ("image: Drop IMAGE_ENABLE_OF_LIBFDT")
> Signed-off-by: Michal Simek <michal.simek@amd.com>
> ---
>
> arch/arm/lib/bootm.c | 2 --
> arch/riscv/lib/bootm.c | 2 --
> 2 files changed, 4 deletions(-)
>
> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
> index a59a5e6c0ea0..fc22befeac1f 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -200,12 +200,10 @@ static void boot_prep_linux(bootm_headers_t *images)
> char *commandline = env_get("bootargs");
>
> if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) {
> -#ifdef CONFIG_OF_LIBFDT
> debug("using: FDT\n");
> if (image_setup_linux(images)) {
> panic("FDT creation failed!");
> }
> -#endif
> } else if (BOOTM_ENABLE_TAGS) {
> debug("using: ATAGS\n");
> setup_start_tag(gd->bd);
> diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
> index 2e1e286c8ef6..c1ac339283a6 100644
> --- a/arch/riscv/lib/bootm.c
> +++ b/arch/riscv/lib/bootm.c
> @@ -65,13 +65,11 @@ static void announce_and_cleanup(int fake)
> static void boot_prep_linux(bootm_headers_t *images)
> {
> if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) {
> -#ifdef CONFIG_OF_LIBFDT
> debug("using: FDT\n");
> if (image_setup_linux(images)) {
> printf("FDT creation failed! hanging...");
> hang();
> }
> -#endif
> } else {
> printf("Device tree not found or missing FDT support\n");
> hang();
Applied.
M
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
prev parent reply other threads:[~2022-07-15 7:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-07 8:47 [PATCH] arm: riscv: Remove additional ifdef from code guarded by CONFIG_IS_ENABLED Michal Simek
2022-07-07 12:31 ` Tom Rini
[not found] ` <HK0PR03MB299426DC64F7B62933B03268C1879@HK0PR03MB2994.apcprd03.prod.outlook.com>
2022-07-11 7:26 ` Rick Chen
2022-07-15 7:42 ` Michal Simek [this message]
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=d745c152-92bd-e91b-52dc-44d97f15da66@monstr.eu \
--to=monstr@monstr.eu \
--cc=Peter.Hoyes@arm.com \
--cc=git@xilinx.com \
--cc=jan.kiszka@siemens.com \
--cc=marex@denx.de \
--cc=mr.nuke.me@gmail.com \
--cc=rick@andestech.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=ycliang@andestech.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;
as well as URLs for NNTP newsgroup(s).