| Message ID | 20230505083824.27085-1-a-bhatia1@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [kirkstone-next] meta-ti: conf: am62xx-lp-evm: Fix DT and DT prefixes | expand |
Couple minor comments regarding the subject tags: 1. You want to specify the target release branch, such as "kirkstone", not the intermediate branches, like "*-wip" or "*-next". 2. We want to keep master up-to-date and in most cases the change is quite straightforward and applies to both master and kirkstone, so it's best to specify that in the tag as "master/kirkstone". And testing against those branches is highly recommended! :) On Fri, May 05, 2023 at 02:08:24PM +0530, Aradhya Bhatia via lists.yoctoproject.org wrote: > The DT name k3-am62-lp-sk.dts was adopted instead of k3-am62x-lp-sk.dts > because the community prefers avoiding the wildcard letter 'x'.[1] > > Drop the letter 'x' from the strings in KERNEL_DEVICETREE_PREFIX and > KERNEL_DEVICETREE to accurately reflect the DT names. > > Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com> > > [1]: > https://lore.kernel.org/all/06cbcd7d-bc83-bfeb-0821-72c7caf9a5e7@linaro.org/ > --- > meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > index ba1a12a7fdb7..ce306a2a0e17 100644 > --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > @@ -5,12 +5,12 @@ > require conf/machine/include/am62xx-lp.inc > > KERNEL_DEVICETREE_PREFIX = " \ > - ti/k3-am62x-lp \ > + ti/k3-am62-lp \ > ti/k3-am625-sk \ > " > > KERNEL_DEVICETREE = " \ > - ti/k3-am62x-lp-sk.dtb \ > + ti/k3-am62-lp-sk.dtb \ > " > > SPL_BINARY = "tispl.bin_HS" > -- > 2.40.1
Hi Denys Thank you for reviewing the patch. On 06-May-23 07:10, Denys Dmytriyenko wrote: > Couple minor comments regarding the subject tags: > > 1. You want to specify the target release branch, such as "kirkstone", not the > intermediate branches, like "*-wip" or "*-next". > Yup, noted! > 2. We want to keep master up-to-date and in most cases the change is quite > straightforward and applies to both master and kirkstone, so it's best to > specify that in the tag as "master/kirkstone". And testing against those > branches is highly recommended! :) Understood! This patch was tested for kirkstone, but not for master branch. After your comment, I checked, and this patch does apply cleanly on master as well. However, I have not been able to find proper configs for oe-layer setup for the master branch, and manually changing the kirkstone config to point to master did not help either. Do you have any suggestions on how I could test the patch on master? Regards Aradhya > > > On Fri, May 05, 2023 at 02:08:24PM +0530, Aradhya Bhatia via lists.yoctoproject.org wrote: >> The DT name k3-am62-lp-sk.dts was adopted instead of k3-am62x-lp-sk.dts >> because the community prefers avoiding the wildcard letter 'x'.[1] >> >> Drop the letter 'x' from the strings in KERNEL_DEVICETREE_PREFIX and >> KERNEL_DEVICETREE to accurately reflect the DT names. >> >> Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com> >> >> [1]: >> https://lore.kernel.org/all/06cbcd7d-bc83-bfeb-0821-72c7caf9a5e7@linaro.org/ >> --- >> meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >> index ba1a12a7fdb7..ce306a2a0e17 100644 >> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >> @@ -5,12 +5,12 @@ >> require conf/machine/include/am62xx-lp.inc >> >> KERNEL_DEVICETREE_PREFIX = " \ >> - ti/k3-am62x-lp \ >> + ti/k3-am62-lp \ >> ti/k3-am625-sk \ >> " >> >> KERNEL_DEVICETREE = " \ >> - ti/k3-am62x-lp-sk.dtb \ >> + ti/k3-am62-lp-sk.dtb \ >> " >> >> SPL_BINARY = "tispl.bin_HS" >> -- >> 2.40.1
On Thu, May 11, 2023 at 10:02:23AM +0530, Aradhya Bhatia wrote: > Hi Denys > > Thank you for reviewing the patch. > > On 06-May-23 07:10, Denys Dmytriyenko wrote: > > Couple minor comments regarding the subject tags: > > > > 1. You want to specify the target release branch, such as "kirkstone", not the > > intermediate branches, like "*-wip" or "*-next". > > > Yup, noted! > > > 2. We want to keep master up-to-date and in most cases the change is quite > > straightforward and applies to both master and kirkstone, so it's best to > > specify that in the tag as "master/kirkstone". And testing against those > > branches is highly recommended! :) > > Understood! This patch was tested for kirkstone, but not for master > branch. > > After your comment, I checked, and this patch does apply cleanly on > master as well. However, I have not been able to find proper configs for > oe-layer setup for the master branch, and manually changing the > kirkstone config to point to master did not help either. > > Do you have any suggestions on how I could test the patch on master? If you use oe-layersetup scripts, then there are arago-kirkstone-config.txt and arago-master-config.txt config files available. Let us know if you see any issues.
Hi Denys On 12-May-23 08:30, Denys Dmytriyenko wrote: > On Thu, May 11, 2023 at 10:02:23AM +0530, Aradhya Bhatia wrote: >> Hi Denys >> >> Thank you for reviewing the patch. >> >> On 06-May-23 07:10, Denys Dmytriyenko wrote: >>> Couple minor comments regarding the subject tags: >>> >>> 1. You want to specify the target release branch, such as "kirkstone", not the >>> intermediate branches, like "*-wip" or "*-next". >>> >> Yup, noted! >> >>> 2. We want to keep master up-to-date and in most cases the change is quite >>> straightforward and applies to both master and kirkstone, so it's best to >>> specify that in the tag as "master/kirkstone". And testing against those >>> branches is highly recommended! :) >> >> Understood! This patch was tested for kirkstone, but not for master >> branch. >> >> After your comment, I checked, and this patch does apply cleanly on >> master as well. However, I have not been able to find proper configs for >> oe-layer setup for the master branch, and manually changing the >> kirkstone config to point to master did not help either. >> >> Do you have any suggestions on how I could test the patch on master? > > If you use oe-layersetup scripts, then there are arago-kirkstone-config.txt > and arago-master-config.txt config files available. Let us know if you see any > issues. > Thank you! I ended up using the arago-master-wip-config.txt file for oe-layersetup. By default it takes the 5.10 branch, but making it point to the ti-linux-6.1.y-cicd:HEAD locally, the required DTBs propped up in the build. Regards Aradhya
On 5/15/2023 4:07 AM, Aradhya Bhatia wrote: > Hi Denys > > On 12-May-23 08:30, Denys Dmytriyenko wrote: >> On Thu, May 11, 2023 at 10:02:23AM +0530, Aradhya Bhatia wrote: >>> Hi Denys >>> >>> Thank you for reviewing the patch. >>> >>> On 06-May-23 07:10, Denys Dmytriyenko wrote: >>>> Couple minor comments regarding the subject tags: >>>> >>>> 1. You want to specify the target release branch, such as "kirkstone", not the >>>> intermediate branches, like "*-wip" or "*-next". >>>> >>> Yup, noted! >>> >>>> 2. We want to keep master up-to-date and in most cases the change is quite >>>> straightforward and applies to both master and kirkstone, so it's best to >>>> specify that in the tag as "master/kirkstone". And testing against those >>>> branches is highly recommended! :) >>> >>> Understood! This patch was tested for kirkstone, but not for master >>> branch. >>> >>> After your comment, I checked, and this patch does apply cleanly on >>> master as well. However, I have not been able to find proper configs for >>> oe-layer setup for the master branch, and manually changing the >>> kirkstone config to point to master did not help either. >>> >>> Do you have any suggestions on how I could test the patch on master? >> >> If you use oe-layersetup scripts, then there are arago-kirkstone-config.txt >> and arago-master-config.txt config files available. Let us know if you see any >> issues. >> > > Thank you! I ended up using the arago-master-wip-config.txt file for > oe-layersetup. By default it takes the 5.10 branch, but making it point > to the ti-linux-6.1.y-cicd:HEAD locally, the required DTBs propped up in > the build. We have not ported the 6.1 changes to master yet as we are still working on the LTS migration on the kirkstone branch. Once we release the 6.1 kernel to kirkstone as the default we will also make the same change on master. > Regards > Aradhya
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index ba1a12a7fdb7..ce306a2a0e17 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -5,12 +5,12 @@ require conf/machine/include/am62xx-lp.inc KERNEL_DEVICETREE_PREFIX = " \ - ti/k3-am62x-lp \ + ti/k3-am62-lp \ ti/k3-am625-sk \ " KERNEL_DEVICETREE = " \ - ti/k3-am62x-lp-sk.dtb \ + ti/k3-am62-lp-sk.dtb \ " SPL_BINARY = "tispl.bin_HS"
The DT name k3-am62-lp-sk.dts was adopted instead of k3-am62x-lp-sk.dts because the community prefers avoiding the wildcard letter 'x'.[1] Drop the letter 'x' from the strings in KERNEL_DEVICETREE_PREFIX and KERNEL_DEVICETREE to accurately reflect the DT names. Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com> [1]: https://lore.kernel.org/all/06cbcd7d-bc83-bfeb-0821-72c7caf9a5e7@linaro.org/ --- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)