From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 17 Oct 2023 16:56:05 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qslUM-00Bsoa-8c for lore@lore.pengutronix.de; Tue, 17 Oct 2023 16:56:05 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qslUK-0004kp-Ir for lore@pengutronix.de; Tue, 17 Oct 2023 16:56:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7THp6AiYvHjx1XSMoKujv2GVj+DRfkr27mvU3M4/QQw=; b=PWv9IT/5ay7LWUy4BWnP1CIS54 LyZ4m9bKqB2xYoULnHkEzIr38EPfwnABb5Ap0b+FNNOd6bwVzG/Jr9RTdfKax7OgDppqPYD8RY2Ay Q6KK6NrE1iFmVllqPc+xgYKG/5Pa3ETYK4SJv6jvQhi56JLZUf6ENBYMxf2kzH4hzxAqjeKRuQfxh S2+mCW+SWdnyDX0vXtFIrM0cP12R9FTCy2wfK/9KX53KCm1EuTUswHiaUntyAeKsplnyFGwW+LHMi SZ9CpPWqFjrUM2YkkdUpBgN5jrHWLfPXmixJFtgr8Fa7c7CxnggXacegP3/Dq8ytw7iB7qjf4qt1k og7hJMAg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qslT5-00CfVm-0c; Tue, 17 Oct 2023 14:54:47 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qslQG-00Ccis-2T for barebox@bombadil.infradead.org; Tue, 17 Oct 2023 14:51:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description; bh=7THp6AiYvHjx1XSMoKujv2GVj+DRfkr27mvU3M4/QQw=; b=jVfgYr5YWmOVlkryph+TXuXWtu dbTLMhpWuOojiczfuTqk8Zw9AV2GUc7F4B39cuKU2WR17BjU97wFPo74D0FyvdMXdcnxTULT2QoMk PLRG6Gii9pkCI8Jak0p4PDI18oDID2xcpgwmhkwt7ntLYdhbmMZa5iniXKR2gAH4wc5Qp1zB0qzhh nPRFD4emcdpVuETLe1zzH2YOhCSeeA9uQPM9upJvEiMBp8J5C5XCjwsmq/LsqC4g3Bqty5xeXYO2g 38vo8cVqAmx/Ir2wyIhA5EnYPHg1QMJwB/e3RwMEIrHf5QgwgwxhQY5euVw07xAywKmO5O1LKomMq GaRvWK9g==; Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qslQ7-007AEc-2s for barebox@lists.infradead.org; Tue, 17 Oct 2023 14:51:51 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qslPy-0001wJ-UZ for barebox@lists.infradead.org; Tue, 17 Oct 2023 16:51:34 +0200 From: Marco Felsch To: barebox@lists.infradead.org Date: Tue, 17 Oct 2023 16:51:19 +0200 Message-Id: <20231017145131.3069283-18-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017145131.3069283-1-m.felsch@pengutronix.de> References: <20231017145131.3069283-1-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231017_155144_176593_AD25E472 X-CRM114-Status: GOOD ( 14.07 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 17/29] scripts: imx: fix i.MX8M CSF header placement X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) The current boot flow is broken if both the FlexSPI image and the HAB support is enabled. The HAB/CST tool need to take the additional FlexSPI IVT header into account which is added in between the first IVT header and the barebox pbl code. Signed-off-by: Marco Felsch --- Changelog: v2: - unchanged - v1-link: https://lore.barebox.org/barebox/20231010143314.2031253-1-m.felsch@pengutronix.de/T/#t include/mach/imx/imx-header.h | 1 + scripts/imx/imx-image.c | 9 +++++---- scripts/imx/imx.c | 7 ++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/mach/imx/imx-header.h b/include/mach/imx/imx-header.h index b11b57c37227..0ad3485eb261 100644 --- a/include/mach/imx/imx-header.h +++ b/include/mach/imx/imx-header.h @@ -7,6 +7,7 @@ #define HEADER_LEN 0x1000 /* length of the blank area + IVT + DCD */ #define CSF_LEN 0x2000 /* length of the CSF (needed for HAB) */ +#define FLEXSPI_HEADER_LEN HEADER_LEN #define DEK_BLOB_HEADER 8 /* length of DEK blob header */ #define DEK_BLOB_KEY 32 /* length of DEK blob AES-256 key */ diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c index ecb16187de17..01da4cc36467 100644 --- a/scripts/imx/imx-image.c +++ b/scripts/imx/imx-image.c @@ -408,8 +408,6 @@ static size_t add_flexspi_fcfb_header(const struct config_data *data, void *buf) return sizeof(nor_conf); } -#define FLEXSPI_HEADER_LEN HEADER_LEN - static size_t add_flexspi_header(const struct config_data *data, void **_buf, size_t *header_len) { @@ -812,8 +810,11 @@ static int hab_sign(struct config_data *data) * For i.MX8 insert the CSF data into the reserved CSF area * right behind the PBL */ - offset = roundup(data->header_gap + data->pbl_code_size + - HEADER_LEN, 0x1000); + offset = data->header_gap + data->pbl_code_size + HEADER_LEN; + if (flexspi_image(data)) + offset += FLEXSPI_HEADER_LEN; + + offset = roundup(offset, 0x1000); if (data->signed_hdmi_firmware_file) offset += PLUGIN_HDMI_SIZE; diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c index 32488455b7a8..3cfa046504e3 100644 --- a/scripts/imx/imx.c +++ b/scripts/imx/imx.c @@ -347,8 +347,13 @@ static int do_hab_blocks(struct config_data *data, int argc, char *argv[]) * Ensure we only sign the PBL for i.MX8MQ */ if (data->pbl_code_size && cpu_is_mx8m(data)) { + unsigned int hdrlen = HEADER_LEN; + + if (flexspi_image(data)) + hdrlen += FLEXSPI_HEADER_LEN; + offset += data->header_gap; - signed_size = roundup(data->pbl_code_size + HEADER_LEN, 0x1000); + signed_size = roundup(data->pbl_code_size + hdrlen, 0x1000); if (data->signed_hdmi_firmware_file) offset += PLUGIN_HDMI_SIZE; } -- 2.39.2