From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 21 Sep 2023 09:57:07 +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 1qjEYc-005dTs-ON for lore@lore.pengutronix.de; Thu, 21 Sep 2023 09:57:07 +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 1qjEYa-0007zi-Lv for lore@pengutronix.de; Thu, 21 Sep 2023 09:57: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:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=xvPw+vCOa7na0k0A3dvCTnYSKmNO0IyhZL42DeM/fw8=; b=U9qY5h1jCfAfdZA7wopTFySq0w LJrHoOexz9d8v4z6QHI2bqaP8Go7Utd2SMlaYDA5pLEo3K9uEQ1pHhwJZGwCgaaY4TWgCbyf9hWcx UZis9BmJSZ/M7EfIFUqxmflWHlpjKgbbfGaYVDRxevZ4d8Pmna4pSEcUcqdfn8V+t48LxMZWxxLQC 1nRFO1+LedulX/XxiB3aCwZSdG04xswaxo7D2SeAkoGcYlpd2iQLA24Fr5tvxXPSRUodHJafjwJgG OGlal9iflTr4gYa6aiiMRw7gA3ro8E5f4RVMHf+CnNx0JfLMo21xV+tZjYEUjyjTUM+NJTVaq0EhP KcqxnANQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qjEXC-005Pp6-0C; Thu, 21 Sep 2023 07:55:38 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qjEX8-005Pmu-34 for barebox@lists.infradead.org; Thu, 21 Sep 2023 07:55:36 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qjEX6-0007bf-HR; Thu, 21 Sep 2023 09:55:32 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qjEX6-007sFo-54; Thu, 21 Sep 2023 09:55:32 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qjEX6-008nx3-0L; Thu, 21 Sep 2023 09:55:32 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Thu, 21 Sep 2023 09:55:11 +0200 Message-Id: <20230921075511.2098569-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230921_005534_986550_C0BF9043 X-CRM114-Status: GOOD ( 12.65 ) 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.9 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] ARM: i.MX: HABv4: point out i.MX6 specifics in docs and Kconfig help text 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) Signed USB images are a i.MX6 quirk as we need a point to DCD for imx-usb-loader to work with, but the DCD pointer needs to be invalidated for actual boot. On i.MX8M*, RAM setup can't be done completely by DCD anymore, so not having a DCD table is the norm and we don't need a signed USB image. Thus mark CONFIG_HABV4_IMAGE_SIGNED_USB i.MX6 only and while at it, fix hardcoded instances of i.MX6 headers. Signed-off-by: Ahmad Fatoum --- Documentation/boards/imx.rst | 6 +++--- arch/arm/mach-imx/Kconfig | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Documentation/boards/imx.rst b/Documentation/boards/imx.rst index 5a4f52b392d5..c64446aff640 100644 --- a/Documentation/boards/imx.rst +++ b/Documentation/boards/imx.rst @@ -150,7 +150,7 @@ Unlike the typical ``imximg`` file extension the following ones are used for these cases: * ``simximg``: generate signed image -* ``usimximg``: generate signed USB image +* ``usimximg``: generate signed USB image (i.MX6-specific) * ``esimximg``: generate encrypted and signed image The imx-image tool is then automatically called with the appropriate flags @@ -168,9 +168,9 @@ keys/certificates are expected in these config variables (assuming HABv4): CONFIG_HABV4_IMG_CRT_PEM A CSF template is located in -``include/mach/imx/habv4-imx6-gencsf.h`` which is preprocessed +``include/mach/imx/habv4-imx*-gencsf.h`` which is preprocessed by barebox. -It must be included in the board's flash header: +It must be included in the board's flash header, e.g. for i.MX6: .. code-block:: none diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 8cab6de7763f..2d55015e5acb 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -798,11 +798,13 @@ if HABV4 config HABV4_IMAGE_SIGNED bool "build signed images" help - enable the creation of a signed image, if the habv4-imx6-gencsf.h - included in the flash-header and the NXP cst Tool is available + enable the creation of a signed image, if the habv4-imx*-gencsf.h + file appropriate for the SoC is included in the flash-header and + the NXP cst Tool is available config HABV4_IMAGE_SIGNED_USB bool "build signed USB images" + depends on ARCH_IMX6 help enable the creation of a usb signed image, if the habv4-imx6-gencsf.h included in the flash-header and the NXP cst Tool is available @@ -810,8 +812,9 @@ config HABV4_IMAGE_SIGNED_USB config HABV4_IMAGE_SIGNED_ENCRYPTED bool "build signed encrypted images" help - enable the creation of the encrypted image, if the habv4-imx6-gencsf.h - included in the flash-header and the NXP cst Tool is available + enable the creation of the encrypted image, if the habv4-imx*-gencsf.h + file appropriate for the SoC is included in the flash-header and + the NXP cst Tool is available endif -- 2.39.2