From b9799be79de3f0a15a14be392ee90574433435ad Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 6 Aug 2021 09:13:33 -0500 Subject: meta-aspeed: prep for new override syntax Signed-off-by: Patrick Williams Change-Id: I8135871ae0e3b360aff7d878f7cf04a2504f2dd0 --- meta-aspeed/classes/socsec-sign.bbclass | 2 +- meta-aspeed/conf/layer.conf | 4 ++-- meta-aspeed/conf/machine/include/aspeed.inc | 22 +++++++++++----------- meta-aspeed/recipes-aspeed/python/socsec_git.bb | 12 ++++++------ .../u-boot/u-boot-aspeed-sdk_2019.04.bb | 10 +++++----- meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc | 2 +- .../recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb | 2 +- .../u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb | 12 ++++++------ .../u-boot/u-boot-fw-utils-aspeed_2016.07.bb | 12 ++++++------ .../udev/udev-aspeed-mtd-partitions.bb | 2 +- meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb | 2 +- 11 files changed, 41 insertions(+), 41 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/classes/socsec-sign.bbclass b/meta-aspeed/classes/socsec-sign.bbclass index 1b1576592..b5866e29e 100644 --- a/meta-aspeed/classes/socsec-sign.bbclass +++ b/meta-aspeed/classes/socsec-sign.bbclass @@ -59,7 +59,7 @@ sign_spl() { } -do_deploy_append() { +do_deploy:append() { if [ "${SOCSEC_SIGN_ENABLE}" = "1" -a -n "${SPL_BINARY}" ] ; then sign_spl fi diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf index c0289753f..00302ddf5 100644 --- a/meta-aspeed/conf/layer.conf +++ b/meta-aspeed/conf/layer.conf @@ -6,5 +6,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "aspeed-layer" BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/" -LAYERVERSION_aspeed-layer = "1" -LAYERSERIES_COMPAT_aspeed-layer = "gatesgarth hardknott" +LAYERVERSION:aspeed-layer = "1" +LAYERSERIES_COMPAT_aspeed-layer = "gatesgarth hardknott honister" diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc index fdc411981..628a73b1d 100644 --- a/meta-aspeed/conf/machine/include/aspeed.inc +++ b/meta-aspeed/conf/machine/include/aspeed.inc @@ -3,9 +3,9 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-aspeed" PREFERRED_PROVIDER_u-boot ?= "u-boot-aspeed" PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-aspeed" -PREFERRED_PROVIDER_virtual/bootloader_aspeed-g6 ?= "u-boot-aspeed-sdk" -PREFERRED_PROVIDER_u-boot_aspeed-g6 ?= "u-boot-aspeed-sdk" -PREFERRED_PROVIDER_u-boot-fw-utils_aspeed-g6 ?= "u-boot-fw-utils-aspeed-sdk" +PREFERRED_PROVIDER_virtual/bootloader:aspeed-g6 ?= "u-boot-aspeed-sdk" +PREFERRED_PROVIDER_u-boot:aspeed-g6 ?= "u-boot-aspeed-sdk" +PREFERRED_PROVIDER_u-boot-fw-utils:aspeed-g6 ?= "u-boot-fw-utils-aspeed-sdk" # Build a FIT image and stuff core-image-minimal in it by default. KERNEL_IMAGETYPE ?= "fitImage" @@ -29,12 +29,12 @@ MACHINEOVERRIDES =. "aspeed:" SERIAL_CONSOLES ?= "115200;ttyS4" -DEFAULTTUNE_aspeed-g5 ?= "arm1176jzs" -DEFAULTTUNE_aspeed-g6 ?= "armv7ahf-vfpv4d16" +DEFAULTTUNE:aspeed-g5 ?= "arm1176jzs" +DEFAULTTUNE:aspeed-g6 ?= "armv7ahf-vfpv4d16" -UBOOT_ENTRYPOINT_aspeed-g4 ?= "0x40001000" -UBOOT_ENTRYPOINT_aspeed-g5 ?= "0x80001000" -UBOOT_ENTRYPOINT_aspeed-g6 ?= "0x80001000" -UBOOT_LOADADDRESS_aspeed-g4 ?= "0x40001000" -UBOOT_LOADADDRESS_aspeed-g5 ?= "0x80001000" -UBOOT_LOADADDRESS_aspeed-g6 ?= "0x80001000" +UBOOT_ENTRYPOINT:aspeed-g4 ?= "0x40001000" +UBOOT_ENTRYPOINT:aspeed-g5 ?= "0x80001000" +UBOOT_ENTRYPOINT:aspeed-g6 ?= "0x80001000" +UBOOT_LOADADDRESS:aspeed-g4 ?= "0x40001000" +UBOOT_LOADADDRESS:aspeed-g5 ?= "0x80001000" +UBOOT_LOADADDRESS:aspeed-g6 ?= "0x80001000" diff --git a/meta-aspeed/recipes-aspeed/python/socsec_git.bb b/meta-aspeed/recipes-aspeed/python/socsec_git.bb index 3de811a51..07b966c1c 100644 --- a/meta-aspeed/recipes-aspeed/python/socsec_git.bb +++ b/meta-aspeed/recipes-aspeed/python/socsec_git.bb @@ -13,11 +13,11 @@ S = "${WORKDIR}/git" inherit python3native setuptools3 -RDEPENDS_${PN} += "python3-bitarray" -RDEPENDS_${PN} += "python3-core" -RDEPENDS_${PN} += "python3-hexdump" -RDEPENDS_${PN} += "python3-jsonschema" -RDEPENDS_${PN} += "python3-jstyleson" -RDEPENDS_${PN} += "python3-pycryptodome" +RDEPENDS:${PN} += "python3-bitarray" +RDEPENDS:${PN} += "python3-core" +RDEPENDS:${PN} += "python3-hexdump" +RDEPENDS:${PN} += "python3-jsonschema" +RDEPENDS:${PN} += "python3-jstyleson" +RDEPENDS:${PN} += "python3-pycryptodome" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb index 727c62d27..56468270a 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb @@ -8,17 +8,17 @@ inherit socsec-sign PROVIDES += "u-boot" DEPENDS += "bc-native dtc-native" -SRC_URI_append_df-phosphor-mmc = " file://u-boot-env-ast2600.txt" +SRC_URI:append:df-phosphor-mmc = " file://u-boot-env-ast2600.txt" SRC_URI += " \ file://rsa_oem_dss_key.pem;sha256sum=64a379979200d39949d3e5b0038e3fdd5548600b2f7077a17e35422336075ad4 \ file://rsa_pub_oem_dss_key.pem;sha256sum=40132a694a10af2d1b094b1cb5adab4d6b4db2a35e02d848b2b6a85e60738264 \ " -UBOOT_ENV_SIZE_df-phosphor-mmc = "0x10000" -UBOOT_ENV_df-phosphor-mmc = "u-boot-env" -UBOOT_ENV_SUFFIX_df-phosphor-mmc = "bin" +UBOOT_ENV_SIZE:df-phosphor-mmc = "0x10000" +UBOOT_ENV:df-phosphor-mmc = "u-boot-env" +UBOOT_ENV_SUFFIX:df-phosphor-mmc = "bin" -do_compile_append() { +do_compile:append() { if [ -n "${UBOOT_ENV}" ] then # Generate redundant environment image diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc index 0b9bc20d2..19de5d2c6 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc @@ -182,7 +182,7 @@ do_install () { } -FILES_${PN} = "/boot ${sysconfdir} ${datadir}" +FILES:${PN} = "/boot ${sysconfdir} ${datadir}" do_deploy () { if [ -n "${UBOOT_CONFIG}" ] diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb index 8cebe5ab3..395f5ab57 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb @@ -6,4 +6,4 @@ DEPENDS += "dtc-native" # FIXME this can/should be removed when we have rebased off our # 2016 snapshot onto a more modern (circa late 2018) u-boot tree. -BUILD_CFLAGS_remove = "-isystem${STAGING_INCDIR_NATIVE}" +BUILD_CFLAGS:remove = "-isystem${STAGING_INCDIR_NATIVE}" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb index cebbee6e6..13a4081b0 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb @@ -9,11 +9,11 @@ SRC_URI += "file://fw_env_ast2600_nor.config" SRC_URI += "file://fw_env_ast2600_mmc.config" ENV_CONFIG_FILE = "fw_env_ast2600_nor.config" -ENV_CONFIG_FILE_df-phosphor-mmc = "fw_env_ast2600_mmc.config" +ENV_CONFIG_FILE:df-phosphor-mmc = "fw_env_ast2600_mmc.config" -INSANE_SKIP_${PN} = "already-stripped" -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' -EXTRA_OEMAKE_class-cross = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' +INSANE_SKIP:${PN} = "already-stripped" +EXTRA_OEMAKE:class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' +EXTRA_OEMAKE:class-cross = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' inherit uboot-config @@ -31,13 +31,13 @@ do_install () { install -m 644 ${WORKDIR}/${ENV_CONFIG_FILE} ${D}${sysconfdir}/fw_env.config } -do_install_class-cross () { +do_install:class-cross () { install -d ${D}${bindir_cross} install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv } -SYSROOT_DIRS_append_class-cross = " ${bindir_cross}" +SYSROOT_DIRS:append:class-cross = " ${bindir_cross}" PACKAGE_ARCH = "${MACHINE_ARCH}" BBCLASSEXTEND = "cross" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb index e9f724df2..0ec64ce8e 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb @@ -9,9 +9,9 @@ DEPENDS += "mtd-utils" PROVIDES += "u-boot-fw-utils" -INSANE_SKIP_${PN} = "already-stripped" -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' -EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' +INSANE_SKIP:${PN} = "already-stripped" +EXTRA_OEMAKE:class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' +EXTRA_OEMAKE:class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' inherit uboot-config @@ -30,15 +30,15 @@ do_install () { install -m 644 ${WORKDIR}/alt_fw_env.config ${D}${sysconfdir}/alt_fw_env.config } -do_install_class-cross () { +do_install:class-cross () { install -d ${D}${bindir_cross} install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv } -SYSROOT_DIRS_append_class-cross = " ${bindir_cross}" +SYSROOT_DIRS:append:class-cross = " ${bindir_cross}" PACKAGE_ARCH = "${MACHINE_ARCH}" BBCLASSEXTEND = "cross" -RDEPENDS_${PN} = "udev-aspeed-mtd-partitions" +RDEPENDS:${PN} = "udev-aspeed-mtd-partitions" diff --git a/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb index 9e85308cd..ea52c2ff2 100644 --- a/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb +++ b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 S = "${WORKDIR}" SRC_URI += "file://76-aspeed-mtd-partitions.rules" -RDEPENDS_${PN} += "udev" +RDEPENDS:${PN} += "udev" do_install() { install -d ${D}/${base_libdir}/udev/rules.d diff --git a/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb index c0ee6771e..188b0a434 100644 --- a/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb +++ b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 S = "${WORKDIR}" SRC_URI += "file://61-aspeed-vuart.rules" -RDEPENDS_${PN} += "udev" +RDEPENDS:${PN} += "udev" do_install() { install -d ${D}/lib/udev/rules.d -- cgit v1.2.3 From 5257879e91af14977dcc7338eaee3b2915c2120c Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Wed, 11 Aug 2021 15:48:25 +0000 Subject: meta-{aspeed,phosphor}: layer.conf: Override syntax cleanup LAYERVERSION should keep underscore instead of colon. Change-Id: I53b0af2fd8c756d09a11ee2c970910cdf7331738 Signed-off-by: Adriana Kobylak --- meta-aspeed/conf/layer.conf | 2 +- meta-phosphor/conf/layer.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf index 00302ddf5..21b96413b 100644 --- a/meta-aspeed/conf/layer.conf +++ b/meta-aspeed/conf/layer.conf @@ -6,5 +6,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "aspeed-layer" BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/" -LAYERVERSION:aspeed-layer = "1" +LAYERVERSION_aspeed-layer = "1" LAYERSERIES_COMPAT_aspeed-layer = "gatesgarth hardknott honister" diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf index 664fc0e40..783545687 100644 --- a/meta-phosphor/conf/layer.conf +++ b/meta-phosphor/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "phosphor-layer" BBFILE_PATTERN_phosphor-layer := "^${LAYERDIR}/" -LAYERVERSION:phosphor-layer = "1" +LAYERVERSION_phosphor-layer = "1" LAYERSERIES_COMPAT_phosphor-layer = "gatesgarth hardknott honister" IMAGE_FEATURES[validitems] += "tools-profile" -- cgit v1.2.3 From ca633cc623210a789fe85da8207305fb753185b2 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Wed, 4 Aug 2021 13:35:31 +0930 Subject: meta-aspeed: socsec: Bump to v0.2.1 Andrew Jeffery (10): resocsec: Style cleanup via autopep8 resocsec: Use env(1) for shebang resocsec: Consistently use single-quotes for strings resocsec: Make signing helper options mutually exclusive resocsec: Add a helper for frobbing the RSA algorithm slug resocsec: Attempt at ergonomic Chain-of-Trust options resocsec: Rename secure-bootloader to secure-bootstrap-image resocsec: Add secure-chained-images subcommand resocsec: Add verify-secure-image subcommand setup: Install resocsec Johnny Huang (43): Merge branch 'develop' into resocsec Merge pull request #7 from amboar/resocsec resocsec: fix typo socsec: add support for ast2605 socsec: remove hexdump module dependcy schema: update otp schema otptool: fix making strap region otptool: fix schema typo readme: add descripton of verify strap: fix "VGA class code" info otptool: fix schema key otptool: fix OTPCFG0[14] description for 2600A1 socsec: move hexdump to global otptool: add 'print' function for otptool socsec: fix public key exponent otp_info: fix config typo otptool: add AST2600A3 support socsec: add rsa pss padding for AST1030A1 socsec: fix cot public key exponent socsec: Add new test item socsec: Add 2600A3 test item Merge branch 'develop' socsec: add mode2v2aes2 pub and priv test socsec: add ecdsa mode for AST1030A1 socsec: Add ecdsa test item otp_info: remove ast1030 from otp_info otp_info: update schema socsec: update revision id otptool: update schema for manifest id config socsec: fix revision id range. socsec: fix f-strings giving SyntaxError socsec: deprecate the CoT sing function otptool: fix bitarray AttributeError readme: update readme and fix typo otp_info: update otp info tool: add info2sample tool otp_info: Add AST2600A3 otp config otp_info: update and add OTPSTRAP Reserved info otptool: fix otptool print otptool: make image also generate OTPCFG1 tool: add script to generate otp config schema setup: update version number Merge branch 'develop' Change-Id: Ie78aa2c0ddb18d823e1055a67c76967aa9762285 Signed-off-by: Andrew Jeffery --- meta-aspeed/recipes-aspeed/python/socsec_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-aspeed/python/socsec_git.bb b/meta-aspeed/recipes-aspeed/python/socsec_git.bb index 07b966c1c..6034b2982 100644 --- a/meta-aspeed/recipes-aspeed/python/socsec_git.bb +++ b/meta-aspeed/recipes-aspeed/python/socsec_git.bb @@ -4,10 +4,10 @@ HOMEPAGE = "https://github.com/AspeedTech-BMC/socsec/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d50b901333b4eedfee074ebcd6a6d611" -SRC_URI = "git://github.com/AspeedTech-BMC/socsec/;protocol=https;branch=develop" +SRC_URI = "git://github.com/AspeedTech-BMC/socsec/;protocol=https;branch=master" -PV = "1.7+git${SRCPV}" -SRCREV = "54cdd3b26262e66d2020a04cba55bc8b02090f1a" +PV = "0.2.1+git${SRCPV}" +SRCREV = "51bd4504bffb5044264cfe4c63b8fe8d48a114a9" S = "${WORKDIR}/git" @@ -15,7 +15,7 @@ inherit python3native setuptools3 RDEPENDS:${PN} += "python3-bitarray" RDEPENDS:${PN} += "python3-core" -RDEPENDS:${PN} += "python3-hexdump" +RDEPENDS:${PN} += "python3-ecdsa" RDEPENDS:${PN} += "python3-jsonschema" RDEPENDS:${PN} += "python3-jstyleson" RDEPENDS:${PN} += "python3-pycryptodome" -- cgit v1.2.3 From 38cfcc393d9eea397fa38bd0d65437bdbadb6f99 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Wed, 4 Aug 2021 12:51:56 +0930 Subject: meta-aspeed: u-boot-aspeed-sdk: Use provided signing key by default Allow configurations to override the SPL signing key if necessary, but provide a default in case they don't. The provided key is intended a low-security key. Change-Id: I756271970b0a55409e40dbd06f1245ada6a3cb73 Signed-off-by: Andrew Jeffery --- meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb index 56468270a..45505b073 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb @@ -14,6 +14,10 @@ SRC_URI += " \ file://rsa_pub_oem_dss_key.pem;sha256sum=40132a694a10af2d1b094b1cb5adab4d6b4db2a35e02d848b2b6a85e60738264 \ " +SOCSEC_SIGN_KEY ?= "${WORKDIR}/rsa_oem_dss_key.pem" +SOCSEC_SIGN_ALGO ?= "RSA4096_SHA512" +SOCSEC_SIGN_EXTRA_OPTS ?= "--stack_intersects_verification_region=false" + UBOOT_ENV_SIZE:df-phosphor-mmc = "0x10000" UBOOT_ENV:df-phosphor-mmc = "u-boot-env" UBOOT_ENV_SUFFIX:df-phosphor-mmc = "bin" -- cgit v1.2.3 From f77919abfe6505a3b29db1efab49b077c10afe4d Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Thu, 5 Aug 2021 13:33:10 +0930 Subject: meta-aspeed: ast2600: Sign the SPL with socsec by default Signing the SPL when secure-boot is disabled has no impact, the SoC will continue to bootstrap as normal. Change-Id: I05c1db80cb4bec44ca315190f5b3c1d97168d1d5 Signed-off-by: Andrew Jeffery --- meta-aspeed/conf/machine/include/ast2600.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta-aspeed') diff --git a/meta-aspeed/conf/machine/include/ast2600.inc b/meta-aspeed/conf/machine/include/ast2600.inc index fff5465d9..1e5e1f8fe 100644 --- a/meta-aspeed/conf/machine/include/ast2600.inc +++ b/meta-aspeed/conf/machine/include/ast2600.inc @@ -1,4 +1,9 @@ SOC_FAMILY = "aspeed-g6" + +# Enable SPL signing by default +SOCSEC_SIGN_ENABLE ?= "1" +SOCSEC_SIGN_SOC ?= "2600" + include conf/machine/include/soc-family.inc require conf/machine/include/aspeed.inc include conf/machine/include/arm/arch-armv7a.inc -- cgit v1.2.3 From 782d7195eac9bb9e05f86477b9537dbbee26930c Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Mon, 16 Aug 2021 23:51:27 -0600 Subject: Fix path to udev rules files Use nonarch_base_libdir instead of base_libdir, because the files are always in /lib/udev/rules.d/. On ppc64le base_libdir is lib64, and the files end up in the wrong spot. Signed-off-by: Anton Blanchard Change-Id: I3c24dae293f4166f1ed1826d09d4bde7cd7d0357 --- meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb | 4 ++-- meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb | 4 ++-- .../meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend | 2 +- .../meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend | 4 ++-- meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb | 4 ++-- meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 4 ++-- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb | 4 ++-- meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb | 2 +- meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb | 4 ++-- meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb | 4 ++-- .../recipes-phosphor/console/obmc-console_%.bbappend | 6 +++--- .../recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb index ea52c2ff2..3f30916bd 100644 --- a/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb +++ b/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb @@ -10,6 +10,6 @@ SRC_URI += "file://76-aspeed-mtd-partitions.rules" RDEPENDS:${PN} += "udev" do_install() { - install -d ${D}/${base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/76-aspeed-mtd-partitions.rules ${D}/${base_libdir}/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/76-aspeed-mtd-partitions.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb index 188b0a434..44cafca8c 100644 --- a/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb +++ b/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb @@ -10,6 +10,6 @@ SRC_URI += "file://61-aspeed-vuart.rules" RDEPENDS:${PN} += "udev" do_install() { - install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/61-aspeed-vuart.rules ${D}/lib/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/61-aspeed-vuart.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend index 192b25086..2a5efdb09 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend @@ -9,6 +9,6 @@ SYSTEMD_SERVICE:${PN} += " \ " do_install:append() { - rm -rf ${D}${base_libdir}/udev/rules.d/80-obmc-console-uart.rules + rm -rf ${D}${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules install -m 0644 ${WORKDIR}/${PN}@.service ${D}${systemd_system_unitdir} } diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend index e5101fff8..de2b22cfa 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -7,6 +7,6 @@ SYSTEMD_SERVICE:${PN}:append = " ${PN}@${SMM_DEVICE}.service " SRC_URI += "file://99-ipmi-kcs.rules" do_install:append() { - install -d ${D}${base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules ${D}${base_libdir}/udev/rules.d/ + install -d ${D}${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules ${D}${nonarch_base_libdir}/udev/rules.d/ } diff --git a/meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb b/meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb index dc185655b..9954b6397 100644 --- a/meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb +++ b/meta-hpe/meta-gxp/recipes-core/udev/udev-gxp-mtd-partitions.bb @@ -10,6 +10,6 @@ SRC_URI += "file://76-gxp-mtd-partitions.rules" RDEPENDS_${PN} += "udev" do_install() { - install -d ${D}/${base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/76-gxp-mtd-partitions.rules ${D}/${base_libdir}/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/76-gxp-mtd-partitions.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index cde45e7cc..080025ead 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -120,8 +120,8 @@ SYSTEMD_LINK_max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.ser SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service" do_install:append:ibm-ac-server() { - install -d ${D}/${base_libdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/ + install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/70-max31785-hwmon.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ install -d ${D}${bindir} install -m 0755 ${WORKDIR}/start_max31785_hwmon.sh ${D}${bindir} diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb index f3b7d4d9f..b9555159d 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb @@ -39,6 +39,6 @@ do_install:append() { install -d ${DEST} install ${SRC}/inventory ${DEST} - install -d ${D}/${base_libdir}/udev/rules.d/ - install -m0644 ${WORKDIR}/70-op-vpd.rules ${D}/${base_libdir}/udev/rules.d/ + install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ + install -m0644 ${WORKDIR}/70-op-vpd.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ } diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index 2da124be0..1a8022c8a 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -40,7 +40,7 @@ SYSTEMD_SERVICE:${PN}-presence += "phosphor-gpio-presence@.service" FILES:${PN}-monitor += "${bindir}/phosphor-gpio-monitor" FILES:${PN}-monitor += "${bindir}/phosphor-multi-gpio-monitor" FILES:${PN}-monitor += "${bindir}/phosphor-gpio-util" -FILES:${PN}-monitor += "${base_libdir}/udev/rules.d/99-gpio-keys.rules" +FILES:${PN}-monitor += "${nonarch_base_libdir}/udev/rules.d/99-gpio-keys.rules" FILES:${PN}-presence += "${bindir}/phosphor-gpio-presence" SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index 62126e43d..684e41c3a 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -24,6 +24,6 @@ SRCREV = "5ee5f3b7162cb5d8e6780a9571e0b0ca3daf7c6e" S = "${WORKDIR}/git" do_install:append() { - install -d ${D}/${base_libdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${base_libdir}/udev/rules.d/ + install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ } diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index 1b91ba364..c7273a032 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -26,8 +26,8 @@ MBOXD_FLASH_SIZE ??= "32M" SYSTEMD_SUBSTITUTIONS += "FLASH_SIZE:${MBOXD_FLASH_SIZE}:${PN}.service" do_install:append() { - install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/${nonarch_base_libdir}/udev/rules.d } TMPL = "mboxd-reload@.service" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend index 5231622da..e38befbb6 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend @@ -8,7 +8,7 @@ do_install:append:olympus-nuvoton() { install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/ ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.ttyS2.conf - install -d ${D}/lib/udev/rules.d - rm -f ${D}/lib/udev/rules.d/80-obmc-console-uart.rules - install -m 0644 ${WORKDIR}/80-olympus-nuvoton-sol.rules ${D}/lib/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + rm -f ${D}/${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules + install -m 0644 ${WORKDIR}/80-olympus-nuvoton-sol.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend index efca54174..c40d537d0 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -5,6 +5,6 @@ SRC_URI:append:olympus-nuvoton = " file://99-ipmi-kcs.rules.rules" KCS_DEVICE:olympus-nuvoton = "ipmi_kcs1" do_install:append:olympus-nuvoton() { - install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules.rules ${D}/lib/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules.rules ${D}/${nonarch_base_libdir}/udev/rules.d } -- cgit v1.2.3 From fc764dabb058dea5e38157ec7a562f259480951a Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 19 Aug 2021 14:19:58 +0930 Subject: linux-aspeed: P2A and AHB2LHB fixes, CFF PSU, P10 gpios B. J. Wyman (1): hwmon: (pmbus/ibm-cffps) Fix write bits for LED control Iwona Winiarska (2): soc: aspeed: lpc-ctrl: Fix boundary check for mmap soc: aspeed: p2a-ctrl: Fix boundary check for mmap Jim Wright (1): ARM: dts: aspeed: p10bmc: Add power control pins Joel Stanley (1): soc: aspeed: socinfo: Add AST2625 variant Change-Id: I127736fd24c0e066fe8b4b3e2d3584d5503d095a Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 208031f1c..7a81e3097 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" LINUX_VERSION ?= "5.10.53" -SRCREV="1519240139a91e3dbc97d8f79de29a22a3328257" +SRCREV="4e5cdadd7722e691077e85ef974b2a55877a640c" require linux-aspeed.inc -- cgit v1.2.3 From aede1df65960794b87c962a60c230f748f6bbfc9 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 19 Aug 2021 14:49:37 +0930 Subject: linux-aspeed: Move to v5.10.60 stable release This includes security and bug fixes from the 5.10.54 through to 5.10.60 stable releases. Change-Id: Ia91c97e7add0aec1b57c36f31692fc893e274040 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 7a81e3097..b7d3c4587 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" -LINUX_VERSION ?= "5.10.53" +LINUX_VERSION ?= "5.10.60" -SRCREV="4e5cdadd7722e691077e85ef974b2a55877a640c" +SRCREV="09869b9b34417297808d8a57b2e9f8f61218354b" require linux-aspeed.inc -- cgit v1.2.3 From b60b7b1333de884fa780ab12c3b55e18c1383472 Mon Sep 17 00:00:00 2001 From: Andrei Kartashev Date: Thu, 29 Jul 2021 09:01:35 +0300 Subject: u-boot-aspeed: improve env handling This fixes some build errors we faced due to add new ast2500-based platform. * Allow to redefine input env file. * Backport providing "u-boot-default-env" from u-boot.inc * PROVIDES += "u-boot-fw-utils" is not enough, add also RPROVIDES Last two changes allows to exclude from build modern libubootenv which somewhy doesn't work for us. Signed-off-by: Andrei Kartashev Change-Id: I33f152c572f6c0b4d8b608375b252290efacd1ea --- meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb | 3 ++- meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc | 4 ++++ meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb index 45505b073..a142c1731 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb @@ -21,11 +21,12 @@ SOCSEC_SIGN_EXTRA_OPTS ?= "--stack_intersects_verification_region=false" UBOOT_ENV_SIZE:df-phosphor-mmc = "0x10000" UBOOT_ENV:df-phosphor-mmc = "u-boot-env" UBOOT_ENV_SUFFIX:df-phosphor-mmc = "bin" +UBOOT_ENV_TXT:df-phosphor-mmc = "u-boot-env-ast2600.txt" do_compile:append() { if [ -n "${UBOOT_ENV}" ] then # Generate redundant environment image - ${B}/tools/mkenvimage -r -s ${UBOOT_ENV_SIZE} -o ${WORKDIR}/${UBOOT_ENV_BINARY} ${WORKDIR}/u-boot-env-ast2600.txt + ${B}/tools/mkenvimage -r -s ${UBOOT_ENV_SIZE} -o ${WORKDIR}/${UBOOT_ENV_BINARY} ${WORKDIR}/${UBOOT_ENV_TXT} fi } diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc index 19de5d2c6..3028a9e19 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc @@ -182,7 +182,11 @@ do_install () { } +PACKAGE_BEFORE_PN += "${PN}-env" + +RPROVIDES:${PN}-env += "u-boot-default-env" FILES:${PN} = "/boot ${sysconfdir} ${datadir}" +RDEPENDS:${PN} += "${PN}-env" do_deploy () { if [ -n "${UBOOT_CONFIG}" ] diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb index 13a4081b0..6c1470a5f 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb @@ -4,6 +4,7 @@ SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" DEPENDS += "mtd-utils" PROVIDES += "u-boot-fw-utils" +RPROVIDES:${PN} += "u-boot-fw-utils" SRC_URI += "file://fw_env_ast2600_nor.config" SRC_URI += "file://fw_env_ast2600_mmc.config" -- cgit v1.2.3 From ce1426257525128c9c8f17e91afc6a60d1cb6244 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Mon, 23 Aug 2021 16:26:20 -0500 Subject: treewide: remove gategarth from layer-support We've typically kept these LAYERSERIES_COMPAT to 2 releases: the current and the upcoming. Remove 'gatesgarth' is it is now 2 releases back. Signed-off-by: Patrick Williams Change-Id: I5e812a94fed1738898af75c0fdee81996a5bbf20 --- meta-alibaba/conf/layer.conf | 2 +- meta-alibaba/meta-thor/conf/layer.conf | 2 +- meta-amd/conf/layer.conf | 2 +- meta-amd/meta-ethanolx/conf/layer.conf | 2 +- meta-ampere/conf/layer.conf | 2 +- meta-ampere/meta-jade/conf/layer.conf | 2 +- meta-arm/conf/layer.conf | 2 +- meta-aspeed/conf/layer.conf | 2 +- meta-asrock/conf/layer.conf | 2 +- meta-asrock/meta-e3c246d4i/conf/layer.conf | 2 +- meta-bytedance/conf/layer.conf | 2 +- meta-bytedance/meta-g220a/conf/layer.conf | 2 +- meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf | 2 +- meta-evb/meta-evb-enclustra/conf/layer.conf | 2 +- meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf | 2 +- meta-evb/meta-evb-nuvoton/conf/layer.conf | 2 +- meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf | 2 +- meta-facebook/conf/layer.conf | 2 +- meta-facebook/meta-bletchley/conf/layer.conf | 2 +- meta-facebook/meta-tiogapass/conf/layer.conf | 2 +- meta-facebook/meta-yosemitev2/conf/layer.conf | 2 +- meta-google/conf/layer.conf | 2 +- meta-hpe/conf/layer.conf | 2 +- meta-hpe/meta-dl360poc/conf/layer.conf | 2 +- meta-hpe/meta-gxp/conf/layer.conf | 2 +- meta-hxt/conf/layer.conf | 2 +- meta-ibm/conf/layer.conf | 2 +- meta-ibm/meta-palmetto/conf/layer.conf | 2 +- meta-ibm/meta-romulus/conf/layer.conf | 2 +- meta-ingrasys/conf/layer.conf | 2 +- meta-ingrasys/meta-zaius/conf/layer.conf | 2 +- meta-inspur/conf/layer.conf | 2 +- meta-inspur/meta-fp5280g2/conf/layer.conf | 2 +- meta-inspur/meta-on5263m5/conf/layer.conf | 2 +- meta-intel-openbmc/conf/layer.conf | 2 +- meta-intel-openbmc/meta-s2600wf/conf/layer.conf | 2 +- meta-inventec/conf/layer.conf | 2 +- meta-lenovo/conf/layer.conf | 2 +- meta-lenovo/meta-hr630/conf/layer.conf | 2 +- meta-lenovo/meta-hr855xg2/conf/layer.conf | 2 +- meta-microsoft/conf/layer.conf | 2 +- meta-microsoft/meta-olympus/conf/layer.conf | 2 +- meta-nuvoton/conf/layer.conf | 2 +- meta-openpower/conf/layer.conf | 2 +- meta-phosphor/conf/layer.conf | 2 +- meta-portwell/meta-neptune/conf/layer.conf | 2 +- meta-qualcomm/conf/layer.conf | 2 +- meta-quanta/conf/layer.conf | 2 +- meta-quanta/meta-f0b/conf/layer.conf | 2 +- meta-quanta/meta-gbs/conf/layer.conf | 2 +- meta-quanta/meta-gsj/conf/layer.conf | 2 +- meta-quanta/meta-olympus-nuvoton/conf/layer.conf | 2 +- meta-quanta/meta-q71l/conf/layer.conf | 2 +- meta-supermicro/conf/layer.conf | 2 +- meta-supermicro/meta-x11spi/conf/layer.conf | 2 +- meta-x86/conf/layer.conf | 2 +- meta-yadro/conf/layer.conf | 2 +- meta-yadro/meta-nicole/conf/layer.conf | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-alibaba/conf/layer.conf b/meta-alibaba/conf/layer.conf index 435d1ddec..715ba5142 100644 --- a/meta-alibaba/conf/layer.conf +++ b/meta-alibaba/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "alibaba-layer" BBFILE_PATTERN_alibaba-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_alibaba-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_alibaba-layer = "hardknott" diff --git a/meta-alibaba/meta-thor/conf/layer.conf b/meta-alibaba/meta-thor/conf/layer.conf index 89eca706a..6ae627170 100644 --- a/meta-alibaba/meta-thor/conf/layer.conf +++ b/meta-alibaba/meta-thor/conf/layer.conf @@ -6,4 +6,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "" BBFILE_PATTERN := "^${LAYERDIR}/" -LAYERSERIES_COMPAT = "gatesgarth hardknott" +LAYERSERIES_COMPAT = "hardknott" diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf index 8caa32493..7fc59b9ac 100644 --- a/meta-amd/conf/layer.conf +++ b/meta-amd/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "amd-layer" BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_amd-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_amd-layer = "hardknott" diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf index 818ab7df1..0564fe424 100644 --- a/meta-amd/meta-ethanolx/conf/layer.conf +++ b/meta-amd/meta-ethanolx/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "ethanolx-layer" BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_ethanolx-layer = "6" -LAYERSERIES_COMPAT_ethanolx-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_ethanolx-layer = "hardknott" diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf index e1d7fe118..321e2b24f 100644 --- a/meta-ampere/conf/layer.conf +++ b/meta-ampere/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ampere-layer" BBFILE_PATTERN_ampere-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ampere-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_ampere-layer = "hardknott honister" diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf index 7b5a07f3d..f979db1c7 100644 --- a/meta-ampere/meta-jade/conf/layer.conf +++ b/meta-ampere/meta-jade/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "jade-layer" BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_jade-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_jade-layer = "hardknott honister" diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf index d111b24b8..102a0ccd9 100644 --- a/meta-arm/conf/layer.conf +++ b/meta-arm/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "arm" BBFILE_PATTERN_arm = "^${LAYERDIR}/" LAYERVERSION_arm = "1" -LAYERSERIES_COMPAT_arm = "gatesgarth hardknott" +LAYERSERIES_COMPAT_arm = "hardknott" diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf index 21b96413b..9dd3b72aa 100644 --- a/meta-aspeed/conf/layer.conf +++ b/meta-aspeed/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "aspeed-layer" BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/" LAYERVERSION_aspeed-layer = "1" -LAYERSERIES_COMPAT_aspeed-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_aspeed-layer = "hardknott honister" diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf index 37e452cec..4c06d8774 100644 --- a/meta-asrock/conf/layer.conf +++ b/meta-asrock/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "asrock-layer" BBFILE_PATTERN_asrock-layer = "^${LAYERDIR}/" LAYERVERSION_asrock-layer = "1" -LAYERSERIES_COMPAT_asrock-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_asrock-layer = "hardknott" diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf index aff53c469..6b8e77192 100644 --- a/meta-asrock/meta-e3c246d4i/conf/layer.conf +++ b/meta-asrock/meta-e3c246d4i/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "e3c246d4i-layer" BBFILE_PATTERN_e3c246d4i-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_e3c246d4i-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_e3c246d4i-layer = "hardknott" diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf index 241bc6d45..9ece82f09 100644 --- a/meta-bytedance/conf/layer.conf +++ b/meta-bytedance/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "bytedance-layer" BBFILE_PATTERN_bytedance-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_bytedance-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_bytedance-layer = "hardknott honister" diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf index 4e4f0092a..e5a5f96dc 100644 --- a/meta-bytedance/meta-g220a/conf/layer.conf +++ b/meta-bytedance/meta-g220a/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "g220a-layer" BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_g220a-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_g220a-layer = "hardknott honister" diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf index b3ef55cba..277e712aa 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "meta-evb-ast2600" BBFILE_PATTERN_meta-evb-ast2600 = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_meta-evb-ast2600 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_meta-evb-ast2600 = "hardknott honister" diff --git a/meta-evb/meta-evb-enclustra/conf/layer.conf b/meta-evb/meta-evb-enclustra/conf/layer.conf index e83298fae..278b6b5f1 100644 --- a/meta-evb/meta-evb-enclustra/conf/layer.conf +++ b/meta-evb/meta-evb-enclustra/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "evb-enclustra" BBFILE_PATTERN_evb-enclustra = "" -LAYERSERIES_COMPAT_evb-enclustra = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-enclustra = "hardknott honister" diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf index ea08f5a56..d9944132d 100644 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf +++ b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "evb-zx3-pm3" BBFILE_PATTERN_evb-zx3-pm3 = "" -LAYERSERIES_COMPAT_evb-zx3-pm3 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-zx3-pm3 = "hardknott honister" diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf index fe07f91ea..5c4dfedf7 100644 --- a/meta-evb/meta-evb-nuvoton/conf/layer.conf +++ b/meta-evb/meta-evb-nuvoton/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "evb-nuvoton" BBFILE_PATTERN_evb-nuvoton = "" -LAYERSERIES_COMPAT_evb-nuvoton = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-nuvoton = "hardknott honister" diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf index 8d64d158e..543f6a6e9 100644 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf +++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "evb-npcm750" BBFILE_PATTERN_evb-npcm750 = "" -LAYERSERIES_COMPAT_evb-npcm750 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-npcm750 = "hardknott honister" diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index 895d48fc1..9e4cf5521 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "facebook-layer" BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_facebook-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_facebook-layer := "hardknott honister" diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf index 8e2770903..14d320079 100644 --- a/meta-facebook/meta-bletchley/conf/layer.conf +++ b/meta-facebook/meta-bletchley/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "bletchley-layer" BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_bletchley-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_bletchley-layer := "hardknott honister" diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf index bb8ecee76..af34387cf 100644 --- a/meta-facebook/meta-tiogapass/conf/layer.conf +++ b/meta-facebook/meta-tiogapass/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "tiogapass-layer" BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_tiogapass-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_tiogapass-layer := "hardknott honister" diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf index 091cdc369..654ffabba 100644 --- a/meta-facebook/meta-yosemitev2/conf/layer.conf +++ b/meta-facebook/meta-yosemitev2/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "yosemitev2-layer" BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_yosemitev2-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_yosemitev2-layer := "hardknott honister" diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf index 346946b99..47379e427 100644 --- a/meta-google/conf/layer.conf +++ b/meta-google/conf/layer.conf @@ -14,4 +14,4 @@ BBFILES_DYNAMIC += " \ BBFILE_COLLECTIONS += "google-layer" BBFILE_PATTERN_google-layer := "^${LAYERDIR}/" LAYERVERSION_google-layer = "1" -LAYERSERIES_COMPAT_google-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_google-layer = "hardknott honister" diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf index 6ff79df8f..2b8f43b06 100644 --- a/meta-hpe/conf/layer.conf +++ b/meta-hpe/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "hpe-layer" BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_hpe-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hpe-layer = "hardknott" # Provide a variable that points the base of the hpe layer. HPEBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-hpe/meta-dl360poc/conf/layer.conf b/meta-hpe/meta-dl360poc/conf/layer.conf index 5f85f7c1c..6e3d5c4f9 100644 --- a/meta-hpe/meta-dl360poc/conf/layer.conf +++ b/meta-hpe/meta-dl360poc/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "dl360poc-layer" BBFILE_PATTERN_dl360poc-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_dl360poc-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_dl360poc-layer = "hardknott" diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf index 28f2ddc87..4612c22b0 100644 --- a/meta-hpe/meta-gxp/conf/layer.conf +++ b/meta-hpe/meta-gxp/conf/layer.conf @@ -7,6 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gxp-layer" BBFILE_PATTERN_gxp-layer = "^${LAYERDIR}/" LAYERVERSION_gxp-layer = "1" -LAYERSERIES_COMPAT_gxp-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_gxp-layer = "hardknott" GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-hxt/conf/layer.conf b/meta-hxt/conf/layer.conf index bc8cd5bc0..96be31b7b 100644 --- a/meta-hxt/conf/layer.conf +++ b/meta-hxt/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "hxt" BBFILE_PATTERN_hxt = "" -LAYERSERIES_COMPAT_hxt = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hxt = "hardknott" diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf index 95c571be6..5d49c2d27 100644 --- a/meta-ibm/conf/layer.conf +++ b/meta-ibm/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ibm-layer" BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ibm-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_ibm-layer = "hardknott honister" diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf index f40a9511d..e57b1d5ed 100644 --- a/meta-ibm/meta-palmetto/conf/layer.conf +++ b/meta-ibm/meta-palmetto/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "palmetto-layer" BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_palmetto-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_palmetto-layer = "hardknott honister" diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf index efeb24a95..3651ada69 100644 --- a/meta-ibm/meta-romulus/conf/layer.conf +++ b/meta-ibm/meta-romulus/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "romulus-layer" BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_romulus-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_romulus-layer = "hardknott honister" diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf index fc07b595d..66d991ac5 100644 --- a/meta-ingrasys/conf/layer.conf +++ b/meta-ingrasys/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "ingrasys" BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ingrasys = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_ingrasys = "hardknott honister" diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf index 0f930d88c..6f62318b9 100644 --- a/meta-ingrasys/meta-zaius/conf/layer.conf +++ b/meta-ingrasys/meta-zaius/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "zaius" BBFILE_PATTERN_zaius := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_zaius = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_zaius = "hardknott honister" diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf index 3e91eb548..9e1f53fb1 100644 --- a/meta-inspur/conf/layer.conf +++ b/meta-inspur/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "inspur-layer" BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_inspur-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_inspur-layer = "hardknott honister" diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf index 99be9a192..f921ba6fe 100644 --- a/meta-inspur/meta-fp5280g2/conf/layer.conf +++ b/meta-inspur/meta-fp5280g2/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "fp5280g2-layer" BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_fp5280g2-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_fp5280g2-layer = "hardknott honister" diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf index f638bcc68..2dcf54c88 100644 --- a/meta-inspur/meta-on5263m5/conf/layer.conf +++ b/meta-inspur/meta-on5263m5/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "on5263m5-layer" BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_on5263m5-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_on5263m5-layer = "hardknott honister" diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf index 3b53a7f1c..f082cafa9 100644 --- a/meta-intel-openbmc/conf/layer.conf +++ b/meta-intel-openbmc/conf/layer.conf @@ -8,5 +8,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "^${LAYERDIR}/" LAYERVERSION_intel = "1" -LAYERSERIES_COMPAT_intel = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_intel = "hardknott honister" LAYERDEPENDS_intel = "phosphor-layer" diff --git a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf index 936b1a9c0..07e7a8369 100644 --- a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf +++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "s2600wf" BBFILE_PATTERN_s2600wf = "" BBFILE_PRIORITY_s2600wf = "5" -LAYERSERIES_COMPAT_s2600wf = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_s2600wf = "hardknott honister" diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf index 08ca2651e..2b5eade4c 100644 --- a/meta-inventec/conf/layer.conf +++ b/meta-inventec/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "inventec" BBFILE_PATTERN_inventec = "" -LAYERSERIES_COMPAT_inventec = "gatesgarth hardknott" +LAYERSERIES_COMPAT_inventec = "hardknott" diff --git a/meta-lenovo/conf/layer.conf b/meta-lenovo/conf/layer.conf index 180e9603e..0b7cb4fe9 100644 --- a/meta-lenovo/conf/layer.conf +++ b/meta-lenovo/conf/layer.conf @@ -12,7 +12,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "lenovo-layer" BBFILE_PATTERN_lenovo-layer = "" LAYERVERSION_lenovo-layer = "1" -LAYERSERIES_COMPAT_lenovo-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_lenovo-layer = "hardknott" # Provide a variable that points the base of the lenovo layer. LENOVOBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-lenovo/meta-hr630/conf/layer.conf b/meta-lenovo/meta-hr630/conf/layer.conf index 9c1b4d652..2c6117c74 100644 --- a/meta-lenovo/meta-hr630/conf/layer.conf +++ b/meta-lenovo/meta-hr630/conf/layer.conf @@ -11,4 +11,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "hr630-layer" BBFILE_PATTERN_hr630-layer = "" BBFILE_PRIORITY_hr630-layer = "5" -LAYERSERIES_COMPAT_hr630-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hr630-layer = "hardknott" diff --git a/meta-lenovo/meta-hr855xg2/conf/layer.conf b/meta-lenovo/meta-hr855xg2/conf/layer.conf index 364143298..2af2de166 100644 --- a/meta-lenovo/meta-hr855xg2/conf/layer.conf +++ b/meta-lenovo/meta-hr855xg2/conf/layer.conf @@ -11,4 +11,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "hr855xg2-layer" BBFILE_PATTERN_hr855xg2-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_hr855xg2-layer = "5" -LAYERSERIES_COMPAT_hr855xg2-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hr855xg2-layer = "hardknott" diff --git a/meta-microsoft/conf/layer.conf b/meta-microsoft/conf/layer.conf index 03c6d8fc7..498b391ed 100755 --- a/meta-microsoft/conf/layer.conf +++ b/meta-microsoft/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "microsoft-layer" BBFILE_PATTERN_microsoft-layer = "" -LAYERSERIES_COMPAT_microsoft-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_microsoft-layer = "hardknott" diff --git a/meta-microsoft/meta-olympus/conf/layer.conf b/meta-microsoft/meta-olympus/conf/layer.conf index 1132bedd2..db4714534 100755 --- a/meta-microsoft/meta-olympus/conf/layer.conf +++ b/meta-microsoft/meta-olympus/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "olympus-layer" BBFILE_PATTERN_olympus-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_olympus-layer = "6" -LAYERSERIES_COMPAT_olympus-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_olympus-layer = "hardknott" diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf index 946ac2374..26830d3b1 100644 --- a/meta-nuvoton/conf/layer.conf +++ b/meta-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nuvoton-layer" BBFILE_PATTERN_nuvoton-layer = "" LAYERVERSION_nuvoton-layer = "1" -LAYERSERIES_COMPAT_nuvoton-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_nuvoton-layer = "hardknott honister" diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf index 4236ab266..9a16ca01f 100644 --- a/meta-openpower/conf/layer.conf +++ b/meta-openpower/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "openpower-layer" BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/" LAYERVERSION_openpower-layer = "1" LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer" -LAYERSERIES_COMPAT_openpower-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_openpower-layer = "hardknott honister" diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf index 783545687..7e510ea50 100644 --- a/meta-phosphor/conf/layer.conf +++ b/meta-phosphor/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "phosphor-layer" BBFILE_PATTERN_phosphor-layer := "^${LAYERDIR}/" LAYERVERSION_phosphor-layer = "1" -LAYERSERIES_COMPAT_phosphor-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_phosphor-layer = "hardknott honister" IMAGE_FEATURES[validitems] += "tools-profile" diff --git a/meta-portwell/meta-neptune/conf/layer.conf b/meta-portwell/meta-neptune/conf/layer.conf index 3ca3cac68..652c8a85d 100644 --- a/meta-portwell/meta-neptune/conf/layer.conf +++ b/meta-portwell/meta-neptune/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "neptune" BBFILE_PATTERN_neptune = "" -LAYERSERIES_COMPAT_neptune = "gatesgarth hardknott" +LAYERSERIES_COMPAT_neptune = "hardknott" diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf index e4c872117..1efa8f6eb 100644 --- a/meta-qualcomm/conf/layer.conf +++ b/meta-qualcomm/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "qualcomm" BBFILE_PATTERN_qualcomm = "" -LAYERSERIES_COMPAT_qualcomm = "gatesgarth hardknott" +LAYERSERIES_COMPAT_qualcomm = "hardknott" diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf index 39655f5ea..a64d93e6c 100644 --- a/meta-quanta/conf/layer.conf +++ b/meta-quanta/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "quanta-layer" BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_quanta-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_quanta-layer = "hardknott honister" diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf index f29015eb6..021711a07 100644 --- a/meta-quanta/meta-f0b/conf/layer.conf +++ b/meta-quanta/meta-f0b/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "f0b-layer" BBFILE_PATTERN_f0b-layer = "" -LAYERSERIES_COMPAT_f0b-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_f0b-layer = "hardknott honister" diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf index 3f738a053..9f41e0501 100644 --- a/meta-quanta/meta-gbs/conf/layer.conf +++ b/meta-quanta/meta-gbs/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gbs-layer" BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gbs-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_gbs-layer = "hardknott honister" diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index a429102b1..7591e0953 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gsj-layer" BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_gsj-layer = "hardknott honister" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf index c62ff264a..e78bf9576 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "olympus-nuvoton-layer" BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_olympus-nuvoton-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_olympus-nuvoton-layer = "hardknott honister" diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf index 98e71463b..991945384 100644 --- a/meta-quanta/meta-q71l/conf/layer.conf +++ b/meta-quanta/meta-q71l/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "q71l" BBFILE_PATTERN_q71l = "" -LAYERSERIES_COMPAT_q71l = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_q71l = "hardknott honister" diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf index f46b3746d..d3943d302 100644 --- a/meta-supermicro/conf/layer.conf +++ b/meta-supermicro/conf/layer.conf @@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "supermicro-layer" BBFILE_PATTERN_supermicro-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_supermicro-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT_supermicro-layer := "hardknott" diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf index d77e82e90..83c64e4b3 100644 --- a/meta-supermicro/meta-x11spi/conf/layer.conf +++ b/meta-supermicro/meta-x11spi/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "x11spi" BBFILE_PATTERN_x11spi = "" -LAYERSERIES_COMPAT_x11spi = "gatesgarth hardknott" +LAYERSERIES_COMPAT_x11spi = "hardknott" diff --git a/meta-x86/conf/layer.conf b/meta-x86/conf/layer.conf index cd4289954..aab9a63e2 100644 --- a/meta-x86/conf/layer.conf +++ b/meta-x86/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "obmc_machines_x86" BBFILE_PATTERN_obmc_machines_x86 = "" -LAYERSERIES_COMPAT_obmc_machines_x86 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_obmc_machines_x86 = "hardknott honister" diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf index 8d6466ffb..b291db86a 100644 --- a/meta-yadro/conf/layer.conf +++ b/meta-yadro/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yadro-layer" BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/" BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1" -LAYERSERIES_COMPAT_yadro-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_yadro-layer = "hardknott honister" diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf index fc18b8c59..13820273f 100644 --- a/meta-yadro/meta-nicole/conf/layer.conf +++ b/meta-yadro/meta-nicole/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nicole-layer" BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_nicole-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_nicole-layer = "hardknott honister" -- cgit v1.2.3 From 50e2234e380c6deca02bd98a1643a95cd8d0dfa7 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Wed, 25 Aug 2021 15:46:26 +0930 Subject: meta-aspeed: u-boot-aspeed-sdk: Ensure SOCSEC_SIGN defaults are set Include the socsec-sign class after the conditional assignments to ensure the values we might assign are considered by the functions of socsec-sign. Without this, u-boot-aspeed-sdk do_deploy logs show: ``` DEBUG: Executing python function sstate_task_prefunc DEBUG: Python function sstate_task_prefunc finished DEBUG: Executing shell function do_deploy Copying u-boot-nodtb binary... Warning: Invalid socsec signing key - SPL verified boot won't be available ``` Adjusting the location of the include gives: ``` DEBUG: Executing python function sstate_task_prefunc DEBUG: Python function sstate_task_prefunc finished DEBUG: Executing shell function do_deploy Copying u-boot-nodtb binary... check header PASS Found PEM header at position 381 check integrity PASS ``` Change-Id: I15cac4c315a6ceaeb69b0c02ba0b7d05e54f6e15 Signed-off-by: Andrew Jeffery --- meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb index a142c1731..6f2d979bc 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb @@ -3,7 +3,6 @@ require u-boot-common-aspeed-sdk_${PV}.inc UBOOT_MAKE_TARGET ?= "DEVICE_TREE=${UBOOT_DEVICETREE}" require u-boot-aspeed.inc -inherit socsec-sign PROVIDES += "u-boot" DEPENDS += "bc-native dtc-native" @@ -18,6 +17,8 @@ SOCSEC_SIGN_KEY ?= "${WORKDIR}/rsa_oem_dss_key.pem" SOCSEC_SIGN_ALGO ?= "RSA4096_SHA512" SOCSEC_SIGN_EXTRA_OPTS ?= "--stack_intersects_verification_region=false" +inherit socsec-sign + UBOOT_ENV_SIZE:df-phosphor-mmc = "0x10000" UBOOT_ENV:df-phosphor-mmc = "u-boot-env" UBOOT_ENV_SUFFIX:df-phosphor-mmc = "bin" -- cgit v1.2.3 From bf97bbd459bde95346a00ca85e3f7995feb2d098 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Thu, 26 Aug 2021 10:26:03 +0930 Subject: meta-aspeed: socsec-sign: Make invalid key configuration fatal Building the SPL and "silently" leaving it unsigned gives us a build that cannot be booted on systems that have secure-boot enabled. Change-Id: Ie788a04ef35c7031897a2bfa7d348caa4292305d Signed-off-by: Andrew Jeffery --- meta-aspeed/classes/socsec-sign.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/classes/socsec-sign.bbclass b/meta-aspeed/classes/socsec-sign.bbclass index b5866e29e..0af88d9f5 100644 --- a/meta-aspeed/classes/socsec-sign.bbclass +++ b/meta-aspeed/classes/socsec-sign.bbclass @@ -23,7 +23,8 @@ sign_spl_helper() { if [ "${SOC_FAMILY}" != "aspeed-g6" ] ; then echo "Warning: SPL signing is only supported on AST2600 boards" elif [ ! -e "${SOCSEC_SIGN_KEY}" ] ; then - echo "Warning: Invalid socsec signing key - SPL verified boot won't be available" + echo "Error: Invalid socsec signing key: ${SOCSEC_SIGN_KEY}" + exit 1 else rm -f ${SPL_BINARY}.staged -- cgit v1.2.3 From 672796227759565a4e22b041925b696f589d877b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 3 Sep 2021 09:14:43 -0500 Subject: meta-aspeed:conf/machine: tunes files moved to arch dirs Upstream yocto moved the tune files under architecture subdirectories so need to adjust our includes of them. Signed-off-by: Andrew Geissler Change-Id: I442f1403a869a117244461c8f94f940cfe7c08cd --- meta-aspeed/conf/machine/include/ast2400.inc | 2 +- meta-aspeed/conf/machine/include/ast2500.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc index 6284a2b64..cc99db025 100644 --- a/meta-aspeed/conf/machine/include/ast2400.inc +++ b/meta-aspeed/conf/machine/include/ast2400.inc @@ -1,4 +1,4 @@ SOC_FAMILY = "aspeed-g4" include conf/machine/include/soc-family.inc require conf/machine/include/aspeed.inc -require conf/machine/include/tune-arm926ejs.inc +require conf/machine/include/arm/armv5/tune-arm926ejs.inc diff --git a/meta-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc index 0724157a9..681ce640e 100644 --- a/meta-aspeed/conf/machine/include/ast2500.inc +++ b/meta-aspeed/conf/machine/include/ast2500.inc @@ -1,4 +1,4 @@ SOC_FAMILY = "aspeed-g5" include conf/machine/include/soc-family.inc require conf/machine/include/aspeed.inc -require conf/machine/include/tune-arm1176jz-s.inc +require conf/machine/include/arm/armv6/tune-arm1176jz-s.inc -- cgit v1.2.3