From patchwork Thu Jun 9 20:13:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1641423 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=F8BhSFVh; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=GWBlQ5LJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LJwKH3NQYz9s1l for ; Fri, 10 Jun 2022 06:13:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8030E843C8; Thu, 9 Jun 2022 22:13:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1654805630; bh=2fHc2RLWNBe04OYN+gvMY2WijSCrzTwtOXXIQSNylVQ=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=F8BhSFVh3ZSCv9h8qfsFbpWy0h8SfklWL09SBzkvoP8OislXsGheRY4bJobs5L3PS MaVmITqyJ9omsOsusFhVZlDGrpQc046+qlUsTLGi78g7ZXFZUhzEOAgxhth8in0zyC f0ObyWUdz4p0G8auUDDNgc8PLzUGNT8/5mcsonfZhbzg+CVN9CJS2VxNK1la/CQn57 rWSysyvrUV79vsIGCjiV+atKk5M5fbzPl3nIwUmCZQyYcZEPdZmWBLolR7WFMBkpyl woUYX8o0xPtevqETunfwOil0FcRLaGg0WGMAsGoxw0bZLdlzbuuoooF6uFuD174nEv nr4T6NgIxJiPA== Received: from localhost.localdomain (unknown [IPv6:2804:14c:485:4b69:65dc:8646:f287:6116]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: festevam@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id E960C83AB5; Thu, 9 Jun 2022 22:13:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1654805628; bh=2fHc2RLWNBe04OYN+gvMY2WijSCrzTwtOXXIQSNylVQ=; h=From:To:Cc:Subject:Date:From; b=GWBlQ5LJcRDbzZFwh2ds9MtoQRQzoGYUmOIDi59LWgxn6dnjQehIgQar5i0gwlQIa JSNnJxMAGkZYuTQo73Rd3HJ9Z/iAMsRbVTP6qZqvebHqAsdLKkwodCXtAH+kc15enF 6i2UaF3BItn+I/DY210BM0QrG/rVeErIwpY0caB/UHGcL6rXIGXZfS4KocG/gIAS5P UVYdGAWcWyG/kYWzGd0Jvl4OilzIDfEUx5wBhgsc6h2z0/DCRnjeGuZPsAV4CgVD9u 3KJd5Uoty6AIClP+cT4XN2ILcgglucAIy5hB3tNKWqlxtfRQA0YkesgoF5B/a0q5x0 Rcubg6qdx+0CQ== From: Fabio Estevam To: sbabic@denx.de Cc: frieder.schrempf@kontron.de, u-boot@lists.denx.de, andrey.zhizhikin@leica-geosystems.com, Fabio Estevam Subject: [PATCH v2] kontron-sl-mx8mm: Add CAAM support Date: Thu, 9 Jun 2022 17:13:31 -0300 Message-Id: <20220609201331.1797229-1-festevam@denx.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Add CAAM support, which is required when enabling HAB secure boot. Select CONFIG_SPL_DRIVERS_MISC so that CONFIG_IMX_HAB could build successfully, if selected. Signed-off-by: Fabio Estevam Acked-by: Frieder Schrempf Tested-by: Frieder Schrempf --- Changes since v1: - Do not disable sec_jr0 node in -u-boot.dtsi. This will get disabled by the imx8mm.dtsi. Sent a patch upstream doing this. (Andrey) arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 16 ++++++++++++++++ arch/arm/mach-imx/imx8m/Kconfig | 3 +++ board/kontron/sl-mx8mm/spl.c | 9 +++++++++ configs/kontron-sl-mx8mm_defconfig | 1 + 4 files changed, 29 insertions(+) diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi index 22d18e6f1c..65ff3988d9 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi @@ -25,6 +25,22 @@ }; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &fec1 { phy-mode = "rgmii-rxid"; }; diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index 61397bf88d..5c59422ecb 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -106,6 +106,9 @@ config TARGET_KONTRON_MX8MM select IMX8MM select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MN_BSH_SMM_S2 bool "imx8mn-bsh-smm-s2" diff --git a/board/kontron/sl-mx8mm/spl.c b/board/kontron/sl-mx8mm/spl.c index 4ef03c8c17..5a513722c5 100644 --- a/board/kontron/sl-mx8mm/spl.c +++ b/board/kontron/sl-mx8mm/spl.c @@ -13,6 +13,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -213,6 +216,12 @@ void spl_board_init(void) struct udevice *dev; int ret; + if (IS_ENABLED(CONFIG_FSL_CAAM)) { + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + } + puts("Normal Boot\n"); ret = uclass_get_device_by_name(UCLASS_CLK, diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig index 2e9d52522b..eae9ac0dbe 100644 --- a/configs/kontron-sl-mx8mm_defconfig +++ b/configs/kontron-sl-mx8mm_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_KONTRON_MX8MM=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y +CONFIG_SPL_DRIVERS_MISC=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x42000000