summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/am62axx-evm-k3r5.conf11
-rw-r--r--conf/machine/am62axx-evm.conf11
-rw-r--r--conf/machine/include/am62axx.inc16
-rw-r--r--recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb4
-rw-r--r--recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb1
-rw-r--r--recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb2
-rw-r--r--recipes-bsp/u-boot/u-boot-ti.inc1
-rw-r--r--recipes-kernel/linux/kernel-rdepends.inc2
-rw-r--r--recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb27
9 files changed, 72 insertions, 3 deletions
diff --git a/conf/machine/am62axx-evm-k3r5.conf b/conf/machine/am62axx-evm-k3r5.conf
new file mode 100644
index 00000000..ca30537f
--- /dev/null
+++ b/conf/machine/am62axx-evm-k3r5.conf
@@ -0,0 +1,11 @@
1#@TYPE: Machine
2#@NAME: AM62AXX EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM62Axx EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "am62ax"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp"
10
11UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
diff --git a/conf/machine/am62axx-evm.conf b/conf/machine/am62axx-evm.conf
new file mode 100644
index 00000000..4eb179f3
--- /dev/null
+++ b/conf/machine/am62axx-evm.conf
@@ -0,0 +1,11 @@
1#@TYPE: Machine
2#@NAME: AM62AXX EVM
3#@DESCRIPTION: Machine configuration for the TI AM62AXX EVM
4
5require conf/machine/include/am62axx.inc
6
7KERNEL_DEVICETREE = " \
8 ti/k3-am62a7-sk.dtb \
9"
10
11UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
diff --git a/conf/machine/include/am62axx.inc b/conf/machine/include/am62axx.inc
new file mode 100644
index 00000000..383d1c3f
--- /dev/null
+++ b/conf/machine/include/am62axx.inc
@@ -0,0 +1,16 @@
1require conf/machine/include/k3.inc
2SOC_FAMILY_append = ":am62axx"
3
4MACHINE_FEATURES += "screen touchscreen"
5
6SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
8
9TFA_K3_SYSTEM_SUSPEND = "1"
10
11do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
12do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
13
14TFA_BOARD = "lite"
15OPTEEMACHINE = "k3-am62x"
16OPTEEOUTPUTMACHINE = "k3"
diff --git a/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
index c904ba62..fac7bb06 100644
--- a/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -13,7 +13,7 @@ PR = "${INC_PR}.1"
13 13
14CLEANBROKEN = "1" 14CLEANBROKEN = "1"
15 15
16COMPATIBLE_MACHINE = "j721s2-evm|j721s2-hs-evm|j784s4-evm|j784s4-hs-evm" 16COMPATIBLE_MACHINE = "j721s2-evm|j721s2-hs-evm|j784s4-evm|j784s4-hs-evm|am62axx"
17 17
18PACKAGE_ARCH = "${MACHINE_ARCH}" 18PACKAGE_ARCH = "${MACHINE_ARCH}"
19 19
@@ -27,7 +27,7 @@ ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${base_libdir}/firmware/cnm/${TARGE
27ALTERNATIVE_PRIORITY = "10" 27ALTERNATIVE_PRIORITY = "10"
28 28
29# Set up names for the firmwares 29# Set up names for the firmwares
30ALTERNATIVE_${PN}_j7 = "\ 30ALTERNATIVE_${PN} = "\
31 wave521c_codec_fw.bin" 31 wave521c_codec_fw.bin"
32 32
33do_install() { 33do_install() {
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 79c39ee5..1b8530ec 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -39,6 +39,7 @@ SYSFW_PREFIX_j784s4-evm-k3r5 = "fs"
39SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs" 39SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs"
40SYSFW_PREFIX_am62xx-evm-k3r5 = "fs" 40SYSFW_PREFIX_am62xx-evm-k3r5 = "fs"
41SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs" 41SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs"
42SYSFW_PREFIX_am62axx-evm-k3r5 = "fs"
42 43
43SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" 44SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
44 45
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 876036f2..30b2e315 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"
7 7
8CLEANBROKEN = "1" 8CLEANBROKEN = "1"
9 9
10COMPATIBLE_MACHINE = "am62xx-evm|am62xx-lp-evm" 10COMPATIBLE_MACHINE = "am62xx|am62axx"
11 11
12PACKAGE_ARCH = "${MACHINE_ARCH}" 12PACKAGE_ARCH = "${MACHINE_ARCH}"
13 13
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index 97f9fa2b..90f60980 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -34,6 +34,7 @@ PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i
34PACKAGECONFIG_append_aarch64 = " atf optee" 34PACKAGECONFIG_append_aarch64 = " atf optee"
35PACKAGECONFIG_append_j7 = " dm" 35PACKAGECONFIG_append_j7 = " dm"
36PACKAGECONFIG_append_am62xx = " dm" 36PACKAGECONFIG_append_am62xx = " dm"
37PACKAGECONFIG_append_am62axx = " dm"
37 38
38COMPATIBLE_MACHINE = "(ti-soc)" 39COMPATIBLE_MACHINE = "(ti-soc)"
39 40
diff --git a/recipes-kernel/linux/kernel-rdepends.inc b/recipes-kernel/linux/kernel-rdepends.inc
index 08f3f462..86d678ee 100644
--- a/recipes-kernel/linux/kernel-rdepends.inc
+++ b/recipes-kernel/linux/kernel-rdepends.inc
@@ -53,8 +53,10 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-evm = " cnm-wave-fw"
53RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-hs-evm = " cnm-wave-fw" 53RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-hs-evm = " cnm-wave-fw"
54RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j784s4-evm = " cnm-wave-fw" 54RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j784s4-evm = " cnm-wave-fw"
55RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j784s4-hs-evm = " cnm-wave-fw" 55RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j784s4-hs-evm = " cnm-wave-fw"
56RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62axx = " cnm-wave-fw"
56 57
57# Add run-time dependency for TIFS Low Power Module stub 58# Add run-time dependency for TIFS Low Power Module stub
58RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-evm = " tifs-lpm-stub" 59RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-evm = " tifs-lpm-stub"
59RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-lp-evm = " tifs-lpm-stub" 60RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-lp-evm = " tifs-lpm-stub"
61RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62axx = " tifs-lpm-stub"
60 62
diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index 31212aae..59145740 100644
--- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -24,6 +24,7 @@ PLAT_SFX_j784s4-hs-evm = "j784s4"
24PLAT_SFX_am65xx = "am65xx" 24PLAT_SFX_am65xx = "am65xx"
25PLAT_SFX_am64xx = "am64xx" 25PLAT_SFX_am64xx = "am64xx"
26PLAT_SFX_am62xx = "am62xx" 26PLAT_SFX_am62xx = "am62xx"
27PLAT_SFX_am62axx = "am62axx"
27 28
28FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" 29FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:"
29require recipes-bsp/ti-linux-fw/ti-linux-fw.inc 30require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -354,6 +355,13 @@ do_install_am62xx() {
354 install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} 355 install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR}
355} 356}
356 357
358do_install_am62axx() {
359 install -d ${LEGACY_IPC_FW_DIR}
360 # DM+IPC Firmware
361 install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw ${LEGACY_IPC_FW_DIR}
362 install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR}
363 install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR}
364}
357 365
358do_deploy() { 366do_deploy() {
359 install -d ${DEPLOYDIR} 367 install -d ${DEPLOYDIR}
@@ -364,6 +372,11 @@ do_deploy_am62xx() {
364 install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${DEPLOYDIR} 372 install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${DEPLOYDIR}
365} 373}
366 374
375do_deploy_am62axx() {
376 install -d ${DEPLOYDIR}
377 install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${DEPLOYDIR}
378}
379
367# Set up names for the firmwares 380# Set up names for the firmwares
368ALTERNATIVE_${PN}_am65xx = "\ 381ALTERNATIVE_${PN}_am65xx = "\
369 am65x-mcu-r5f0_0-fw \ 382 am65x-mcu-r5f0_0-fw \
@@ -382,6 +395,11 @@ ALTERNATIVE_${PN}_am62xx = "\
382 am62-main-r5f0_0-fw \ 395 am62-main-r5f0_0-fw \
383 " 396 "
384 397
398ALTERNATIVE_${PN}_am62axx = "\
399 am62a-mcu-r5f0_0-fw \
400 am62a-c71_0-fw \
401 "
402
385ALTERNATIVE_${PN}_j7-hs-evm = "\ 403ALTERNATIVE_${PN}_j7-hs-evm = "\
386 j7-mcu-r5f0_0-fw \ 404 j7-mcu-r5f0_0-fw \
387 j7-mcu-r5f0_1-fw \ 405 j7-mcu-r5f0_1-fw \
@@ -514,6 +532,9 @@ TARGET_MCU_M4FSS0_0_am64xx = "am64-mcu-m4f0_0-fw"
514TARGET_MAIN_R5FSS0_0_am62xx = "am62-main-r5f0_0-fw" 532TARGET_MAIN_R5FSS0_0_am62xx = "am62-main-r5f0_0-fw"
515TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw" 533TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw"
516 534
535TARGET_C7X_0_am62axx = "am62a-c71_0-fw"
536TARGET_MCU_R5F0_0_am62axx = "am62a-mcu-r5f0_0-fw"
537
517TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" 538TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw"
518TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" 539TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw"
519TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" 540TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw"
@@ -619,6 +640,9 @@ ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MC
619ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" 640ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
620ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" 641ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}"
621 642
643ALTERNATIVE_LINK_NAME[am62a-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X_0}"
644ALTERNATIVE_LINK_NAME[am62a-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5F0_0}"
645
622ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" 646ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}"
623ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" 647ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}"
624ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" 648ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
@@ -699,6 +723,9 @@ ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_ec
699ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" 723ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f"
700ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" 724ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f"
701 725
726ALTERNATIVE_TARGET[am62a-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71"
727ALTERNATIVE_TARGET[am62a-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/am62a-mcu-r5f0_0-fw"
728
702ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" 729ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f"
703ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" 730ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f"
704ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" 731ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f"