From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A766BC433F5 for ; Fri, 20 May 2022 13:30:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D9A2E83EBA; Fri, 20 May 2022 15:30:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="BMxvU9gV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2550A83DCB; Fri, 20 May 2022 15:29:36 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::62c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D396983DE2 for ; Fri, 20 May 2022 15:29:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E7fPSrdWTw7H1jx3JNSkXjjK1t89KM5UDmAdNyAITnYL8B0qo0dO4uLSQehDB4pNIhJEEIdeFgTpLN5ortYMlHAz2JYRuS1XqA2tibllkFX41j1c03jgqJBAru+v4eCrXwkF3Dv19W9im+uxcQxkWhoCpb48OpMayqlNfT4n+5nhAncVrKNFg8IcM2zcmkn8RcHLCLOE/KhIJT01UzEL/iXHUJjNaG2PFDNF9sF6GqnJsb/AoA+4pHMZ3JMHi1H8+8qHBdVc1QnDGMEHYZG9ReBwKuMVTwA1+47+GVY3ppQ/TbVuletaxjfjWrydUSWoI1D7MkOAWf/dmf26CsRajg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/+jCQS/Po52TEXFPpZiqlxK4bDFWZ+94Bs6Twp04z1U=; b=dPpAf2/JYjEwko05aND4uTuySepHNS5Zt+jiHAQ4VSJb8AjWgg0JhEjSHnI3x6/K3OT6DSwkm3JKykh3wFM/jrM0Y0Cb4Q9JojT6n3Uiy0ozsR9V9nfDZMx0eojmLR+CWUQjrbQOXv4v/6W+SXNTyUdnTxajfoZZsn+3hkWarww8MRPkxqK2Bo8vZHoKq9mzOS7MknjeNlskc6sYG5YTwwgVXLGwgOsWflJoQ8yxxlpTfTuRmEJPH5fMUuCqUIrN1cJFMp0Gmnxn3+8c++E2yerMul73nFIIZSnau5UYPcTuuvzGKTpRzoeJ6xBAa4Rswn71v0ZoSrkcZq/Fgowl7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/+jCQS/Po52TEXFPpZiqlxK4bDFWZ+94Bs6Twp04z1U=; b=BMxvU9gV5wzO8vllDa5KbOfXpNJCFlfJmsbL8eiye0tRAeHag+aILOXK2e6oboqxnOCDnLCSNF+YQCM7rFGoSOPB33cNhAj3VMLu1kWoEJ/XNavmH/dAqFL9yOBL5IQ8ZMfmsUq7223xgwwX8u8xFNZ3oHgs7q6dky6cV3iuDyY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from PA4PR04MB9416.eurprd04.prod.outlook.com (2603:10a6:102:2ab::21) by AM0PR0402MB3539.eurprd04.prod.outlook.com (2603:10a6:208:1b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.17; Fri, 20 May 2022 13:29:12 +0000 Received: from PA4PR04MB9416.eurprd04.prod.outlook.com ([fe80::c9b8:325d:8250:4fed]) by PA4PR04MB9416.eurprd04.prod.outlook.com ([fe80::c9b8:325d:8250:4fed%4]) with mapi id 15.20.5227.023; Fri, 20 May 2022 13:29:12 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, ariel.dalessandro@collabora.com, michael@amarulasolutions.com, tharvey@gateworks.com, sjg@chromium.org, alpernebiyasak@gmail.com, marek.behun@nic.cz, pali@kernel.org, sr@denx.de, ricardo@foundries.io, patrick.delaunay@foss.st.com, trini@konsulko.com Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH V4 8/8] binman_sym: guard with CONFIG_SPL_BINMAN_SYMBOLS Date: Fri, 20 May 2022 22:10:47 +0800 Message-Id: <20220520141048.20034-9-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220520141048.20034-1-peng.fan@oss.nxp.com> References: <20220520141048.20034-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR01CA0157.apcprd01.prod.exchangelabs.com (2603:1096:4:28::13) To PA4PR04MB9416.eurprd04.prod.outlook.com (2603:10a6:102:2ab::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b846232e-2125-4316-9f17-08da3a64ba59 X-MS-TrafficTypeDiagnostic: AM0PR0402MB3539:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9WebQaX0sdU7K+mA97KoINwiJJEGVC7S4ip1jYapx8iKiNfHVCQYtyWrV75tIWW2tUnhr9rYfgG4fEVwJwI/AUo9sD05dEJPApisk9JIXg8L90ph3EB9MxsNMzJj4X5QH3EJCCRuz6ReBcumw3YRp6Gs7RGsTfMii3o+/3WFQ3QcASJP7uWIMRdhlLRMg/qxIWvYlUXOZaXlsTB/meIpKTzphy+kxRzYwoxpe2mdRAvFkASWaXdy+Fu1rmpUW+lINBwCgQFqrWFXUaiddt3ALWbvFLYBcTp16rhuxb9pZ/gEPSPRojNZSgFYLHS1REMAgvDDo8M/gXD7FHUsotEmH648FmEbxDDiL//KZiWM3xeMZHpXVnFQNG2fS+XGyAsl3jMJcMu0LnTqCCDEs6tiwePB4xXnnNHth6moQyBMpI4NTeXlpcO45LHrxmI0DRuISGmkyj2jmOmKUK7mWPiei2FTlMkRZHoOaQUfBSbiRt0r7LKxbmvDaPpviI88RUCUDLD+pcEuoyPjEXfX/U9YUsNOt4JDD02rMcx4USxudgh6Ry9z2iSoxh01jgtrcXJbYyQCv5PipFwNVwnoOGP7erzW5m2yYojGJ2yAHohsHbFHciTBoop5fUpej96kuD55DlC3oS9xWhC8KL04tZp1qjt1J0QMrlT61CDtpGLid0e8UW52FY8irq9JQzQYO6PDzDu1fRYwemMZzR+qJcAUlxAD4CMEtrCyFxVCQlHcxEA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR04MB9416.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(2616005)(26005)(6512007)(6486002)(6506007)(52116002)(316002)(66476007)(4326008)(66946007)(66556008)(508600001)(6666004)(83380400001)(186003)(8676002)(1076003)(7416002)(8936002)(5660300002)(86362001)(2906002)(38100700002)(38350700002)(921005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uhre60pbDgbAg8UFepzlrXqVh5kM/3f18IilKCKOsfes8Isqz0ecFOOt37/g?= =?us-ascii?Q?SRGk9WiMf7wHevzZNcCcVUePvVCpHb1o1Vl1AsORN4b96J16Ro7MF2MsPVF+?= =?us-ascii?Q?SSJXH+phJl+qmQU8J1OYEvvuSVCcQxl4ZACFaSWMVQBsyKZSVYTGtxaVgSCe?= =?us-ascii?Q?jnlJ3gO2aLyfzdsofKtVF4U8fSOnbFGcOyIVbEhCwa6DZZUJOoE1m+f+IO9j?= =?us-ascii?Q?4oXeh7C39VHxSMI3y0KOaEBwNnbi5Oqvf2tJy0w78UHj90CEQ6yfeT7fUMQu?= =?us-ascii?Q?bi2B/sjBWeeIO07jf7PFBb4HqsfCglDqi8b0VPy9W3NqODgu7IS7p12Xw9yE?= =?us-ascii?Q?IHPbRVK2vJmdq0wOiGil0vUDepdUS4EGdQsGvIKu8Fv9XTILAqdK0OYkfeag?= =?us-ascii?Q?kQ1TcbkaJbbG3F4ykD9buoG9D0Dsprz5SAObfTD5wA+EqGga+1qA5EVgLRUm?= =?us-ascii?Q?qiClht4CaLyChIzRX3g+vgNTkx8BsOoetv7wT8YpVFUqB4n2p069Q/d1njil?= =?us-ascii?Q?8ufoFAefN7LwHiMIg9aqUO3P3EQh3sswCkGE8yPwMupzR9UyudgujKPHpki+?= =?us-ascii?Q?O8woJCltrWQB9lXpL9x85gbT7sZhskNliulIhDfkNjlLRoV5VUjLduD6kePb?= =?us-ascii?Q?dEKahuCPJWTqjfDc5GS1chQsmh/X8GPwoP6/uQnG0OmMa9YixGA16mXME+Ta?= =?us-ascii?Q?IUlqtCpinGDWVS0CkpxmhsUl1wkG5eKnY1mp607FaZ+t432BIJNSMGrADYdx?= =?us-ascii?Q?/Nz8dXCh0DHORVKmE0VrdeisSJdMbZk/lXORWphP8iPxwrg6UAd3ep2IlOQ1?= =?us-ascii?Q?nAlFx+3oi/1nXgHifiq8oZ/vlmySLV+iQkKWjdDJ7Omg80+9KpydC8g9vQ4U?= =?us-ascii?Q?XQb9valiZDj1yggxuuCt9H+2a8b8xL4lkymNJQQ9zSdl2W31qUp7fDTn++xA?= =?us-ascii?Q?EM8dvhBoztqp0+kRbfUVs8G2rkL/bZQ8cGkInHqR00iMTPKM/UKCUDYgNDBI?= =?us-ascii?Q?b9F8Wk3NxpKz5pF3qMYSBcXHjF30wPlGG5SKfhxXVfmbyTk5L19JSRkdCuCb?= =?us-ascii?Q?RbwDAHDPrYpR2dJidg/2xlQXvx5DX5X3Y0NANaY29vUMsQQuEU6IsnoNE+WY?= =?us-ascii?Q?D2+2gAVVLjkWajUoRoe+M6H59T4SNa91Z85nNoh8OXlk3Wm68iaDIgAWc+8C?= =?us-ascii?Q?BFqmfuddGHRXH2pWdCyY0iHBZPzppIQD1X3m3J6KMcoI47YmytafkQl9k1d1?= =?us-ascii?Q?2hPjn8CC+H1049yLzgXyU0jgMkB4JxhjfaXL3uKNVdVKiuNeha75O+BjIjwU?= =?us-ascii?Q?jwkCvigyPDq3HIzK9vA6ipfS00GQozwiEr2aKXb8g3E+2z8ksr7jxZUj6Jx3?= =?us-ascii?Q?ZXqs1EQVqXG94V6N3+KOpaBdTaA+xBQ61N46mImZ0rVNtKTimxwU63Gl/8Jx?= =?us-ascii?Q?b3cHPeVRLGQKMU0s/8lHMjxFQGfvOE5GRnD9AlU4/U4vWo2+wMpVZMpvVVdN?= =?us-ascii?Q?uwUG0kWr3+0xes63tMPHK/aN9LsENmsuahlk12+90oAxS3l8Lobr/rsCzc9V?= =?us-ascii?Q?mVhWAeLu60QVf7NsO3n+RZbrRQ+66p4SOdUWWxMQVnQYwGUaVbhl5Te884os?= =?us-ascii?Q?PlytoPitI6m+FTQZrcqIe3DC4c1isnVeHGtEkbHBNzhslmmHKNkysZMFLJCW?= =?us-ascii?Q?SEQjhD059MDms4qCjByR+WmnDlunff4UHevbXVgRBJRYRWtb+qn6aXPGJc4k?= =?us-ascii?Q?YoM7G3NmKA=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b846232e-2125-4316-9f17-08da3a64ba59 X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB9416.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2022 13:29:12.6734 (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: 8uKmu/WA05FlFrzz3Ryd8Ycut0YvZFTSHGq9wrgEK+Sp0Ed8vI8VjBM/u2BOexTgSjG04t4gC702a6m4eqG/4w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3539 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 From: Peng Fan There is case that CONFIG_BINMAN is defined, but CONFIG_SPL_BINMAN_SYMBOLS is not defined. In that case, there will be build failure. So use CONFIG_SPL_BINMAN_SYMBOLS to guard the macros, and define CONFIG_SPL_BINMAN_SYMBOLS in binman syms test. Tested-by: Tim Harvey #imx8m[m,n,p]-venice Signed-off-by: Peng Fan --- include/binman_sym.h | 2 +- tools/binman/test/u_boot_binman_syms.c | 1 + tools/binman/test/u_boot_binman_syms_size.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/binman_sym.h b/include/binman_sym.h index 72e6765fe52..548d8f5654c 100644 --- a/include/binman_sym.h +++ b/include/binman_sym.h @@ -13,7 +13,7 @@ #define BINMAN_SYM_MISSING (-1UL) -#ifdef CONFIG_BINMAN +#ifdef CONFIG_SPL_BINMAN_SYMBOLS /** * binman_symname() - Internal function to get a binman symbol name diff --git a/tools/binman/test/u_boot_binman_syms.c b/tools/binman/test/u_boot_binman_syms.c index 37fc339ce84..f4a4d1f6846 100644 --- a/tools/binman/test/u_boot_binman_syms.c +++ b/tools/binman/test/u_boot_binman_syms.c @@ -6,6 +6,7 @@ */ #define CONFIG_BINMAN +#define CONFIG_SPL_BINMAN_SYMBOLS #include binman_sym_declare(unsigned long, u_boot_spl_any, offset); diff --git a/tools/binman/test/u_boot_binman_syms_size.c b/tools/binman/test/u_boot_binman_syms_size.c index 7224bc1863c..3a01d8ca4be 100644 --- a/tools/binman/test/u_boot_binman_syms_size.c +++ b/tools/binman/test/u_boot_binman_syms_size.c @@ -6,6 +6,7 @@ */ #define CONFIG_BINMAN +#define CONFIG_SPL_BINMAN_SYMBOLS #include binman_sym_declare(char, u_boot_spl, pos); -- 2.36.0