| Message ID | 20221003171600.24454-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] arm-bsp/fvp: move the fvp include file to the include directory | expand |
On Mon, 3 Oct 2022 13:15:59 -0400, Jon Mason wrote: > Move the FVP include file to the include directory, matching what is > done for corstone1000 and other machines in meta-arm-bsp. Applied, thanks! [1/2] arm-bsp/fvp: move the fvp include file to the include directory commit: 6655928c81517513b557dbaee555f564ba21044a [2/2] ci: move features only needed by testimage from base commit: 6983e2a2a99ecc502893526a87ec6b5b9e6380fd Best regards,
diff --git a/meta-arm-bsp/conf/machine/fvp-base-arm32.conf b/meta-arm-bsp/conf/machine/fvp-base-arm32.conf index 7343aed6..d3452b74 100644 --- a/meta-arm-bsp/conf/machine/fvp-base-arm32.conf +++ b/meta-arm-bsp/conf/machine/fvp-base-arm32.conf @@ -4,7 +4,7 @@ #@NAME: Armv7-A Base Platform FVP machine #@DESCRIPTION: Machine configuration for Armv7-A Base Platform FVP model -require conf/machine/fvp-common.inc +require conf/machine/include/fvp-common.inc require conf/machine/include/arm/arch-armv7a.inc # FVP u-boot configuration diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf index 04ec1120..320e22ce 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.inc +require conf/machine/include/fvp-common.inc require conf/machine/include/arm/arch-armv8a.inc TUNE_FEATURES = "aarch64" diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/include/fvp-common.inc similarity index 100% rename from meta-arm-bsp/conf/machine/fvp-common.inc rename to meta-arm-bsp/conf/machine/include/fvp-common.inc
Move the FVP include file to the include directory, matching what is done for corstone1000 and other machines in meta-arm-bsp. Signed-off-by: Jon Mason <jon.mason@arm.com> --- meta-arm-bsp/conf/machine/fvp-base-arm32.conf | 2 +- meta-arm-bsp/conf/machine/fvp-base.conf | 2 +- meta-arm-bsp/conf/machine/{ => include}/fvp-common.inc | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-arm-bsp/conf/machine/{ => include}/fvp-common.inc (100%)