[PATCH] common: boards: qemu-virt: fix env path for QEMU RISC-V

[PATCH] common: boards: qemu-virt: fix env path for QEMU RISC-V

[Ahmad Fatoum]

At least with QEMU emulator version 7.1.0 (Debian 1:7.1+dfsg-2+b2),
the flash node is no longer in /soc and is instead top-level like
ARM Virt. Fix the path in the overlay accordingly.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/boards/qemu-virt/overlay-of-flash.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/boards/qemu-virt/overlay-of-flash.dts b/common/boards/qemu-virt/overlay-of-flash.dts
index ace2c7026b7a..3f2beaac3798 100644
--- a/common/boards/qemu-virt/overlay-of-flash.dts
+++ b/common/boards/qemu-virt/overlay-of-flash.dts
@@ -4,8 +4,8 @@
 /plugin/;
 
 #ifdef RISCV_VIRT
-#define PARTS_TARGET_PATH	"/soc/flash@20000000"
-#define ENV_DEVICE_PATH		"/soc/flash@20000000/partitions/partition@3c00000"
+#define PARTS_TARGET_PATH	"/flash@20000000"
+#define ENV_DEVICE_PATH		"/flash@20000000/partitions/partition@3c00000"
 #else
 #define PARTS_TARGET_PATH	"/flash@0"
 #define ENV_DEVICE_PATH		"/flash@0/partitions/partition@3c00000"
-- 
2.30.2

Re: [PATCH] common: boards: qemu-virt: fix env path for QEMU RISC-V

[Sascha Hauer]

On Mon, Dec 05, 2022 at 02:36:02PM +0100, Ahmad Fatoum wrote:
> At least with QEMU emulator version 7.1.0 (Debian 1:7.1+dfsg-2+b2),
> the flash node is no longer in /soc and is instead top-level like
> ARM Virt. Fix the path in the overlay accordingly.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  common/boards/qemu-virt/overlay-of-flash.dts | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/common/boards/qemu-virt/overlay-of-flash.dts b/common/boards/qemu-virt/overlay-of-flash.dts
> index ace2c7026b7a..3f2beaac3798 100644
> --- a/common/boards/qemu-virt/overlay-of-flash.dts
> +++ b/common/boards/qemu-virt/overlay-of-flash.dts
> @@ -4,8 +4,8 @@
>  /plugin/;
>  
>  #ifdef RISCV_VIRT
> -#define PARTS_TARGET_PATH	"/soc/flash@20000000"
> -#define ENV_DEVICE_PATH		"/soc/flash@20000000/partitions/partition@3c00000"
> +#define PARTS_TARGET_PATH	"/flash@20000000"
> +#define ENV_DEVICE_PATH		"/flash@20000000/partitions/partition@3c00000"
>  #else
>  #define PARTS_TARGET_PATH	"/flash@0"
>  #define ENV_DEVICE_PATH		"/flash@0/partitions/partition@3c00000"
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |