diff mbox series

[master/kirkstone,3/5] linux-bb.org: update kernel to 6.1 for Beagle devices

Message ID 20231020204458.546852-3-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master/kirkstone,1/5] conf: beaglebone-ai64: trim down the DTB list | expand

Commit Message

Denys Dmytriyenko Oct. 20, 2023, 8:44 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Update both 32-bit and 64-bit configs to use the latest 6.1 Linux kernel
from beagleboard.org repository, which is based on ti-linux-kernel repo
used in linux-ti-staging, but with extra Beagle-specific features on top.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-kernel/linux/linux-bb.org_git.bb  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Comments

Ryan Eatmon Oct. 23, 2023, 3:53 p.m. UTC | #1 
I just sent a patch for master only against this recipe that removes all 
of the patches.  Not sure if you want a v2 series that includes that 
change, or just have a follow on patch.


On 10/20/2023 3:44 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
> 
> Update both 32-bit and 64-bit configs to use the latest 6.1 Linux kernel
> from beagleboard.org repository, which is based on ti-linux-kernel repo
> used in linux-ti-staging, but with extra Beagle-specific features on top.
> 
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
>   .../recipes-kernel/linux/linux-bb.org_git.bb  | 19 +++++++++++--------
>   1 file changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> index f4c1775d..4048e106 100644
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> @@ -10,21 +10,24 @@ inherit kernel
>   require recipes-kernel/linux/setup-defconfig.inc
>   require recipes-kernel/linux/ti-kernel.inc
>   
> +# BB.org hasn't switched to "vendored" DTB layout by default yet
> +KERNEL_DTBVENDORED = "0"
> +
>   DEPENDS += "gmp-native libmpc-native"
>   
>   KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
>   
>   S = "${WORKDIR}/git"
>   
> -# 5.10.168 version for 32-bit
> -SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
> -PV:armv7a = "5.10.168+git${SRCPV}"
> -BRANCH:armv7a = "v5.10.168-ti-r70"
> +# 6.1.33 version for 32-bit
> +SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
> +PV:armv7a = "6.1.33+git${SRCPV}"
> +BRANCH:armv7a = "v6.1.33-ti-r7"
>   
> -# 5.10.162 version for 64-bit
> -SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
> -PV:aarch64 = "5.10.162+git${SRCPV}"
> -BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
> +# 6.1.46 version for 64-bit
> +SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
> +PV:aarch64 = "6.1.46+git${SRCPV}"
> +BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
>   
>   SRC_URI = " \
>       git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17158): https://lists.yoctoproject.org/g/meta-ti/message/17158
> Mute This Topic: https://lists.yoctoproject.org/mt/102089682/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/10828724/6551054/1815494134/xyzzy [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Denys Dmytriyenko Oct. 23, 2023, 7:19 p.m. UTC | #2 
On Mon, Oct 23, 2023 at 10:53:55AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> 
> I just sent a patch for master only against this recipe that removes
> all of the patches.  Not sure if you want a v2 series that includes
> that change, or just have a follow on patch.

Unless you explicitly want a v2 with master patch removal and possibly 
kernel-rdepends.inc rework all squashed in, I'm fine with follow on patches.


