| Message ID | 20230518161519.16296-2-reatmon@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,kirkstone,v2,1/2] kernel_devicetree_vendor_dtb: Backport kernel-devicetree.bbclass | expand |
On 5/18/23 11:15 AM, Ryan Eatmon via lists.yoctoproject.org wrote: > Change over to using the kernel_devicetree_vendor_dtb.bbclass to have > the DTBs installed into the same vendored subdirectory that is in the > kernel. > > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > v2: - Fixed syntax of "1" > - Fixed name of custom kernel class to match the other patch. > > meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb > index cdee548f..7c992ac5 100644 > --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb > +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb > @@ -3,7 +3,7 @@ SUMMARY = "Linux kernel for TI devices" > LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" > > -inherit kernel > +inherit kernel_vendor_dtb > > require recipes-kernel/linux/setup-defconfig.inc > require recipes-kernel/linux/kernel-rdepends.inc > @@ -18,6 +18,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" > KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ > ${EXTRA_DTC_ARGS}" > > +KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtbs" > +KERNEL_DTBVENDORED = "1" > + We will want this for all kernels, not just ti-6.1, is there a more common place to put these defines so we get the same for -next and -mainline too? Andrew > S = "${WORKDIR}/git" > > BRANCH = "ti-linux-6.1.y" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#16558): https://lists.yoctoproject.org/g/meta-ti/message/16558 > Mute This Topic: https://lists.yoctoproject.org/mt/98994752/3619733 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695306/3619733/2033773410/xyzzy [afd@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Thu, May 18, 2023 at 12:25:43PM -0500, Andrew Davis via lists.yoctoproject.org wrote: > On 5/18/23 11:15 AM, Ryan Eatmon via lists.yoctoproject.org wrote: > >Change over to using the kernel_devicetree_vendor_dtb.bbclass to have > >the DTBs installed into the same vendored subdirectory that is in the > >kernel. > > > >Signed-off-by: Ryan Eatmon <reatmon@ti.com> > >--- > >v2: - Fixed syntax of "1" > > - Fixed name of custom kernel class to match the other patch. > > > > meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > >diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb > >index cdee548f..7c992ac5 100644 > >--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb > >+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb > >@@ -3,7 +3,7 @@ SUMMARY = "Linux kernel for TI devices" > > LICENSE = "GPL-2.0-only" > > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" > >-inherit kernel > >+inherit kernel_vendor_dtb > > require recipes-kernel/linux/setup-defconfig.inc > > require recipes-kernel/linux/kernel-rdepends.inc > >@@ -18,6 +18,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" > > KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ > > ${EXTRA_DTC_ARGS}" > >+KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtbs" > >+KERNEL_DTBVENDORED = "1" > >+ > > We will want this for all kernels, not just ti-6.1, is there a more > common place to put these defines so we get the same for -next and > -mainline too? Only ti-kernel.inc is also included by -mainline and -next.
On 5/18/23 11:15 AM, Ryan Eatmon via lists.yoctoproject.org wrote: > Change over to using the kernel_devicetree_vendor_dtb.bbclass to have > the DTBs installed into the same vendored subdirectory that is in the > kernel. > > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > v2: - Fixed syntax of "1" > - Fixed name of custom kernel class to match the other patch. > > meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb > index cdee548f..7c992ac5 100644 > --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb > +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb > @@ -3,7 +3,7 @@ SUMMARY = "Linux kernel for TI devices" > LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" > > -inherit kernel > +inherit kernel_vendor_dtb > > require recipes-kernel/linux/setup-defconfig.inc > require recipes-kernel/linux/kernel-rdepends.inc > @@ -18,6 +18,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" > KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ > ${EXTRA_DTC_ARGS}" > > +KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtbs" Do we want this to be "dtbs" or "dtb"? Debian uses "dtb" which is the far more common distro today and the one we plan to support in the near term. I know I used "dtbs" in the U-Boot side patch for this, but I'm having second thoughts and it's easy to switch it over in U-Boot.. Andrew > +KERNEL_DTBVENDORED = "1" > + > S = "${WORKDIR}/git" > > BRANCH = "ti-linux-6.1.y" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#16558): https://lists.yoctoproject.org/g/meta-ti/message/16558 > Mute This Topic: https://lists.yoctoproject.org/mt/98994752/3619733 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695306/3619733/2033773410/xyzzy [afd@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 5/18/2023 12:45 PM, Andrew Davis wrote: > On 5/18/23 11:15 AM, Ryan Eatmon via lists.yoctoproject.org wrote: >> Change over to using the kernel_devicetree_vendor_dtb.bbclass to have >> the DTBs installed into the same vendored subdirectory that is in the >> kernel. >> >> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >> --- >> v2: - Fixed syntax of "1" >> - Fixed name of custom kernel class to match the other patch. >> >> meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb >> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb >> index cdee548f..7c992ac5 100644 >> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb >> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb >> @@ -3,7 +3,7 @@ SUMMARY = "Linux kernel for TI devices" >> LICENSE = "GPL-2.0-only" >> LIC_FILES_CHKSUM = >> "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" >> -inherit kernel >> +inherit kernel_vendor_dtb >> require recipes-kernel/linux/setup-defconfig.inc >> require recipes-kernel/linux/kernel-rdepends.inc >> @@ -18,6 +18,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" >> KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ >> ${EXTRA_DTC_ARGS}" >> +KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtbs" > > Do we want this to be "dtbs" or "dtb"? Debian uses "dtb" which is the > far more common distro today and the one we plan to support in the near > term. I know I used "dtbs" in the U-Boot side patch for this, but I'm > having second thoughts and it's easy to switch it over in U-Boot.. If debian does dtb then I vote dtb. I'll submit a V3 with that change and putting the logic in ti-kernel.inc. > Andrew > >> +KERNEL_DTBVENDORED = "1" >> + >> S = "${WORKDIR}/git" >> BRANCH = "ti-linux-6.1.y" >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#16558): >> https://lists.yoctoproject.org/g/meta-ti/message/16558 >> Mute This Topic: https://lists.yoctoproject.org/mt/98994752/3619733 >> Group Owner: meta-ti+owner@lists.yoctoproject.org >> Unsubscribe: >> https://lists.yoctoproject.org/g/meta-ti/leave/6695306/3619733/2033773410/xyzzy [afd@ti.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb index cdee548f..7c992ac5 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb @@ -3,7 +3,7 @@ SUMMARY = "Linux kernel for TI devices" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -inherit kernel +inherit kernel_vendor_dtb require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/kernel-rdepends.inc @@ -18,6 +18,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ ${EXTRA_DTC_ARGS}" +KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtbs" +KERNEL_DTBVENDORED = "1" + S = "${WORKDIR}/git" BRANCH = "ti-linux-6.1.y"
Change over to using the kernel_devicetree_vendor_dtb.bbclass to have the DTBs installed into the same vendored subdirectory that is in the kernel. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- v2: - Fixed syntax of "1" - Fixed name of custom kernel class to match the other patch. meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)