From 7c6ee7c2e9c9e45bb7e9480b50cd61dc009d530d Mon Sep 17 00:00:00 2001 From: Alejandro Enedino Hernandez Samaniego Date: Thu, 30 Jan 2020 16:16:59 -0800 Subject: meta-xilinx-bsp: Unify machine confs Unify the meta-xilinx-bsp and meta-xilinx-standalone layers by moving the machine confs to the BSP layer and keeping the standalone layer as a DISTRO layer Signed-off-by: Alejandro Enedino Hernandez Samaniego --- meta-xilinx-bsp/conf/machine/cortexa53-zynqmp.conf | 16 ++++++++++++++++ meta-xilinx-bsp/conf/machine/cortexa72-versal.conf | 17 +++++++++++++++++ meta-xilinx-bsp/conf/machine/cortexr5-versal.conf | 17 +++++++++++++++++ meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf | 18 ++++++++++++++++++ meta-xilinx-bsp/conf/machine/microblaze-plm.conf | 11 +++++++++++ meta-xilinx-bsp/conf/machine/microblaze-pmu.conf | 11 +++++++++++ meta-xilinx-bsp/conf/machine/versal-mb.conf | 11 +++++++++++ .../conf/machine/cortexa53-zynqmp.conf | 16 ---------------- .../conf/machine/cortexa72-versal.conf | 17 ----------------- .../conf/machine/cortexr5-versal.conf | 17 ----------------- .../conf/machine/cortexr5-zynqmp.conf | 18 ------------------ .../conf/machine/microblaze-plm.conf | 11 ----------- .../conf/machine/microblaze-pmu.conf | 11 ----------- meta-xilinx-standalone/conf/machine/versal-mb.conf | 11 ----------- 14 files changed, 101 insertions(+), 101 deletions(-) create mode 100644 meta-xilinx-bsp/conf/machine/cortexa53-zynqmp.conf create mode 100644 meta-xilinx-bsp/conf/machine/cortexa72-versal.conf create mode 100644 meta-xilinx-bsp/conf/machine/cortexr5-versal.conf create mode 100644 meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf create mode 100644 meta-xilinx-bsp/conf/machine/microblaze-plm.conf create mode 100644 meta-xilinx-bsp/conf/machine/microblaze-pmu.conf create mode 100644 meta-xilinx-bsp/conf/machine/versal-mb.conf delete mode 100644 meta-xilinx-standalone/conf/machine/cortexa53-zynqmp.conf delete mode 100644 meta-xilinx-standalone/conf/machine/cortexa72-versal.conf delete mode 100644 meta-xilinx-standalone/conf/machine/cortexr5-versal.conf delete mode 100644 meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf delete mode 100644 meta-xilinx-standalone/conf/machine/microblaze-plm.conf delete mode 100644 meta-xilinx-standalone/conf/machine/microblaze-pmu.conf delete mode 100644 meta-xilinx-standalone/conf/machine/versal-mb.conf diff --git a/meta-xilinx-bsp/conf/machine/cortexa53-zynqmp.conf b/meta-xilinx-bsp/conf/machine/cortexa53-zynqmp.conf new file mode 100644 index 00000000..282624ee --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/cortexa53-zynqmp.conf @@ -0,0 +1,16 @@ +DEFAULTTUNE ?= "cortexa53" + +require conf/machine/include/arm/arch-armv8a.inc + +TUNEVALID[cortexa53] = "Enable Cortex-a53 specific processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexa53', ' -mcpu=cortex-a53', '', d)}" + +AVAILTUNES += "cortexa53" + +ARMPKGARCH_tune-cortexa53 = "cortexa53" + +TUNE_FEATURES_tune-cortexa53 = "${TUNE_FEATURES_tune-aarch64} cortexa53" +PACKAGE_EXTRA_ARCHS_tune-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64}" + +SOC_FAMILY = "zynqmp" + diff --git a/meta-xilinx-bsp/conf/machine/cortexa72-versal.conf b/meta-xilinx-bsp/conf/machine/cortexa72-versal.conf new file mode 100644 index 00000000..ed93f0cc --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/cortexa72-versal.conf @@ -0,0 +1,17 @@ +DEFAULTTUNE ?= "cortexa72" + +require conf/machine/include/arm/arch-armv8a.inc + +TUNEVALID[cortexa72] = "Enable Cortex-A72 specific processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexa72', ' -mcpu=cortex-a72', '', d)}" + +AVAILTUNES += "cortexa72" + +ARMPKGARCH_tune-cortexa72 = "cortexa72" + +TUNE_FEATURES_tune-cortexa72 = "${TUNE_FEATURES_tune-aarch64} cortexa72" +PACKAGE_EXTRA_ARCHS_tune-cortexa72 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64}" + + +#LANGUAGES_append = ",lto" + diff --git a/meta-xilinx-bsp/conf/machine/cortexr5-versal.conf b/meta-xilinx-bsp/conf/machine/cortexr5-versal.conf new file mode 100644 index 00000000..05bc28fd --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/cortexr5-versal.conf @@ -0,0 +1,17 @@ +DEFAULTTUNE ?= "cortexr5" + +require conf/machine/include/arm/arch-arm.inc + +TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}" + +AVAILTUNES += "cortexr5" + +ARMPKGARCH_tune-cortexr5 = "cortexr5" + +TUNE_FEATURES_tune-cortexr5 = "cortexr5" + +#PACKAGE_EXTRA_ARCHS_tune-cortexr5 = "cortexr5" + +SOC_FAMILY = "versal" + diff --git a/meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf b/meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf new file mode 100644 index 00000000..58804bfe --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf @@ -0,0 +1,18 @@ +DEFAULTTUNE ?= "cortexr5" + +require conf/machine/include/arm/arch-arm.inc + +TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}" + +AVAILTUNES += "cortexr5" + +ARMPKGARCH_tune-cortexr5 = "cortexr5" + +TUNE_FEATURES_tune-cortexr5 = "cortexr5" + +#PACKAGE_EXTRA_ARCHS_tune-cortexr5 = "cortexr5" + +SOC_FAMILY = "zynqmp" + + diff --git a/meta-xilinx-bsp/conf/machine/microblaze-plm.conf b/meta-xilinx-bsp/conf/machine/microblaze-plm.conf new file mode 100644 index 00000000..32ea9739 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/microblaze-plm.conf @@ -0,0 +1,11 @@ +DEFAULTTUNE ?= "microblaze" + +require conf/machine/include/microblaze/arch-microblaze.inc + +# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities +AVAILTUNES += "microblaze" +TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" +PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" +SOC_FAMILY = "versal" + +TARGET_LINK_HASH_STYLE_microblaze = "" diff --git a/meta-xilinx-bsp/conf/machine/microblaze-pmu.conf b/meta-xilinx-bsp/conf/machine/microblaze-pmu.conf new file mode 100644 index 00000000..6759c2d8 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/microblaze-pmu.conf @@ -0,0 +1,11 @@ +DEFAULTTUNE ?= "microblaze" + +require conf/machine/include/microblaze/arch-microblaze.inc + +# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities +AVAILTUNES += "microblaze" +TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" +PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" +SOC_FAMILY = "zynqmp" + +TARGET_LINK_HASH_STYLE_microblaze = "" diff --git a/meta-xilinx-bsp/conf/machine/versal-mb.conf b/meta-xilinx-bsp/conf/machine/versal-mb.conf new file mode 100644 index 00000000..32ea9739 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/versal-mb.conf @@ -0,0 +1,11 @@ +DEFAULTTUNE ?= "microblaze" + +require conf/machine/include/microblaze/arch-microblaze.inc + +# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities +AVAILTUNES += "microblaze" +TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" +PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" +SOC_FAMILY = "versal" + +TARGET_LINK_HASH_STYLE_microblaze = "" diff --git a/meta-xilinx-standalone/conf/machine/cortexa53-zynqmp.conf b/meta-xilinx-standalone/conf/machine/cortexa53-zynqmp.conf deleted file mode 100644 index 282624ee..00000000 --- a/meta-xilinx-standalone/conf/machine/cortexa53-zynqmp.conf +++ /dev/null @@ -1,16 +0,0 @@ -DEFAULTTUNE ?= "cortexa53" - -require conf/machine/include/arm/arch-armv8a.inc - -TUNEVALID[cortexa53] = "Enable Cortex-a53 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexa53', ' -mcpu=cortex-a53', '', d)}" - -AVAILTUNES += "cortexa53" - -ARMPKGARCH_tune-cortexa53 = "cortexa53" - -TUNE_FEATURES_tune-cortexa53 = "${TUNE_FEATURES_tune-aarch64} cortexa53" -PACKAGE_EXTRA_ARCHS_tune-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64}" - -SOC_FAMILY = "zynqmp" - diff --git a/meta-xilinx-standalone/conf/machine/cortexa72-versal.conf b/meta-xilinx-standalone/conf/machine/cortexa72-versal.conf deleted file mode 100644 index ed93f0cc..00000000 --- a/meta-xilinx-standalone/conf/machine/cortexa72-versal.conf +++ /dev/null @@ -1,17 +0,0 @@ -DEFAULTTUNE ?= "cortexa72" - -require conf/machine/include/arm/arch-armv8a.inc - -TUNEVALID[cortexa72] = "Enable Cortex-A72 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexa72', ' -mcpu=cortex-a72', '', d)}" - -AVAILTUNES += "cortexa72" - -ARMPKGARCH_tune-cortexa72 = "cortexa72" - -TUNE_FEATURES_tune-cortexa72 = "${TUNE_FEATURES_tune-aarch64} cortexa72" -PACKAGE_EXTRA_ARCHS_tune-cortexa72 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64}" - - -#LANGUAGES_append = ",lto" - diff --git a/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf b/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf deleted file mode 100644 index 05bc28fd..00000000 --- a/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf +++ /dev/null @@ -1,17 +0,0 @@ -DEFAULTTUNE ?= "cortexr5" - -require conf/machine/include/arm/arch-arm.inc - -TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}" - -AVAILTUNES += "cortexr5" - -ARMPKGARCH_tune-cortexr5 = "cortexr5" - -TUNE_FEATURES_tune-cortexr5 = "cortexr5" - -#PACKAGE_EXTRA_ARCHS_tune-cortexr5 = "cortexr5" - -SOC_FAMILY = "versal" - diff --git a/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf b/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf deleted file mode 100644 index 58804bfe..00000000 --- a/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf +++ /dev/null @@ -1,18 +0,0 @@ -DEFAULTTUNE ?= "cortexr5" - -require conf/machine/include/arm/arch-arm.inc - -TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}" - -AVAILTUNES += "cortexr5" - -ARMPKGARCH_tune-cortexr5 = "cortexr5" - -TUNE_FEATURES_tune-cortexr5 = "cortexr5" - -#PACKAGE_EXTRA_ARCHS_tune-cortexr5 = "cortexr5" - -SOC_FAMILY = "zynqmp" - - diff --git a/meta-xilinx-standalone/conf/machine/microblaze-plm.conf b/meta-xilinx-standalone/conf/machine/microblaze-plm.conf deleted file mode 100644 index 32ea9739..00000000 --- a/meta-xilinx-standalone/conf/machine/microblaze-plm.conf +++ /dev/null @@ -1,11 +0,0 @@ -DEFAULTTUNE ?= "microblaze" - -require conf/machine/include/microblaze/arch-microblaze.inc - -# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities -AVAILTUNES += "microblaze" -TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" -PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" -SOC_FAMILY = "versal" - -TARGET_LINK_HASH_STYLE_microblaze = "" diff --git a/meta-xilinx-standalone/conf/machine/microblaze-pmu.conf b/meta-xilinx-standalone/conf/machine/microblaze-pmu.conf deleted file mode 100644 index 6759c2d8..00000000 --- a/meta-xilinx-standalone/conf/machine/microblaze-pmu.conf +++ /dev/null @@ -1,11 +0,0 @@ -DEFAULTTUNE ?= "microblaze" - -require conf/machine/include/microblaze/arch-microblaze.inc - -# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities -AVAILTUNES += "microblaze" -TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" -PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" -SOC_FAMILY = "zynqmp" - -TARGET_LINK_HASH_STYLE_microblaze = "" diff --git a/meta-xilinx-standalone/conf/machine/versal-mb.conf b/meta-xilinx-standalone/conf/machine/versal-mb.conf deleted file mode 100644 index 32ea9739..00000000 --- a/meta-xilinx-standalone/conf/machine/versal-mb.conf +++ /dev/null @@ -1,11 +0,0 @@ -DEFAULTTUNE ?= "microblaze" - -require conf/machine/include/microblaze/arch-microblaze.inc - -# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities -AVAILTUNES += "microblaze" -TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" -PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" -SOC_FAMILY = "versal" - -TARGET_LINK_HASH_STYLE_microblaze = "" -- cgit v1.2.3-54-g00ecf