diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-24 08:42:56 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-15 16:03:37 +0300 |
commit | ac7284629ea572cf27d69949dc4014b3b226f14f (patch) | |
tree | 5fc089f2688322722a46f0dcfe12e608a1be59af | |
parent | df497e2c06efce859fa48082d3fba69a42a47842 (diff) | |
download | openbmc-ac7284629ea572cf27d69949dc4014b3b226f14f.tar.xz |
Rename and move kernel recipe
Rename linux-obmc to linux-aspeed and move to the Aspeed
layer. Like recipes for u-boot forks, recipes for kernel
forks in support of different SOCs are typically provided
in the BSP supporting the SOC.
Moved a number of phosphor-isms out of the kernel recipe and put
those in a bbappend in aspeed-layer/bbappend.
Removed COMPATIBLE_MACHINE setting. We simply use PREFERRED_PROVIDER
in machine configuration files to set the default kernel recipe.
Tested: Booted spoon/palmetto images using QEMU
Change-Id: I7dc73629cad4789dcd5aeb0f7b6214fe064c6adc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
35 files changed, 29 insertions, 40 deletions
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc b/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed.inc index 274db26a4..55678405f 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc +++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed.inc @@ -1,28 +1,20 @@ -DESCRIPTION = "Linux kernel for OpenBMC" +DESCRIPTION = "Linux kernel for Aspeed" SECTION = "kernel" LICENSE = "GPLv2" -KCONFIG_MODE="--alldefconfig" +PROVIDES += "virtual/kernel" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +KCONFIG_MODE="--alldefconfig" KSRC ?= "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}" SRC_URI = "${KSRC}" -SRC_URI += "file://phosphor-gpio-keys.scc" -SRC_URI += "file://phosphor-gpio-keys.cfg" -SRC_URI += "file://phosphor-vlan.scc" -SRC_URI += "file://phosphor-vlan.cfg" -SRC_URI += "file://phosphor-wdt-on-panic.scc" -SRC_URI += "file://phosphor-wdt-on-panic.cfg" -SRC_URI_append_df-obmc-ubi-fs = " file://0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch" - +SRC_URI_append_ast2400 = " file://ast2400/defconfig" +SRC_URI_append_ast2500 = " file://ast2500/defconfig" LINUX_VERSION_EXTENSION ?= "-${SRCREV}" PV = "${LINUX_VERSION}+git${SRCPV}" -COMPATIBLE_MACHINE_${MACHINE} = "openbmc" - do_patch_append() { for DTB in "${KERNEL_DEVICETREE}"; do DT=`basename ${DTB} .dtb` @@ -35,6 +27,3 @@ do_patch_append() { inherit kernel require recipes-kernel/linux/linux-yocto.inc - -KERNEL_FEATURES_append = " phosphor-vlan" -KERNEL_FEATURES_remove_qemuall = " phosphor-vlan" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2400/defconfig index ed1c470ba..ed1c470ba 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2400/defconfig diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2500/defconfig index 5183a7fd5..5183a7fd5 100755 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2500/defconfig diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb b/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed_4.13.bb index 6207a0a08..42bff8fea 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb +++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed_4.13.bb @@ -3,4 +3,4 @@ LINUX_VERSION ?= "4.13.16" SRCREV="aca92be80c008bceeb6fb62fd1d450b5be5d0a4f" -require linux-obmc.inc +require linux-aspeed.inc diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc index ff6c83e42..88290ff82 100644 --- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc +++ b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc @@ -1,4 +1,4 @@ -PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-aspeed" 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" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf index 2ce719c7f..5757afeb4 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf @@ -1,10 +1,6 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_PATTERN_ast2400-layer = "^${LAYERDIR}/" +BBFILE_PATTERN_ast2400-layer = "" BBFILE_COLLECTIONS += "ast2400-layer" LAYERVERSION_ast2400-layer = "1" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend deleted file mode 100644 index 7b49ba126..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend_ast2400 := "${THISDIR}/${PN}:" -SRC_URI_append_ast2400 = " file://defconfig" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/layer.conf index 00dd677ff..c18b2cfea 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/layer.conf +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/layer.conf @@ -1,10 +1,6 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_PATTERN_ast2500-layer = "^${LAYERDIR}/" +BBFILE_PATTERN_ast2500-layer = "" BBFILE_COLLECTIONS += "ast2500-layer" LAYERVERSION_ast2500-layer = "1" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend deleted file mode 100644 index ee9a010ea..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/${PN}:" -SRC_URI_append_ast2500 = " file://defconfig" diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-obmc/centriq2400-rep.cfg b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed/centriq2400-rep.cfg index 2182623e6..2182623e6 100644 --- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-obmc/centriq2400-rep.cfg +++ b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed/centriq2400-rep.cfg diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed_%.bbappend index 573e29872..573e29872 100644 --- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-obmc_%.bbappend +++ b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed_%.bbappend diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed/palmetto.cfg index 498497e9f..498497e9f 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed/palmetto.cfg diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..6cdb95135 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +SRC_URI += "file://palmetto.cfg" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend deleted file mode 100644 index a49c23910..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:" -SRC_URI += "file://palmetto.cfg" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc/romulus.cfg b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed/romulus.cfg index 9f8fdb977..9f8fdb977 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc/romulus.cfg +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed/romulus.cfg diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..fd0a1495c --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" +SRC_URI += "file://romulus.cfg" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc_%.bbappend deleted file mode 100644 index 5d4802863..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:" -SRC_URI += "file://romulus.cfg" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc/witherspoon.cfg b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg index dc41d5834..dc41d5834 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc/witherspoon.cfg +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..cad9140a0 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend_witherspoon := "${THISDIR}/${PN}:" +SRC_URI += "file://witherspoon.cfg" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend deleted file mode 100644 index 3d0b856c4..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:" -SRC_URI += "file://witherspoon.cfg" diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/zaius.cfg b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg index 75c630ce6..75c630ce6 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/zaius.cfg +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend index f3a83990b..f3a83990b 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed/barreleye.cfg index f778394c1..f778394c1 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed/barreleye.cfg diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..8a12f9270 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend_barreleye := "${THISDIR}/${PN}:" +SRC_URI += "file://barreleye.cfg" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend deleted file mode 100644 index 9e74ab4ff..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:" -SRC_URI += "file://barreleye.cfg" diff --git a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/recipes-kernel/linux/linux-obmc/msn.cfg b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed/msn.cfg index e0df616f2..e0df616f2 100644 --- a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/recipes-kernel/linux/linux-obmc/msn.cfg +++ b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed/msn.cfg diff --git a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed_%.bbappend index 35e9d9b33..35e9d9b33 100644 --- a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/recipes-kernel/linux/linux-obmc_%.bbappend +++ b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed_%.bbappend diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch index f514ef252..f514ef252 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.cfg index f5c01bed7..f5c01bed7 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.cfg diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.scc index 78961af7a..78961af7a 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.scc diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.cfg b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-vlan.cfg index 1ea3eed08..1ea3eed08 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.cfg +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-vlan.cfg diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.scc b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-vlan.scc index 46d3bcec8..46d3bcec8 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.scc +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-vlan.scc diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg index 329b4df4b..329b4df4b 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc index 7fc650799..7fc650799 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..b8c40c520 --- /dev/null +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://phosphor-gpio-keys.scc" +SRC_URI += "file://phosphor-gpio-keys.cfg" +SRC_URI += "file://phosphor-vlan.scc" +SRC_URI += "file://phosphor-vlan.cfg" +SRC_URI += "file://phosphor-wdt-on-panic.scc" +SRC_URI += "file://phosphor-wdt-on-panic.cfg" +SRC_URI_append_df-obmc-ubi-fs = " file://0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch" + +KERNEL_FEATURES_append = " phosphor-vlan" +KERNEL_FEATURES_remove_qemuall = " phosphor-vlan" |