diff options
Diffstat (limited to 'poky/meta/conf/machine')
10 files changed, 9 insertions, 17 deletions
diff --git a/poky/meta/conf/machine/include/arm/arch-arm64.inc b/poky/meta/conf/machine/include/arm/arch-arm64.inc index 53f456681..6d5b22fff 100644 --- a/poky/meta/conf/machine/include/arm/arch-arm64.inc +++ b/poky/meta/conf/machine/include/arm/arch-arm64.inc @@ -12,6 +12,8 @@ ARMPKGARCH_tune-aarch64 ?= "aarch64" ARMPKGARCH_tune-aarch64_be ?= "aarch64_be" TUNE_FEATURES_tune-aarch64 = "aarch64" TUNE_FEATURES_tune-aarch64_be = "${TUNE_FEATURES_tune-aarch64} bigendian" +TUNE_PKGARCH_64_tune-aarch64 = "aarch64" +TUNE_PKGARCH_64_tune-aarch64_be = "aarch64_be" BASE_LIB_tune-aarch64 = "lib64" BASE_LIB_tune-aarch64_be = "lib64" @@ -20,7 +22,7 @@ PACKAGE_EXTRA_ARCHS_tune-aarch64_be = "aarch64_be" ARMPKGSFX_ENDIAN_64 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '_be', '', d)}" TUNE_ARCH_64 = "aarch64${ARMPKGSFX_ENDIAN_64}" -TUNE_PKGARCH_64 = "aarch64${ARMPKGSFX_ENDIAN_64}" +TUNE_PKGARCH_64 = "${ARMPKGARCH}${ARMPKGSFX_ENDIAN_64}" ABIEXTENSION_64 = "" TARGET_FPU_64 = "" diff --git a/poky/meta/conf/machine/include/tune-cortexa53.inc b/poky/meta/conf/machine/include/tune-cortexa53.inc index b7327d00c..c0bb28a19 100644 --- a/poky/meta/conf/machine/include/tune-cortexa53.inc +++ b/poky/meta/conf/machine/include/tune-cortexa53.inc @@ -8,14 +8,11 @@ require conf/machine/include/arm/arch-armv8a.inc # Little Endian base configs AVAILTUNES += "cortexa53 cortexa53-crypto" ARMPKGARCH_tune-cortexa53 = "cortexa53" -ARMPKGARCH_tune-cortexa53-crypto = "cortexa53" +ARMPKGARCH_tune-cortexa53-crypto = "cortexa53-crypto" TUNE_FEATURES_tune-cortexa53 = "aarch64 cortexa53 crc" TUNE_FEATURES_tune-cortexa53-crypto = "aarch64 cortexa53 crc crypto" PACKAGE_EXTRA_ARCHS_tune-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa53 cortexa53-crypto" -TUNE_PKGARCH_tune-cortexa53 = "cortexa53" -TUNE_PKGARCH_tune-cortexa53-crypto = "cortexa53-crypto" - BASE_LIB_tune-cortexa53 = "lib64" BASE_LIB_tune-cortexa53-crypto = "lib64" diff --git a/poky/meta/conf/machine/include/tune-cortexa55.inc b/poky/meta/conf/machine/include/tune-cortexa55.inc index 274944819..89032b59e 100644 --- a/poky/meta/conf/machine/include/tune-cortexa55.inc +++ b/poky/meta/conf/machine/include/tune-cortexa55.inc @@ -9,6 +9,5 @@ require conf/machine/include/arm/arch-armv8a.inc AVAILTUNES += "cortexa55" ARMPKGARCH_tune-cortexa55 = "cortexa55" TUNE_FEATURES_tune-cortexa55 = "aarch64 cortexa55 crc crypto" -TUNE_PKGARCH_tune-cortexa55 = "cortexa55" PACKAGE_EXTRA_ARCHS_tune-cortexa55 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa55" BASE_LIB_tune-cortexa55 = "lib64" diff --git a/poky/meta/conf/machine/include/tune-cortexa57-cortexa53.inc b/poky/meta/conf/machine/include/tune-cortexa57-cortexa53.inc index b95d63e86..ba4b07385 100644 --- a/poky/meta/conf/machine/include/tune-cortexa57-cortexa53.inc +++ b/poky/meta/conf/machine/include/tune-cortexa57-cortexa53.inc @@ -11,6 +11,5 @@ require conf/machine/include/arm/arch-armv8a.inc AVAILTUNES += "cortexa57-cortexa53" ARMPKGARCH_tune-cortexa57-cortexa53 = "cortexa57-cortexa53" TUNE_FEATURES_tune-cortexa57-cortexa53 = "aarch64 cortexa57-cortexa53" -TUNE_PKGARCH_tune-cortexa57-cortexa53 = "cortexa57-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa57-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64} cortexa57-cortexa53" BASE_LIB_tune-cortexa57-cortexa53 = "lib64" diff --git a/poky/meta/conf/machine/include/tune-cortexa57.inc b/poky/meta/conf/machine/include/tune-cortexa57.inc index e8ddeb578..0811d503c 100644 --- a/poky/meta/conf/machine/include/tune-cortexa57.inc +++ b/poky/meta/conf/machine/include/tune-cortexa57.inc @@ -8,12 +8,10 @@ require conf/machine/include/arm/arch-armv8a.inc # Little Endian base configs AVAILTUNES += "cortexa57 cortexa57-crypto" ARMPKGARCH_tune-cortexa57 = "cortexa57" -ARMPKGARCH_tune-cortexa57-crypto = "cortexa57" +ARMPKGARCH_tune-cortexa57-crypto = "cortexa57-crypto" TUNE_FEATURES_tune-cortexa57 = "aarch64 cortexa57 crc" TUNE_FEATURES_tune-cortexa57-crypto = "aarch64 cortexa57 crc crypto" PACKAGE_EXTRA_ARCHS_tune-cortexa57 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa57" PACKAGE_EXTRA_ARCHS_tune-cortexa57-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa57 cortexa57-crypto" -TUNE_PKGARCH_tune-cortexa57 = "cortexa57" -TUNE_PKGARCH_tune-cortexa57-crypto = "cortexa57-crypto" BASE_LIB_tune-cortexa57 = "lib64" BASE_LIB_tune-cortexa57-crypto = "lib64" diff --git a/poky/meta/conf/machine/include/tune-cortexa72-cortexa53.inc b/poky/meta/conf/machine/include/tune-cortexa72-cortexa53.inc index fd1ffeb17..e857f875f 100644 --- a/poky/meta/conf/machine/include/tune-cortexa72-cortexa53.inc +++ b/poky/meta/conf/machine/include/tune-cortexa72-cortexa53.inc @@ -10,13 +10,11 @@ require conf/machine/include/arm/arch-armv8a.inc # cortexa72.cortexa53 implies crc support AVAILTUNES += "cortexa72-cortexa53 cortexa72-cortexa53-crypto" ARMPKGARCH_tune-cortexa72-cortexa53 = "cortexa72-cortexa53" -ARMPKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53" +ARMPKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53-crypto" TUNE_FEATURES_tune-cortexa72-cortexa53 = "aarch64 crc cortexa72-cortexa53" TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "aarch64 crc crypto cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72-cortexa53 cortexa72-cortexa53-crypto" -TUNE_PKGARCH_tune-cortexa72-cortexa53 = "cortexa72-cortexa53" -TUNE_PKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53-crypto" BASE_LIB_tune-cortexa72-cortexa53 = "lib64" BASE_LIB_tune-cortexa72-cortexa53-crypto = "lib64" diff --git a/poky/meta/conf/machine/include/tune-cortexa72.inc b/poky/meta/conf/machine/include/tune-cortexa72.inc index 23640d5c1..00f7745a2 100644 --- a/poky/meta/conf/machine/include/tune-cortexa72.inc +++ b/poky/meta/conf/machine/include/tune-cortexa72.inc @@ -10,5 +10,4 @@ AVAILTUNES += "cortexa72" ARMPKGARCH_tune-cortexa72 = "cortexa72" TUNE_FEATURES_tune-cortexa72 = "aarch64 cortexa72 crc crypto" PACKAGE_EXTRA_ARCHS_tune-cortexa72 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72" -TUNE_PKGARCH_tune-cortexa72 = "cortexa72" BASE_LIB_tune-cortexa72 = "lib64" diff --git a/poky/meta/conf/machine/include/tune-cortexa73-cortexa53.inc b/poky/meta/conf/machine/include/tune-cortexa73-cortexa53.inc index ab87c8874..ba2b9b195 100644 --- a/poky/meta/conf/machine/include/tune-cortexa73-cortexa53.inc +++ b/poky/meta/conf/machine/include/tune-cortexa73-cortexa53.inc @@ -10,13 +10,11 @@ require conf/machine/include/arm/arch-armv8a.inc # cortexa73.cortexa53 implies crc support AVAILTUNES += "cortexa73-cortexa53 cortexa73-cortexa53-crypto" ARMPKGARCH_tune-cortexa73-cortexa53 = "cortexa73-cortexa53" -ARMPKGARCH_tune-cortexa73-cortexa53-crypto = "cortexa73-cortexa53" +ARMPKGARCH_tune-cortexa73-cortexa53-crypto = "cortexa73-cortexa53-crypto" TUNE_FEATURES_tune-cortexa73-cortexa53 = "aarch64 crc cortexa73-cortexa53" TUNE_FEATURES_tune-cortexa73-cortexa53-crypto = "aarch64 crc crypto cortexa73-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa73-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa73-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa73-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa73-cortexa53 cortexa73-cortexa53-crypto" -TUNE_PKGARCH_tune-cortexa73-cortexa53 = "cortexa73-cortexa53" -TUNE_PKGARCH_tune-cortexa73-cortexa53-crypto = "cortexa73-cortexa53-crypto" BASE_LIB_tune-cortexa73-cortexa53 = "lib64" BASE_LIB_tune-cortexa73-cortexa53-crypto = "lib64" diff --git a/poky/meta/conf/machine/qemuarm.conf b/poky/meta/conf/machine/qemuarm.conf index 367fcef01..4e605d3a9 100644 --- a/poky/meta/conf/machine/qemuarm.conf +++ b/poky/meta/conf/machine/qemuarm.conf @@ -8,6 +8,7 @@ require conf/machine/include/qemu.inc KERNEL_IMAGETYPE = "zImage" SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" diff --git a/poky/meta/conf/machine/qemuarm64.conf b/poky/meta/conf/machine/qemuarm64.conf index 7965fac71..e8aac3847 100644 --- a/poky/meta/conf/machine/qemuarm64.conf +++ b/poky/meta/conf/machine/qemuarm64.conf @@ -8,6 +8,7 @@ require conf/machine/include/qemu.inc KERNEL_IMAGETYPE = "Image" SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # For runqemu QB_SYSTEM_NAME = "qemu-system-aarch64" |