From patchwork Thu Jul 18 12:34:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 1133718 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="F6sFwV4M"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qD9P4yYfz9s4Y for ; Thu, 18 Jul 2019 22:34:49 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 59B79C21FBB; Thu, 18 Jul 2019 12:34:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D1225C21FF7; Thu, 18 Jul 2019 12:34:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EA026C21C8B; Thu, 18 Jul 2019 12:34:13 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20088.outbound.protection.outlook.com [40.107.2.88]) by lists.denx.de (Postfix) with ESMTPS id 4828BC21F8A for ; Thu, 18 Jul 2019 12:34:10 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bdCDpK+pR66ajDF5tV9xrwwCKfO6a7Mvk9ffdT0lcAnj7C8YsXlZis105/oiTkMBpCJt8rAHt8Y4bX/tegTBjGbW6g84ycWubp++tVAswTVTBTWK6mR/KF4hadB2Vf0kaKPwHsXQ2GQEnmsHyBZuAo+U4SrA8gPVy6+TeDsR+ToYAqBZlC2iXFDEH8oHdq23kuTyGO9fSsUzeGi7pgToxhe7n5zhoiGSh3rz1i7fQrV8cZTsOVNX5DVcZMug00rZ3VaI9Y7AiFmt4E3tbsnfTHSlYqcr+Rfvsf1G/eWvAvfzAYcWYbrU01vzhCrRyBCAIEp6vnzUeksi2sTpDNntLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E/ohY2XOLqCMfnIUneHYgbnmrTmrTqKyPyOVsxKp9Sk=; b=RfrJVYFsxNgCoVwv/m7n5dzfyJpf/EwNCrnJY81Sq29QWAwYd4zIrz1ydt8pwIm4OoEWgvhTnKKnizAX89Y09v6W0jGRi6O+YKWiY5uGmCfrHB25ugyg+0UhPc8nXRr2PHVAc8Nw9LAR4VMac4M3eyurGn0KsQqtfC7zvYcQtPM/HHNFaJYNiUd5kWd7KAvDda0oT7cLxNK83Y5HR7hOYQVz+/H80aS64cGZtFk2eZBt4lvGe/V4bFyLoPBzTQjWvsBQGbpOQ3nGVtXD48H1n0uhE3HoGbIZQhseIPXFoGQkV8Nu3Df5HlXOyspbZpk7DWrX6SmcjZRBYgQcZI/pyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E/ohY2XOLqCMfnIUneHYgbnmrTmrTqKyPyOVsxKp9Sk=; b=F6sFwV4MYWdc4OEkwc0JO75pPVhOLIFQK2EU8yQ9AX9M4F5UvIrLQk17kQJjaPql5M2fGgPwGdpZNP6z00Lve0OJF3kKCLe/stRFEyBS7eat7Shmbdq0cqbzUayi1nTGplVfR2qIejS6aQVyt78ZyHB6fzuY29JKKacGAcqDf8o= Received: from DB7PR04MB4636.eurprd04.prod.outlook.com (52.135.134.158) by DB7PR04MB3993.eurprd04.prod.outlook.com (52.134.108.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 12:34:08 +0000 Received: from DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4]) by DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4%6]) with mapi id 15.20.2094.011; Thu, 18 Jul 2019 12:34:08 +0000 From: Breno Matheus Lima To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 1/4] Kconfig: Migrate CONFIG_CSF_SIZE to Kconfig Thread-Index: AQHVPWUY6UWHTDOEO02mPIYj1yeSig== Date: Thu, 18 Jul 2019 12:34:08 +0000 Message-ID: <1563453220-248-2-git-send-email-breno.lima@nxp.com> References: <1563453220-248-1-git-send-email-breno.lima@nxp.com> In-Reply-To: <1563453220-248-1-git-send-email-breno.lima@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [82.144.34.2] x-clientproxiedby: LO2P265CA0334.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::34) To DB7PR04MB4636.eurprd04.prod.outlook.com (2603:10a6:5:2e::30) authentication-results: spf=none (sender IP is ) smtp.mailfrom=breno.lima@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0c8ddd0c-92f2-4e54-c078-08d70b7c3a6b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB7PR04MB3993; x-ms-traffictypediagnostic: DB7PR04MB3993: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(366004)(39860400002)(376002)(346002)(396003)(189003)(199004)(256004)(50226002)(8936002)(26005)(52116002)(68736007)(8676002)(86362001)(186003)(76176011)(6506007)(386003)(25786009)(102836004)(478600001)(81156014)(2501003)(81166006)(2616005)(14454004)(7736002)(476003)(305945005)(66066001)(446003)(486006)(11346002)(53936002)(3846002)(2906002)(4326008)(6512007)(316002)(36756003)(6116002)(5660300002)(54906003)(110136005)(66556008)(66946007)(64756008)(66446008)(66476007)(71190400001)(71200400001)(99286004)(6486002)(6436002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB3993; H:DB7PR04MB4636.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: tG+J5epVs8HSXG6BqZzo5GhqLyEsD2/abAp0/aJ+SYgpzELjpa5tgAhAnBNWYUGSwlb1NT+JIphymQjLfzTB9isoArYDeL7jCrVe8FugF9uJEao1RZLi2GEfDOPF+kWImb6V5LGA3L2DW4b0kSp1K8Mo9pqmn39NYWBqnDOgN5u6Q0Q0B1/YY/IkdEi4SfmfweMmGoNkXTYKZsxnbaa0IocUj2wP44JXHiZ1aw3mJPEnqG0JR/vI5VpdDz9pTDFy3ZAfY8iH2IpGzPxG5eCPLjfhjolE6qFw3AZX5P2zKX7Ak0qdrQXotfTv+TzBLLKoBbHyw6InYab8hd8UTPYpP7xktPA30z0mbfzweLh+2hnOeZ0oc4I53cDTczq380VHkT2N8L5G6SvOl2uPNm4maMOCoAcSMsnTBFn88JUNV7M= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c8ddd0c-92f2-4e54-c078-08d70b7c3a6b X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 12:34:08.7780 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: breno.lima@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB3993 Cc: "sven.ebenfeld@gmail.com" , Breno Matheus Lima , "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH 1/4] Kconfig: Migrate CONFIG_CSF_SIZE to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Move CONFIG_CSF_SIZE to Kconfig and define default value as 0x4000. mx8mqevk requires 0x2000 add this configuration in imx8mq_evk_defconfig file. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- arch/arm/mach-imx/Kconfig | 7 +++++++ configs/imx8mq_evk_defconfig | 1 + include/configs/cl-som-imx7.h | 1 - include/configs/imx8mq_evk.h | 4 ---- include/configs/mx6_common.h | 4 ---- include/configs/mx6sllevk.h | 6 ------ include/configs/mx6ullevk.h | 6 ------ include/configs/mx7_common.h | 4 ---- include/configs/mx7ulp_evk.h | 6 ------ scripts/config_whitelist.txt | 1 - 10 files changed, 8 insertions(+), 32 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index b6fd1595f0..3df96d570b 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -43,6 +43,13 @@ config SECURE_BOOT This option enables the support for secure boot (HAB). See doc/README.mxc_hab for more details. +config CSF_SIZE + hex "Maximum size for Command Sequence File (CSF) binary" + default 0x4000 + help + Define the maximum size for Command Sequence File (CSF) binary + this information is used to define the image boot data. + config CMD_BMODE bool "Support the 'bmode' command" default y diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index 8417c3ba54..534f4b39f0 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x40200000 CONFIG_TARGET_IMX8MQ_EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y +CONFIG_CSF_SIZE=0x2000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 4c93fc6cbe..73fbceec06 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -19,7 +19,6 @@ /* Uncomment to enable secure boot support */ /* #define CONFIG_SECURE_BOOT */ -#define CONFIG_CSF_SIZE 0x4000 /* Network */ #define CONFIG_FEC_MXC diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 16e4136fa9..8ecdf9eb67 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -9,10 +9,6 @@ #include #include -#ifdef CONFIG_SECURE_BOOT -#define CONFIG_CSF_SIZE 0x2000 /* 8K region */ -#endif - #define CONFIG_SPL_MAX_SIZE (124 * 1024) #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 2b8ce9d71d..25e27da54b 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -57,12 +57,8 @@ /* MMC */ #define CONFIG_FSL_USDHC -/* Secure boot (HAB) support */ -#ifdef CONFIG_SECURE_BOOT -#define CONFIG_CSF_SIZE 0x4000 #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #endif -#endif #endif diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index fb8f44684b..b96e63198d 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -10,12 +10,6 @@ #include "mx6_common.h" -#ifdef CONFIG_SECURE_BOOT -#ifndef CONFIG_CSF_SIZE -#define CONFIG_CSF_SIZE 0x4000 -#endif -#endif - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 1fc5c24dec..7416ccf3ae 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -13,12 +13,6 @@ #include "mx6_common.h" #include -#ifdef CONFIG_SECURE_BOOT -#ifndef CONFIG_CSF_SIZE -#define CONFIG_CSF_SIZE 0x4000 -#endif -#endif - #define PHYS_SDRAM_SIZE SZ_512M /* Size of malloc() pool */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 4f822ef9a0..01a625b135 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -46,13 +46,9 @@ #define CONFIG_ARMV7_PSCI_1_0 -/* Secure boot (HAB) support */ -#ifdef CONFIG_SECURE_BOOT -#define CONFIG_CSF_SIZE 0x4000 #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #endif -#endif /* * If we have defined the OPTEE ram size and not OPTEE it means that we were diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 2af5a4fe3e..c53270d3ad 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -14,12 +14,6 @@ /*Uncomment it to use secure boot*/ /*#define CONFIG_SECURE_BOOT*/ -#ifdef CONFIG_SECURE_BOOT -#ifndef CONFIG_CSF_SIZE -#define CONFIG_CSF_SIZE 0x4000 -#endif -#endif - #define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_SYS_BOOTM_LEN 0x1000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2c9cfb450d..9684f1784a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -276,7 +276,6 @@ CONFIG_CPU_VR41XX CONFIG_CQSPI_REF_CLK CONFIG_CS8900_BUS16 CONFIG_CS8900_BUS32 -CONFIG_CSF_SIZE CONFIG_CTL_JTAG CONFIG_CTL_TBE CONFIG_CUSTOMER_BOARD_SUPPORT From patchwork Thu Jul 18 12:34:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 1133719 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="N2bDL4zS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qDB25rTkz9s4Y for ; Thu, 18 Jul 2019 22:35:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 59ECEC21FE1; Thu, 18 Jul 2019 12:34:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 71011C21C8B; Thu, 18 Jul 2019 12:34:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ADD46C21F21; Thu, 18 Jul 2019 12:34:18 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50044.outbound.protection.outlook.com [40.107.5.44]) by lists.denx.de (Postfix) with ESMTPS id 11AA7C21FBB for ; Thu, 18 Jul 2019 12:34:17 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a7pMy/1bAfVMpNLkTkmo4v4vHEj6yX0c/5UoAmr2eEldaV+H0PGQd2QD8MXGSabsYMNDJGASaVv0Tov8LG4X3qmRxnSOaXe93Tl/ZXG1XLmI1Lh8dktCjLJ8F3zyO851p6so9nnI9CvJLNDqspPCZiNRTxBQRgp9Fx4zn9fB1J7XLBpfqs8YhSb2uJ+Wm+GR88DUrqZxEJCDYO0mCfc81WI/WKuxTRlpeokoebBgJ/uwp4BEAbl1mRSd4DXn93ssjq50lzGLXUjmM/mToHt8jCXf78oB8rsvh2iKu/LITXL1RqhHl7SiNdhYk6vRs7w7aj+wptDMQrVOLobGmhN1sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ywsyutPjzTvgIn0W8He3mZ6v6mv4lY486h1iMVSS7GM=; b=JIENrv6fos+GJtbn6lerNDf66wDplLxDsIwiTZNrOO6pbvvXbju55VHlA2lWkvZVoW3FJFNpVH04e59iTbMNYqzLx7dFe+APx+Gc/eQ+yRECIb/UQ/Krx+u4Yzt4TqWsfN4t1/yDnVs6XSxTKHL0i9ERtxlkfyPOCh4vDkS/3r9oMzZ2TVDK7+HH9stqi10ZWGRkDK0tlo59L360q1MLNQeSlLLiP3WJbPf8tPzNZKyBQmsVLEI7f8TI35VIefxwCk1yT18fdSU+4uQBTZuBH5/w/AUme6hkyrgjrNW47/mSwrqRxITfcA979QQuLUvG3K5Kyqe1SmsulAuAr8LEjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ywsyutPjzTvgIn0W8He3mZ6v6mv4lY486h1iMVSS7GM=; b=N2bDL4zSlGvfAWfsUAqqX1BaZE8ig28FZ8XS6JRfymQE99yF2MryKRcf1SH4zP429M2m8KiLTT9lUFFo2vBLxoY+BMvGsXJS/vA0/LBwKw/7pcV90/uePR2V1L6tKnNfOQrjNVW5JMjnYoJUAdvPTgbY6MjfjV9rOR6nxEuWiJA= Received: from DB7PR04MB4636.eurprd04.prod.outlook.com (52.135.134.158) by DB7PR04MB3993.eurprd04.prod.outlook.com (52.134.108.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 12:34:16 +0000 Received: from DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4]) by DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4%6]) with mapi id 15.20.2094.011; Thu, 18 Jul 2019 12:34:16 +0000 From: Breno Matheus Lima To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 2/4] habv4: tools: Avoid hardcoded CSF size for SPL targets Thread-Index: AQHVPWUcwqU0IjyR7U6cywWYetGUCQ== Date: Thu, 18 Jul 2019 12:34:15 +0000 Message-ID: <1563453220-248-3-git-send-email-breno.lima@nxp.com> References: <1563453220-248-1-git-send-email-breno.lima@nxp.com> In-Reply-To: <1563453220-248-1-git-send-email-breno.lima@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [82.144.34.2] x-clientproxiedby: LO2P265CA0334.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::34) To DB7PR04MB4636.eurprd04.prod.outlook.com (2603:10a6:5:2e::30) authentication-results: spf=none (sender IP is ) smtp.mailfrom=breno.lima@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 63233cf2-6e83-459d-b54e-08d70b7c3ebb x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB7PR04MB3993; x-ms-traffictypediagnostic: DB7PR04MB3993: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4303; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(366004)(39860400002)(376002)(346002)(396003)(189003)(199004)(256004)(50226002)(8936002)(26005)(52116002)(68736007)(8676002)(86362001)(186003)(76176011)(14444005)(6506007)(386003)(25786009)(102836004)(478600001)(81156014)(2501003)(81166006)(2616005)(14454004)(7736002)(476003)(305945005)(66066001)(446003)(486006)(11346002)(53936002)(3846002)(2906002)(4326008)(6512007)(316002)(36756003)(6116002)(5660300002)(54906003)(110136005)(66556008)(66946007)(64756008)(66446008)(66476007)(71190400001)(71200400001)(99286004)(6486002)(6436002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB3993; H:DB7PR04MB4636.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: R2Q+nG2DjqP/I3AkUb0bBCImY5m91dp1Yd41GcOBdYYm9/UaZw73qdvcIKkzMdSB77gq1mwih8ODIentFK6+FMDVnw5O1l+Gk6M9yOnOwKsSqe/QFLjrvM9G3WfLb3xoXV8JgzmRpZ1jGIjr72RyovT4d2yp9OmrzADVCsCxFUG//22q0ft9jfGweVq3wDmEHr7vYIx5lDWajgSvf3HRLd0fDUc5jmIAoMOoFQ4nHLIJlu0mYworoAJfTsT690eBOvcVmF5cLy43KCKJe2g1pBn9VsRJZCRlaSMAA24xm0W2SfE/+OMeZUAZLj04SnzO38O4znHs8GjGGLEJ7WIiNny9d/qFUA78SXmqnptL0AQB7Y9j4YZNSRFYmZ6WeHk7jtxVlAcVCtyVMU1Vpz3YAi9hOw6EekugUsX0bhZGd4M= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63233cf2-6e83-459d-b54e-08d70b7c3ebb X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 12:34:15.8820 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: breno.lima@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB3993 Cc: "sven.ebenfeld@gmail.com" , Breno Matheus Lima , "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH 2/4] habv4: tools: Avoid hardcoded CSF size for SPL targets X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Currently it's not possible to authenticate the U-Boot proper of mx6ul_14x14_evk_defconfig target: Authenticate image from DDR location 0x877fffc0... bad magic magic=0x0 length=0x00 version=0x3 bad length magic=0x0 length=0x00 version=0x3 bad version magic=0x0 length=0x00 version=0x3 spl: ERROR: image authentication fail Commit 0633e134784a ("imx: hab: Increase CSF_SIZE for i.MX6 and i.MX7 devices") has increased CSF_SIZE to avoid a possible issue when booting encrypted boot images. Commit d21bd69b6e95 ("tools: mkimage: add firmware-ivt image type for HAB verification") is hardcoding the CSF and IVT sizes, the new CSF size is not being considered and u-boot-ivt.img fails to boot. Avoid hardcoded CSF and IVT size to fix this issue. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- common/image.c | 8 +++++--- tools/default_image.c | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common/image.c b/common/image.c index 9f9538fac2..fc19dfdd9c 100644 --- a/common/image.c +++ b/common/image.c @@ -54,6 +54,8 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch, #endif /* !USE_HOSTCC*/ #include +#include +#include #ifndef CONFIG_SYS_BARGSIZE #define CONFIG_SYS_BARGSIZE 512 @@ -369,9 +371,9 @@ void image_print_contents(const void *ptr) } } else if (image_check_type(hdr, IH_TYPE_FIRMWARE_IVT)) { printf("HAB Blocks: 0x%08x 0x0000 0x%08x\n", - image_get_load(hdr) - image_get_header_size(), - image_get_size(hdr) + image_get_header_size() - - 0x1FE0); + image_get_load(hdr) - image_get_header_size(), + (int)(image_get_size(hdr) + image_get_header_size() + + sizeof(flash_header_v2_t) - CONFIG_CSF_SIZE)); } } diff --git a/tools/default_image.c b/tools/default_image.c index 4b7d1ed4a1..7a26232779 100644 --- a/tools/default_image.c +++ b/tools/default_image.c @@ -19,6 +19,8 @@ #include #include #include +#include +#include static image_header_t header; @@ -106,7 +108,8 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd, if (params->type == IH_TYPE_FIRMWARE_IVT) /* Add size of CSF minus IVT */ - imagesize = sbuf->st_size - sizeof(image_header_t) + 0x1FE0; + imagesize = sbuf->st_size - sizeof(image_header_t) + + CONFIG_CSF_SIZE - sizeof(flash_header_v2_t); else imagesize = sbuf->st_size - sizeof(image_header_t); From patchwork Thu Jul 18 12:34:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 1133720 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="fYLWEqV9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qDBR1vp2z9sBt for ; Thu, 18 Jul 2019 22:35:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E5114C21C8B; Thu, 18 Jul 2019 12:34:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 609AAC21EF1; Thu, 18 Jul 2019 12:34:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1D9D9C22011; Thu, 18 Jul 2019 12:34:29 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50048.outbound.protection.outlook.com [40.107.5.48]) by lists.denx.de (Postfix) with ESMTPS id 06FAAC21F21 for ; Thu, 18 Jul 2019 12:34:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OMQde0VBv6jcoHIhZ/GuLL2sDxGC4XSY75LjG2sFLiBl9pT0VFlofrxY9G5PPIbSk3ATIisz0k8thcoZHoK0uvide+uKHWNq35Pz2JnJbjzcO8UGr6vLb/YFNrbStYRTz5EP92XFN2RO+eXrs7N25mgJQc2rSIFp7s3R5eQlYM2CbPpKjHW6RESDAlMxboY3ThS4MYZeSflnVxhVY/xWGK745lOmlVBJmhtfkELPfWZBs9NF1VJVWuQXLXVvgsTv5aZwyAMACCOyzkhUCUdYu6xm1xoVQZsZ2sMxTYe2ep5XdjlsWzHkF2km6/uVY0V4wxb/CMMBTTwNPPdLj+KlCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lWfb9gKRGM5t1W1LRN2YL7oYXNKgoSUb7A6TTlY+Gvs=; b=El5+DInFNdBbe45W+l8kzcM+P24UiirqjNQaeUs+OkXk8Usoxt0qbz1ChT2DKZCA/gfds95zcewSI3Z3N9+pxlapcloKGrrw7Q/I0bvCFTP3VD3Lq6WY6u8OECvxhiMnLOZvy4dUoqCcE87tI/qmVQ1w2yen7v29ShI+K+kkKdjAqew4Z9gnaLoRGsVHoh7utCoeLvwhwecC0STSm8lnSCtzmlWdlyR9WDstydjR9T5BTIGnuy9TS274ifMhi1Hr3t4DDq5WWd0hF1j1nYsA20dHvOuejQZcNqDCamx3QsctDG6IBsuqfu3LNNWLjWMSUR7/LnRw3ZIB3N9Tk5W2LQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lWfb9gKRGM5t1W1LRN2YL7oYXNKgoSUb7A6TTlY+Gvs=; b=fYLWEqV9Gn6xS3n/DJkB2XHMegjR4S3bxwGxbhjiDD1uA2K+WjPrAkUN5N5WgHw7hVjEza8NGuM28Qw5merTpe2Umdh8KuQ2BZ7ek50HhOJUN3U+/wIwQvEgvJfd/rdcP/rZwPFOAqS5xMolEZ0eGYPjPF3+V2hVrGgJh8J1oLc= Received: from DB7PR04MB4636.eurprd04.prod.outlook.com (52.135.134.158) by DB7PR04MB3993.eurprd04.prod.outlook.com (52.134.108.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 12:34:24 +0000 Received: from DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4]) by DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4%6]) with mapi id 15.20.2094.011; Thu, 18 Jul 2019 12:34:23 +0000 From: Breno Matheus Lima To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 3/4] imx6: spl: Reduce SPL limit size in case CONFIG_SECURE_BOOT is enabled Thread-Index: AQHVPWUhWULFEQ4JlUGXvvw/fTOhow== Date: Thu, 18 Jul 2019 12:34:23 +0000 Message-ID: <1563453220-248-4-git-send-email-breno.lima@nxp.com> References: <1563453220-248-1-git-send-email-breno.lima@nxp.com> In-Reply-To: <1563453220-248-1-git-send-email-breno.lima@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [82.144.34.2] x-clientproxiedby: LO2P265CA0334.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::34) To DB7PR04MB4636.eurprd04.prod.outlook.com (2603:10a6:5:2e::30) authentication-results: spf=none (sender IP is ) smtp.mailfrom=breno.lima@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 570c574b-4c4e-406b-6486-08d70b7c434d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB7PR04MB3993; x-ms-traffictypediagnostic: DB7PR04MB3993: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(366004)(39860400002)(376002)(346002)(396003)(189003)(199004)(256004)(50226002)(8936002)(26005)(52116002)(68736007)(8676002)(86362001)(186003)(76176011)(14444005)(6506007)(386003)(25786009)(102836004)(478600001)(81156014)(2501003)(81166006)(2616005)(14454004)(7736002)(476003)(305945005)(66066001)(446003)(486006)(11346002)(53936002)(3846002)(2906002)(4326008)(6512007)(316002)(36756003)(6116002)(5660300002)(54906003)(110136005)(66556008)(66946007)(64756008)(66446008)(66476007)(71190400001)(71200400001)(99286004)(6486002)(6436002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB3993; H:DB7PR04MB4636.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: KxHaqv/qLtxNbyKY0Q3sw1RtJyjirrFAjOm0w+rSmgluiYkq93vcbJzYcRRur8TGofcHixwh4WfWUrIonW/bYizAw9ePB/fB+gLuRbsJTEQItmQsI7s/4iwsIR6EobjrQVFjasaJ3hyuDkUwiX9cQCPoQpzbu1sdHy3mRDHYcyScvbw5qStoLhO36LY/zXj1jMpsRJfkZsCwSIJ5qhj5KWBWSTyDNzIqu6JZ41bTuTz3YS1skG2ZzhulpjBnFZJCo4Oo9FpFOL2hW+urbNstW9l1ByKN1KgTao1g2cOxBx0h+4H8H+sYoHgKH2uR87QSKtA7jnk9psMSA+ChKh9IUL7qgkFEhRXg0P2JIX9iUhUDP2KySRTu/IlSdEpYwGR39WAE63RuEFIQvWJ3GLHxmF/JWjJke+3JriOTtpRiJTc= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 570c574b-4c4e-406b-6486-08d70b7c434d X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 12:34:23.2908 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: breno.lima@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB3993 Cc: "sven.ebenfeld@gmail.com" , Breno Matheus Lima , "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH 3/4] imx6: spl: Reduce SPL limit size in case CONFIG_SECURE_BOOT is enabled X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" In case CONFIG_SECURE_BOOT is enabled we need to limit the SPL size to avoid a possible HAB failure event: --------- HAB Event 1 ----------------- event data: 0xdb 0x00 0x14 0x42 0x33 0x22 0x33 0x00 0x00 0x00 0x00 0x0f 0x00 0x90 0x70 0x00 0x00 0x01 0x10 0x00 STS = HAB_FAILURE (0x33) RSN = HAB_INV_ADDRESS (0x22) CTX = HAB_CTX_TARGET (0x33) ENG = HAB_ENG_ANY (0x00) As explained in Commit 23612534fe0f ("spl: imx6: Provide a SPL_SIZE_LIMIT default") the i.MX6 SPL size limit is 68KB. The ROM code is copying the image size defined in boot data to its respective load address, in case we exceed the OCRAM free region a HAB invalid address failure event is generated. The maximum CSF size is defined in CONFIG_CSF_SIZE, reduce SPL size limit based on this configuration. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- tools/spl_size_limit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/spl_size_limit.c b/tools/spl_size_limit.c index 98ff491867..8902e30129 100644 --- a/tools/spl_size_limit.c +++ b/tools/spl_size_limit.c @@ -14,6 +14,9 @@ int main(int argc, char *argv[]) #ifdef CONFIG_SPL_SIZE_LIMIT spl_size_limit = CONFIG_SPL_SIZE_LIMIT; +#if defined(CONFIG_SECURE_BOOT) && defined(CONFIG_CSF_SIZE) + spl_size_limit -= CONFIG_CSF_SIZE; +#endif #ifdef CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD spl_size_limit -= GENERATED_GBL_DATA_SIZE; #endif From patchwork Thu Jul 18 12:34:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 1133721 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="dBrAHL7S"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qDC43FXnz9s4Y for ; Thu, 18 Jul 2019 22:36:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1B042C2201E; Thu, 18 Jul 2019 12:35:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C026DC21FBC; Thu, 18 Jul 2019 12:35:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2CA1EC22022; Thu, 18 Jul 2019 12:34:37 +0000 (UTC) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40069.outbound.protection.outlook.com [40.107.4.69]) by lists.denx.de (Postfix) with ESMTPS id D68A4C21FE3 for ; Thu, 18 Jul 2019 12:34:31 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gwFssPeZ0uOGXyPEYfGqtn7yx0d5lQE1+0Wg9GEUO2VjFslg541RdIuqqUGgj4YA/GTNV1qsxLSHYOTyYPfMtDUsHo4KchGiisVRlKNjqiniEbcrsMknzmWbJ8hoT0Og62fUjFc95PfiBO6ZbAZIwEMpBH9svgtsGu3/hzJA/3LNtXNKJ8n+Xb0/E6nvgog4fdXVtMLxSTskqlB53gDUb3jCDh7rGabt7ws/QoORDH8KXzt583LVL/uisE4C5djpeb3mhu52UoFIx6fWIn6BQUKqsM4WEQqUWsU76uWLuR/jh8pcZYe/ieVoqlssX4ZJuGc+xJQG98tuCwVC7fA1aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fdzMR9hnAXTIerLPu2RPex57oUnWEfNPkSJC0K4drBY=; b=DZQ+Rc1eg2N2CTrh2OIjmNI+lh3pfZ9lETNvTbSlKhmQMNsuOJLVCU+cZEhx8uuFClDeLHpuxGFh6T+lgKa5BT+lmbA8oPyDbt3ZW0XfVkJ8gxCZR8qnFpxwutqCn+cvJhYXkELOJrnwxoniOYXDp8sYpZG2KWVrex2QZ3DJrNnPEQ9g8IgHPo+aDNTpJ5X1g0U5BfAic3OznCIq3fjvHh/8+wP9o+fAPvjh5gHOQfOusXTiWWuh0vbHLbXmplTJmLY+NWY5xmnusNiVDQu1rNUSK3BdnyPRXtC0QK3hezza/J1QBORoUDlKhrLxlwsTu60Sr1mNqVAZgrMnnUq6fQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fdzMR9hnAXTIerLPu2RPex57oUnWEfNPkSJC0K4drBY=; b=dBrAHL7SRycMqJukgn7vN5/dn3pWxYAPnvt8dgUIV73l3KzKgn7GHhuc0zwrYvMDUsnLIaB+XXfWFgBygnIr4Hcwp4mIEMytTUhQKEflkfo70vYStr3hxb9WWzhj/5CJdduaEEI11TCzNxP0MKCZzlnEfqp8y2CqaV7Mf15tfxk= Received: from DB7PR04MB4636.eurprd04.prod.outlook.com (52.135.134.158) by DB7PR04MB4170.eurprd04.prod.outlook.com (52.134.108.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.11; Thu, 18 Jul 2019 12:34:30 +0000 Received: from DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4]) by DB7PR04MB4636.eurprd04.prod.outlook.com ([fe80::ed41:1ceb:290b:7fa4%6]) with mapi id 15.20.2094.011; Thu, 18 Jul 2019 12:34:30 +0000 From: Breno Matheus Lima To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 4/4] imx: configs: Cleanup CONFIG_SECURE_BOOT comments Thread-Index: AQHVPWUlgbl0COwuQkeJ0tnWkNND+w== Date: Thu, 18 Jul 2019 12:34:30 +0000 Message-ID: <1563453220-248-5-git-send-email-breno.lima@nxp.com> References: <1563453220-248-1-git-send-email-breno.lima@nxp.com> In-Reply-To: <1563453220-248-1-git-send-email-breno.lima@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [82.144.34.2] x-clientproxiedby: LO2P265CA0334.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::34) To DB7PR04MB4636.eurprd04.prod.outlook.com (2603:10a6:5:2e::30) authentication-results: spf=none (sender IP is ) smtp.mailfrom=breno.lima@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f6ccc925-7917-4d96-84dc-08d70b7c479b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB7PR04MB4170; x-ms-traffictypediagnostic: DB7PR04MB4170: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:338; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(396003)(39860400002)(366004)(136003)(376002)(199004)(189003)(71190400001)(102836004)(26005)(2501003)(71200400001)(25786009)(316002)(50226002)(81156014)(81166006)(386003)(6506007)(486006)(5660300002)(6486002)(2906002)(53936002)(186003)(4326008)(305945005)(7736002)(99286004)(68736007)(54906003)(14454004)(256004)(478600001)(8676002)(6436002)(36756003)(11346002)(6512007)(3846002)(6116002)(66446008)(2616005)(66556008)(64756008)(52116002)(66476007)(66946007)(476003)(86362001)(8936002)(446003)(76176011)(66066001)(110136005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4170; H:DB7PR04MB4636.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: xvM1wN0bWhdxXsgnVau+5dHDarzlRtX+X7rsytC2G/tIKFeSi6qX73exMQ9fORZkEco0ho1kKhDhqSMfdhS6HA8hjVp7oNhyIHj5RGuAR9cP5rla8hXDmVJp2AVcGByoSao+S2MsnV6VldyA0gsZhMCmHuj3MMwkW0HBk9MmIu625KPnQ49UQeLgKGCsw8g6ASXJ0gGZk7KGZ8ppNjElJ/CQRVcJV/1Gz7RoyoZSswyHzWLbxlsnAlp0ZnzSKm+gB6vAUi79C2Eb1xNcJBT16DTeH9C1+GJk8K5O6tnQ8OTkdNXqNyrCNvSCYKKC/4C1oqIGI8Dx5vNtOUBiAnthBeG2Ma2AqCbLWdA+LSC5fsOzmpUOJzHZaTLishwly5iCeZ121XJ0+k8u/XrqjqbMnA/CDyPAwKCxjq3qIXSICps= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6ccc925-7917-4d96-84dc-08d70b7c479b X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 12:34:30.6926 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: breno.lima@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4170 Cc: "sven.ebenfeld@gmail.com" , Breno Matheus Lima , "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH 4/4] imx: configs: Cleanup CONFIG_SECURE_BOOT comments X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Since commit 6e1f4d2652e7 ("arm: imx-common: add SECURE_BOOT option to Kconfig") the SECURE_BOOT option is selected through Kconfig. Cleanup comments in code to align with this change. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- include/configs/cl-som-imx7.h | 3 --- include/configs/mx7ulp_evk.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 73fbceec06..3ca16c5201 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -17,9 +17,6 @@ #define CONFIG_BOARD_LATE_INIT -/* Uncomment to enable secure boot support */ -/* #define CONFIG_SECURE_BOOT */ - /* Network */ #define CONFIG_FEC_MXC #define CONFIG_FEC_XCV_TYPE RGMII diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index c53270d3ad..437b2758e8 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -11,9 +11,6 @@ #include #include -/*Uncomment it to use secure boot*/ -/*#define CONFIG_SECURE_BOOT*/ - #define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_SYS_BOOTM_LEN 0x1000000