diff --git a/platform/qemu-virt/debug.c b/platform/qemu-virt-arm/debug.c
similarity index 100%
rename from platform/qemu-virt/debug.c
rename to platform/qemu-virt-arm/debug.c
diff --git a/platform/qemu-virt/include/platform/gic.h b/platform/qemu-virt-arm/include/platform/gic.h
similarity index 100%
rename from platform/qemu-virt/include/platform/gic.h
rename to platform/qemu-virt-arm/include/platform/gic.h
diff --git a/platform/qemu-virt/include/platform/qemu-virt.h b/platform/qemu-virt-arm/include/platform/qemu-virt.h
similarity index 100%
rename from platform/qemu-virt/include/platform/qemu-virt.h
rename to platform/qemu-virt-arm/include/platform/qemu-virt.h
diff --git a/platform/qemu-virt/platform.c b/platform/qemu-virt-arm/platform.c
similarity index 100%
rename from platform/qemu-virt/platform.c
rename to platform/qemu-virt-arm/platform.c
diff --git a/platform/qemu-virt/platform_p.h b/platform/qemu-virt-arm/platform_p.h
similarity index 100%
rename from platform/qemu-virt/platform_p.h
rename to platform/qemu-virt-arm/platform_p.h
diff --git a/platform/qemu-virt/rules.mk b/platform/qemu-virt-arm/rules.mk
similarity index 100%
rename from platform/qemu-virt/rules.mk
rename to platform/qemu-virt-arm/rules.mk
diff --git a/platform/qemu-virt/secondary_boot.S b/platform/qemu-virt-arm/secondary_boot.S
similarity index 100%
rename from platform/qemu-virt/secondary_boot.S
rename to platform/qemu-virt-arm/secondary_boot.S
diff --git a/platform/qemu-virt/uart.c b/platform/qemu-virt-arm/uart.c
similarity index 100%
rename from platform/qemu-virt/uart.c
rename to platform/qemu-virt-arm/uart.c
diff --git a/project/target/qemu-virt-a15.mk b/project/target/qemu-virt-a15.mk
index 4d10e821..d75e5699 100644
--- a/project/target/qemu-virt-a15.mk
+++ b/project/target/qemu-virt-a15.mk
@@ -2,5 +2,5 @@
 ARCH := arm
 ARM_CPU := cortex-a15
 
-include project/target/qemu-virt.mk
+include project/target/qemu-virt-arm.mk
 
diff --git a/project/target/qemu-virt-a53.mk b/project/target/qemu-virt-a53.mk
index 19fa69ac..9ef6ccd4 100644
--- a/project/target/qemu-virt-a53.mk
+++ b/project/target/qemu-virt-a53.mk
@@ -2,6 +2,6 @@
 ARCH := arm64
 ARM_CPU := cortex-a53
 
-include project/target/qemu-virt.mk
+include project/target/qemu-virt-arm.mk
 
 
diff --git a/project/target/qemu-virt-arm.mk b/project/target/qemu-virt-arm.mk
new file mode 100644
index 00000000..e248af95
--- /dev/null
+++ b/project/target/qemu-virt-arm.mk
@@ -0,0 +1,4 @@
+# main project for qemu-virt-arm
+TARGET := qemu-virt-arm
+
+WITH_LINKER_GC := 0
diff --git a/project/target/qemu-virt.mk b/project/target/qemu-virt.mk
deleted file mode 100644
index ebeeedf2..00000000
--- a/project/target/qemu-virt.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# main project for qemu-virt
-TARGET := qemu-virt
-
-WITH_LINKER_GC := 0
diff --git a/target/qemu-virt/include/target/debugconfig.h b/target/qemu-virt-arm/include/target/debugconfig.h
similarity index 100%
rename from target/qemu-virt/include/target/debugconfig.h
rename to target/qemu-virt-arm/include/target/debugconfig.h
diff --git a/target/qemu-virt/rules.mk b/target/qemu-virt-arm/rules.mk
similarity index 80%
rename from target/qemu-virt/rules.mk
rename to target/qemu-virt-arm/rules.mk
index a8d0af1f..1dfe1b6b 100644
--- a/target/qemu-virt/rules.mk
+++ b/target/qemu-virt-arm/rules.mk
@@ -3,7 +3,7 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 GLOBAL_INCLUDES += \
     $(LOCAL_DIR)/include
 
-PLATFORM := qemu-virt
+PLATFORM := qemu-virt-arm
 
 #include make/module.mk