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