Skip to contentSkip to conversation

conf/machine: introduce am65xx SOC family and new am65xx-hs-evm

PATCH New Denys Dmytriyenko 1 participant 3 messages May 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 conf/machine: introduce am65xx SOC family and new am65xx-hs-evm

---
 conf/machine/am65xx-evm.conf    |  7 +------
 conf/machine/am65xx-hs-evm.conf | 23 +++++++++++++++++++++++
 conf/machine/include/am65xx.inc |  7 +++++++
 3 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 conf/machine/am65xx-hs-evm.conf
 create mode 100644 conf/machine/include/am65xx.inc
conf/machine/am65xx-evm.conf +1 -6
index 877b1a6..1113dbc 100644
@@ -2,7 +2,7 @@
 #@NAME: AM65xx EVM
 #@DESCRIPTION: Machine configuration for the TI AM65xx EVM
 
-require conf/machine/include/k3.inc
+require conf/machine/include/am65xx.inc
 
 MACHINE_FEATURES += "touchscreen"
 
@@ -28,8 +28,3 @@ WKS_FILE = "sdimage-bootpart.wks"
 IMAGE_BOOT_FILES = "u-boot.img"
 
 do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am65xx"
-TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk"
-TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0"
conf/machine/am65xx-hs-evm.conf new file +23 -0
new file mode 100644
index 0000000..1de37cf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: AM65xx HS EVM
+#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM
+
+require conf/machine/am65xx-evm.conf
+
+UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
+
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
+SPL_BINARY = "tispl.bin_HS"
+SPL_BINARYNAME = "tispl.bin"
+UBOOT_BINARY = "u-boot.img_HS"
+IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
+
+OPTEEMACHINE = "k3"
+OPTEEFLAVOR = "am65x"
+OPTEEOUTPUTMACHINE = "k3"
conf/machine/include/am65xx.inc new file +7 -0
new file mode 100644
index 0000000..d433ed1
@@ -0,0 +1,7 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY_append = ":am65xx"
+
+# Set the list of device targets for ti-pdk class recipes
+TI_PDK_LIMIT_SOCS = "am65xx"
+TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk"
+TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0"
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/3 recipes: convert existing uses of am65xx-evm to am65xx SOC family

---
 recipes-bsp/pru/pru-icss_git.bb             | 6 +++---
 recipes-bsp/sciclient/sciclient-rtos_git.bb | 6 +++---
 recipes-ti/ipc/ti-ipc-common.inc            | 2 +-
 recipes-ti/ipc/ti-ipc-examples_git.bb       | 2 +-
 recipes-ti/ipc/ti-ipc-rtos.inc              | 6 +++---
 recipes-ti/ipc/ti-ipc-rtos_git.bb           | 8 ++++----
 6 files changed, 15 insertions(+), 15 deletions(-)
recipes-bsp/pru/pru-icss_git.bb +3 -3
index 94522f6..a36bce0 100644
@@ -40,7 +40,7 @@ PLATFORM_ti33x = "am335x"
 PLATFORM_ti43x = "am437x"
 PLATFORM_omap-a15 = "am572x"
 PLATFORM_k2g = "k2g"
