* [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210
@ 2025-10-29 9:44 Feng Jiang
2025-10-29 9:44 ` [PATCH 2/2] riscv: Remove redundant judgment for the default build target Feng Jiang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Feng Jiang @ 2025-10-29 9:44 UTC (permalink / raw)
To: pjw, palmer, aou, alex, emil.renner.berthing, nicolas.schier,
masahiroy
Cc: linux-riscv, linux-kernel, Feng Jiang
According to the explanation in commit ef10bdf9c3e6 ("riscv:
Kconfig.socs: Split ARCH_CANAAN and SOC_CANAAN_K210"),
loader.bin is a special feature of the Canaan K210 and
is not applicable to other SoCs.
Fixes: e79dfcbfb902 ("riscv: make image compression configurable")
Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
---
arch/riscv/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index ecf2fcce2d92..3998d4036f15 100644
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -159,7 +159,7 @@ boot-image-$(CONFIG_KERNEL_LZO) := Image.lzo
boot-image-$(CONFIG_KERNEL_ZSTD) := Image.zst
boot-image-$(CONFIG_KERNEL_XZ) := Image.xz
ifdef CONFIG_RISCV_M_MODE
-boot-image-$(CONFIG_ARCH_CANAAN) := loader.bin
+boot-image-$(CONFIG_SOC_CANAAN_K210) := loader.bin
endif
boot-image-$(CONFIG_EFI_ZBOOT) := vmlinuz.efi
boot-image-$(CONFIG_XIP_KERNEL) := xipImage
--
2.25.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] riscv: Remove redundant judgment for the default build target
2025-10-29 9:44 [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210 Feng Jiang
@ 2025-10-29 9:44 ` Feng Jiang
2025-10-29 10:44 ` Emil Renner Berthing
2025-10-29 19:09 ` Paul Walmsley
2025-10-29 10:45 ` [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210 Emil Renner Berthing
2025-10-29 19:07 ` Paul Walmsley
2 siblings, 2 replies; 6+ messages in thread
From: Feng Jiang @ 2025-10-29 9:44 UTC (permalink / raw)
To: pjw, palmer, aou, alex, emil.renner.berthing, nicolas.schier,
masahiroy
Cc: linux-riscv, linux-kernel, Feng Jiang
The value of KBUILD_IMAGE is derived from $(boot-image-y),
so there's no need for redundant checks before this.
Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
---
arch/riscv/Makefile | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index 3998d4036f15..4c6de57f65ef 100644
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -134,21 +134,6 @@ endif
CHECKFLAGS += -D__riscv -D__riscv_xlen=$(BITS)
# Default target when executing plain make
-boot := arch/riscv/boot
-ifeq ($(CONFIG_XIP_KERNEL),y)
-KBUILD_IMAGE := $(boot)/xipImage
-else
-ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN_K210),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 := arch/riscv/boot
boot-image-y := Image
boot-image-$(CONFIG_KERNEL_BZIP2) := Image.bz2
--
2.25.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] riscv: Remove redundant judgment for the default build target
2025-10-29 9:44 ` [PATCH 2/2] riscv: Remove redundant judgment for the default build target Feng Jiang
@ 2025-10-29 10:44 ` Emil Renner Berthing
2025-10-29 19:09 ` Paul Walmsley
1 sibling, 0 replies; 6+ messages in thread
From: Emil Renner Berthing @ 2025-10-29 10:44 UTC (permalink / raw)
To: Feng Jiang, alex, aou, masahiroy, nicolas.schier, palmer, pjw
Cc: linux-riscv, linux-kernel
Quoting Feng Jiang (2025-10-29 10:44:29)
> The value of KBUILD_IMAGE is derived from $(boot-image-y),
> so there's no need for redundant checks before this.
>
> Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
> ---
> arch/riscv/Makefile | 15 ---------------
> 1 file changed, 15 deletions(-)
>
> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
> index 3998d4036f15..4c6de57f65ef 100644
> --- a/arch/riscv/Makefile
> +++ b/arch/riscv/Makefile
> @@ -134,21 +134,6 @@ endif
> CHECKFLAGS += -D__riscv -D__riscv_xlen=$(BITS)
>
> # Default target when executing plain make
> -boot := arch/riscv/boot
> -ifeq ($(CONFIG_XIP_KERNEL),y)
> -KBUILD_IMAGE := $(boot)/xipImage
> -else
> -ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN_K210),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
> -
I think this might be a leftover from a faulty merge. The original patchset
removed this part, so
Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
> boot := arch/riscv/boot
> boot-image-y := Image
> boot-image-$(CONFIG_KERNEL_BZIP2) := Image.bz2
> --
> 2.25.1
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] riscv: Remove redundant judgment for the default build target
2025-10-29 9:44 ` [PATCH 2/2] riscv: Remove redundant judgment for the default build target Feng Jiang
2025-10-29 10:44 ` Emil Renner Berthing
@ 2025-10-29 19:09 ` Paul Walmsley
1 sibling, 0 replies; 6+ messages in thread
From: Paul Walmsley @ 2025-10-29 19:09 UTC (permalink / raw)
To: Feng Jiang
Cc: pjw, palmer, aou, alex, emil.renner.berthing, nicolas.schier,
masahiroy, linux-riscv, linux-kernel
On Wed, 29 Oct 2025, Feng Jiang wrote:
> The value of KBUILD_IMAGE is derived from $(boot-image-y),
> so there's no need for redundant checks before this.
>
> Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
Thanks, queued for v6.18-rc fixes.
- Paul
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210
2025-10-29 9:44 [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210 Feng Jiang
2025-10-29 9:44 ` [PATCH 2/2] riscv: Remove redundant judgment for the default build target Feng Jiang
@ 2025-10-29 10:45 ` Emil Renner Berthing
2025-10-29 19:07 ` Paul Walmsley
2 siblings, 0 replies; 6+ messages in thread
From: Emil Renner Berthing @ 2025-10-29 10:45 UTC (permalink / raw)
To: Feng Jiang, alex, aou, masahiroy, nicolas.schier, palmer, pjw
Cc: linux-riscv, linux-kernel
Quoting Feng Jiang (2025-10-29 10:44:28)
> According to the explanation in commit ef10bdf9c3e6 ("riscv:
> Kconfig.socs: Split ARCH_CANAAN and SOC_CANAAN_K210"),
> loader.bin is a special feature of the Canaan K210 and
> is not applicable to other SoCs.
>
> Fixes: e79dfcbfb902 ("riscv: make image compression configurable")
> Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
Sounds reasonable to me.
Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210
2025-10-29 9:44 [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210 Feng Jiang
2025-10-29 9:44 ` [PATCH 2/2] riscv: Remove redundant judgment for the default build target Feng Jiang
2025-10-29 10:45 ` [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210 Emil Renner Berthing
@ 2025-10-29 19:07 ` Paul Walmsley
2 siblings, 0 replies; 6+ messages in thread
From: Paul Walmsley @ 2025-10-29 19:07 UTC (permalink / raw)
To: Feng Jiang
Cc: pjw, palmer, aou, alex, emil.renner.berthing, nicolas.schier,
masahiroy, linux-riscv, linux-kernel
On Wed, 29 Oct 2025, Feng Jiang wrote:
> According to the explanation in commit ef10bdf9c3e6 ("riscv:
> Kconfig.socs: Split ARCH_CANAAN and SOC_CANAAN_K210"),
> loader.bin is a special feature of the Canaan K210 and
> is not applicable to other SoCs.
>
> Fixes: e79dfcbfb902 ("riscv: make image compression configurable")
> Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
Thanks, queued for v6.18-rc fixes.
- Paul
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-10-29 19:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-29 9:44 [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210 Feng Jiang
2025-10-29 9:44 ` [PATCH 2/2] riscv: Remove redundant judgment for the default build target Feng Jiang
2025-10-29 10:44 ` Emil Renner Berthing
2025-10-29 19:09 ` Paul Walmsley
2025-10-29 10:45 ` [PATCH 1/2] riscv: Build loader.bin exclusively for Canaan K210 Emil Renner Berthing
2025-10-29 19:07 ` Paul Walmsley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox