| Message ID | 1086025809583809538dfecaa899892218f44e7e.1698159066.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 57a4542cb7c9baa1509c3366b57a08d75b212ead |
| Headers | show |
| Series | riscv: boot: Fix creation of loader.bin | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-for-next-PR | fail | PR summary |
| conchuod/patch-1-test-1 | fail | .github/scripts/patches/build_rv32_defconfig.sh |
| conchuod/patch-1-test-2 | fail | .github/scripts/patches/build_rv64_clang_allmodconfig.sh |
| conchuod/patch-1-test-3 | fail | .github/scripts/patches/build_rv64_gcc_allmodconfig.sh |
| conchuod/patch-1-test-4 | fail | .github/scripts/patches/build_rv64_nommu_k210_defconfig.sh |
| conchuod/patch-1-test-5 | fail | .github/scripts/patches/build_rv64_nommu_virt_defconfig.sh |
| conchuod/patch-1-test-6 | warning | .github/scripts/patches/checkpatch.sh |
| conchuod/patch-1-test-7 | success | .github/scripts/patches/dtb_warn_rv64.sh |
| conchuod/patch-1-test-8 | success | .github/scripts/patches/header_inline.sh |
| conchuod/patch-1-test-9 | success | .github/scripts/patches/kdoc.sh |
| conchuod/patch-1-test-10 | success | .github/scripts/patches/module_param.sh |
| conchuod/patch-1-test-11 | success | .github/scripts/patches/verify_fixes.sh |
| conchuod/patch-1-test-12 | success | .github/scripts/patches/verify_signedoff.sh |
On 10/24/23 23:53, Geert Uytterhoeven wrote: > When flashing loader.bin for K210 using kflash: > > [ERROR] This is an ELF file and cannot be programmed to flash directly: arch/riscv/boot/loader.bin > > Before, loader.bin relied on "OBJCOPYFLAGS := -O binary" in the main > RISC-V Makefile to create a boot image with the right format. With this > removed, the image is now created in the wrong (ELF) format. > > Fix this by adding an explicit rule. > > Fixes: 505b02957e74f0c5 ("riscv: Remove duplicate objcopy flag") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Looks OK to me. Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Hello: This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <palmer@rivosinc.com>: On Tue, 24 Oct 2023 16:53:18 +0200 you wrote: > When flashing loader.bin for K210 using kflash: > > [ERROR] This is an ELF file and cannot be programmed to flash directly: arch/riscv/boot/loader.bin > > Before, loader.bin relied on "OBJCOPYFLAGS := -O binary" in the main > RISC-V Makefile to create a boot image with the right format. With this > removed, the image is now created in the wrong (ELF) format. > > [...] Here is the summary with links: - riscv: boot: Fix creation of loader.bin https://git.kernel.org/riscv/c/57a4542cb7c9 You are awesome, thank you!
diff --git a/arch/riscv/boot/Makefile b/arch/riscv/boot/Makefile index 22b13947bd131e84..8e7fc0edf21d3ece 100644 --- a/arch/riscv/boot/Makefile +++ b/arch/riscv/boot/Makefile @@ -17,6 +17,7 @@ KCOV_INSTRUMENT := n OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S +OBJCOPYFLAGS_loader.bin :=-O binary OBJCOPYFLAGS_xipImage :=-O binary -R .note -R .note.gnu.build-id -R .comment -S targets := Image Image.* loader loader.o loader.lds loader.bin
When flashing loader.bin for K210 using kflash: [ERROR] This is an ELF file and cannot be programmed to flash directly: arch/riscv/boot/loader.bin Before, loader.bin relied on "OBJCOPYFLAGS := -O binary" in the main RISC-V Makefile to create a boot image with the right format. With this removed, the image is now created in the wrong (ELF) format. Fix this by adding an explicit rule. Fixes: 505b02957e74f0c5 ("riscv: Remove duplicate objcopy flag") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/riscv/boot/Makefile | 1 + 1 file changed, 1 insertion(+)