Skip to contentSkip to conversation

linux-ti-mainline: Use upstream configs with upstream kernel

PATCH In review Andrew Davis 2 participants 11 messages Apr 11, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/6 linux-ti-mainline: Use upstream configs with upstream kernel

Mainline should test the mainline kernel as it is, not with out-of-tree changes like to the default configuration that one would get when using a stock distro. Use only upstream configuration.

---
 .../recipes-kernel/linux/linux-ti-mainline/defconfig      | 1 -
 .../linux/linux-ti-mainline/dra7xx/defconfig              | 1 -
 .../recipes-kernel/linux/linux-ti-mainline/k3/defconfig   | 1 -
 .../linux/linux-ti-mainline/omapl138/defconfig            | 1 -
 .../linux/linux-ti-mainline/ti33x/defconfig               | 1 -
 .../linux/linux-ti-mainline/ti43x/defconfig               | 1 -
 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 8 +++++---
 7 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig deleted +0 -1
deleted file mode 100644
index d083d182..00000000
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omap2_release
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig deleted +0 -1
deleted file mode 100644
index dcb53bab..00000000
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_dra7x_release
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig deleted +0 -1
deleted file mode 100644
index b9bc6137..00000000
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_arm64_release
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig deleted +0 -1
deleted file mode 100644
index b3467853..00000000
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omapl138_release
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig deleted +0 -1
deleted file mode 100644
index 88f80fa9..00000000
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am3x_release
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig deleted +0 -1
deleted file mode 100644
index 4b9daaf9..00000000
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am4x_release
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +5 -3
index be278d73..7d948a85 100644
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 inherit kernel
 
-DEFCONFIG_BUILDER = "${S}/ti-upstream-tools/config/defconfig_builder.sh"
-require recipes-kernel/linux/setup-defconfig.inc
 require recipes-kernel/linux/kernel-rdepends.inc
 require recipes-kernel/linux/ti-kernel.inc
 
@@ -33,12 +31,16 @@ KERNEL_GIT_PROTOCOL = "https"
 SRC_URI += " \
     ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \
     git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools \
-    file://defconfig \
 "
 
 SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95"
 SRCREV_FORMAT = "linux"
 
+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}"
+
 kernel_do_compile:append() {
 	oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
 	oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
Signature · 1 line
2.39.2
#1 lore raw

PATCH v3 2/6 linux-ti-mainline: Remove ti-upstream-tools

Mainline should test the mainline kernel as it is, not with out-of-tree changes like new DTB/DTBOs. Use only upstream DTB/DTBOs. As that was the last thing provided by ti-upstream-tools, remove it here.

---
 .../linux/linux-ti-mainline_git.bb              | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +3 -14
index 7d948a85..842864cd 100644
@@ -1,5 +1,5 @@
 SECTION = "kernel"
-SUMMARY = "Mainline Linux kernel for TI devices (with ti-upstream-tools)"
+SUMMARY = "Mainline Linux kernel for TI devices"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
@@ -15,9 +15,6 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
 
 S = "${WORKDIR}/git"
 
-BRANCH = "master"
-TOOLS_BRANCH = "master"
-
 # 5.15 Mainline version
 SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813"
 PV = "5.15+git${SRCPV}"
@@ -28,24 +25,16 @@ PR = "${MACHINE_KERNEL_PR}"
 
 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=${BRANCH};name=linux \
-    git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools \
+	${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_GIT_BRANCH} \
 "
 
-SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95"
-SRCREV_FORMAT = "linux"
-
 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}"
 
-kernel_do_compile:append() {
-	oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
-	oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
-}
-
 do_shared_workdir:prepend() {
 	cd ${B}
 	echo >> Module.symvers
Signature · 1 line
2.39.2
Reviewed-by on v3 2/6
#2 lore raw

Re: [meta-ti][master/kirkstone][PATCH v3 2/6] linux-ti-mainline: Remove ti-upstream-tools

Quoted 5 lines · Andrew Davis via lists.yoctoproject.org

Mainline should test the mainline kernel as it is, not with out-of-tree changes like new DTB/DTBOs. Use only upstream DTB/DTBOs. As that was the last thing provided by ti-upstream-tools, remove it here.

Quoted 54 lines
---
 .../linux/linux-ti-mainline_git.bb              | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +3 -14
index 7d948a85..842864cd 100644
@@ -1,5 +1,5 @@
 SECTION = "kernel"
-SUMMARY = "Mainline Linux kernel for TI devices (with ti-upstream-tools)"
+SUMMARY = "Mainline Linux kernel for TI devices"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
@@ -15,9 +15,6 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
 
 S = "${WORKDIR}/git"
 
-BRANCH = "master"
-TOOLS_BRANCH = "master"
-
 # 5.15 Mainline version
 SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813"
 PV = "5.15+git${SRCPV}"
@@ -28,24 +25,16 @@ PR = "${MACHINE_KERNEL_PR}"
 
 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=${BRANCH};name=linux \
-    git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools \
+	${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_GIT_BRANCH} \
 "
 
-SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95"
-SRCREV_FORMAT = "linux"
-
 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}"
 
