Skip to contentSkip to conversation

arm-bsp: FVP include cleanup

PATCH Applied Jon Mason 2 participants 2 messages Jul 17, 2020 – Jul 20, 2020

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm-bsp: FVP include cleanup

No real benefit to having the FVP inc file in a layer above the conf files. Move the file down one level and rename to make it more consistent with the layout.

Change-Id If32c0462352fbe2f3496957b1b2a169cfd7e7f66
---
 meta-arm-bsp/conf/machine/foundation-armv8.conf                 | 2 +-
 meta-arm-bsp/conf/machine/fvp-base.conf                         | 2 +-
 .../conf/machine/{fvp-common/fvp.inc => fvp-common.inc}         | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-arm-bsp/conf/machine/{fvp-common/fvp.inc => fvp-common.inc} (100%)
meta-arm-bsp/conf/machine/foundation-armv8.conf +1 -1
index 73d2798..c1b9f4d 100644
@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Foundation Platform machine
 #@DESCRIPTION: Machine configuration for Armv8-A Foundation Platform model
 
-require conf/machine/fvp-common/fvp.inc
+require conf/machine/fvp-common.inc
 
 KERNEL_DEVICETREE = "arm/foundation-v8-gicv3-psci.dtb"
 
meta-arm-bsp/conf/machine/fvp-base.conf +1 -1
index 3039644..bd3c62d 100644
@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Base Platform FVP machine
 #@DESCRIPTION: Machine configuration for Armv8-A Base Platform FVP model
 
-require conf/machine/fvp-common/fvp.inc
+require conf/machine/fvp-common.inc
 
 KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
 
meta-arm-bsp/conf/machine/fvp-common.inc renamed from meta-arm-bsp/conf/machine/fvp-common/fvp.inc +0 -0
similarity index 100%
rename from meta-arm-bsp/conf/machine/fvp-common/fvp.inc
rename to meta-arm-bsp/conf/machine/fvp-common.inc
Signature · 1 line
2.17.1
Applied
#1 lore raw
Quoted 6 lines · Jon Mason

No real benefit to having the FVP inc file in a layer above the conf files. Move the file down one level and rename to make it more consistent with the layout.

Change-Id If32c0462352fbe2f3496957b1b2a169cfd7e7f66

Applied to master.

Thanks,
Jon

Quoted 42 lines
---
 meta-arm-bsp/conf/machine/foundation-armv8.conf                 | 2 +-
 meta-arm-bsp/conf/machine/fvp-base.conf                         | 2 +-
 .../conf/machine/{fvp-common/fvp.inc => fvp-common.inc}         | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-arm-bsp/conf/machine/{fvp-common/fvp.inc => fvp-common.inc} (100%)
meta-arm-bsp/conf/machine/foundation-armv8.conf +1 -1
index 73d2798..c1b9f4d 100644
@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Foundation Platform machine
 #@DESCRIPTION: Machine configuration for Armv8-A Foundation Platform model
 
-require conf/machine/fvp-common/fvp.inc
+require conf/machine/fvp-common.inc
 
 KERNEL_DEVICETREE = "arm/foundation-v8-gicv3-psci.dtb"
 
meta-arm-bsp/conf/machine/fvp-base.conf +1 -1
index 3039644..bd3c62d 100644
@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Base Platform FVP machine
 #@DESCRIPTION: Machine configuration for Armv8-A Base Platform FVP model
 
-require conf/machine/fvp-common/fvp.inc
+require conf/machine/fvp-common.inc
 
 KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
 
meta-arm-bsp/conf/machine/fvp-common.inc renamed from meta-arm-bsp/conf/machine/fvp-common/fvp.inc +0 -0
similarity index 100%
rename from meta-arm-bsp/conf/machine/fvp-common/fvp.inc
rename to meta-arm-bsp/conf/machine/fvp-common.inc
Signature · 1 line
2.17.1