1. Patchew
  2. QEMU
  3. View series

[PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules

Michael Tokarev posted 1 patch 3 months, 2 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20250727215511.807880-1-mjt@tls.msk.ru
Maintainers: Michael Tokarev <mjt@tls.msk.ru>, Laurent Vivier <laurent@vivier.eu>
roms/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
[PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules
Posted by Michael Tokarev 3 months, 2 weeks ago 
Since commit 70ce076fa6dff60, the actual rom source dirs
are subdirs of vbootrom/ submodule, not in top-level of it.

Fixes: 70ce076fa6dff60 "roms: Update vbootrom to 1287b6e"

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 roms/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roms/Makefile b/roms/Makefile
index beff58d9d5..6af68a922f 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -193,12 +193,12 @@ qboot:
 	cp qboot/build/bios.bin ../pc-bios/qboot.rom
 
 npcm7xx_bootrom:
-	$(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix)
-	cp vbootrom/npcm7xx_bootrom.bin ../pc-bios/npcm7xx_bootrom.bin
+	$(MAKE) -C vbootrom/npcm7xx CROSS_COMPILE=$(arm_cross_prefix)
+	cp vbootrom/npcm7xx/npcm7xx_bootrom.bin ../pc-bios/npcm7xx_bootrom.bin
 
 npcm8xx_bootrom:
-	$(MAKE) -C vbootrom CROSS_COMPILE=$(aarch64_cross_prefix)
-	cp vbootrom/npcm8xx_bootrom.bin ../pc-bios/npcm8xx_bootrom.bin
+	$(MAKE) -C vbootrom/npcm8xx CROSS_COMPILE=$(aarch64_cross_prefix)
+	cp vbootrom/npcm8xx/npcm8xx_bootrom.bin ../pc-bios/npcm8xx_bootrom.bin
 
 hppa-firmware:
 	$(MAKE) -C seabios-hppa parisc
-- 
2.47.2
Re: [PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules
Posted by Philippe Mathieu-Daudé 3 months, 2 weeks ago 
On 27/7/25 23:55, Michael Tokarev wrote:
> Since commit 70ce076fa6dff60, the actual rom source dirs
> are subdirs of vbootrom/ submodule, not in top-level of it.
> 
> Fixes: 70ce076fa6dff60 "roms: Update vbootrom to 1287b6e"
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>   roms/Makefile | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/roms/Makefile b/roms/Makefile
> index beff58d9d5..6af68a922f 100644
> --- a/roms/Makefile
> +++ b/roms/Makefile
> @@ -193,12 +193,12 @@ qboot:
>   	cp qboot/build/bios.bin ../pc-bios/qboot.rom
>   
>   npcm7xx_bootrom:
> -	$(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix)
> -	cp vbootrom/npcm7xx_bootrom.bin ../pc-bios/npcm7xx_bootrom.bin
> +	$(MAKE) -C vbootrom/npcm7xx CROSS_COMPILE=$(arm_cross_prefix)
> +	cp vbootrom/npcm7xx/npcm7xx_bootrom.bin ../pc-bios/npcm7xx_bootrom.bin
>   
>   npcm8xx_bootrom:
> -	$(MAKE) -C vbootrom CROSS_COMPILE=$(aarch64_cross_prefix)
> -	cp vbootrom/npcm8xx_bootrom.bin ../pc-bios/npcm8xx_bootrom.bin
> +	$(MAKE) -C vbootrom/npcm8xx CROSS_COMPILE=$(aarch64_cross_prefix)
> +	cp vbootrom/npcm8xx/npcm8xx_bootrom.bin ../pc-bios/npcm8xx_bootrom.bin

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
(note: not working on macOS, only Linux)

Queued adding:

Fixes: 269b7effd90 ("pc-bios: Add NPCM8XX vBootrom")

Thanks!
Re: [PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules
Posted by Michael Tokarev 3 months, 2 weeks ago 
On 28.07.2025 00:55, Michael Tokarev wrote:
> Since commit 70ce076fa6dff60, the actual rom source dirs
> are subdirs of vbootrom/ submodule, not in top-level of it.
> 
> Fixes: 70ce076fa6dff60 "roms: Update vbootrom to 1287b6e"
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

Cc: qemu-stable@ (for 10.0.x)

/mjt

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.