diff --git a/conf/machine/stm32mp1.conf b/conf/machine/stm32mp1.conf
index 825f098..8c4d659 100644
--- a/conf/machine/stm32mp1.conf
+++ b/conf/machine/stm32mp1.conf
@@ -14,7 +14,7 @@ MACHINEOVERRIDES .= ":stm32mp15common"
 # Chip architecture
 # =========================================================================
 DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
-include conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 # =========================================================================
 # boot scheme
diff --git a/conf/machine/stm32mp15-disco.conf b/conf/machine/stm32mp15-disco.conf
index f81025d..aacbe54 100644
--- a/conf/machine/stm32mp15-disco.conf
+++ b/conf/machine/stm32mp15-disco.conf
@@ -13,7 +13,7 @@ MACHINEOVERRIDES .= ":stm32mp1common:stm32mp15common"
 # Chip architecture
 # =========================================================================
 DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
-include conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 # =========================================================================
 # boot scheme
diff --git a/conf/machine/stm32mp15-eval.conf b/conf/machine/stm32mp15-eval.conf
index d806926..f75fce9 100644
--- a/conf/machine/stm32mp15-eval.conf
+++ b/conf/machine/stm32mp15-eval.conf
@@ -13,7 +13,7 @@ MACHINEOVERRIDES .= ":stm32mp1common:stm32mp15common"
 # Chip architecture
 # =========================================================================
 DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
-include conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 # =========================================================================
 # boot scheme