> On 10/20/2023 3:44 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >Update both 32-bit and 64-bit configs to use the latest 6.1 Linux kernel
> >from beagleboard.org repository, which is based on ti-linux-kernel repo
> >used in linux-ti-staging, but with extra Beagle-specific features on top.
> >
> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >---
> >  .../recipes-kernel/linux/linux-bb.org_git.bb  | 19 +++++++++++--------
> >  1 file changed, 11 insertions(+), 8 deletions(-)
> >
> >diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> >index f4c1775d..4048e106 100644
> >--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> >+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> >@@ -10,21 +10,24 @@ inherit kernel
> >  require recipes-kernel/linux/setup-defconfig.inc
> >  require recipes-kernel/linux/ti-kernel.inc
> >+# BB.org hasn't switched to "vendored" DTB layout by default yet
> >+KERNEL_DTBVENDORED = "0"
> >+
> >  DEPENDS += "gmp-native libmpc-native"
> >  KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
> >  S = "${WORKDIR}/git"
> >-# 5.10.168 version for 32-bit
> >-SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
> >-PV:armv7a = "5.10.168+git${SRCPV}"
> >-BRANCH:armv7a = "v5.10.168-ti-r70"
> >+# 6.1.33 version for 32-bit
> >+SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
> >+PV:armv7a = "6.1.33+git${SRCPV}"
> >+BRANCH:armv7a = "v6.1.33-ti-r7"
> >-# 5.10.162 version for 64-bit
> >-SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
> >-PV:aarch64 = "5.10.162+git${SRCPV}"
> >-BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
> >+# 6.1.46 version for 64-bit
> >+SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
> >+PV:aarch64 = "6.1.46+git${SRCPV}"
> >+BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
> >  SRC_URI = " \
> >      git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
Ryan Eatmon Oct. 23, 2023, 8:24 p.m. UTC | #3 
On 10/23/2023 2:19 PM, Denys Dmytriyenko wrote:
> On Mon, Oct 23, 2023 at 10:53:55AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>>
>> I just sent a patch for master only against this recipe that removes
>> all of the patches.  Not sure if you want a v2 series that includes
>> that change, or just have a follow on patch.
> 
> Unless you explicitly want a v2 with master patch removal and possibly
> kernel-rdepends.inc rework all squashed in, I'm fine with follow on patches.
> 

nah.. follow on patches are fine.


>> On 10/20/2023 3:44 PM, Denys Dmytriyenko wrote:
>>> From: Denys Dmytriyenko <denys@konsulko.com>
>>>
>>> Update both 32-bit and 64-bit configs to use the latest 6.1 Linux kernel
>> >from beagleboard.org repository, which is based on ti-linux-kernel repo
>>> used in linux-ti-staging, but with extra Beagle-specific features on top.
>>>
>>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>>> ---
>>>   .../recipes-kernel/linux/linux-bb.org_git.bb  | 19 +++++++++++--------
>>>   1 file changed, 11 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
>>> index f4c1775d..4048e106 100644
>>> --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
>>> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
>>> @@ -10,21 +10,24 @@ inherit kernel
>>>   require recipes-kernel/linux/setup-defconfig.inc
>>>   require recipes-kernel/linux/ti-kernel.inc
>>> +# BB.org hasn't switched to "vendored" DTB layout by default yet
>>> +KERNEL_DTBVENDORED = "0"
>>> +
>>>   DEPENDS += "gmp-native libmpc-native"
>>>   KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
>>>   S = "${WORKDIR}/git"
>>> -# 5.10.168 version for 32-bit
>>> -SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
>>> -PV:armv7a = "5.10.168+git${SRCPV}"
>>> -BRANCH:armv7a = "v5.10.168-ti-r70"
>>> +# 6.1.33 version for 32-bit
>>> +SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
>>> +PV:armv7a = "6.1.33+git${SRCPV}"
>>> +BRANCH:armv7a = "v6.1.33-ti-r7"
>>> -# 5.10.162 version for 64-bit
>>> -SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
>>> -PV:aarch64 = "5.10.162+git${SRCPV}"
>>> -BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
>>> +# 6.1.46 version for 64-bit
>>> +SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
>>> +PV:aarch64 = "6.1.46+git${SRCPV}"
>>> +BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
>>>   SRC_URI = " \
>>>       git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
diff mbox series

Patch

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
index f4c1775d..4048e106 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
@@ -10,21 +10,24 @@  inherit kernel
 require recipes-kernel/linux/setup-defconfig.inc
 require recipes-kernel/linux/ti-kernel.inc
 
+# BB.org hasn't switched to "vendored" DTB layout by default yet
+KERNEL_DTBVENDORED = "0"
+
 DEPENDS += "gmp-native libmpc-native"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
 
 S = "${WORKDIR}/git"
 
-# 5.10.168 version for 32-bit
-SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
-PV:armv7a = "5.10.168+git${SRCPV}"
-BRANCH:armv7a = "v5.10.168-ti-r70"
+# 6.1.33 version for 32-bit
+SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
+PV:armv7a = "6.1.33+git${SRCPV}"
+BRANCH:armv7a = "v6.1.33-ti-r7"
 
-# 5.10.162 version for 64-bit
-SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
-PV:aarch64 = "5.10.162+git${SRCPV}"
-BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
+# 6.1.46 version for 64-bit
+SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
+PV:aarch64 = "6.1.46+git${SRCPV}"
+BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
 
 SRC_URI = " \
     git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \