From 116cbd42e44dec3caca3d9c68c99bdddcff2302b Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Wed, 6 Sep 2017 15:56:10 +0200 Subject: add separate kernel recipe for guest guest kernel is based on cavium kernel source tree as the one for host but we need a seprate recipe so we can append different kernel configurations for guest. Signed-off-by: Adrian Calianu Signed-off-by: Martin Borg --- recipes-kernel/linux/linux-cavium-guest_4.9.bb | 1 + recipes-kernel/linux/linux-cavium-sdk_4.9.bb | 2 +- recipes-kernel/linux/linux-cavium_4.9.bb | 38 +------------------------- recipes-kernel/linux/linux-cavium_4.9.inc | 37 +++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 recipes-kernel/linux/linux-cavium-guest_4.9.bb create mode 100644 recipes-kernel/linux/linux-cavium_4.9.inc diff --git a/recipes-kernel/linux/linux-cavium-guest_4.9.bb b/recipes-kernel/linux/linux-cavium-guest_4.9.bb new file mode 100644 index 0000000..2851845 --- /dev/null +++ b/recipes-kernel/linux/linux-cavium-guest_4.9.bb @@ -0,0 +1 @@ +require linux-cavium_4.9.inc diff --git a/recipes-kernel/linux/linux-cavium-sdk_4.9.bb b/recipes-kernel/linux/linux-cavium-sdk_4.9.bb index 5e4cbfe..a45fe96 100644 --- a/recipes-kernel/linux/linux-cavium-sdk_4.9.bb +++ b/recipes-kernel/linux/linux-cavium-sdk_4.9.bb @@ -1,4 +1,4 @@ -require linux-cavium_4.9.bb +require linux-cavium_4.9.inc # Debug tools support KERNEL_FEATURES_append = " features/debug/debug_kernel_y.scc" diff --git a/recipes-kernel/linux/linux-cavium_4.9.bb b/recipes-kernel/linux/linux-cavium_4.9.bb index f26a34e..2851845 100644 --- a/recipes-kernel/linux/linux-cavium_4.9.bb +++ b/recipes-kernel/linux/linux-cavium_4.9.bb @@ -1,37 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -require recipes-kernel/linux/linux-yocto.inc -require recipes-kernel/linux/linux-deploy-kconfig.inc - -# board specific branches -KBRANCH_cn8304 ?= "cavium-4.9" -KBRANCH_qemuarm64 ?= "cavium-4.9" - -SRCREV_machine_cn8304 ?= "3804edd9db9c0d3e0e8301f13bdc569bcc0ebd09" -SRCREV_machine_qemuarm64 ?= "3804edd9db9c0d3e0e8301f13bdc569bcc0ebd09" -SRCREV_metaenea ?= "85a500385477e07d144fc3fcfa4ec62e6aabc8e8" -KENEABRANCH = "cavium-4.9" - -SRC_URI = "git://git@git.enea.com/linux/linux-cavium.git;protocol=ssh;name=machine;branch=${KBRANCH} \ - git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-cache \ - file://dts \ - " - -LINUX_KERNEL_TYPE = "tiny" -LINUX_VERSION ?= "4.9.0" -LINUX_VERSION_EXTENSION = "-cavium-${LINUX_KERNEL_TYPE}" -PV = "4.9-octeontx.sdk.6.1.0.p2.build.17" - -KERNEL_DEVICETREE_cn8304 = "cavium/ebb8304-linux.dtb" - -COMPATIBLE_MACHINE = "cn8304|qemuarm64" -KMACHINE_cn8304 = "cavium-cn8304" -KMACHINE_qemuarm64 = "cavium-cn8304" - -KERNEL_FEATURES_append = " features/udev/udev.scc" -KERNEL_FEATURES_append_cn8304 += "features/net/thunderx/thunderx_nic.scc" - -do_patch_append() { - install -D ${S}/arch/${ARCH}/boot/dts - install ${WORKDIR}/dts/* ${S}/arch/${ARCH}/boot/dts/cavium/ -} +require linux-cavium_4.9.inc diff --git a/recipes-kernel/linux/linux-cavium_4.9.inc b/recipes-kernel/linux/linux-cavium_4.9.inc new file mode 100644 index 0000000..1077e48 --- /dev/null +++ b/recipes-kernel/linux/linux-cavium_4.9.inc @@ -0,0 +1,37 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-cavium:" + +require recipes-kernel/linux/linux-yocto.inc +require recipes-kernel/linux/linux-deploy-kconfig.inc + +# board specific branches +KBRANCH_cn8304 ?= "cavium-4.9" +KBRANCH_qemuarm64 ?= "cavium-4.9" + +SRCREV_machine_cn8304 ?= "3804edd9db9c0d3e0e8301f13bdc569bcc0ebd09" +SRCREV_machine_qemuarm64 ?= "3804edd9db9c0d3e0e8301f13bdc569bcc0ebd09" +SRCREV_metaenea ?= "85a500385477e07d144fc3fcfa4ec62e6aabc8e8" +KENEABRANCH = "cavium-4.9" + +SRC_URI = "git://git@git.enea.com/linux/linux-cavium.git;protocol=ssh;name=machine;branch=${KBRANCH} \ + git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-cache \ + file://dts \ + " + +LINUX_KERNEL_TYPE = "tiny" +LINUX_VERSION ?= "4.9.0" +LINUX_VERSION_EXTENSION = "-cavium-${LINUX_KERNEL_TYPE}" +PV = "4.9-octeontx.sdk.6.1.0.p2.build.17" + +KERNEL_DEVICETREE_cn8304 = "cavium/ebb8304-linux.dtb" + +COMPATIBLE_MACHINE = "cn8304|qemuarm64" +KMACHINE_cn8304 = "cavium-cn8304" +KMACHINE_qemuarm64 = "cavium-cn8304" + +KERNEL_FEATURES_append = " features/udev/udev.scc" +KERNEL_FEATURES_append_cn8304 += "features/net/thunderx/thunderx_nic.scc" + +do_patch_append() { + install -D ${S}/arch/${ARCH}/boot/dts + install ${WORKDIR}/dts/* ${S}/arch/${ARCH}/boot/dts/cavium/ +} -- cgit v1.2.3-54-g00ecf