| Message ID | 20240906135826.402206-1-c-shilwant@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/scarthgap] conf: machine: Remove multiconfig compulsion for k3 platforms | expand |
On 9/6/2024 8:58 AM, Chirag Shilwant wrote: > - While implementing k3.inc, there was an assumption that all > k3 based TI SOC's would always have a Cortex-R5F core [1]. This > assumption is not true. > > - Hence, create a new mc_k3r5 include file & move the multiconfig > dependencies to it. Also, include this file only in those k3 platforms > which needs the R5 multiconfig support. > > [1]: https://git.ti.com/cgit/arago-project/meta-ti/commit/conf/machine/include/k3.inc?h=scarthgap&id=f814840465358a6b5429ad20165742ac6e6e6a29 > > Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> > --- > meta-ti-bsp/conf/machine/include/am62axx.inc | 2 ++ > meta-ti-bsp/conf/machine/include/am62pxx.inc | 2 ++ > meta-ti-bsp/conf/machine/include/am62xx.inc | 2 ++ > meta-ti-bsp/conf/machine/include/am64xx.inc | 2 ++ > meta-ti-bsp/conf/machine/include/am65xx.inc | 2 ++ > meta-ti-bsp/conf/machine/include/am68.inc | 2 ++ > meta-ti-bsp/conf/machine/include/am69.inc | 2 ++ > meta-ti-bsp/conf/machine/include/j7200.inc | 2 ++ > meta-ti-bsp/conf/machine/include/j721e.inc | 2 ++ > meta-ti-bsp/conf/machine/include/j721s2.inc | 2 ++ > meta-ti-bsp/conf/machine/include/j722s.inc | 2 ++ > meta-ti-bsp/conf/machine/include/j742s2.inc | 2 ++ > meta-ti-bsp/conf/machine/include/j784s4.inc | 2 ++ > meta-ti-bsp/conf/machine/include/k3.inc | 3 --- > meta-ti-bsp/conf/machine/include/mc_k3r5.inc | 3 +++ You forgot to update the conf/machine/beagelplay.conf file. You probably only searched in the include dir. I'll add the missing file and fix this patch and send a v2. > 15 files changed, 29 insertions(+), 3 deletions(-) > create mode 100644 meta-ti-bsp/conf/machine/include/mc_k3r5.inc > > diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc > index 8268a956..0d7a0602 100644 > --- a/meta-ti-bsp/conf/machine/include/am62axx.inc > +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":am62axx" > > MACHINE_FEATURES += "screen touchscreen" > diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc > index cc9a2c01..e88f1bc1 100644 > --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc > +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":am62pxx" > > MACHINE_FEATURES += "screen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc > index 21b6d1ec..e1669e28 100644 > --- a/meta-ti-bsp/conf/machine/include/am62xx.inc > +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":am62xx" > > MACHINE_FEATURES += "screen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc > index 95529a83..4802e796 100644 > --- a/meta-ti-bsp/conf/machine/include/am64xx.inc > +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":am64xx" > > KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" > diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc > index 485dcc54..6ff4886b 100644 > --- a/meta-ti-bsp/conf/machine/include/am65xx.inc > +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":am65xx" > > MACHINE_FEATURES += "screen touchscreen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc > index a7ccea79..42d20109 100644 > --- a/meta-ti-bsp/conf/machine/include/am68.inc > +++ b/meta-ti-bsp/conf/machine/include/am68.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":j721s2" > > MACHINE_FEATURES += "screen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc > index d18cf740..0faeb07e 100644 > --- a/meta-ti-bsp/conf/machine/include/am69.inc > +++ b/meta-ti-bsp/conf/machine/include/am69.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":j784s4" > > MACHINE_FEATURES += "screen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc > index bee2345f..511c7ba2 100644 > --- a/meta-ti-bsp/conf/machine/include/j7200.inc > +++ b/meta-ti-bsp/conf/machine/include/j7200.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":j7200" > > # Default tiboot3.bin on J7200 is for GP > diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc > index 29e50023..6c58c3c7 100644 > --- a/meta-ti-bsp/conf/machine/include/j721e.inc > +++ b/meta-ti-bsp/conf/machine/include/j721e.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":j721e" > > MACHINE_FEATURES += "screen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc > index 5ebb4a16..189b0dc3 100644 > --- a/meta-ti-bsp/conf/machine/include/j721s2.inc > +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":j721s2" > > MACHINE_FEATURES += "screen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc > index 42f50feb..4e92731f 100644 > --- a/meta-ti-bsp/conf/machine/include/j722s.inc > +++ b/meta-ti-bsp/conf/machine/include/j722s.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":j722s" > > MACHINE_FEATURES += "screen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc > index 7c248310..ef39f4f2 100644 > --- a/meta-ti-bsp/conf/machine/include/j742s2.inc > +++ b/meta-ti-bsp/conf/machine/include/j742s2.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":j742s2" > > MACHINE_FEATURES += "screen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc > index 6fb26bbc..ca1aca56 100644 > --- a/meta-ti-bsp/conf/machine/include/j784s4.inc > +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc > @@ -1,4 +1,6 @@ > require conf/machine/include/k3.inc > +require conf/machine/include/mc_k3r5.inc > + > SOC_FAMILY:append = ":j784s4" > > MACHINE_FEATURES += "screen gpu" > diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc > index 2e5ffe09..de4be550 100644 > --- a/meta-ti-bsp/conf/machine/include/k3.inc > +++ b/meta-ti-bsp/conf/machine/include/k3.inc > @@ -5,8 +5,6 @@ SOC_FAMILY:append = ":k3" > > require conf/machine/include/arm/arch-arm64.inc > > -BBMULTICONFIG += "k3r5" > - > require conf/machine/include/ti-bsp.inc > > KERNEL_IMAGETYPE = "Image" > @@ -60,6 +58,5 @@ MACHINE_FEATURES += "efi" > WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" > > do_image_wic[depends] += "virtual/bootloader:do_deploy" > -do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" > > SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" > diff --git a/meta-ti-bsp/conf/machine/include/mc_k3r5.inc b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc > new file mode 100644 > index 00000000..d5a530b8 > --- /dev/null > +++ b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc > @@ -0,0 +1,3 @@ > +BBMULTICONFIG += "k3r5" > + > +do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc index 8268a956..0d7a0602 100644 --- a/meta-ti-bsp/conf/machine/include/am62axx.inc +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am62axx" MACHINE_FEATURES += "screen touchscreen" diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc index cc9a2c01..e88f1bc1 100644 --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am62pxx" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 21b6d1ec..e1669e28 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am62xx" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 95529a83..4802e796 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am64xx" KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 485dcc54..6ff4886b 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am65xx" MACHINE_FEATURES += "screen touchscreen gpu" diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc index a7ccea79..42d20109 100644 --- a/meta-ti-bsp/conf/machine/include/am68.inc +++ b/meta-ti-bsp/conf/machine/include/am68.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc index d18cf740..0faeb07e 100644 --- a/meta-ti-bsp/conf/machine/include/am69.inc +++ b/meta-ti-bsp/conf/machine/include/am69.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index bee2345f..511c7ba2 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j7200" # Default tiboot3.bin on J7200 is for GP diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 29e50023..6c58c3c7 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j721e" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 5ebb4a16..189b0dc3 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index 42f50feb..4e92731f 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j722s" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc index 7c248310..ef39f4f2 100644 --- a/meta-ti-bsp/conf/machine/include/j742s2.inc +++ b/meta-ti-bsp/conf/machine/include/j742s2.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j742s2" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 6fb26bbc..ca1aca56 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 2e5ffe09..de4be550 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -5,8 +5,6 @@ SOC_FAMILY:append = ":k3" require conf/machine/include/arm/arch-arm64.inc -BBMULTICONFIG += "k3r5" - require conf/machine/include/ti-bsp.inc KERNEL_IMAGETYPE = "Image" @@ -60,6 +58,5 @@ MACHINE_FEATURES += "efi" WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" do_image_wic[depends] += "virtual/bootloader:do_deploy" -do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" diff --git a/meta-ti-bsp/conf/machine/include/mc_k3r5.inc b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc new file mode 100644 index 00000000..d5a530b8 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc @@ -0,0 +1,3 @@ +BBMULTICONFIG += "k3r5" + +do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
- While implementing k3.inc, there was an assumption that all k3 based TI SOC's would always have a Cortex-R5F core [1]. This assumption is not true. - Hence, create a new mc_k3r5 include file & move the multiconfig dependencies to it. Also, include this file only in those k3 platforms which needs the R5 multiconfig support. [1]: https://git.ti.com/cgit/arago-project/meta-ti/commit/conf/machine/include/k3.inc?h=scarthgap&id=f814840465358a6b5429ad20165742ac6e6e6a29 Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> --- meta-ti-bsp/conf/machine/include/am62axx.inc | 2 ++ meta-ti-bsp/conf/machine/include/am62pxx.inc | 2 ++ meta-ti-bsp/conf/machine/include/am62xx.inc | 2 ++ meta-ti-bsp/conf/machine/include/am64xx.inc | 2 ++ meta-ti-bsp/conf/machine/include/am65xx.inc | 2 ++ meta-ti-bsp/conf/machine/include/am68.inc | 2 ++ meta-ti-bsp/conf/machine/include/am69.inc | 2 ++ meta-ti-bsp/conf/machine/include/j7200.inc | 2 ++ meta-ti-bsp/conf/machine/include/j721e.inc | 2 ++ meta-ti-bsp/conf/machine/include/j721s2.inc | 2 ++ meta-ti-bsp/conf/machine/include/j722s.inc | 2 ++ meta-ti-bsp/conf/machine/include/j742s2.inc | 2 ++ meta-ti-bsp/conf/machine/include/j784s4.inc | 2 ++ meta-ti-bsp/conf/machine/include/k3.inc | 3 --- meta-ti-bsp/conf/machine/include/mc_k3r5.inc | 3 +++ 15 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/include/mc_k3r5.inc