* [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel
@ 2023-04-11 17:40 Andrew Davis
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 2/5] linux-ti-mainline: Remove ti-upstream-tools Andrew Davis
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Andrew Davis @ 2023-04-11 17:40 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
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.
Signed-off-by: Andrew Davis <afd@ti.com>
---
.../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
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig
deleted file mode 100644
index d083d182..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omap2_release
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig
deleted file mode 100644
index dcb53bab..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_dra7x_release
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig
deleted file mode 100644
index b9bc6137..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_arm64_release
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig
deleted file mode 100644
index b3467853..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omapl138_release
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig
deleted file mode 100644
index 88f80fa9..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am3x_release
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig
deleted file mode 100644
index 4b9daaf9..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am4x_release
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 be278d73..7d948a85 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
@@ -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}
--
2.39.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-ti][master/kirkstone][PATCH v2 2/5] linux-ti-mainline: Remove ti-upstream-tools
2023-04-11 17:40 [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
@ 2023-04-11 17:40 ` Andrew Davis
2023-04-11 19:49 ` Denys Dmytriyenko
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 3/5] linux-ti-mainline: Update to v6.2 mainline version Andrew Davis
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Andrew Davis @ 2023-04-11 17:40 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
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.
Signed-off-by: Andrew Davis <afd@ti.com>
---
.../recipes-kernel/linux/linux-ti-mainline_git.bb | 11 +++--------
1 file changed, 3 insertions(+), 8 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 7d948a85..d0f1b4e2 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
@@ -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() {
--
2.39.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-ti][master/kirkstone][PATCH v2 3/5] linux-ti-mainline: Update to v6.2 mainline version
2023-04-11 17:40 [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 2/5] linux-ti-mainline: Remove ti-upstream-tools Andrew Davis
@ 2023-04-11 17:40 ` Andrew Davis
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 4/5] linux-ti-next: Add defconfig for OMAP-L138 Andrew Davis
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Andrew Davis @ 2023-04-11 17:40 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
Signed-off-by: Andrew Davis <afd@ti.com>
---
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 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 d0f1b4e2..294cbef1 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
@@ -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"
--
2.39.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-ti][master/kirkstone][PATCH v2 4/5] linux-ti-next: Add defconfig for OMAP-L138
2023-04-11 17:40 [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 2/5] linux-ti-mainline: Remove ti-upstream-tools Andrew Davis
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 3/5] linux-ti-mainline: Update to v6.2 mainline version Andrew Davis
@ 2023-04-11 17:40 ` Andrew Davis
2023-04-11 19:51 ` Denys Dmytriyenko
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 5/5] linux-ti-next: Remove unneeded do_compile append Andrew Davis
2023-04-11 19:38 ` [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Denys Dmytriyenko
4 siblings, 1 reply; 12+ messages in thread
From: Andrew Davis @ 2023-04-11 17:40 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
Not sure if anyone is testing on this device with -next, but for
completeness add its defconfig.
Signed-off-by: Andrew Davis <afd@ti.com>
---
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 1 +
1 file changed, 1 insertion(+)
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 b540e508..62831c9c 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
@@ -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}"
--
2.39.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-ti][master/kirkstone][PATCH v2 5/5] linux-ti-next: Remove unneeded do_compile append
2023-04-11 17:40 [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
` (2 preceding siblings ...)
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 4/5] linux-ti-next: Add defconfig for OMAP-L138 Andrew Davis
@ 2023-04-11 17:40 ` Andrew Davis
2023-04-11 19:38 ` [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Denys Dmytriyenko
4 siblings, 0 replies; 12+ messages in thread
From: Andrew Davis @ 2023-04-11 17:40 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: 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.
Signed-off-by: Andrew Davis <afd@ti.com>
---
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 4 ----
1 file changed, 4 deletions(-)
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 62831c9c..1e86ed97 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
@@ -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}
-}
--
2.39.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel
2023-04-11 17:40 [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
` (3 preceding siblings ...)
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 5/5] linux-ti-next: Remove unneeded do_compile append Andrew Davis
@ 2023-04-11 19:38 ` Denys Dmytriyenko
4 siblings, 0 replies; 12+ messages in thread
From: Denys Dmytriyenko @ 2023-04-11 19:38 UTC (permalink / raw)
To: afd; +Cc: Ryan Eatmon, meta-ti
On Tue, Apr 11, 2023 at 12:40:33PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> 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.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> .../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
>
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig
> deleted file mode 100644
> index d083d182..00000000
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig
> +++ /dev/null
> @@ -1 +0,0 @@
> -use-tisdk-config=ti_sdk_omap2_release
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig
> deleted file mode 100644
> index dcb53bab..00000000
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig
> +++ /dev/null
> @@ -1 +0,0 @@
> -use-tisdk-config=ti_sdk_dra7x_release
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig
> deleted file mode 100644
> index b9bc6137..00000000
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig
> +++ /dev/null
> @@ -1 +0,0 @@
> -use-tisdk-config=ti_sdk_arm64_release
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig
> deleted file mode 100644
> index b3467853..00000000
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig
> +++ /dev/null
> @@ -1 +0,0 @@
> -use-tisdk-config=ti_sdk_omapl138_release
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig
> deleted file mode 100644
> index 88f80fa9..00000000
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig
> +++ /dev/null
> @@ -1 +0,0 @@
> -use-tisdk-config=ti_sdk_am3x_release
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig
> deleted file mode 100644
> index 4b9daaf9..00000000
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig
> +++ /dev/null
> @@ -1 +0,0 @@
> -use-tisdk-config=ti_sdk_am4x_release
> 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 be278d73..7d948a85 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
> @@ -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}
> --
> 2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH v2 2/5] linux-ti-mainline: Remove ti-upstream-tools
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 2/5] linux-ti-mainline: Remove ti-upstream-tools Andrew Davis
@ 2023-04-11 19:49 ` Denys Dmytriyenko
2023-04-11 21:35 ` Andrew Davis
0 siblings, 1 reply; 12+ messages in thread
From: Denys Dmytriyenko @ 2023-04-11 19:49 UTC (permalink / raw)
To: afd; +Cc: Ryan Eatmon, meta-ti
On Tue, Apr 11, 2023 at 12:40:34PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> 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.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> .../recipes-kernel/linux/linux-ti-mainline_git.bb | 11 +++--------
> 1 file changed, 3 insertions(+), 8 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 7d948a85..d0f1b4e2 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
> @@ -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"
Remove SRCREV_FORMAT that is used for multi-SCM recipes, as well as
";name=linux" from SRC_URI above.
> 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?)
> - 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() {
> --
> 2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH v2 4/5] linux-ti-next: Add defconfig for OMAP-L138
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 4/5] linux-ti-next: Add defconfig for OMAP-L138 Andrew Davis
@ 2023-04-11 19:51 ` Denys Dmytriyenko
2023-04-11 21:14 ` Andrew Davis
0 siblings, 1 reply; 12+ messages in thread
From: Denys Dmytriyenko @ 2023-04-11 19:51 UTC (permalink / raw)
To: afd; +Cc: Ryan Eatmon, meta-ti
On Tue, Apr 11, 2023 at 12:40:36PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> Not sure if anyone is testing on this device with -next, but for
> completeness add its defconfig.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> 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 b540e508..62831c9c 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
> @@ -20,6 +20,7 @@ PV = "6.1.0-rc1+git${SRCPV}"
Should PV/SRCREV be bumped past 6.1-rc1?
> 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}"
>
> --
> 2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH v2 4/5] linux-ti-next: Add defconfig for OMAP-L138
2023-04-11 19:51 ` Denys Dmytriyenko
@ 2023-04-11 21:14 ` Andrew Davis
2023-04-11 21:32 ` Denys Dmytriyenko
0 siblings, 1 reply; 12+ messages in thread
From: Andrew Davis @ 2023-04-11 21:14 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Ryan Eatmon, meta-ti
On 4/11/23 2:51 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 11, 2023 at 12:40:36PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> Not sure if anyone is testing on this device with -next, but for
>> completeness add its defconfig.
>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>> meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> 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 b540e508..62831c9c 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
>> @@ -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
>
>> 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}"
>>
>> --
>> 2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH v2 4/5] linux-ti-next: Add defconfig for OMAP-L138
2023-04-11 21:14 ` Andrew Davis
@ 2023-04-11 21:32 ` Denys Dmytriyenko
2023-04-11 21:42 ` Andrew Davis
0 siblings, 1 reply; 12+ messages in thread
From: Denys Dmytriyenko @ 2023-04-11 21:32 UTC (permalink / raw)
To: Andrew Davis; +Cc: Ryan Eatmon, meta-ti
On Tue, Apr 11, 2023 at 04:14:47PM -0500, Andrew Davis wrote:
> On 4/11/23 2:51 PM, Denys Dmytriyenko wrote:
> >On Tue, Apr 11, 2023 at 12:40:36PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> >>Not sure if anyone is testing on this device with -next, but for
> >>completeness add its defconfig.
> >>
> >>Signed-off-by: Andrew Davis <afd@ti.com>
> >>---
> >> meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 1 +
> >> 1 file changed, 1 insertion(+)
> >>
> >>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 b540e508..62831c9c 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
> >>@@ -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..
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...
--
Denys
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH v2 2/5] linux-ti-mainline: Remove ti-upstream-tools
2023-04-11 19:49 ` Denys Dmytriyenko
@ 2023-04-11 21:35 ` Andrew Davis
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Davis @ 2023-04-11 21:35 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Ryan Eatmon, meta-ti
On 4/11/23 2:49 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 11, 2023 at 12:40:34PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> 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.
>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>> .../recipes-kernel/linux/linux-ti-mainline_git.bb | 11 +++--------
>> 1 file changed, 3 insertions(+), 8 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 7d948a85..d0f1b4e2 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
>> @@ -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"
>
> Remove SRCREV_FORMAT that is used for multi-SCM recipes, as well as
Way too many magic variables to keep track :)
> ";name=linux" from SRC_URI above.
>
Ack
>
>> 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
> (though j784s4-evm has an empty KERNEL_DEVICETREE - nothing got upstreamed?)
>
Looks like it needs updated..
Andrew
>
>> - 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() {
>> --
>> 2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH v2 4/5] linux-ti-next: Add defconfig for OMAP-L138
2023-04-11 21:32 ` Denys Dmytriyenko
@ 2023-04-11 21:42 ` Andrew Davis
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Davis @ 2023-04-11 21:42 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Ryan Eatmon, meta-ti
On 4/11/23 4:32 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 11, 2023 at 04:14:47PM -0500, Andrew Davis wrote:
>> On 4/11/23 2:51 PM, Denys Dmytriyenko wrote:
>>> On Tue, Apr 11, 2023 at 12:40:36PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>>>> Not sure if anyone is testing on this device with -next, but for
>>>> completeness add its defconfig.
>>>>
>>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>>> ---
>>>> meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 1 +
>>>> 1 file changed, 1 insertion(+)
>>>>
>>>> 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 b540e508..62831c9c 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
>>>> @@ -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..
>
> 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...
>
Sure, why not, will add a patch for v3
Andrew
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-04-11 21:42 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-11 17:40 [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 2/5] linux-ti-mainline: Remove ti-upstream-tools Andrew Davis
2023-04-11 19:49 ` Denys Dmytriyenko
2023-04-11 21:35 ` Andrew Davis
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 3/5] linux-ti-mainline: Update to v6.2 mainline version Andrew Davis
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 4/5] linux-ti-next: Add defconfig for OMAP-L138 Andrew Davis
2023-04-11 19:51 ` Denys Dmytriyenko
2023-04-11 21:14 ` Andrew Davis
2023-04-11 21:32 ` Denys Dmytriyenko
2023-04-11 21:42 ` Andrew Davis
2023-04-11 17:40 ` [meta-ti][master/kirkstone][PATCH v2 5/5] linux-ti-next: Remove unneeded do_compile append Andrew Davis
2023-04-11 19:38 ` [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.