soc: arm64: xenvm: Move GIC version to DT

Move the GIC version to the device tree for xenvm to improve readability Signed-off-by: Piotr Wojnarowski <pwojnarowski@antmicro.com>
zephyrproject-rtos · Jun 2, 2023 · 13b3193 · 13b3193
1 parent 9336dae
commit 13b3193
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/boards/arm64/xenvm/Kconfig b/boards/arm64/xenvm/Kconfig
diff --git a/boards/arm64/xenvm/xenvm.dts b/boards/arm64/xenvm/xenvm.dts
@@ -52,7 +52,7 @@
 	};
 
 	gic: interrupt-controller@3001000 {
-		compatible = "arm,gic";
+		compatible = "arm,gic-v2", "arm,gic";
 		#interrupt-cells = <0x04>;
 		#address-cells = <0x00>;
 		interrupt-controller;

diff --git a/boards/arm64/xenvm/xenvm_gicv3.dts b/boards/arm64/xenvm/xenvm_gicv3.dts
@@ -6,5 +6,6 @@
 #include "xenvm.dts"
 
 &gic {
+	compatible = "arm,gic-v3", "arm,gic";
 	reg = <0x00 0x3001000 0x00 0x10000 0x00 0x3020000 0x00 0x1000000>;
 };
diff --git a/boards/arm64/xenvm/xenvm_gicv3_defconfig b/boards/arm64/xenvm/xenvm_gicv3_defconfig
@@ -1,9 +1,6 @@
 CONFIG_SOC_XENVM=y
 CONFIG_BOARD_XENVM=y
 
-# Use GICv3
-CONFIG_XENVM_USE_GIC_V3=y
-
 # Enable UART driver
 CONFIG_SERIAL=y
 

diff --git a/soc/arm64/xenvm/Kconfig.soc b/soc/arm64/xenvm/Kconfig.soc
@@ -5,8 +5,6 @@ config SOC_XENVM
 	bool "Xen virtual machine on aarch64"
 	select ARM64
 	select ARM_ARCH_TIMER
-	select GIC_V3 if XENVM_USE_GIC_V3
-	select GIC_V2 if !XENVM_USE_GIC_V3
 	select CPU_CORTEX_A72
 
 config XEN_INITIAL_DOMAIN