Skip to contentSkip to conversation

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

PATCH Superseded Andrew Davis 2 participants 12 messages Apr 11, 2023

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/5 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 v2 2/5 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.

---
 .../recipes-kernel/linux/linux-ti-mainline_git.bb     | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +3 -8
index 7d948a85..d0f1b4e2 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,12 +25,11 @@ 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};name=linux \
 "
 
-SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95"
 SRCREV_FORMAT = "linux"
 
 DEFCONFIG_NAME = "multi_v7_defconfig"
@@ -43,7 +39,6 @@ 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() {
Signature · 1 line
2.39.2
#2 lore raw

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

Quoted 33 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.

---
 .../recipes-kernel/linux/linux-ti-mainline_git.bb     | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +1 -4
index 7d948a85..d0f1b4e2 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,12 +25,11 @@ PR = "${MACHINE_KERNEL_PR}"
 
 KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"

meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb PR = "${MACHINE_KERNEL_PR}" · line 33

Quoted 10 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +2 -3
 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};name=linux \
 "
 
-SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95"
 SRCREV_FORMAT = "linux"

Remove SRCREV_FORMAT that is used for multi-SCM recipes, as well as ";name=linux" from SRC_URI above.

meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" · line 41

Quoted 5 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +0 -0
 DEFCONFIG_NAME = "multi_v7_defconfig"
@@ -43,7 +39,6 @@ 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}

Are you keeping "make dtbs" to build ALL DTBs from the kernel? Same story as with patch #5 for linux-ti-next - KERNEL_DEVICETREE has a list of upstreamed DTBs that will be built automatically, so above line can also be removed. (though j784s4-evm has an empty KERNEL_DEVICETREE - nothing got upstreamed?)

Quoted 6 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +0 -1
-	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() {
Signature · 1 line
2.39.2
#3 lore raw

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

Quoted 42 lines · Denys Dmytriyenko
Quoted 41 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.

---
  .../recipes-kernel/linux/linux-ti-mainline_git.bb     | 11 +++--------
  1 file changed, 3 insertions(+), 8 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +3 -6
index 7d948a85..d0f1b4e2 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,12 +25,11 @@ 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};name=linux \
  "
 
Quoted 4 lines

meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb PR = "${MACHINE_KERNEL_PR}" · line 33

Quoted 2 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +0 -1
-SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95"
  SRCREV_FORMAT = "linux"

Remove SRCREV_FORMAT that is used for multi-SCM recipes, as well as

Way too many magic variables to keep track :)

Quoted 2 lines

";name=linux" from SRC_URI above.

Ack

Quoted 10 lines

meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" · line 41

Quoted 6 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +0 -0
  DEFCONFIG_NAME = "multi_v7_defconfig"
@@ -43,7 +39,6 @@ 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}

Are you keeping "make dtbs" to build ALL DTBs from the kernel? Same story as with patch #5 for linux-ti-next - KERNEL_DEVICETREE has a list of upstreamed DTBs that will be built automatically, so above line can also be removed.

Sure, will remove for v3

Quoted 2 lines

(though j784s4-evm has an empty KERNEL_DEVICETREE - nothing got upstreamed?)

Looks like it needs updated..

Andrew

Quoted 7 lines
Quoted 7 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +0 -1
-	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() {
Signature · 1 line
2.39.2
#4 lore raw

PATCH v2 3/5 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 d0f1b4e2..294cbef1 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 v2 4/5 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
#6 lore raw

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

meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb PV = "6.1.0-rc1+git${SRCPV}"

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

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 +0 -0
index b540e508..62831c9c 100644
@@ -20,6 +20,7 @@ PV = "6.1.0-rc1+git${SRCPV}"

Should PV/SRCREV be bumped past 6.1-rc1?

Quoted 9 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +1 -0
 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

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

Quoted 9 lines · Denys Dmytriyenko
Quoted 8 lines · Andrew Davis via lists.yoctoproject.org

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(+)
Quoted 8 lines

meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb PV = "6.1.0-rc1+git${SRCPV}"

Quoted 5 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +0 -0
index b540e508..62831c9c 100644
@@ -20,6 +20,7 @@ PV = "6.1.0-rc1+git${SRCPV}"

Should PV/SRCREV be bumped past 6.1-rc1?

Someone should. But unless we automate then it will get stale again.

It could be part of the build automation scripts when we start -next testing..

Andrew

Quoted 10 lines
Quoted 10 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +1 -0
  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
#8 lore raw

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

Quoted 19 lines · Andrew Davis
Quoted 9 lines · Denys Dmytriyenko
Quoted 8 lines · Andrew Davis via lists.yoctoproject.org

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(+)
Quoted 8 lines

meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb PV = "6.1.0-rc1+git${SRCPV}"

Quoted 5 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +0 -0
index b540e508..62831c9c 100644
@@ -20,6 +20,7 @@ PV = "6.1.0-rc1+git${SRCPV}"

Should PV/SRCREV be bumped past 6.1-rc1?

Quoted 4 lines

Someone should. But unless we automate then it will get stale again.

It could be part of the build automation scripts when we start -next testing..

And it already is - Arago Distro branding-next AUTOREVs it:
https://git.yoctoproject.org/meta-arago/tree/meta-arago-distro/conf/distro/include/branding-next.inc#n4

It is done indirectly through the Distro/branding as recipes shouldn't default to AUTOREV. You don't want bitbake to hit kernel.org everytime the recipe gets parsed, even when you are not building it.

I know "next" will be getting stale very quickly and it's expected, but it may be nice to get it updated now, since you are changing it anyway...

Signature · 1 line
Denys
#9 lore raw

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

Quoted 28 lines · Denys Dmytriyenko
Quoted 19 lines · Andrew Davis
Quoted 9 lines · Denys Dmytriyenko
Quoted 8 lines · Andrew Davis via lists.yoctoproject.org

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(+)
Quoted 8 lines

meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb PV = "6.1.0-rc1+git${SRCPV}"

Quoted 5 lines
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +0 -0
index b540e508..62831c9c 100644
@@ -20,6 +20,7 @@ PV = "6.1.0-rc1+git${SRCPV}"

Should PV/SRCREV be bumped past 6.1-rc1?

Quoted 4 lines

Someone should. But unless we automate then it will get stale again.

It could be part of the build automation scripts when we start -next testing..

And it already is - Arago Distro branding-next AUTOREVs it:
https://git.yoctoproject.org/meta-arago/tree/meta-arago-distro/conf/distro/include/branding-next.inc#n4

Quoted 7 lines

It is done indirectly through the Distro/branding as recipes shouldn't default to AUTOREV. You don't want bitbake to hit kernel.org everytime the recipe gets parsed, even when you are not building it.

I know "next" will be getting stale very quickly and it's expected, but it may be nice to get it updated now, since you are changing it anyway...

Sure, why not, will add a patch for v3

Andrew

#10 lore raw

PATCH v2 5/5 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 v2 1/5
#11 lore raw
In reply to Andrew Davis
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 to the default configuration that one would get when using a stock distro. Use only upstream configuration.

Quoted 91 lines
---
 .../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