-PLATFORM_am65xx-evm = "am65x"
+PLATFORM_am65xx = "am65x"
 
 do_compile() {
     for dir in ${SUBDIRS}
@@ -102,7 +102,7 @@ do_install_append_k2g() {
     done
 }
 
-do_install_append_am65xx-evm() {
+do_install_append_am65xx() {
     for i in 0 1 
     do
         install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \
@@ -131,7 +131,7 @@ PRU_ICSS_ALTERNATIVES_ti33x    = "am335x-pru0-fw am335x-pru1-fw"
 PRU_ICSS_ALTERNATIVES_ti43x    = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw"
 PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
 PRU_ICSS_ALTERNATIVES_k2g      = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw"
-PRU_ICSS_ALTERNATIVES_am65xx-evm = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
+PRU_ICSS_ALTERNATIVES_am65xx   = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
 
 # Set up link names for the firmwares
 ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw"
recipes-bsp/sciclient/sciclient-rtos_git.bb +3 -3
index 2de94d0..e145599 100644
@@ -36,9 +36,9 @@ export PDK_SCICLIENT_ROOT_PATH = "${SCICLIENT_PACKAGE_BASE}/package/all/pdk_/pac
 #export PDK_SCICLIENT_ROOT_PATH ="${WORKDIR}/build"
 #export DEST_ROOT="${S}"
 
-LIMSOCS_am65xx-evm = "am65xx"
-LIMBOARDS_am65xx-evm = "am65xx_evm"
-BOARD_PACKAGE_am65xx-evm = "am65xx_evm"
+LIMSOCS_am65xx = "am65xx"
+LIMBOARDS_am65xx = "am65xx_evm"
+BOARD_PACKAGE_am65xx = "am65xx_evm"
 
 # HTML doc link params
 PDK_COMP_LINK_TEXT = "SCICLIENT"
recipes-ti/ipc/ti-ipc-common.inc +1 -1
index 8401ea6..036e46d 100644
@@ -15,7 +15,7 @@ PLATFORM_k2g = "66AK2G"
 PLATFORM_omapl138 = "OMAPL138"
 PLATFORM_c667x-evm = "C6678"
 PLATFORM_c665x-evm = "C6678"
-PLATFORM_am65xx-evm = "AM65XX"
+PLATFORM_am65xx = "AM65XX"
 
 ALT_PLATFORM_k2hk = "TCI6636"
 ALT_PLATFORM_am57xx-evm = "AM572X AM571X"
recipes-ti/ipc/ti-ipc-examples_git.bb +1 -1
index d8733ae..43e45e6 100644
@@ -3,7 +3,7 @@ require ti-ipc-examples.inc
 
 DEPENDS = "ti-ipc ti-xdctools-native ti-sysbios ti-ipc-rtos zip-native"
 
-DEPENDS_append_am65xx-evm = " sciclient-rtos"
+DEPENDS_append_am65xx = " sciclient-rtos"
 
 do_compile_append() {
 
recipes-ti/ipc/ti-ipc-rtos.inc +3 -3
index 9b7bccf..dcd6309 100644
@@ -53,7 +53,7 @@ DEPENDS_append_omapl138 = " ti-cgt6x-native \
 DEPENDS_append_c66x = " ti-cgt6x-native \
 "
 
-DEPENDS_append_am65xx-evm = " ti-cgt-arm-native \
+DEPENDS_append_am65xx = " ti-cgt-arm-native \
                               gcc-linaro-baremetal-aarch64-native"
 
 IPC_TARGETS = ""
@@ -79,7 +79,7 @@ IPC_TARGETS_c66x = " \
     ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
 "
 
-IPC_TARGETS_am65xx-evm = "\
+IPC_TARGETS_am65xx = "\
     gnu.targets.arm.A53F="${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN}" \
     ti.targets.arm.elf.R5F="${M4_TOOLCHAIN_INSTALL_DIR}" \
 "
@@ -92,5 +92,5 @@ EXTRA_OEMAKE = "\
     JOBS="--jobs=${BB_NUMBER_THREADS}" \
     JAVA_TOOL_OPTIONS=-Xss2560k \
 "
-EXTRA_OEMAKE_append_am65xx-evm = " PDK_INSTALL_DIR=${PDK_INSTALL_DIR}"
+EXTRA_OEMAKE_append_am65xx = " PDK_INSTALL_DIR=${PDK_INSTALL_DIR}"
 
recipes-ti/ipc/ti-ipc-rtos_git.bb +4 -4
index 7f1cae0..4c0e71e 100644
@@ -3,7 +3,7 @@ require ti-ipc-common.inc
 require ti-ipc-rtos.inc
 
 DEPENDS = "ti-xdctools-native ti-sysbios doxygen-native zip-native"
-DEPENDS_append_am65xx-evm = " sciclient-rtos"
+DEPENDS_append_am65xx = " sciclient-rtos"
 
 PACKAGES =+ "${PN}-fw"
 FILES_${PN}-fw = "${base_libdir}/firmware/*"
@@ -62,7 +62,7 @@ do_compile() {
   fi
 }
 
-do_install_prepend_am65xx-evm () {
+do_install_prepend_am65xx () {
   # Trim directory name
   mv ${S}/packages/ti/ipc/tests/bin/ti_platforms_cortexR_AM65X_false_R5F0 ${S}/packages/ti/ipc/tests/bin/ti_platforms_cortexR_AM65X_R5F0
   mv ${S}/packages/ti/ipc/tests/bin/ti_platforms_cortexR_AM65X_false_R5F1 ${S}/packages/ti/ipc/tests/bin/ti_platforms_cortexR_AM65X_R5F1
@@ -130,12 +130,12 @@ pkg_postrm_${PN}-fw_omapl138 () {
   update-alternatives --remove rproc-dsp-fw ipc/ti_platforms_evmOMAPL138_DSP/messageq_single.xe674
 }
 
-pkg_postinst_${PN}-fw_am65xx-evm () {
+pkg_postinst_${PN}-fw_am65xx () {
   update-alternatives --install /lib/firmware/am65x-mcu-r5f0_0-fw am65x-mcu-r5f0_0-fw ipc/ti_platforms_cortexR_AM65X_R5F0/messageq_single.xer5f ${ALTERNATIVE_PRIORITY}
   update-alternatives --install /lib/firmware/am65x-mcu-r5f0_1-fw am65x-mcu-r5f0_1-fw ipc/ti_platforms_cortexR_AM65X_R5F1/messageq_single.xer5f ${ALTERNATIVE_PRIORITY}
 }
 
-pkg_postrm_${PN}-fw_am65xx-evm () {
+pkg_postrm_${PN}-fw_am65xx () {
   update-alternatives --remove am65x-mcu-r5f0_0-fw ipc/ti_platforms_cortexR_AM65X_R5F0/messageq_single.xer5f
   update-alternatives --remove am65x-mcu-r5f0_1-fw ipc/ti_platforms_cortexR_AM65X_R5F1/messageq_single.xer5f
 }
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/3 arm-trusted-firmare: sign ATF image for am65xx HS

In reply to Denys Dmytriyenko
---
 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.0.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.0.bb +8 -0
index 24aa3f4..64e4067 100644
@@ -46,6 +46,14 @@ do_compile() {
 	oe_runmake all
 }
 
+do_compile_append_am65xx-hs-evm() {
+	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+	( cd ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/; \
+		mv bl31.bin bl31.bin.unsigned; \
+		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
+	)
+}
+
 do_install() {
 	install -d ${D}/boot
 	install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31.bin ${D}/boot/
Signature · 1 line
2.7.4