| Message ID | 20240323113500.1249272-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3b938e231b660a278de2988ee77b832d665c5326 |
| Headers | show |
| Series | riscv: merge two if-blocks for KBUILD_IMAGE | expand |
Hi Masahiro, On 23/03/2024 12:35, Masahiro Yamada wrote: > In arch/riscv/Makefile, KBUILD_IMAGE is assigned in two separate > if-blocks. > > When CONFIG_XIP_KERNEL is disabled, the decision made by the first > if-block is overwritten by the second one, which is redundant and > unreadable. > > Merge the two if-blocks. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/riscv/Makefile | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile > index 252d63942f34..a74e70405d3f 100644 > --- a/arch/riscv/Makefile > +++ b/arch/riscv/Makefile > @@ -133,7 +133,15 @@ boot := arch/riscv/boot > ifeq ($(CONFIG_XIP_KERNEL),y) > KBUILD_IMAGE := $(boot)/xipImage > else > +ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy) > +KBUILD_IMAGE := $(boot)/loader.bin > +else > +ifeq ($(CONFIG_EFI_ZBOOT),) > KBUILD_IMAGE := $(boot)/Image.gz > +else > +KBUILD_IMAGE := $(boot)/vmlinuz.efi > +endif > +endif > endif > > libs-y += arch/riscv/lib/ > @@ -153,17 +161,6 @@ endif > vdso-install-y += arch/riscv/kernel/vdso/vdso.so.dbg > vdso-install-$(CONFIG_COMPAT) += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so > > -ifneq ($(CONFIG_XIP_KERNEL),y) > -ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy) > -KBUILD_IMAGE := $(boot)/loader.bin > -else > -ifeq ($(CONFIG_EFI_ZBOOT),) > -KBUILD_IMAGE := $(boot)/Image.gz > -else > -KBUILD_IMAGE := $(boot)/vmlinuz.efi > -endif > -endif > -endif > BOOT_TARGETS := Image Image.gz loader loader.bin xipImage vmlinuz.efi > > all: $(notdir $(KBUILD_IMAGE)) You can add: Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Thanks, Alex
Hello: This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <palmer@rivosinc.com>: On Sat, 23 Mar 2024 20:35:00 +0900 you wrote: > In arch/riscv/Makefile, KBUILD_IMAGE is assigned in two separate > if-blocks. > > When CONFIG_XIP_KERNEL is disabled, the decision made by the first > if-block is overwritten by the second one, which is redundant and > unreadable. > > [...] Here is the summary with links: - riscv: merge two if-blocks for KBUILD_IMAGE https://git.kernel.org/riscv/c/3b938e231b66 You are awesome, thank you!
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 252d63942f34..a74e70405d3f 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -133,7 +133,15 @@ boot := arch/riscv/boot ifeq ($(CONFIG_XIP_KERNEL),y) KBUILD_IMAGE := $(boot)/xipImage else +ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy) +KBUILD_IMAGE := $(boot)/loader.bin +else +ifeq ($(CONFIG_EFI_ZBOOT),) KBUILD_IMAGE := $(boot)/Image.gz +else +KBUILD_IMAGE := $(boot)/vmlinuz.efi +endif +endif endif libs-y += arch/riscv/lib/ @@ -153,17 +161,6 @@ endif vdso-install-y += arch/riscv/kernel/vdso/vdso.so.dbg vdso-install-$(CONFIG_COMPAT) += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so -ifneq ($(CONFIG_XIP_KERNEL),y) -ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy) -KBUILD_IMAGE := $(boot)/loader.bin -else -ifeq ($(CONFIG_EFI_ZBOOT),) -KBUILD_IMAGE := $(boot)/Image.gz -else -KBUILD_IMAGE := $(boot)/vmlinuz.efi -endif -endif -endif BOOT_TARGETS := Image Image.gz loader loader.bin xipImage vmlinuz.efi all: $(notdir $(KBUILD_IMAGE))
In arch/riscv/Makefile, KBUILD_IMAGE is assigned in two separate if-blocks. When CONFIG_XIP_KERNEL is disabled, the decision made by the first if-block is overwritten by the second one, which is redundant and unreadable. Merge the two if-blocks. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- arch/riscv/Makefile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)