* [PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules
@ 2025-07-27 21:55 Michael Tokarev
2025-07-28 8:47 ` Michael Tokarev
2025-07-29 7:53 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Michael Tokarev @ 2025-07-27 21:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael Tokarev, qemu-trivial, Hao Wu, Peter Maydell
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules
2025-07-27 21:55 [PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules Michael Tokarev
@ 2025-07-28 8:47 ` Michael Tokarev
2025-07-29 7:53 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Michael Tokarev @ 2025-07-28 8:47 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Hao Wu, qemu-stable
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules
2025-07-27 21:55 [PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules Michael Tokarev
2025-07-28 8:47 ` Michael Tokarev
@ 2025-07-29 7:53 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-07-29 7:53 UTC (permalink / raw)
To: Michael Tokarev, qemu-devel; +Cc: qemu-trivial, Hao Wu, Peter Maydell
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-07-29 7:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-27 21:55 [PATCH trivial for 10.1] roms/Makefile: fix npcmNxx_bootrom build rules Michael Tokarev
2025-07-28 8:47 ` Michael Tokarev
2025-07-29 7:53 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).