diff mbox series

[master/scarthgap] linux: cleanup and unify mainline and next kernel recipes

Message ID 20240621005636.6279-1-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master/scarthgap] linux: cleanup and unify mainline and next kernel recipes | expand

Commit Message

Denys Dmytriyenko June 21, 2024, 12:56 a.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

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>
---
 .../linux/linux-ti-mainline_git.bb            | 19 +++----------------
 .../recipes-kernel/linux/linux-ti-next_git.bb | 19 ++-----------------
 2 files changed, 5 insertions(+), 33 deletions(-)
diff mbox series

Patch

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
 
 DEPENDS += "gmp-native libmpc-native"
 
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
-		      ${EXTRA_DTC_ARGS}"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
 
 S = "${WORKDIR}/git"
 
 # 6.6 Mainline version
 SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa"
-PV = "6.6+git"
+PV = "6.6"
 
-KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
-KERNEL_GIT_PROTOCOL = "https"
-KERNEL_GIT_BRANCH = "master"
-SRC_URI += " \
-	${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_GIT_BRANCH} \
-"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=https;branch=master"
 
 DEFCONFIG_NAME = "multi_v7_defconfig"
 DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
 DEFCONFIG_NAME:k3 = "defconfig"
 KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"
-
-do_shared_workdir:prepend() {
-	cd ${B}
-	echo >> Module.symvers
-}
-
-FILES:${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 @@ 
-SECTION = "kernel"
-SUMMARY = "Linux-next kernel for TI devices"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+require linux-ti-mainline_git.bb
 
-inherit kernel
+SUMMARY = "Linux-next kernel for TI devices"
 
-require recipes-kernel/linux/ti-kernel.inc
 include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
 
-DEPENDS += "gmp-native libmpc-native"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
-
-S = "${WORKDIR}/git"
-
 # 6.6.0-rc3+ version
 SRCREV = "6465e260f48790807eef06b583b38ca9789b6072"
 PV = "6.6.0-rc3+git"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master"
-
-DEFCONFIG_NAME = "multi_v7_defconfig"
-DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
-DEFCONFIG_NAME:k3 = "defconfig"
-KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"