From patchwork Wed Jun 8 20:02:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 9045 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C15A8C433EF for ; Wed, 8 Jun 2022 20:03:07 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web09.2133.1654718577903240473 for ; Wed, 08 Jun 2022 13:02:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=VYGVt8R3; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 258K2tmV050608; Wed, 8 Jun 2022 15:02:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1654718575; bh=DxNs8DHh2oPOp0MSxX5bF1T51TUhA13R5LlDSlydHW4=; h=From:To:CC:Subject:Date; b=VYGVt8R3Ro1rj4npgntvspaGtLqYRB/eoVSh+my1JvLRzIJR/vtIi8RHmxPWrDAPL 1az96wdCY1H3ayFSUH7JVsxDsergt93nGDaEF1kPbbRQDMJk4kmONTS/MiKTxFR22A Onn2FmLE41yiEWe8rJ0xRqf9d7Pe7UCzWcHirJu4= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 258K2tha013814 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 8 Jun 2022 15:02:55 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Wed, 8 Jun 2022 15:02:55 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Wed, 8 Jun 2022 15:02:55 -0500 Received: from ula0226330.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 258K2sU5095745; Wed, 8 Jun 2022 15:02:54 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Manorit Chawdhry , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH v2] conf: machine: wic: Fix HS image boot partition Date: Wed, 8 Jun 2022 15:02:54 -0500 Message-ID: <20220608200254.28768-1-afd@ti.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jun 2022 20:03:07 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14806 From: Manorit Chawdhry IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to incomplete binaries in /boot and the naming of the binaries were not correct. Fixes /boot partition for HS devices. Signed-off-by: Manorit Chawdhry [afd: Extended fix to all HS platforms] Signed-off-by: Andrew Davis --- Changes from v1: - Use signed u-boot.img file for HS conf/machine/am64xx-hs-evm.conf | 2 -- conf/machine/am65xx-hs-evm.conf | 2 -- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 2 -- conf/machine/j7200-hs-evm.conf | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf index 44e81463..c63d382e 100644 --- a/conf/machine/am64xx-hs-evm.conf +++ b/conf/machine/am64xx-hs-evm.conf @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" 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}" diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf index e4eebb6a..a28b45dc 100644 --- a/conf/machine/am65xx-hs-evm.conf +++ b/conf/machine/am65xx-hs-evm.conf @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" 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}" diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index e0970698..f85e6b98 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc @@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" SPL_BINARY = "tispl.bin" +SPL_BINARYNAME = "tispl.bin" UBOOT_SUFFIX = "img" EXTRA_IMAGEDEPENDS += "virtual/bootloader" @@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin" +IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" +IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}" diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf index f2e3ccf5..c7766def 100644 --- a/conf/machine/j7-hs-evm.conf +++ b/conf/machine/j7-hs-evm.conf @@ -15,9 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" BBMULTICONFIG += "k3r5-sr1-1" diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf index a5bd637e..93c0c0ce 100644 --- a/conf/machine/j7200-hs-evm.conf +++ b/conf/machine/j7200-hs-evm.conf @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" 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}"