Received: from mail.yoctoproject.org (mail.yoctoproject.org [198.145.29.25]) by mx.groups.io with SMTP id smtpd.web08.1645.1610047070594231023 for ; Thu, 07 Jan 2021 11:17:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=N/nO4TPL; spf=fail (domain: ti.com, ip: 198.145.29.25, mailfrom: dmurphy@ti.com) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mail.yoctoproject.org (Postfix) with ESMTPS id BFF0438C0627 for ; Thu, 7 Jan 2021 19:17:49 +0000 (UTC) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 107JHnf0079042 for ; Thu, 7 Jan 2021 13:17:49 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1610047069; bh=WHbcXBq81fhZ2VgDvz3te9Sd53dQYPGoPN9lAQkdnJ0=; h=Subject:To:References:From:Date:In-Reply-To; b=N/nO4TPLvHBq+2jitdP1CQfHSQM9/0Od919u78rg/V96U17oe9bvsZ3cZFYbOFFlK yvG34UcNyVjt8kcmZHzW9FEBUDNovGztGhIEQbSetkioqrsFNtlVzbVVA6iExwRwwY FyMzFzlumGTcYf61j/lFpRJygPxzi0us7NdSV2hg= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 107JHn7D019706 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 7 Jan 2021 13:17:49 -0600 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Thu, 7 Jan 2021 13:17:48 -0600 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Thu, 7 Jan 2021 13:17:48 -0600 Received: from [10.250.35.201] (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 107JHmZa085702; Thu, 7 Jan 2021 13:17:48 -0600 Subject: Re: [meta-ti] [dunfell/master] [PATCH] am64xx: Add combined boot build support To: Suman Anna , References: <20210107132425.23218-1-dmurphy@ti.com> <8e260a85-d0dd-1572-1ec4-d7128cd295d2@ti.com> From: "Dan Murphy" Message-ID: Date: Thu, 7 Jan 2021 13:17:48 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <8e260a85-d0dd-1572-1ec4-d7128cd295d2@ti.com> X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Suman On 1/7/21 1:10 PM, Suman Anna wrote: > Hi Dan, > > On 1/7/21 7:24 AM, Dan Murphy via lists.yoctoproject.org wrote: >> Add combined boot flow support for the AM64XX device. >> >> From: Dan Murphy >> Signed-off-by: Dan Murphy >> --- >> conf/machine/am64xx-evm-k3r5.conf | 4 +++- >> conf/machine/am64xx-evm.conf | 4 ++++ >> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 16 ++++++++++++++++ >> recipes-bsp/u-boot/u-boot-ti.inc | 6 ++++++ >> 4 files changed, 29 insertions(+), 1 deletion(-) >> >> diff --git a/conf/machine/am64xx-evm-k3r5.conf b/conf/machine/am64xx-evm-k3r5.conf >> index b788e634699d..dfeaeb570a55 100644 >> --- a/conf/machine/am64xx-evm-k3r5.conf >> +++ b/conf/machine/am64xx-evm-k3r5.conf >> @@ -7,6 +7,8 @@ require conf/machine/include/k3r5.inc >> SYSFW_SOC = "am64x" >> SYSFW_CONFIG = "evm" >> SYSFW_SUFFIX = "gp" >> -SYSFW_SYMLINK = "sysfw.itb" >> >> UBOOT_MACHINE = "am64x_evm_r5_defconfig" >> +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" >> +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" >> +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" >> diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf >> index c6ba2a8735f3..9336d4ae4c54 100644 >> --- a/conf/machine/am64xx-evm.conf >> +++ b/conf/machine/am64xx-evm.conf >> @@ -4,4 +4,8 @@ >> >> require conf/machine/include/am64xx.inc >> >> +IMAGE_BOOT_FILES = "tispl.bin u-boot.img" >> + >> UBOOT_MACHINE = "am64x_evm_a53_defconfig" >> +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > I see J7200 has two additional lines w.r.t trusted-firmware-a:do_deploy, do we > not need those lines for AM64xx or are they in error even on J7200? Do we need the ATF in the WIC and tar? If so then yes we probably need to add those 2 lines as well >> 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 310c7d544030..4d4a9a349c70 100644 >> --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb >> +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb >> @@ -2,6 +2,7 @@ require recipes-bsp/ti-sci-fw/ti-sci-fw.inc >> >> DEPENDS = "openssl-native u-boot-mkimage-native dtc-native" >> DEPENDS_append_j7200-evm-k3r5 = " virtual/bootloader" >> +DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader" >> >> CLEANBROKEN = "1" >> PR = "r1" >> @@ -52,6 +53,7 @@ EXTRA_OEMAKE_HS = " \ >> EXTRA_OEMAKE_append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']}" >> >> EXTRA_OEMAKE_append_j7200-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"" >> >> do_compile() { >> cd ${WORKDIR}/imggen/ >> @@ -98,4 +100,18 @@ do_deploy_j7200-evm-k3r5() { >> ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} >> } >> >> +do_install_am64xx-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_am64xx-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} >> +} >> + >> 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 b7fd246aca6c..7ce3d7019431 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_am64xx = " dm" > This looks wrong, AM64xx doesn't have Split SYSFW architecture, and there is no > DM firmware. OK I will remove this >> >> COMPATIBLE_MACHINE = "(ti-soc)" >> >> @@ -65,6 +66,7 @@ SPL_UART_BINARY_keystone = "" >> SPL_UART_BINARY_k3r5 = "" >> SPL_UART_BINARY_lego-ev3 = "" >> SPL_UART_BINARY_j7200-evm-k3r5 = "u-boot-spl.bin" >> +SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin" >> >> SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" >> SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" >> @@ -395,4 +397,8 @@ do_deploy_append_j7200-evm-k3r5 () { >> mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true >> } >> >> +do_deploy_append_am64xx-evm-k3r5 () { >> + mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true >> + mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true >> +} > nit, please add a blank line after this blob. Meh but OK Dan