-kernel_do_compile:append() {
-	oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
-	oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
-}
-
 do_shared_workdir:prepend() {
 	cd ${B}
 	echo >> Module.symvers
Signature · 1 line
2.39.2
#3 lore raw

PATCH v3 3/6 linux-ti-mainline: Update to v6.2 mainline version

In reply to Andrew Davis
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +3 -3
index 842864cd..dfa46f48 100644
@@ -15,9 +15,9 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
 
 S = "${WORKDIR}/git"
 
-# 5.15 Mainline version
-SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813"
-PV = "5.15+git${SRCPV}"
+# 6.2 Mainline version
+SRCREV = "c9c3395d5e3dcc6daee66c6908354d47bf98cb0c"
+PV = "6.2+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR:append = "b"
Signature · 1 line
2.39.2
Reviewed-by on v3 3/6
#4 lore raw

Re: [meta-ti][master/kirkstone][PATCH v3 3/6] linux-ti-mainline: Update to v6.2 mainline version

Quoted 1 line · Andrew Davis via lists.yoctoproject.org
Quoted 23 lines
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +3 -3
index 842864cd..dfa46f48 100644
@@ -15,9 +15,9 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
 
 S = "${WORKDIR}/git"
 
-# 5.15 Mainline version
-SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813"
-PV = "5.15+git${SRCPV}"
+# 6.2 Mainline version
+SRCREV = "c9c3395d5e3dcc6daee66c6908354d47bf98cb0c"
+PV = "6.2+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR:append = "b"
Signature · 1 line
2.39.2
#5 lore raw

PATCH v3 4/6 linux-ti-next: Add defconfig for OMAP-L138

In reply to Andrew Davis

Not sure if anyone is testing on this device with -next, but for completeness add its defconfig.

---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 1 +
 1 file changed, 1 insertion(+)
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +1 -0
index b540e508..62831c9c 100644
@@ -20,6 +20,7 @@ PV = "6.1.0-rc1+git${SRCPV}"
 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}"
 
Signature · 1 line
2.39.2
Reviewed-by on v3 4/6
#6 lore raw

Re: [meta-ti][master/kirkstone][PATCH v3 4/6] linux-ti-next: Add defconfig for OMAP-L138

Quoted 4 lines · Andrew Davis via lists.yoctoproject.org

Not sure if anyone is testing on this device with -next, but for completeness add its defconfig.

Quoted 18 lines
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 1 +
 1 file changed, 1 insertion(+)
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +1 -0
index b540e508..62831c9c 100644
@@ -20,6 +20,7 @@ PV = "6.1.0-rc1+git${SRCPV}"
 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}"
 
Signature · 1 line
2.39.2
#7 lore raw

PATCH v3 5/6 linux-ti-next: Remove unneeded do_compile append

In reply to Andrew Davis

Was used to build kernel DTBs prior to KERNEL_DEVICETREE getting populated with the list of preset of upstream DTBs. Not needed anymore so remove.

---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 4 ----
 1 file changed, 4 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +0 -4
index 62831c9c..1e86ed97 100644
@@ -23,7 +23,3 @@ 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}"
-
-kernel_do_compile:append() {
-	oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
-}
Signature · 1 line
2.39.2
Reviewed-by on v3 5/6
#8 lore raw

Re: [meta-ti][master/kirkstone][PATCH v3 5/6] linux-ti-next: Remove unneeded do_compile append

Quoted 4 lines · Andrew Davis via lists.yoctoproject.org

Was used to build kernel DTBs prior to KERNEL_DEVICETREE getting populated with the list of preset of upstream DTBs. Not needed anymore so remove.

Quoted 18 lines
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 4 ----
 1 file changed, 4 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +0 -4
index 62831c9c..1e86ed97 100644
@@ -23,7 +23,3 @@ 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}"
-
-kernel_do_compile:append() {
-	oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
-}
Signature · 1 line
2.39.2
#9 lore raw

PATCH v3 6/6 linux-ti-next: Update to v6.3-rc6 next version

In reply to Andrew Davis
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +3 -3
index 1e86ed97..9138c7c5 100644
@@ -13,9 +13,9 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
 
 S = "${WORKDIR}/git"
 
-# 6.1.0-rc1+ version
-SRCREV = "4d48f589d294ddc5e01d3b0dc7cecc55324c05ca"
-PV = "6.1.0-rc1+git${SRCPV}"
+# 6.3.0-rc6+ version
+SRCREV = "009795d283d1f9f043e5a4ff97d4140cde17e2d3"
+PV = "6.3.0-rc6+git${SRCPV}"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master"
 
Signature · 1 line
2.39.2
Reviewed-by on v3 6/6
#10 lore raw

Re: [meta-ti][master/kirkstone][PATCH v3 6/6] linux-ti-next: Update to v6.3-rc6 next version

Quoted 1 line · Andrew Davis via lists.yoctoproject.org
Quoted 23 lines
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +3 -3
index 1e86ed97..9138c7c5 100644
@@ -13,9 +13,9 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
 
 S = "${WORKDIR}/git"
 
-# 6.1.0-rc1+ version
-SRCREV = "4d48f589d294ddc5e01d3b0dc7cecc55324c05ca"
-PV = "6.1.0-rc1+git${SRCPV}"
+# 6.3.0-rc6+ version
+SRCREV = "009795d283d1f9f043e5a4ff97d4140cde17e2d3"
+PV = "6.3.0-rc6+git${SRCPV}"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master"
 
Signature · 1 line
2.39.2