* [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel
@ 2023-04-05 18:47 Andrew Davis
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 2/4] linux-ti-mainline: Update to v6.2 mainline version Andrew Davis
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Andrew Davis @ 2023-04-05 18:47 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 -
.../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
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..3f4b560d 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
@@ -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}
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [meta-ti][master/kirkstone][PATCH 2/4] linux-ti-mainline: Update to v6.2 mainline version
2023-04-05 18:47 [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
@ 2023-04-05 18:47 ` Andrew Davis
2023-04-05 19:00 ` Denys Dmytriyenko
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 3/4] linux-ti-next: Add defconfig for OMAP-L138 Andrew Davis
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Andrew Davis @ 2023-04-05 18:47 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 | 8 +++-----
1 file changed, 3 insertions(+), 5 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 3f4b560d..eb8009df 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
@@ -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"
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [meta-ti][master/kirkstone][PATCH 2/4] linux-ti-mainline: Update to v6.2 mainline version
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 2/4] linux-ti-mainline: Update to v6.2 mainline version Andrew Davis
@ 2023-04-05 19:00 ` Denys Dmytriyenko
2023-04-11 17:25 ` Andrew Davis
0 siblings, 1 reply; 10+ messages in thread
From: Denys Dmytriyenko @ 2023-04-05 19:00 UTC (permalink / raw)
To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On Wed, Apr 05, 2023 at 01:47:12PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 8 +++-----
> 1 file changed, 3 insertions(+), 5 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 3f4b560d..eb8009df 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
> @@ -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...
> -
> -# 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"
> --
> 2.39.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [meta-ti][master/kirkstone][PATCH 2/4] linux-ti-mainline: Update to v6.2 mainline version
2023-04-05 19:00 ` Denys Dmytriyenko
@ 2023-04-11 17:25 ` Andrew Davis
0 siblings, 0 replies; 10+ messages in thread
From: Andrew Davis @ 2023-04-11 17:25 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 4/5/23 2:00 PM, Denys Dmytriyenko wrote:
> On Wed, Apr 05, 2023 at 01:47:12PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>> meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 8 +++-----
>> 1 file changed, 3 insertions(+), 5 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 3f4b560d..eb8009df 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
>> @@ -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...
>
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
>
>> -
>> -# 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"
>> --
>> 2.39.2
^ permalink raw reply [flat|nested] 10+ messages in thread
* [meta-ti][master/kirkstone][PATCH 3/4] linux-ti-next: Add defconfig for OMAP-L138
2023-04-05 18:47 [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 2/4] linux-ti-mainline: Update to v6.2 mainline version Andrew Davis
@ 2023-04-05 18:47 ` Andrew Davis
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 4/4] linux-ti-next: Remove unneeded do_compile append Andrew Davis
2023-04-05 18:58 ` [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel Denys Dmytriyenko
3 siblings, 0 replies; 10+ messages in thread
From: Andrew Davis @ 2023-04-05 18:47 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] 10+ messages in thread* [meta-ti][master/kirkstone][PATCH 4/4] linux-ti-next: Remove unneeded do_compile append
2023-04-05 18:47 [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 2/4] linux-ti-mainline: Update to v6.2 mainline version Andrew Davis
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 3/4] linux-ti-next: Add defconfig for OMAP-L138 Andrew Davis
@ 2023-04-05 18:47 ` Andrew Davis
2023-04-05 19:07 ` Denys Dmytriyenko
2023-04-05 18:58 ` [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel Denys Dmytriyenko
3 siblings, 1 reply; 10+ messages in thread
From: Andrew Davis @ 2023-04-05 18:47 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: 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.
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] 10+ messages in thread* Re: [meta-ti][master/kirkstone][PATCH 4/4] linux-ti-next: Remove unneeded do_compile append
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 4/4] linux-ti-next: Remove unneeded do_compile append Andrew Davis
@ 2023-04-05 19:07 ` Denys Dmytriyenko
2023-04-11 17:41 ` Andrew Davis
0 siblings, 1 reply; 10+ messages in thread
From: Denys Dmytriyenko @ 2023-04-05 19:07 UTC (permalink / raw)
To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On Wed, Apr 05, 2023 at 01:47:14PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> 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.
> 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 [flat|nested] 10+ messages in thread* Re: [meta-ti][master/kirkstone][PATCH 4/4] linux-ti-next: Remove unneeded do_compile append
2023-04-05 19:07 ` Denys Dmytriyenko
@ 2023-04-11 17:41 ` Andrew Davis
0 siblings, 0 replies; 10+ messages in thread
From: Andrew Davis @ 2023-04-11 17:41 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 4/5/23 2:07 PM, Denys Dmytriyenko wrote:
> On Wed, Apr 05, 2023 at 01:47:14PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> 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
>
>> 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 [flat|nested] 10+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel
2023-04-05 18:47 [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
` (2 preceding siblings ...)
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 4/4] linux-ti-next: Remove unneeded do_compile append Andrew Davis
@ 2023-04-05 18:58 ` Denys Dmytriyenko
2023-04-11 17:24 ` Andrew Davis
3 siblings, 1 reply; 10+ messages in thread
From: Denys Dmytriyenko @ 2023-04-05 18:58 UTC (permalink / raw)
To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On Wed, Apr 05, 2023 at 01:47:11PM -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>
> ---
> .../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
>
> 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..3f4b560d 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
> @@ -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?
> -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}
> --
> 2.39.2
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel
2023-04-05 18:58 ` [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel Denys Dmytriyenko
@ 2023-04-11 17:24 ` Andrew Davis
0 siblings, 0 replies; 10+ messages in thread
From: Andrew Davis @ 2023-04-11 17:24 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 4/5/23 1:58 PM, Denys Dmytriyenko wrote:
> On Wed, Apr 05, 2023 at 01:47:11PM -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>
>> ---
>> .../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
>>
>> 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..3f4b560d 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
>> @@ -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.
>
ACK, will remove in v2
> 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
>
>> -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}
>> --
>> 2.39.2
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-04-11 17:41 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-05 18:47 [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel Andrew Davis
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 2/4] linux-ti-mainline: Update to v6.2 mainline version Andrew Davis
2023-04-05 19:00 ` Denys Dmytriyenko
2023-04-11 17:25 ` Andrew Davis
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 3/4] linux-ti-next: Add defconfig for OMAP-L138 Andrew Davis
2023-04-05 18:47 ` [meta-ti][master/kirkstone][PATCH 4/4] linux-ti-next: Remove unneeded do_compile append Andrew Davis
2023-04-05 19:07 ` Denys Dmytriyenko
2023-04-11 17:41 ` Andrew Davis
2023-04-05 18:58 ` [meta-ti][master/kirkstone][PATCH 1/4] linux-ti-mainline: Use upstream configs with upstream kernel Denys Dmytriyenko
2023-04-11 17:24 ` Andrew Davis
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.