summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@konsulko.com>2024-06-20 20:56:36 -0400
committerRyan Eatmon <reatmon@ti.com>2024-07-01 08:58:02 -0500
commit5cda7e9f4a0d9c7746adcaadefb1c8423f0e3568 (patch)
treea9ebf040076002315efc6036c7206389483075f3
parentffae59bd23377a490c8d499522558a16d6452371 (diff)
downloadmeta-ti-5cda7e9f4a0d9c7746adcaadefb1c8423f0e3568.tar.gz
linux: cleanup and unify mainline and next kernel recipes
Share the most commonality between the recipes, except: * SRC_URI torvalds vs. linux-next * SRCREV and PV * Device Tree list vs. DT prefix * SUMMARY Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb19
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb19
2 files changed, 5 insertions, 33 deletions
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
index 47b573e1..77ebb11e 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
@@ -9,30 +9,17 @@ require recipes-kernel/linux/ti-kernel.inc
9 9
10DEPENDS += "gmp-native libmpc-native" 10DEPENDS += "gmp-native libmpc-native"
11 11
12KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ 12KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
13 ${EXTRA_DTC_ARGS}"
14 13
15S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
16 15
17# 6.6 Mainline version 16# 6.6 Mainline version
18SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa" 17SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa"
19PV = "6.6+git" 18PV = "6.6"
20 19
21KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" 20SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=https;branch=master"
22KERNEL_GIT_PROTOCOL = "https"
23KERNEL_GIT_BRANCH = "master"
24SRC_URI += " \
25 ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_GIT_BRANCH} \
26"
27 21
28DEFCONFIG_NAME = "multi_v7_defconfig" 22DEFCONFIG_NAME = "multi_v7_defconfig"
29DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" 23DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
30DEFCONFIG_NAME:k3 = "defconfig" 24DEFCONFIG_NAME:k3 = "defconfig"
31KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" 25KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"
32
33do_shared_workdir:prepend() {
34 cd ${B}
35 echo >> Module.symvers
36}
37
38FILES:${KERNEL_PACKAGE_NAME}-devicetree += "/${KERNEL_IMAGEDEST}/*.itb"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
index f1a14ab1..3c206754 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
@@ -1,26 +1,11 @@
1SECTION = "kernel" 1require linux-ti-mainline_git.bb
2SUMMARY = "Linux-next kernel for TI devices"
3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5 2
6inherit kernel 3SUMMARY = "Linux-next kernel for TI devices"
7 4
8require recipes-kernel/linux/ti-kernel.inc
9include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} 5include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
10 6
11DEPENDS += "gmp-native libmpc-native"
12
13KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
14
15S = "${WORKDIR}/git"
16
17# 6.6.0-rc3+ version 7# 6.6.0-rc3+ version
18SRCREV = "6465e260f48790807eef06b583b38ca9789b6072" 8SRCREV = "6465e260f48790807eef06b583b38ca9789b6072"
19PV = "6.6.0-rc3+git" 9PV = "6.6.0-rc3+git"
20 10
21SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master" 11SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master"
22
23DEFCONFIG_NAME = "multi_v7_defconfig"
24DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
25DEFCONFIG_NAME:k3 = "defconfig"
26KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"