| Message ID | 20230405184714.26036-2-afd@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/kirkstone,1/4] linux-ti-mainline: Use upstream configs with upstream kernel | expand |
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
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
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"
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(-)