[PATCH] arm-bsp: FVP include cleanup

[PATCH] arm-bsp: FVP include cleanup

[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
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 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%)

diff --git a/meta-arm-bsp/conf/machine/foundation-armv8.conf b/meta-arm-bsp/conf/machine/foundation-armv8.conf
index 73d2798..c1b9f4d 100644
--- a/meta-arm-bsp/conf/machine/foundation-armv8.conf
+++ b/meta-arm-bsp/conf/machine/foundation-armv8.conf
@@ -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"
 
diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
index 3039644..bd3c62d 100644
--- a/meta-arm-bsp/conf/machine/fvp-base.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base.conf
@@ -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"
 
diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common.inc
similarity index 100%
rename from meta-arm-bsp/conf/machine/fvp-common/fvp.inc
rename to meta-arm-bsp/conf/machine/fvp-common.inc
-- 
2.17.1

Re: [meta-arm] [PATCH] arm-bsp: FVP include cleanup

[Jon Mason]

On Thu, Jul 16, 2020 at 02:07:33PM -0400, Jon Mason wrote:
> 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
> Signed-off-by: Jon Mason <jon.mason@arm.com>

Applied to master.

Thanks,
Jon

> ---
>  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%)
> 
> diff --git a/meta-arm-bsp/conf/machine/foundation-armv8.conf b/meta-arm-bsp/conf/machine/foundation-armv8.conf
> index 73d2798..c1b9f4d 100644
> --- a/meta-arm-bsp/conf/machine/foundation-armv8.conf
> +++ b/meta-arm-bsp/conf/machine/foundation-armv8.conf
> @@ -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"
>  
> diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
> index 3039644..bd3c62d 100644
> --- a/meta-arm-bsp/conf/machine/fvp-base.conf
> +++ b/meta-arm-bsp/conf/machine/fvp-base.conf
> @@ -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"
>  
> diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common.inc
> similarity index 100%
> rename from meta-arm-bsp/conf/machine/fvp-common/fvp.inc
> rename to meta-arm-bsp/conf/machine/fvp-common.inc
> -- 
> 2.17.1
> 

>