diff options
Diffstat (limited to 'meta-phosphor')
10 files changed, 12 insertions, 46 deletions
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" diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc deleted file mode 100644 index 274db26a4..000000000 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Linux kernel for OpenBMC" -SECTION = "kernel" -LICENSE = "GPLv2" - -KCONFIG_MODE="--alldefconfig" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -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" - - -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` - if [ -r "${WORKDIR}/${DT}.dts" ]; then - cp ${WORKDIR}/${DT}.dts \ - ${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts - fi - done -} - -inherit kernel -require recipes-kernel/linux/linux-yocto.inc - -KERNEL_FEATURES_append = " phosphor-vlan" -KERNEL_FEATURES_remove_qemuall = " phosphor-vlan" diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb deleted file mode 100644 index 6207a0a08..000000000 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb +++ /dev/null @@ -1,6 +0,0 @@ -KBRANCH ?= "dev-4.13" -LINUX_VERSION ?= "4.13.16" - -SRCREV="aca92be80c008bceeb6fb62fd1d450b5be5d0a4f" - -require linux-obmc.inc |