| Message ID | 20220826185638.1030640-1-gadiyar@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [dunfell] machine: add am62xx-lp-skevm configuration | expand |
On 8/26/2022 13:56, Anand Gadiyar wrote: > This platform is similar to the currently supported am62xx-evm, except > that we currently need new defconfigs for u-boot and new dtbs in the > filesystem. > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com> > Cc: Hari Nagalla <hnagalla@ti.com> > Cc: Andrew Davis <afd@ti.com> > Cc: Praneeth Bajjuri <praneeth@ti.com> > Cc: Ryan Eatmon <reatmon@ti.com> > --- > For yocto purposes, this machine is nearly identical to the AM62x SK, > and we will have more similar machines in the future. > > Mainly, we just need to add more dtbs in the filesystem and to build > u-boot/spl/tiboot3.bin with different defconfigs than the AM62x SK. > > If there's a better way to add support for this, let me know. Now's a > better time than later. Even though the first board that came out was an SK board, in the long run the boards will eventually be called EVM boards. We typically pick the names for the long run, and not the short term. Please change the name of the platform to am62xx-lp-evm (remove the sk). This means changing the name of the conf files, and the various places in the other files that reference the machine name in variable settings. So to restate: am62xx-lp-skevm --> am62xx-lp-evm > conf/machine/am62xx-lp-skevm-k3r5.conf | 11 +++++++++++ > conf/machine/am62xx-lp-skevm.conf | 16 ++++++++++++++++ > recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + > recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb | 2 +- > recipes-kernel/linux/kernel-rdepends.inc | 1 + > recipes-security/optee/optee-os_%.bbappend | 1 + > 6 files changed, 31 insertions(+), 1 deletion(-) > create mode 100644 conf/machine/am62xx-lp-skevm-k3r5.conf > create mode 100644 conf/machine/am62xx-lp-skevm.conf > > diff --git a/conf/machine/am62xx-lp-skevm-k3r5.conf b/conf/machine/am62xx-lp-skevm-k3r5.conf > new file mode 100644 > index 00000000..8e3b04d0 > --- /dev/null > +++ b/conf/machine/am62xx-lp-skevm-k3r5.conf > @@ -0,0 +1,11 @@ > +#@TYPE: Machine > +#@NAME: AM62XX EVM (R5F) > +#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) Copy paste error? Need to add LP to the description? > + > +require conf/machine/include/k3r5.inc > + > +SYSFW_SOC = "am62x" > +SYSFW_CONFIG = "evm" > +SYSFW_SUFFIX = "gp" > + > +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" > diff --git a/conf/machine/am62xx-lp-skevm.conf b/conf/machine/am62xx-lp-skevm.conf > new file mode 100644 > index 00000000..1bed1ff0 > --- /dev/null > +++ b/conf/machine/am62xx-lp-skevm.conf > @@ -0,0 +1,16 @@ > +#@TYPE: Machine > +#@NAME: AM62XX EVM > +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM Copy paste error? Need to add LP to the description? > + > +require conf/machine/include/am62xx.inc > + > +MACHINE_FEATURES += "gpu" > + > +KERNEL_DEVICETREE = " \ > + ti/k3-am62x-lp-sk.dtb \ > + ti/k3-am625-skeleton.dtb \ > + ti/k3-am625-sk-lpmdemo.dtb \ > + ti/k3-am625-sk-csi2-ov5640.dtbo \ > +" > + > +UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" > diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > index 18652dd4..6ee6b09a 100644 > --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > @@ -34,6 +34,7 @@ SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs" > SYSFW_PREFIX_j721s2-evm-k3r5 = "fs" > SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs" > SYSFW_PREFIX_am62xx-evm-k3r5 = "fs" > +SYSFW_PREFIX_am62xx-lp-skevm-k3r5 = "fs" > > SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" > > diff --git a/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb b/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb > index 642a8d3a..cfd6e767 100644 > --- a/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb > +++ b/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb > @@ -7,7 +7,7 @@ PR = "${INC_PR}.0" > > CLEANBROKEN = "1" > > -COMPATIBLE_MACHINE = "am62xx-evm" > +COMPATIBLE_MACHINE = "am62xx-evm|am62xx-lp-skevm" > > PACKAGE_ARCH = "${MACHINE_ARCH}" > > diff --git a/recipes-kernel/linux/kernel-rdepends.inc b/recipes-kernel/linux/kernel-rdepends.inc > index 143e6545..f78afaa0 100644 > --- a/recipes-kernel/linux/kernel-rdepends.inc > +++ b/recipes-kernel/linux/kernel-rdepends.inc > @@ -50,4 +50,5 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-hs-evm = " cnm-wave-fw" > > # Add run-time dependency for TIFS Low Power Module stub > RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-evm = " tifs-lpm-stub" > +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-lp-skevm = " tifs-lpm-stub" > > diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend > index 5a25bd99..196ef71e 100644 > --- a/recipes-security/optee/optee-os_%.bbappend > +++ b/recipes-security/optee/optee-os_%.bbappend > @@ -7,6 +7,7 @@ DEPENDS_append_ti-soc = " python3-cryptography-native" > EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" > > EXTRA_OEMAKE_append_am62xx-evm = " CFG_WITH_SOFTWARE_PRNG=y" > +EXTRA_OEMAKE_append_am62xx-lp-skevm = " CFG_WITH_SOFTWARE_PRNG=y" > EXTRA_OEMAKE_append_j721s2-evm = " CFG_WITH_SOFTWARE_PRNG=y" > EXTRA_OEMAKE_append_j721s2-hs-evm = " CFG_WITH_SOFTWARE_PRNG=y" >
> From: Eatmon, Ryan <reatmon@ti.com> > > > On 8/26/2022 13:56, Anand Gadiyar wrote: > > This platform is similar to the currently supported am62xx-evm, except > > that we currently need new defconfigs for u-boot and new dtbs in the > > filesystem. > > > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com> > > Cc: Hari Nagalla <hnagalla@ti.com> > > Cc: Andrew Davis <afd@ti.com> > > Cc: Praneeth Bajjuri <praneeth@ti.com> > > Cc: Ryan Eatmon <reatmon@ti.com> > > --- > > For yocto purposes, this machine is nearly identical to the AM62x SK, > > and we will have more similar machines in the future. > > > > Mainly, we just need to add more dtbs in the filesystem and to build > > u-boot/spl/tiboot3.bin with different defconfigs than the AM62x SK. > > > > If there's a better way to add support for this, let me know. Now's a > > better time than later. > > > Even though the first board that came out was an SK board, in the long > run the boards will eventually be called EVM boards. We typically pick > the names for the long run, and not the short term. Please change the > name of the platform to am62xx-lp-evm (remove the sk). > > This means changing the name of the conf files, and the various places > in the other files that reference the machine name in variable settings. > > So to restate: > > am62xx-lp-skevm --> am62xx-lp-evm Done - changed in v2. > > conf/machine/am62xx-lp-skevm-k3r5.conf | 11 +++++++++++ > > conf/machine/am62xx-lp-skevm.conf | 16 ++++++++++++++++ > > recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + > > recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb | 2 +- > > recipes-kernel/linux/kernel-rdepends.inc | 1 + > > recipes-security/optee/optee-os_%.bbappend | 1 + > > 6 files changed, 31 insertions(+), 1 deletion(-) > > create mode 100644 conf/machine/am62xx-lp-skevm-k3r5.conf > > create mode 100644 conf/machine/am62xx-lp-skevm.conf > > > > diff --git a/conf/machine/am62xx-lp-skevm-k3r5.conf b/conf/machine/am62xx-lp-skevm-k3r5.conf > > new file mode 100644 > > index 00000000..8e3b04d0 > > --- /dev/null > > +++ b/conf/machine/am62xx-lp-skevm-k3r5.conf > > @@ -0,0 +1,11 @@ > > +#@TYPE: Machine > > +#@NAME: AM62XX EVM (R5F) > > +#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) > > Copy paste error? Need to add LP to the description? > > > + > > +require conf/machine/include/k3r5.inc > > + > > +SYSFW_SOC = "am62x" > > +SYSFW_CONFIG = "evm" > > +SYSFW_SUFFIX = "gp" > > + > > +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" > > diff --git a/conf/machine/am62xx-lp-skevm.conf b/conf/machine/am62xx-lp-skevm.conf > > new file mode 100644 > > index 00000000..1bed1ff0 > > --- /dev/null > > +++ b/conf/machine/am62xx-lp-skevm.conf > > @@ -0,0 +1,16 @@ > > +#@TYPE: Machine > > +#@NAME: AM62XX EVM > > +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM > > > Copy paste error? Need to add LP to the description? Thanks! Fixed in both places in v2.
On Mon, Aug 29, 2022 at 04:50:00PM +0000, Anand Gadiyar via lists.yoctoproject.org wrote: > > From: Eatmon, Ryan <reatmon@ti.com> > > > > > > On 8/26/2022 13:56, Anand Gadiyar wrote: > > > This platform is similar to the currently supported am62xx-evm, except > > > that we currently need new defconfigs for u-boot and new dtbs in the > > > filesystem. > > > > > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com> > > > Cc: Hari Nagalla <hnagalla@ti.com> > > > Cc: Andrew Davis <afd@ti.com> > > > Cc: Praneeth Bajjuri <praneeth@ti.com> > > > Cc: Ryan Eatmon <reatmon@ti.com> > > > --- > > > For yocto purposes, this machine is nearly identical to the AM62x SK, > > > and we will have more similar machines in the future. > > > > > > Mainly, we just need to add more dtbs in the filesystem and to build > > > u-boot/spl/tiboot3.bin with different defconfigs than the AM62x SK. > > > > > > If there's a better way to add support for this, let me know. Now's a > > > better time than later. Adding new DTBs to the existing am62xx-evm shouldn't be a problem: https://git.yoctoproject.org/meta-ti/tree/conf/machine/include/ti33x.inc?h=dunfell#n29 As of 2 different defconfigs in U-boot - it sounded like it is a temporary situation. If the plan is to have the same defconfig and U-boot tiboot3.bin binary for both AM62 and AM62 LP at some point, it is probably better to go that route and keep a single am62xx-evm machine config, instead of duplicating almost identical platforms... > > Even though the first board that came out was an SK board, in the long > > run the boards will eventually be called EVM boards. We typically pick > > the names for the long run, and not the short term. Please change the > > name of the platform to am62xx-lp-evm (remove the sk). > > > > This means changing the name of the conf files, and the various places > > in the other files that reference the machine name in variable settings. > > > > So to restate: > > > > am62xx-lp-skevm --> am62xx-lp-evm > > Done - changed in v2. > > > > > conf/machine/am62xx-lp-skevm-k3r5.conf | 11 +++++++++++ > > > conf/machine/am62xx-lp-skevm.conf | 16 ++++++++++++++++ > > > recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + > > > recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb | 2 +- > > > recipes-kernel/linux/kernel-rdepends.inc | 1 + > > > recipes-security/optee/optee-os_%.bbappend | 1 + > > > 6 files changed, 31 insertions(+), 1 deletion(-) > > > create mode 100644 conf/machine/am62xx-lp-skevm-k3r5.conf > > > create mode 100644 conf/machine/am62xx-lp-skevm.conf > > > > > > diff --git a/conf/machine/am62xx-lp-skevm-k3r5.conf b/conf/machine/am62xx-lp-skevm-k3r5.conf > > > new file mode 100644 > > > index 00000000..8e3b04d0 > > > --- /dev/null > > > +++ b/conf/machine/am62xx-lp-skevm-k3r5.conf > > > @@ -0,0 +1,11 @@ > > > +#@TYPE: Machine > > > +#@NAME: AM62XX EVM (R5F) > > > +#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) > > > > Copy paste error? Need to add LP to the description? > > > > > + > > > +require conf/machine/include/k3r5.inc > > > + > > > +SYSFW_SOC = "am62x" > > > +SYSFW_CONFIG = "evm" > > > +SYSFW_SUFFIX = "gp" > > > + > > > +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" > > > diff --git a/conf/machine/am62xx-lp-skevm.conf b/conf/machine/am62xx-lp-skevm.conf > > > new file mode 100644 > > > index 00000000..1bed1ff0 > > > --- /dev/null > > > +++ b/conf/machine/am62xx-lp-skevm.conf > > > @@ -0,0 +1,16 @@ > > > +#@TYPE: Machine > > > +#@NAME: AM62XX EVM > > > +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM > > > > > > Copy paste error? Need to add LP to the description? > > Thanks! Fixed in both places in v2.
> From: Denys Dmytriyenko <denis@denix.org> > > On Mon, Aug 29, 2022 at 04:50:00PM +0000, Anand Gadiyar via > lists.yoctoproject.org wrote: > > > From: Eatmon, Ryan <reatmon@ti.com> > > > > > > > > > On 8/26/2022 13:56, Anand Gadiyar wrote: > > > > This platform is similar to the currently supported am62xx-evm, except > > > > that we currently need new defconfigs for u-boot and new dtbs in the > > > > filesystem. > > > > > > > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com> > > > > Cc: Hari Nagalla <hnagalla@ti.com> > > > > Cc: Andrew Davis <afd@ti.com> > > > > Cc: Praneeth Bajjuri <praneeth@ti.com> > > > > Cc: Ryan Eatmon <reatmon@ti.com> > > > > --- > > > > For yocto purposes, this machine is nearly identical to the AM62x SK, > > > > and we will have more similar machines in the future. > > > > > > > > Mainly, we just need to add more dtbs in the filesystem and to build > > > > u-boot/spl/tiboot3.bin with different defconfigs than the AM62x SK. > > > > > > > > If there's a better way to add support for this, let me know. Now's a > > > > better time than later. > > Adding new DTBs to the existing am62xx-evm shouldn't be a problem: > https://git.yoctoproject.org/meta-ti/tree/conf/machine/include/ti33x.inc?h=dunfell#n29 > > As of 2 different defconfigs in U-boot - it sounded like it is a temporary > situation. If the plan is to have the same defconfig and U-boot tiboot3.bin > binary for both AM62 and AM62 LP at some point, it is probably better to go > that route and keep a single am62xx-evm machine config, instead of duplicating > almost identical platforms... Unfortunately, this turned out to be quite hard to do at this time. The DTBs for the boards are vastly different because of one major contributor - the DDR DTSI file, which is currently the entire set of DDR registers. tiboot3.bin is currently the one responsible for configuring the DDR and includes this DTSI in entirity. The DDR parts are different on the two boards, so we need to embed two sets of this DTSI. I was unable to fit both sets of DTSI in the binary at this time (the binary would boot up fully on the first board, but SPL doesn't release memory when the device model is reinitialized if SPL detects it's running on a different board). For tiboot3.bin, I would like to explore if we can start with a reduced DTB without any DDR, identify the board, and then switch to a full DTB unconditionally. Is there a better approach? I think the A53 SPL/u-boot would be able to get away with a single FIT image with both sets of DTBs embedded. Could we start by merging this patch for now, if I promise to explore getting a single image to work?
diff --git a/conf/machine/am62xx-lp-skevm-k3r5.conf b/conf/machine/am62xx-lp-skevm-k3r5.conf new file mode 100644 index 00000000..8e3b04d0 --- /dev/null +++ b/conf/machine/am62xx-lp-skevm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM62XX EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" diff --git a/conf/machine/am62xx-lp-skevm.conf b/conf/machine/am62xx-lp-skevm.conf new file mode 100644 index 00000000..1bed1ff0 --- /dev/null +++ b/conf/machine/am62xx-lp-skevm.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: AM62XX EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM + +require conf/machine/include/am62xx.inc + +MACHINE_FEATURES += "gpu" + +KERNEL_DEVICETREE = " \ + ti/k3-am62x-lp-sk.dtb \ + ti/k3-am625-skeleton.dtb \ + ti/k3-am625-sk-lpmdemo.dtb \ + ti/k3-am625-sk-csi2-ov5640.dtbo \ +" + +UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 18652dd4..6ee6b09a 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -34,6 +34,7 @@ SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs" SYSFW_PREFIX_j721s2-evm-k3r5 = "fs" SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs" SYSFW_PREFIX_am62xx-evm-k3r5 = "fs" +SYSFW_PREFIX_am62xx-lp-skevm-k3r5 = "fs" SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" diff --git a/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb b/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb index 642a8d3a..cfd6e767 100644 --- a/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb +++ b/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb @@ -7,7 +7,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "am62xx-evm" +COMPATIBLE_MACHINE = "am62xx-evm|am62xx-lp-skevm" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-kernel/linux/kernel-rdepends.inc b/recipes-kernel/linux/kernel-rdepends.inc index 143e6545..f78afaa0 100644 --- a/recipes-kernel/linux/kernel-rdepends.inc +++ b/recipes-kernel/linux/kernel-rdepends.inc @@ -50,4 +50,5 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-hs-evm = " cnm-wave-fw" # Add run-time dependency for TIFS Low Power Module stub RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-evm = " tifs-lpm-stub" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-lp-skevm = " tifs-lpm-stub" diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index 5a25bd99..196ef71e 100644 --- a/recipes-security/optee/optee-os_%.bbappend +++ b/recipes-security/optee/optee-os_%.bbappend @@ -7,6 +7,7 @@ DEPENDS_append_ti-soc = " python3-cryptography-native" EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" EXTRA_OEMAKE_append_am62xx-evm = " CFG_WITH_SOFTWARE_PRNG=y" +EXTRA_OEMAKE_append_am62xx-lp-skevm = " CFG_WITH_SOFTWARE_PRNG=y" EXTRA_OEMAKE_append_j721s2-evm = " CFG_WITH_SOFTWARE_PRNG=y" EXTRA_OEMAKE_append_j721s2-hs-evm = " CFG_WITH_SOFTWARE_PRNG=y"
This platform is similar to the currently supported am62xx-evm, except that we currently need new defconfigs for u-boot and new dtbs in the filesystem. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Cc: Hari Nagalla <hnagalla@ti.com> Cc: Andrew Davis <afd@ti.com> Cc: Praneeth Bajjuri <praneeth@ti.com> Cc: Ryan Eatmon <reatmon@ti.com> --- For yocto purposes, this machine is nearly identical to the AM62x SK, and we will have more similar machines in the future. Mainly, we just need to add more dtbs in the filesystem and to build u-boot/spl/tiboot3.bin with different defconfigs than the AM62x SK. If there's a better way to add support for this, let me know. Now's a better time than later. conf/machine/am62xx-lp-skevm-k3r5.conf | 11 +++++++++++ conf/machine/am62xx-lp-skevm.conf | 16 ++++++++++++++++ recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb | 2 +- recipes-kernel/linux/kernel-rdepends.inc | 1 + recipes-security/optee/optee-os_%.bbappend | 1 + 6 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 conf/machine/am62xx-lp-skevm-k3r5.conf create mode 100644 conf/machine/am62xx-lp-skevm.conf