From c44804ac19b29cbc0387d6576491344660bf3d38 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 19 Aug 2025 09:54:40 +0200 Subject: [PATCH] configs/{canaan_kd233, sipeed*}: use BR2_LINUX_KENREL_IMAGE_TARGET_NAME Since commit cb4f11a6964902990ce774ff7144b24a1ffd635c ("linux: handle empty BR2_LINUX_KERNEL_IMAGE_TARGET_NAME situation"), we error out if BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y but BR2_LINUX_KERNEL_IMAGE_TARGET_NAME is empty, which is exactly the case of the RISC-V configurations being fixed by this commit. They define the BR2_LINUX_KERNEL_IMAGE_NAME variable, but not BR2_LINUX_KERNEL_IMAGE_TARGET_NAME, while BR2_LINUX_KERNEL_IMAGE_NAME will automatically default to BR2_LINUX_KERNEL_IMAGE_TARGET_NAME if BR2_LINUX_KERNEL_IMAGE_NAME is not provided. It probably used to work because specifying an empty make target was generating the right images, and they did have the name specified in BR2_LINUX_KERNEL_IMAGE_TARGET_NAME. But with the additional check added in cb4f11a6964902990ce774ff7144b24a1ffd635c this scenario is no longer supported. Fixes: canaan_kd233 | https://gitlab.com/buildroot.org/buildroot/-/jobs/11012273088 sipeed_maix_bit | https://gitlab.com/buildroot.org/buildroot/-/jobs/11026771237 sipeed_maix_bit_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/11026771342 sipeed_maix_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/11026771387 sipeed_maix_dock_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/11026771472 sipeed_maix_go | https://gitlab.com/buildroot.org/buildroot/-/jobs/11026771505 sipeed_maix_go_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/11026771581 sipeed_maixduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/11026771663 sipeed_maixduino_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/11026771885 Cc: Damien Le Moal Signed-off-by: Thomas Petazzoni Reviewed-by: Damien Le Moal Signed-off-by: Julien Olivain (cherry picked from commit 070d91ed04a2a3c462dbd5ad1878ce47c2433986) Signed-off-by: Thomas Perale --- configs/canaan_kd233_defconfig | 2 +- configs/sipeed_maix_bit_defconfig | 2 +- configs/sipeed_maix_bit_sdcard_defconfig | 2 +- configs/sipeed_maix_dock_defconfig | 2 +- configs/sipeed_maix_dock_sdcard_defconfig | 2 +- configs/sipeed_maix_go_defconfig | 2 +- configs/sipeed_maix_go_sdcard_defconfig | 2 +- configs/sipeed_maixduino_defconfig | 2 +- configs/sipeed_maixduino_sdcard_defconfig | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig index 491a834477..47d0b55e90 100644 --- a/configs/canaan_kd233_defconfig +++ b/configs/canaan_kd233_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/kd233/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig index 00c6a993d8..c3fc9192c6 100644 --- a/configs/sipeed_maix_bit_defconfig +++ b/configs/sipeed_maix_bit_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maix-bit/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig index 5127bfeae6..4ae824a26b 100644 --- a/configs/sipeed_maix_bit_sdcard_defconfig +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_bit" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig index d97e185311..73372056a3 100644 --- a/configs/sipeed_maix_dock_defconfig +++ b/configs/sipeed_maix_dock_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maix-dock/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig index a755872cfd..66317d968c 100644 --- a/configs/sipeed_maix_dock_sdcard_defconfig +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_dock" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig index a4d976353f..bb64dccdf4 100644 --- a/configs/sipeed_maix_go_defconfig +++ b/configs/sipeed_maix_go_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maix-go/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig index 6067fea785..a3076c3e12 100644 --- a/configs/sipeed_maix_go_sdcard_defconfig +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_go" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig index 37c6eb4582..27bf958c76 100644 --- a/configs/sipeed_maixduino_defconfig +++ b/configs/sipeed_maixduino_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maixduino/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig index 0a460f15d3..1b6db4f8a4 100644 --- a/configs/sipeed_maixduino_sdcard_defconfig +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maixduino" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set