| Message ID | 20220325210632.8142-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,dunfell,v4] machine: Add am62xx evm configuration | expand |
On Fri, Mar 25, 2022 at 04:06:32PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > From: Nishanth Menon <nm@ti.com> > > Lets add the basic AM62xx-evm configuration. > - Add configurations. > - Add firmware overrides. > - Add u-boot overrides. Everything in one patch? > Signed-off-by: Nishanth Menon <nm@ti.com> > Signed-off-by: Hari Nagalla <hnagalla@ti.com> > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > v2: Removed ti-graphics patch, and removed lpm-demo patches. > v3: Squashed and cleaned up the previous patches. > v4: Removed tabs that made their way into some of the files, and added > more to the commit message. > > conf/machine/am62xx-evm-k3r5.conf | 11 +++++++ > conf/machine/am62xx-evm.conf | 13 ++++++++ > conf/machine/include/am62xx.inc | 17 ++++++++++ > recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 18 ++++++++++ > recipes-bsp/u-boot/u-boot-ti.inc | 7 ++++ > recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 38 +++++++++++++++++++--- > 6 files changed, 99 insertions(+), 5 deletions(-) > create mode 100644 conf/machine/am62xx-evm-k3r5.conf > create mode 100644 conf/machine/am62xx-evm.conf > create mode 100644 conf/machine/include/am62xx.inc > > diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5.conf > new file mode 100644 > index 00000000..724a8d4a > --- /dev/null > +++ b/conf/machine/am62xx-evm-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_evm_r5_defconfig" > diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf > new file mode 100644 > index 00000000..600abb58 > --- /dev/null > +++ b/conf/machine/am62xx-evm.conf > @@ -0,0 +1,13 @@ > +#@TYPE: Machine > +#@NAME: AM62XX EVM > +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM > + > +require conf/machine/include/am62xx.inc > + > +KERNEL_DEVICETREE = " \ > + ti/k3-am625-sk.dtb \ > + ti/k3-am625-sk-lpmdemo.dtb \ > + ti/k3-am625-minimal.dtb \ > +" > + > +UBOOT_MACHINE = "am62x_evm_a53_defconfig" > diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc > new file mode 100644 > index 00000000..e8823dd2 > --- /dev/null > +++ b/conf/machine/include/am62xx.inc > @@ -0,0 +1,17 @@ > +require conf/machine/include/k3.inc > +SOC_FAMILY_append = ":am62xx" > + > +MACHINE_FEATURES += "screen touchscreen" > + > +SERIAL_CONSOLES = "115200;ttyS2" > +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" > + > +# AM62 supports multi-certificate images, use the same > +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" > + > +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > + > +TFA_BOARD = "lite" > +OPTEEMACHINE = "k3-am65x" > +OPTEEOUTPUTMACHINE = "k3" > 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 646833a7..099473b4 100644 > --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > @@ -6,6 +6,7 @@ DEPENDS_append_j7200-hs-evm-k3r5 = " virtual/bootloader" > DEPENDS_append_j721s2-evm-k3r5 = " virtual/bootloader" > DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader" > DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader" > +DEPENDS_append_am62xx-evm-k3r5 = " virtual/bootloader" > > CLEANBROKEN = "1" > PR = "${INC_PR}.2" > @@ -29,6 +30,7 @@ SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" > SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware" > SYSFW_PREFIX_j7200-hs-evm-k3r5 = "ti-fs-firmware" > SYSFW_PREFIX_j721s2-evm-k3r5 = "ti-fs-firmware" > +SYSFW_PREFIX_am62xx-evm-k3r5 = "ti-fs-firmware" > > SYSFW_SUFFIX ?= "unknown" > > @@ -63,6 +65,7 @@ EXTRA_OEMAKE_append_j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-s > EXTRA_OEMAKE_append_j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > +EXTRA_OEMAKE_append_am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > > do_compile() { > cd ${WORKDIR}/imggen/ > @@ -170,4 +173,19 @@ do_deploy_am64xx-hs-evm-k3r5() { > install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ > } > > +do_install_am62xx-evm-k3r5() { > + install -d ${D}/boot > + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} > + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} > + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} > +} > + > +do_deploy_am62xx-evm-k3r5() { > + install -d ${DEPLOYDIR} > + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} > + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} > + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} > + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ > +} > + > addtask deploy before do_build after do_compile > diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc > index 7ed6c5b4..231b7647 100644 > --- a/recipes-bsp/u-boot/u-boot-ti.inc > +++ b/recipes-bsp/u-boot/u-boot-ti.inc > @@ -41,6 +41,7 @@ PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i > > PACKAGECONFIG_append_aarch64 = " atf optee" > PACKAGECONFIG_append_j7 = " dm" > +PACKAGECONFIG_append_am62xx = " dm" > > COMPATIBLE_MACHINE = "(ti-soc)" > > @@ -69,6 +70,7 @@ SPL_UART_BINARY_j7200-hs-evm-k3r5 = "u-boot-spl.bin" > SPL_UART_BINARY_j721s2-evm-k3r5 = "u-boot-spl.bin" > SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin" > SPL_UART_BINARY_am64xx-hs-evm-k3r5 = "u-boot-spl.bin" > +SPL_UART_BINARY_am62xx-evm-k3r5 = "u-boot-spl.bin" > > SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" > SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" > @@ -419,4 +421,9 @@ do_deploy_append_am64xx-hs-evm-k3r5 () { > mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true > } > > +do_deploy_append_am62xx-evm-k3r5 () { > + mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true > + mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true > +} > + > TOOLCHAIN = "gcc" > diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > index c5852dbd..02e5d665 100644 > --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > @@ -19,6 +19,7 @@ PLAT_SFX_j7200-hs-evm = "j7200" > PLAT_SFX_j721s2-evm = "j721s2" > PLAT_SFX_am65xx = "am65xx" > PLAT_SFX_am64xx = "am64xx" > +PLAT_SFX_am62xx = "am62x" > > FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" > require recipes-bsp/ti-linux-fw/ti-linux-fw.inc > @@ -50,11 +51,11 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" > > # J7 HS support > do_install_prepend_j7-hs-evm() { > - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} > - ( cd ${RTOS_DM_FW_DIR}; \ > - mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ > - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ > - ) > + export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} > + ( cd ${RTOS_DM_FW_DIR}; \ > + mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ > + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ > + ) > } > > # J7 HS support > @@ -77,6 +78,13 @@ do_install_prepend_am64xx() { > ) > } > > +# Update the am62xx ipc binaries to be consistent with other platforms > +do_install_prepend_am62xx() { > + ( cd ${RTOS_IPC_FW_DIR}; \ > + mv am62-mcu-m4f0_0-fw ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f; \ > + ) > +} > + > #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level > do_install() { > > @@ -154,6 +162,13 @@ do_install_am64xx() { > install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} > } > > +do_install_am62xx() { > + install -d ${LEGACY_IPC_FW_DIR} > + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} > + # DM Firmware > + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} > +} > + > # Set up names for the firmwares > ALTERNATIVE_${PN}_am65xx = "\ > am65x-mcu-r5f0_0-fw \ > @@ -167,6 +182,10 @@ ALTERNATIVE_${PN}_am64xx = "\ > am64-main-r5f1_1-fw \ > am64-mcu-m4f0_0-fw \ > " > +ALTERNATIVE_${PN}_am62xx = "\ > + am62-mcu-m4f0_0-fw \ > + am62-main-r5f0_0-fw \ > + " > > ALTERNATIVE_${PN}_j7 = "\ > j7-mcu-r5f0_0-fw \ > @@ -216,6 +235,9 @@ TARGET_MAIN_R5FSS1_0_am64xx = "am64-main-r5f1_0-fw" > TARGET_MAIN_R5FSS1_1_am64xx = "am64-main-r5f1_1-fw" > TARGET_MCU_M4FSS0_0_am64xx = "am64-mcu-m4f0_0-fw" > > +TARGET_MAIN_R5FSS0_0_am62xx = "am62-main-r5f0_0-fw" > +TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw" > + > TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" > TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" > TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" > @@ -254,6 +276,9 @@ ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_M > ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" > ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" > > +ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" > +ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" > + > ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" > ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" > ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" > @@ -289,6 +314,9 @@ ALTERNATIVE_TARGET[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_e > ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_1_release_strip.xer5f" > ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f" > > +ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" > +ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" > + > ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" > ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" > ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" > -- > 2.17.1 >
On 3/29/2022 12:41 AM, Denys Dmytriyenko wrote: > On Fri, Mar 25, 2022 at 04:06:32PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: >> From: Nishanth Menon <nm@ti.com> >> >> Lets add the basic AM62xx-evm configuration. >> - Add configurations. >> - Add firmware overrides. >> - Add u-boot overrides. That's the result of squashing. The five various development commits touched the files in varying ways. So they ended up as a single patch. The only other option would be for me to make the edits by hand (by copying each aggregated file to a new copy of the repository) and then doing new commits of the "clean" file. Which is preferable? > Everything in one patch? > > >> Signed-off-by: Nishanth Menon <nm@ti.com> >> Signed-off-by: Hari Nagalla <hnagalla@ti.com> >> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >> --- >> v2: Removed ti-graphics patch, and removed lpm-demo patches. >> v3: Squashed and cleaned up the previous patches. >> v4: Removed tabs that made their way into some of the files, and added >> more to the commit message. >> >> conf/machine/am62xx-evm-k3r5.conf | 11 +++++++ >> conf/machine/am62xx-evm.conf | 13 ++++++++ >> conf/machine/include/am62xx.inc | 17 ++++++++++ >> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 18 ++++++++++ >> recipes-bsp/u-boot/u-boot-ti.inc | 7 ++++ >> recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 38 +++++++++++++++++++--- >> 6 files changed, 99 insertions(+), 5 deletions(-) >> create mode 100644 conf/machine/am62xx-evm-k3r5.conf >> create mode 100644 conf/machine/am62xx-evm.conf >> create mode 100644 conf/machine/include/am62xx.inc >> >> diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5.conf >> new file mode 100644 >> index 00000000..724a8d4a >> --- /dev/null >> +++ b/conf/machine/am62xx-evm-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_evm_r5_defconfig" >> diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf >> new file mode 100644 >> index 00000000..600abb58 >> --- /dev/null >> +++ b/conf/machine/am62xx-evm.conf >> @@ -0,0 +1,13 @@ >> +#@TYPE: Machine >> +#@NAME: AM62XX EVM >> +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM >> + >> +require conf/machine/include/am62xx.inc >> + >> +KERNEL_DEVICETREE = " \ >> + ti/k3-am625-sk.dtb \ >> + ti/k3-am625-sk-lpmdemo.dtb \ >> + ti/k3-am625-minimal.dtb \ >> +" >> + >> +UBOOT_MACHINE = "am62x_evm_a53_defconfig" >> diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc >> new file mode 100644 >> index 00000000..e8823dd2 >> --- /dev/null >> +++ b/conf/machine/include/am62xx.inc >> @@ -0,0 +1,17 @@ >> +require conf/machine/include/k3.inc >> +SOC_FAMILY_append = ":am62xx" >> + >> +MACHINE_FEATURES += "screen touchscreen" >> + >> +SERIAL_CONSOLES = "115200;ttyS2" >> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" >> + >> +# AM62 supports multi-certificate images, use the same >> +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" >> + >> +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> + >> +TFA_BOARD = "lite" >> +OPTEEMACHINE = "k3-am65x" >> +OPTEEOUTPUTMACHINE = "k3" >> 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 646833a7..099473b4 100644 >> --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb >> +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb >> @@ -6,6 +6,7 @@ DEPENDS_append_j7200-hs-evm-k3r5 = " virtual/bootloader" >> DEPENDS_append_j721s2-evm-k3r5 = " virtual/bootloader" >> DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader" >> DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader" >> +DEPENDS_append_am62xx-evm-k3r5 = " virtual/bootloader" >> >> CLEANBROKEN = "1" >> PR = "${INC_PR}.2" >> @@ -29,6 +30,7 @@ SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" >> SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware" >> SYSFW_PREFIX_j7200-hs-evm-k3r5 = "ti-fs-firmware" >> SYSFW_PREFIX_j721s2-evm-k3r5 = "ti-fs-firmware" >> +SYSFW_PREFIX_am62xx-evm-k3r5 = "ti-fs-firmware" >> >> SYSFW_SUFFIX ?= "unknown" >> >> @@ -63,6 +65,7 @@ EXTRA_OEMAKE_append_j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-s >> EXTRA_OEMAKE_append_j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" >> EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" >> EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" >> +EXTRA_OEMAKE_append_am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" >> >> do_compile() { >> cd ${WORKDIR}/imggen/ >> @@ -170,4 +173,19 @@ do_deploy_am64xx-hs-evm-k3r5() { >> install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ >> } >> >> +do_install_am62xx-evm-k3r5() { >> + install -d ${D}/boot >> + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} >> + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} >> + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} >> +} >> + >> +do_deploy_am62xx-evm-k3r5() { >> + install -d ${DEPLOYDIR} >> + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} >> + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} >> + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} >> + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ >> +} >> + >> addtask deploy before do_build after do_compile >> diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc >> index 7ed6c5b4..231b7647 100644 >> --- a/recipes-bsp/u-boot/u-boot-ti.inc >> +++ b/recipes-bsp/u-boot/u-boot-ti.inc >> @@ -41,6 +41,7 @@ PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i >> >> PACKAGECONFIG_append_aarch64 = " atf optee" >> PACKAGECONFIG_append_j7 = " dm" >> +PACKAGECONFIG_append_am62xx = " dm" >> >> COMPATIBLE_MACHINE = "(ti-soc)" >> >> @@ -69,6 +70,7 @@ SPL_UART_BINARY_j7200-hs-evm-k3r5 = "u-boot-spl.bin" >> SPL_UART_BINARY_j721s2-evm-k3r5 = "u-boot-spl.bin" >> SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin" >> SPL_UART_BINARY_am64xx-hs-evm-k3r5 = "u-boot-spl.bin" >> +SPL_UART_BINARY_am62xx-evm-k3r5 = "u-boot-spl.bin" >> >> SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" >> SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" >> @@ -419,4 +421,9 @@ do_deploy_append_am64xx-hs-evm-k3r5 () { >> mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true >> } >> >> +do_deploy_append_am62xx-evm-k3r5 () { >> + mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true >> + mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true >> +} >> + >> TOOLCHAIN = "gcc" >> diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb >> index c5852dbd..02e5d665 100644 >> --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb >> +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb >> @@ -19,6 +19,7 @@ PLAT_SFX_j7200-hs-evm = "j7200" >> PLAT_SFX_j721s2-evm = "j721s2" >> PLAT_SFX_am65xx = "am65xx" >> PLAT_SFX_am64xx = "am64xx" >> +PLAT_SFX_am62xx = "am62x" >> >> FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" >> require recipes-bsp/ti-linux-fw/ti-linux-fw.inc >> @@ -50,11 +51,11 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" >> >> # J7 HS support >> do_install_prepend_j7-hs-evm() { >> - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} >> - ( cd ${RTOS_DM_FW_DIR}; \ >> - mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ >> - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ >> - ) >> + export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} >> + ( cd ${RTOS_DM_FW_DIR}; \ >> + mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ >> + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ >> + ) >> } >> >> # J7 HS support >> @@ -77,6 +78,13 @@ do_install_prepend_am64xx() { >> ) >> } >> >> +# Update the am62xx ipc binaries to be consistent with other platforms >> +do_install_prepend_am62xx() { >> + ( cd ${RTOS_IPC_FW_DIR}; \ >> + mv am62-mcu-m4f0_0-fw ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f; \ >> + ) >> +} >> + >> #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level >> do_install() { >> >> @@ -154,6 +162,13 @@ do_install_am64xx() { >> install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} >> } >> >> +do_install_am62xx() { >> + install -d ${LEGACY_IPC_FW_DIR} >> + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} >> + # DM Firmware >> + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} >> +} >> + >> # Set up names for the firmwares >> ALTERNATIVE_${PN}_am65xx = "\ >> am65x-mcu-r5f0_0-fw \ >> @@ -167,6 +182,10 @@ ALTERNATIVE_${PN}_am64xx = "\ >> am64-main-r5f1_1-fw \ >> am64-mcu-m4f0_0-fw \ >> " >> +ALTERNATIVE_${PN}_am62xx = "\ >> + am62-mcu-m4f0_0-fw \ >> + am62-main-r5f0_0-fw \ >> + " >> >> ALTERNATIVE_${PN}_j7 = "\ >> j7-mcu-r5f0_0-fw \ >> @@ -216,6 +235,9 @@ TARGET_MAIN_R5FSS1_0_am64xx = "am64-main-r5f1_0-fw" >> TARGET_MAIN_R5FSS1_1_am64xx = "am64-main-r5f1_1-fw" >> TARGET_MCU_M4FSS0_0_am64xx = "am64-mcu-m4f0_0-fw" >> >> +TARGET_MAIN_R5FSS0_0_am62xx = "am62-main-r5f0_0-fw" >> +TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw" >> + >> TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" >> TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" >> TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" >> @@ -254,6 +276,9 @@ ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_M >> ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" >> ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" >> >> +ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" >> +ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" >> + >> ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" >> ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" >> ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" >> @@ -289,6 +314,9 @@ ALTERNATIVE_TARGET[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_e >> ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_1_release_strip.xer5f" >> ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f" >> >> +ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" >> +ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" >> + >> ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" >> ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" >> ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" >> -- >> 2.17.1 >>
On Tue, Mar 29, 2022 at 07:26:12AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > > > On 3/29/2022 12:41 AM, Denys Dmytriyenko wrote: > >On Fri, Mar 25, 2022 at 04:06:32PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > >>From: Nishanth Menon <nm@ti.com> > >> > >>Lets add the basic AM62xx-evm configuration. > >>- Add configurations. > >>- Add firmware overrides. > >>- Add u-boot overrides. > > That's the result of squashing. The five various development > commits touched the files in varying ways. So they ended up as a > single patch. > > The only other option would be for me to make the edits by hand (by > copying each aggregated file to a new copy of the repository) and > then doing new commits of the "clean" file. Which is preferable? Thanks for the explanation. If nobody else objects, I'd be fine with merging it as a single patch to avoid extra manual editing. It's just a bit harder to review - give me couple hours to go over it again. > >Everything in one patch? > > > > > >>Signed-off-by: Nishanth Menon <nm@ti.com> > >>Signed-off-by: Hari Nagalla <hnagalla@ti.com> > >>Signed-off-by: Ryan Eatmon <reatmon@ti.com> > >>--- > >>v2: Removed ti-graphics patch, and removed lpm-demo patches. > >>v3: Squashed and cleaned up the previous patches. > >>v4: Removed tabs that made their way into some of the files, and added > >> more to the commit message. > >> > >> conf/machine/am62xx-evm-k3r5.conf | 11 +++++++ > >> conf/machine/am62xx-evm.conf | 13 ++++++++ > >> conf/machine/include/am62xx.inc | 17 ++++++++++ > >> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 18 ++++++++++ > >> recipes-bsp/u-boot/u-boot-ti.inc | 7 ++++ > >> recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 38 +++++++++++++++++++--- > >> 6 files changed, 99 insertions(+), 5 deletions(-) > >> create mode 100644 conf/machine/am62xx-evm-k3r5.conf > >> create mode 100644 conf/machine/am62xx-evm.conf > >> create mode 100644 conf/machine/include/am62xx.inc > >> > >>diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5.conf > >>new file mode 100644 > >>index 00000000..724a8d4a > >>--- /dev/null > >>+++ b/conf/machine/am62xx-evm-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_evm_r5_defconfig" > >>diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf > >>new file mode 100644 > >>index 00000000..600abb58 > >>--- /dev/null > >>+++ b/conf/machine/am62xx-evm.conf > >>@@ -0,0 +1,13 @@ > >>+#@TYPE: Machine > >>+#@NAME: AM62XX EVM > >>+#@DESCRIPTION: Machine configuration for the TI AM62XX EVM > >>+ > >>+require conf/machine/include/am62xx.inc > >>+ > >>+KERNEL_DEVICETREE = " \ > >>+ ti/k3-am625-sk.dtb \ > >>+ ti/k3-am625-sk-lpmdemo.dtb \ > >>+ ti/k3-am625-minimal.dtb \ > >>+" > >>+ > >>+UBOOT_MACHINE = "am62x_evm_a53_defconfig" > >>diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc > >>new file mode 100644 > >>index 00000000..e8823dd2 > >>--- /dev/null > >>+++ b/conf/machine/include/am62xx.inc > >>@@ -0,0 +1,17 @@ > >>+require conf/machine/include/k3.inc > >>+SOC_FAMILY_append = ":am62xx" > >>+ > >>+MACHINE_FEATURES += "screen touchscreen" > >>+ > >>+SERIAL_CONSOLES = "115200;ttyS2" > >>+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" > >>+ > >>+# AM62 supports multi-certificate images, use the same > >>+IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" > >>+ > >>+do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > >>+do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > >>+ > >>+TFA_BOARD = "lite" > >>+OPTEEMACHINE = "k3-am65x" > >>+OPTEEOUTPUTMACHINE = "k3" > >>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 646833a7..099473b4 100644 > >>--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > >>+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > >>@@ -6,6 +6,7 @@ DEPENDS_append_j7200-hs-evm-k3r5 = " virtual/bootloader" > >> DEPENDS_append_j721s2-evm-k3r5 = " virtual/bootloader" > >> DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader" > >> DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader" > >>+DEPENDS_append_am62xx-evm-k3r5 = " virtual/bootloader" > >> CLEANBROKEN = "1" > >> PR = "${INC_PR}.2" > >>@@ -29,6 +30,7 @@ SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" > >> SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware" > >> SYSFW_PREFIX_j7200-hs-evm-k3r5 = "ti-fs-firmware" > >> SYSFW_PREFIX_j721s2-evm-k3r5 = "ti-fs-firmware" > >>+SYSFW_PREFIX_am62xx-evm-k3r5 = "ti-fs-firmware" > >> SYSFW_SUFFIX ?= "unknown" > >>@@ -63,6 +65,7 @@ EXTRA_OEMAKE_append_j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-s > >> EXTRA_OEMAKE_append_j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > >> EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > >> EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > >>+EXTRA_OEMAKE_append_am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > >> do_compile() { > >> cd ${WORKDIR}/imggen/ > >>@@ -170,4 +173,19 @@ do_deploy_am64xx-hs-evm-k3r5() { > >> install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ > >> } > >>+do_install_am62xx-evm-k3r5() { > >>+ install -d ${D}/boot > >>+ install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} > >>+ ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} > >>+ ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} > >>+} > >>+ > >>+do_deploy_am62xx-evm-k3r5() { > >>+ install -d ${DEPLOYDIR} > >>+ install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} > >>+ ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} > >>+ ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} > >>+ install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ > >>+} > >>+ > >> addtask deploy before do_build after do_compile > >>diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc > >>index 7ed6c5b4..231b7647 100644 > >>--- a/recipes-bsp/u-boot/u-boot-ti.inc > >>+++ b/recipes-bsp/u-boot/u-boot-ti.inc > >>@@ -41,6 +41,7 @@ PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i > >> PACKAGECONFIG_append_aarch64 = " atf optee" > >> PACKAGECONFIG_append_j7 = " dm" > >>+PACKAGECONFIG_append_am62xx = " dm" > >> COMPATIBLE_MACHINE = "(ti-soc)" > >>@@ -69,6 +70,7 @@ SPL_UART_BINARY_j7200-hs-evm-k3r5 = "u-boot-spl.bin" > >> SPL_UART_BINARY_j721s2-evm-k3r5 = "u-boot-spl.bin" > >> SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin" > >> SPL_UART_BINARY_am64xx-hs-evm-k3r5 = "u-boot-spl.bin" > >>+SPL_UART_BINARY_am62xx-evm-k3r5 = "u-boot-spl.bin" > >> SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" > >> SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" > >>@@ -419,4 +421,9 @@ do_deploy_append_am64xx-hs-evm-k3r5 () { > >> mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true > >> } > >>+do_deploy_append_am62xx-evm-k3r5 () { > >>+ mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true > >>+ mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true > >>+} > >>+ > >> TOOLCHAIN = "gcc" > >>diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > >>index c5852dbd..02e5d665 100644 > >>--- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > >>+++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > >>@@ -19,6 +19,7 @@ PLAT_SFX_j7200-hs-evm = "j7200" > >> PLAT_SFX_j721s2-evm = "j721s2" > >> PLAT_SFX_am65xx = "am65xx" > >> PLAT_SFX_am64xx = "am64xx" > >>+PLAT_SFX_am62xx = "am62x" > >> FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" > >> require recipes-bsp/ti-linux-fw/ti-linux-fw.inc > >>@@ -50,11 +51,11 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" > >> # J7 HS support > >> do_install_prepend_j7-hs-evm() { > >>- export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} > >>- ( cd ${RTOS_DM_FW_DIR}; \ > >>- mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ > >>- ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ > >>- ) > >>+ export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} > >>+ ( cd ${RTOS_DM_FW_DIR}; \ > >>+ mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ > >>+ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ > >>+ ) > >> } > >> # J7 HS support > >>@@ -77,6 +78,13 @@ do_install_prepend_am64xx() { > >> ) > >> } > >>+# Update the am62xx ipc binaries to be consistent with other platforms > >>+do_install_prepend_am62xx() { > >>+ ( cd ${RTOS_IPC_FW_DIR}; \ > >>+ mv am62-mcu-m4f0_0-fw ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f; \ > >>+ ) > >>+} > >>+ > >> #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level > >> do_install() { > >>@@ -154,6 +162,13 @@ do_install_am64xx() { > >> install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} > >> } > >>+do_install_am62xx() { > >>+ install -d ${LEGACY_IPC_FW_DIR} > >>+ install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} > >>+ # DM Firmware > >>+ install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} > >>+} > >>+ > >> # Set up names for the firmwares > >> ALTERNATIVE_${PN}_am65xx = "\ > >> am65x-mcu-r5f0_0-fw \ > >>@@ -167,6 +182,10 @@ ALTERNATIVE_${PN}_am64xx = "\ > >> am64-main-r5f1_1-fw \ > >> am64-mcu-m4f0_0-fw \ > >> " > >>+ALTERNATIVE_${PN}_am62xx = "\ > >>+ am62-mcu-m4f0_0-fw \ > >>+ am62-main-r5f0_0-fw \ > >>+ " > >> ALTERNATIVE_${PN}_j7 = "\ > >> j7-mcu-r5f0_0-fw \ > >>@@ -216,6 +235,9 @@ TARGET_MAIN_R5FSS1_0_am64xx = "am64-main-r5f1_0-fw" > >> TARGET_MAIN_R5FSS1_1_am64xx = "am64-main-r5f1_1-fw" > >> TARGET_MCU_M4FSS0_0_am64xx = "am64-mcu-m4f0_0-fw" > >>+TARGET_MAIN_R5FSS0_0_am62xx = "am62-main-r5f0_0-fw" > >>+TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw" > >>+ > >> TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" > >> TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" > >> TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" > >>@@ -254,6 +276,9 @@ ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_M > >> ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" > >> ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" > >>+ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" > >>+ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" > >>+ > >> ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" > >> ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" > >> ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" > >>@@ -289,6 +314,9 @@ ALTERNATIVE_TARGET[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_e > >> ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_1_release_strip.xer5f" > >> ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f" > >>+ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" > >>+ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" > >>+ > >> ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" > >> ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" > >> ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" > >>-- > >>2.17.1
On Fri, Mar 25, 2022 at 04:06:32PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > From: Nishanth Menon <nm@ti.com> > > Lets add the basic AM62xx-evm configuration. > - Add configurations. > - Add firmware overrides. > - Add u-boot overrides. > > Signed-off-by: Nishanth Menon <nm@ti.com> > Signed-off-by: Hari Nagalla <hnagalla@ti.com> > Signed-off-by: Ryan Eatmon <reatmon@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> > --- > v2: Removed ti-graphics patch, and removed lpm-demo patches. > v3: Squashed and cleaned up the previous patches. > v4: Removed tabs that made their way into some of the files, and added > more to the commit message. > > conf/machine/am62xx-evm-k3r5.conf | 11 +++++++ > conf/machine/am62xx-evm.conf | 13 ++++++++ > conf/machine/include/am62xx.inc | 17 ++++++++++ > recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 18 ++++++++++ > recipes-bsp/u-boot/u-boot-ti.inc | 7 ++++ > recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 38 +++++++++++++++++++--- > 6 files changed, 99 insertions(+), 5 deletions(-) > create mode 100644 conf/machine/am62xx-evm-k3r5.conf > create mode 100644 conf/machine/am62xx-evm.conf > create mode 100644 conf/machine/include/am62xx.inc > > diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5.conf > new file mode 100644 > index 00000000..724a8d4a > --- /dev/null > +++ b/conf/machine/am62xx-evm-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_evm_r5_defconfig" > diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf > new file mode 100644 > index 00000000..600abb58 > --- /dev/null > +++ b/conf/machine/am62xx-evm.conf > @@ -0,0 +1,13 @@ > +#@TYPE: Machine > +#@NAME: AM62XX EVM > +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM > + > +require conf/machine/include/am62xx.inc > + > +KERNEL_DEVICETREE = " \ > + ti/k3-am625-sk.dtb \ > + ti/k3-am625-sk-lpmdemo.dtb \ > + ti/k3-am625-minimal.dtb \ > +" > + > +UBOOT_MACHINE = "am62x_evm_a53_defconfig" > diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc > new file mode 100644 > index 00000000..e8823dd2 > --- /dev/null > +++ b/conf/machine/include/am62xx.inc > @@ -0,0 +1,17 @@ > +require conf/machine/include/k3.inc > +SOC_FAMILY_append = ":am62xx" > + > +MACHINE_FEATURES += "screen touchscreen" > + > +SERIAL_CONSOLES = "115200;ttyS2" > +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" > + > +# AM62 supports multi-certificate images, use the same > +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" > + > +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > + > +TFA_BOARD = "lite" > +OPTEEMACHINE = "k3-am65x" > +OPTEEOUTPUTMACHINE = "k3" > 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 646833a7..099473b4 100644 > --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > @@ -6,6 +6,7 @@ DEPENDS_append_j7200-hs-evm-k3r5 = " virtual/bootloader" > DEPENDS_append_j721s2-evm-k3r5 = " virtual/bootloader" > DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader" > DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader" > +DEPENDS_append_am62xx-evm-k3r5 = " virtual/bootloader" > > CLEANBROKEN = "1" > PR = "${INC_PR}.2" > @@ -29,6 +30,7 @@ SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" > SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware" > SYSFW_PREFIX_j7200-hs-evm-k3r5 = "ti-fs-firmware" > SYSFW_PREFIX_j721s2-evm-k3r5 = "ti-fs-firmware" > +SYSFW_PREFIX_am62xx-evm-k3r5 = "ti-fs-firmware" > > SYSFW_SUFFIX ?= "unknown" > > @@ -63,6 +65,7 @@ EXTRA_OEMAKE_append_j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-s > EXTRA_OEMAKE_append_j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > +EXTRA_OEMAKE_append_am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" > > do_compile() { > cd ${WORKDIR}/imggen/ > @@ -170,4 +173,19 @@ do_deploy_am64xx-hs-evm-k3r5() { > install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ > } > > +do_install_am62xx-evm-k3r5() { > + install -d ${D}/boot > + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} > + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} > + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} > +} > + > +do_deploy_am62xx-evm-k3r5() { > + install -d ${DEPLOYDIR} > + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} > + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} > + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} > + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ > +} > + > addtask deploy before do_build after do_compile > diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc > index 7ed6c5b4..231b7647 100644 > --- a/recipes-bsp/u-boot/u-boot-ti.inc > +++ b/recipes-bsp/u-boot/u-boot-ti.inc > @@ -41,6 +41,7 @@ PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i > > PACKAGECONFIG_append_aarch64 = " atf optee" > PACKAGECONFIG_append_j7 = " dm" > +PACKAGECONFIG_append_am62xx = " dm" > > COMPATIBLE_MACHINE = "(ti-soc)" > > @@ -69,6 +70,7 @@ SPL_UART_BINARY_j7200-hs-evm-k3r5 = "u-boot-spl.bin" > SPL_UART_BINARY_j721s2-evm-k3r5 = "u-boot-spl.bin" > SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin" > SPL_UART_BINARY_am64xx-hs-evm-k3r5 = "u-boot-spl.bin" > +SPL_UART_BINARY_am62xx-evm-k3r5 = "u-boot-spl.bin" > > SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" > SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" > @@ -419,4 +421,9 @@ do_deploy_append_am64xx-hs-evm-k3r5 () { > mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true > } > > +do_deploy_append_am62xx-evm-k3r5 () { > + mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true > + mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true > +} > + > TOOLCHAIN = "gcc" > diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > index c5852dbd..02e5d665 100644 > --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > @@ -19,6 +19,7 @@ PLAT_SFX_j7200-hs-evm = "j7200" > PLAT_SFX_j721s2-evm = "j721s2" > PLAT_SFX_am65xx = "am65xx" > PLAT_SFX_am64xx = "am64xx" > +PLAT_SFX_am62xx = "am62x" > > FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" > require recipes-bsp/ti-linux-fw/ti-linux-fw.inc > @@ -50,11 +51,11 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" > > # J7 HS support > do_install_prepend_j7-hs-evm() { > - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} > - ( cd ${RTOS_DM_FW_DIR}; \ > - mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ > - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ > - ) > + export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} > + ( cd ${RTOS_DM_FW_DIR}; \ > + mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ > + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ > + ) > } > > # J7 HS support > @@ -77,6 +78,13 @@ do_install_prepend_am64xx() { > ) > } > > +# Update the am62xx ipc binaries to be consistent with other platforms > +do_install_prepend_am62xx() { > + ( cd ${RTOS_IPC_FW_DIR}; \ > + mv am62-mcu-m4f0_0-fw ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f; \ > + ) > +} > + > #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level > do_install() { > > @@ -154,6 +162,13 @@ do_install_am64xx() { > install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} > } > > +do_install_am62xx() { > + install -d ${LEGACY_IPC_FW_DIR} > + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} > + # DM Firmware > + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} > +} > + > # Set up names for the firmwares > ALTERNATIVE_${PN}_am65xx = "\ > am65x-mcu-r5f0_0-fw \ > @@ -167,6 +182,10 @@ ALTERNATIVE_${PN}_am64xx = "\ > am64-main-r5f1_1-fw \ > am64-mcu-m4f0_0-fw \ > " > +ALTERNATIVE_${PN}_am62xx = "\ > + am62-mcu-m4f0_0-fw \ > + am62-main-r5f0_0-fw \ > + " > > ALTERNATIVE_${PN}_j7 = "\ > j7-mcu-r5f0_0-fw \ > @@ -216,6 +235,9 @@ TARGET_MAIN_R5FSS1_0_am64xx = "am64-main-r5f1_0-fw" > TARGET_MAIN_R5FSS1_1_am64xx = "am64-main-r5f1_1-fw" > TARGET_MCU_M4FSS0_0_am64xx = "am64-mcu-m4f0_0-fw" > > +TARGET_MAIN_R5FSS0_0_am62xx = "am62-main-r5f0_0-fw" > +TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw" > + > TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" > TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" > TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" > @@ -254,6 +276,9 @@ ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_M > ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" > ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" > > +ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" > +ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" > + > ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" > ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" > ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" > @@ -289,6 +314,9 @@ ALTERNATIVE_TARGET[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_e > ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_1_release_strip.xer5f" > ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f" > > +ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" > +ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" > + > ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" > ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" > ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" > -- > 2.17.1 >
diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5.conf new file mode 100644 index 00000000..724a8d4a --- /dev/null +++ b/conf/machine/am62xx-evm-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_evm_r5_defconfig" diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf new file mode 100644 index 00000000..600abb58 --- /dev/null +++ b/conf/machine/am62xx-evm.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: AM62XX EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM + +require conf/machine/include/am62xx.inc + +KERNEL_DEVICETREE = " \ + ti/k3-am625-sk.dtb \ + ti/k3-am625-sk-lpmdemo.dtb \ + ti/k3-am625-minimal.dtb \ +" + +UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc new file mode 100644 index 00000000..e8823dd2 --- /dev/null +++ b/conf/machine/include/am62xx.inc @@ -0,0 +1,17 @@ +require conf/machine/include/k3.inc +SOC_FAMILY_append = ":am62xx" + +MACHINE_FEATURES += "screen touchscreen" + +SERIAL_CONSOLES = "115200;ttyS2" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +# AM62 supports multi-certificate images, use the same +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" + +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" + +TFA_BOARD = "lite" +OPTEEMACHINE = "k3-am65x" +OPTEEOUTPUTMACHINE = "k3" 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 646833a7..099473b4 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -6,6 +6,7 @@ DEPENDS_append_j7200-hs-evm-k3r5 = " virtual/bootloader" DEPENDS_append_j721s2-evm-k3r5 = " virtual/bootloader" DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader" DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader" +DEPENDS_append_am62xx-evm-k3r5 = " virtual/bootloader" CLEANBROKEN = "1" PR = "${INC_PR}.2" @@ -29,6 +30,7 @@ SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware" SYSFW_PREFIX_j7200-hs-evm-k3r5 = "ti-fs-firmware" SYSFW_PREFIX_j721s2-evm-k3r5 = "ti-fs-firmware" +SYSFW_PREFIX_am62xx-evm-k3r5 = "ti-fs-firmware" SYSFW_SUFFIX ?= "unknown" @@ -63,6 +65,7 @@ EXTRA_OEMAKE_append_j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-s EXTRA_OEMAKE_append_j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_append_am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { cd ${WORKDIR}/imggen/ @@ -170,4 +173,19 @@ do_deploy_am64xx-hs-evm-k3r5() { install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ } +do_install_am62xx-evm-k3r5() { + install -d ${D}/boot + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} +} + +do_deploy_am62xx-evm-k3r5() { + install -d ${DEPLOYDIR} + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ +} + addtask deploy before do_build after do_compile diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index 7ed6c5b4..231b7647 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc @@ -41,6 +41,7 @@ PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i PACKAGECONFIG_append_aarch64 = " atf optee" PACKAGECONFIG_append_j7 = " dm" +PACKAGECONFIG_append_am62xx = " dm" COMPATIBLE_MACHINE = "(ti-soc)" @@ -69,6 +70,7 @@ SPL_UART_BINARY_j7200-hs-evm-k3r5 = "u-boot-spl.bin" SPL_UART_BINARY_j721s2-evm-k3r5 = "u-boot-spl.bin" SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin" SPL_UART_BINARY_am64xx-hs-evm-k3r5 = "u-boot-spl.bin" +SPL_UART_BINARY_am62xx-evm-k3r5 = "u-boot-spl.bin" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" @@ -419,4 +421,9 @@ do_deploy_append_am64xx-hs-evm-k3r5 () { mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true } +do_deploy_append_am62xx-evm-k3r5 () { + mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true + mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true +} + TOOLCHAIN = "gcc" diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index c5852dbd..02e5d665 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -19,6 +19,7 @@ PLAT_SFX_j7200-hs-evm = "j7200" PLAT_SFX_j721s2-evm = "j721s2" PLAT_SFX_am65xx = "am65xx" PLAT_SFX_am64xx = "am64xx" +PLAT_SFX_am62xx = "am62x" FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" require recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -50,11 +51,11 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" # J7 HS support do_install_prepend_j7-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${RTOS_DM_FW_DIR}; \ - mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ - ) + export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} + ( cd ${RTOS_DM_FW_DIR}; \ + mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ + ) } # J7 HS support @@ -77,6 +78,13 @@ do_install_prepend_am64xx() { ) } +# Update the am62xx ipc binaries to be consistent with other platforms +do_install_prepend_am62xx() { + ( cd ${RTOS_IPC_FW_DIR}; \ + mv am62-mcu-m4f0_0-fw ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f; \ + ) +} + #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level do_install() { @@ -154,6 +162,13 @@ do_install_am64xx() { install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} } +do_install_am62xx() { + install -d ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + # DM Firmware + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} +} + # Set up names for the firmwares ALTERNATIVE_${PN}_am65xx = "\ am65x-mcu-r5f0_0-fw \ @@ -167,6 +182,10 @@ ALTERNATIVE_${PN}_am64xx = "\ am64-main-r5f1_1-fw \ am64-mcu-m4f0_0-fw \ " +ALTERNATIVE_${PN}_am62xx = "\ + am62-mcu-m4f0_0-fw \ + am62-main-r5f0_0-fw \ + " ALTERNATIVE_${PN}_j7 = "\ j7-mcu-r5f0_0-fw \ @@ -216,6 +235,9 @@ TARGET_MAIN_R5FSS1_0_am64xx = "am64-main-r5f1_0-fw" TARGET_MAIN_R5FSS1_1_am64xx = "am64-main-r5f1_1-fw" TARGET_MCU_M4FSS0_0_am64xx = "am64-mcu-m4f0_0-fw" +TARGET_MAIN_R5FSS0_0_am62xx = "am62-main-r5f0_0-fw" +TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw" + TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" @@ -254,6 +276,9 @@ ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_M ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" +ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" + ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" @@ -289,6 +314,9 @@ ALTERNATIVE_TARGET[am64-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_e ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_1_release_strip.xer5f" ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f" +ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" +ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" + ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f"