| Message ID | f8e3ff9124195cbd957874de9a65ef79760ef5e7.1657183634.git.michal.simek@amd.com |
|---|---|
| State | Accepted |
| Commit | b09e462482b4b84f5d99986514db5fe8d10f4c2f |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | arm: riscv: Remove additional ifdef from code guarded by CONFIG_IS_ENABLED | expand |
On Thu, Jul 07, 2022 at 10:47:16AM +0200, 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> Reviewed-by: Tom Rini <trini@konsulko.com>
> From: Michal Simek <michal.simek@amd.com> > Sent: Thursday, July 07, 2022 4:47 PM > 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 Yu-Chi Liang(梁育齊) <ycliang@andestech.com>; Marek Vasut <marex@denx.de>; Peter Hoyes <Peter.Hoyes@arm.com>; Rick Jian-Zhi Chen(陳建志) <rick@andestech.com>; Tom Rini <trini@konsulko.com> > Subject: [PATCH] arm: riscv: Remove additional ifdef from code guarded by CONFIG_IS_ENABLED > > 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(-) Reviewed-by: Rick Chen <rick@andestech.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
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();
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(-)