[PATCH 1/2] common: boards: qemu-virt: fix dtc warning

[PATCH 1/2] common: boards: qemu-virt: fix dtc warning

[Ahmad Fatoum]

DTC complains about a Warning (chosen_node_is_root):

  /fragment@1/__overlay__/chosen: chosen node must be at root node

As /chosen is already available in the device tree of all of:

  - ARM 32-Bit QEMU Virt
  - ARM 64-Bit QEMU Virt
  - RISC-V 32-Bit QEMU Virt
  - RISC-V 64-Bit QEMU Virt

Just reference that in a new fragment to silence the warning.

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

diff --git a/common/boards/qemu-virt/overlay-of-flash.dts b/common/boards/qemu-virt/overlay-of-flash.dts
index b3cdf6893f8a..ace2c7026b7a 100644
--- a/common/boards/qemu-virt/overlay-of-flash.dts
+++ b/common/boards/qemu-virt/overlay-of-flash.dts
@@ -37,15 +37,20 @@
 			};
 		};
 	};
+
 	fragment@1 {
-		target-path="/";
+		target-path = "/chosen";
 		__overlay__ {
-			chosen {
-				environment {
-					compatible = "barebox,environment";
-					device-path = ENV_DEVICE_PATH;
-				};
+			environment {
+				compatible = "barebox,environment";
+				device-path = ENV_DEVICE_PATH;
 			};
+		};
+	};
+
+	fragment@2 {
+		target-path = "/";
+		__overlay__ {
 			aliases {
 				state = "/state";
 			};
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] ARM64: qemu-virt64: disable MMU

[Ahmad Fatoum]

We have CFI flash at address 0 till start of RAM. Until we have a scheme
to remap the flash, so it's usable at that address, just disable the MMU
in the defconfig. Currently the defconfig prints a couple of error
messages on every start up for cfi-flash as well as environment and
state that depend on it.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/configs/qemu_virt64_defconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/configs/qemu_virt64_defconfig b/arch/arm/configs/qemu_virt64_defconfig
index 57e715bf8d09..3802ead279cd 100644
--- a/arch/arm/configs/qemu_virt64_defconfig
+++ b/arch/arm/configs/qemu_virt64_defconfig
@@ -1,8 +1,5 @@
 CONFIG_ARCH_ARM64_VIRT=y
-CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_PSCI_CLIENT=y
-CONFIG_MMU=y
-# CONFIG_MMU_EARLY is not set
 CONFIG_MALLOC_SIZE=0x0
 CONFIG_KALLSYMS=y
 CONFIG_PROMPT=""
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] common: boards: qemu-virt: fix dtc warning

[Sascha Hauer]

On Sat, Jan 08, 2022 at 06:13:55PM +0100, Ahmad Fatoum wrote:
> DTC complains about a Warning (chosen_node_is_root):
> 
>   /fragment@1/__overlay__/chosen: chosen node must be at root node
> 
> As /chosen is already available in the device tree of all of:
> 
>   - ARM 32-Bit QEMU Virt
>   - ARM 64-Bit QEMU Virt
>   - RISC-V 32-Bit QEMU Virt
>   - RISC-V 64-Bit QEMU Virt
> 
> Just reference that in a new fragment to silence the warning.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  common/boards/qemu-virt/overlay-of-flash.dts | 17 +++++++++++------
>  1 file changed, 11 insertions(+), 6 deletions(-)

Applied, thanks

Sascha

-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox