Skip to contentSkip to conversation

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

PATCH Superseded Andrew Davis 2 participants 10 messages Apr 5, 2023 – Apr 11, 2023

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 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 -
 .../recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig | 1 -
 .../recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig | 1 -
 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb  | 7 +++++--
 7 files changed, 5 insertions(+), 8 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 -2
index be278d73..3f4b560d 100644
@@ -6,7 +6,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 +32,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 2/4 linux-ti-mainline: Update to v6.2 mainline version

---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +3 -5
index 3f4b560d..eb8009df 100644
@@ -16,12 +16,10 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
 
 S = "${WORKDIR}/git"
 
+# 6.2 Mainline version
 BRANCH = "master"
-TOOLS_BRANCH = "master"
-
-# 5.15 Mainline version
-SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813"
-PV = "5.15+git${SRCPV}"
+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
#4 lore raw

PATCH 3/4 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
#5 lore raw

PATCH 4/4 linux-ti-next: Remove unneeded do_compile append

In reply to Andrew Davis

Looks to be a leftover copy/paste error from when we did more in this append for other kernel build types. Not needed here 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
#8 lore raw
In reply to Andrew Davis
Quoted 68 lines · Andrew Davis via lists.yoctoproject.org

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 -
 .../recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig | 1 -
 .../recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig | 1 -
 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb  | 7 +++++--
 7 files changed, 5 insertions(+), 8 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 +0 -0
index be278d73..3f4b560d 100644

meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" · line 8

Quoted 3 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +0 -0
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 inherit kernel
 
 DEFCONFIG_BUILDER = "${S}/ti-upstream-tools/config/defconfig_builder.sh"

Then this ^^^ variable is also not needed any more.

Semms like you are pretty much abandoning the old ti-upstream-tools concept, which was supplying TI-specific defconfig fragments+script and DTB/DTBOs on top of mainline kernel. In that case mainline and next recipes will be the same, except for SRC_URI tree and SRCREV?

Quoted 24 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +5 -2
-require recipes-kernel/linux/setup-defconfig.inc
 require recipes-kernel/linux/kernel-rdepends.inc
 require recipes-kernel/linux/ti-kernel.inc
 
@@ -33,12 +32,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
#2 lore raw

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

In reply to Andrew Davis
Quoted 10 lines · Andrew Davis via lists.yoctoproject.org
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +0 -0
index 3f4b560d..eb8009df 100644

meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ · line 20

Quoted 6 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +1 -1
@@ -16,12 +16,10 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
 
 S = "${WORKDIR}/git"
 
+# 6.2 Mainline version
 BRANCH = "master"
-TOOLS_BRANCH = "master"

But you haven't removed ti-upstream-tools from SRC_URI, which uses it...

Quoted 11 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +2 -4
-
-# 5.15 Mainline version
-SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813"
-PV = "5.15+git${SRCPV}"
+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
#6 lore raw

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

In reply to Andrew Davis
Quoted 2 lines · Andrew Davis via lists.yoctoproject.org

Looks to be a leftover copy/paste error from when we did more in this append for other kernel build types. Not needed here so remove.

It isn't a copy/paste error - it used to build kernel DTBs prior to KERNEL_DEVICETREE getting populated with the list of built .dtb/.dtbo files. Now KERNEL_DEVICETREE contains a preset of upstream DTBs and the code can be removed, true.

Quoted 19 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
In reply to Denys Dmytriyenko
Quoted 71 lines · Denys Dmytriyenko
Quoted 70 lines · Andrew Davis via lists.yoctoproject.org

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 -
  .../recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig | 1 -
  .../recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig | 1 -
  meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb  | 7 +++++--
  7 files changed, 5 insertions(+), 8 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 +0 -0
index be278d73..3f4b560d 100644
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
  inherit kernel
 
Quoted 4 lines

meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" · line 8

Quoted 1 line
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +0 -0
  DEFCONFIG_BUILDER = "${S}/ti-upstream-tools/config/defconfig_builder.sh"

Then this ^^^ variable is also not needed any more.

ACK, will remove in v2

Quoted 5 lines

Semms like you are pretty much abandoning the old ti-upstream-tools concept, which was supplying TI-specific defconfig fragments+script and DTB/DTBOs on top of mainline kernel. In that case mainline and next recipes will be the same, except for SRC_URI tree and SRCREV?

Basically yes. For now I keep the ti-upstream-tools in the "mainline" builds just for adding some DTBOs used in testing, I have a patch that removes it completely, I'll add that patch for v2.

Andrew

Quoted 25 lines
Quoted 25 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +5 -2
-require recipes-kernel/linux/setup-defconfig.inc
  require recipes-kernel/linux/kernel-rdepends.inc
  require recipes-kernel/linux/ti-kernel.inc
 
@@ -33,12 +32,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
#3 lore raw

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

In reply to Denys Dmytriyenko
Quoted 12 lines · Denys Dmytriyenko
Quoted 11 lines · Andrew Davis via lists.yoctoproject.org
---
  meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +0 -0
index 3f4b560d..eb8009df 100644
@@ -16,12 +16,10 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
 
Quoted 8 lines

meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ · line 20

Quoted 5 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +1 -1
  S = "${WORKDIR}/git"
 
+# 6.2 Mainline version
  BRANCH = "master"
-TOOLS_BRANCH = "master"

But you haven't removed ti-upstream-tools from SRC_URI, which uses it...

ACK, have a patch going in last that does, but didn't send it, will merge that all together in the last patch for v2

Andrew

Quoted 12 lines
Quoted 12 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +2 -4
-
-# 5.15 Mainline version
-SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813"
-PV = "5.15+git${SRCPV}"
+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
#7 lore raw

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

In reply to Denys Dmytriyenko
Quoted 9 lines · Denys Dmytriyenko
Quoted 2 lines · Andrew Davis via lists.yoctoproject.org

Looks to be a leftover copy/paste error from when we did more in this append for other kernel build types. Not needed here so remove.

It isn't a copy/paste error - it used to build kernel DTBs prior to KERNEL_DEVICETREE getting populated with the list of built .dtb/.dtbo files. Now KERNEL_DEVICETREE contains a preset of upstream DTBs and the code can be removed, true.

Ah, good to know, will update commit message.

Andrew

Quoted 20 lines
Quoted 20 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