| commit | ac7284629ea572cf27d69949dc4014b3b226f14f | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Sat Mar 24 01:42:56 2018 -0400 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Jun 15 13:03:37 2018 +0000 |
| tree | 5fc089f2688322722a46f0dcfe12e608a1be59af | |
| parent | df497e2c06efce859fa48082d3fba69a42a47842 [diff] |
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>
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 similarity index 100% rename from meta-phosphor/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch rename to 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 similarity index 100% rename from meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg rename to 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 similarity index 100% rename from meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc rename to 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 similarity index 100% rename from meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.cfg rename to 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 similarity index 100% rename from meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-vlan.scc rename to 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 similarity index 100% rename from meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg rename to 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 similarity index 100% rename from meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc rename to 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 0000000..b8c40c5 --- /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 274db26..0000000 --- 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 6207a0a..0000000 --- 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