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 DD961C433EF for ; Tue, 24 May 2022 07:20:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E1D648427E; Tue, 24 May 2022 09:19:36 +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="Z6Pf5Vvg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 43983842B2; Tue, 24 May 2022 09:18:55 +0200 (CEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::60a]) (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 173098429F for ; Tue, 24 May 2022 09:18:48 +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=Uw5vTZbBqdR9pcFuiDHuDtrLRk992z5GucSmnpJRYzn52DZeTVLdNFwVkOxNew1hY0mNieyazt5hHXweyZtXCwelGGkAnhF02v0LQyDkBx777qZ77BuI3JVBBHlo098nPk1ijAesGAhPGoToV0cLnyMuwlM2wvHaEJgvW2Tedeem/b5+q1CuOn6a2qv3Tiu31iN1N6JxzszitX778dhSs4g7Oj5YeObmOQNPS9I3R2xR8W2fOD+WLUmOD5kGAIrIMOe7jJbnlEb2Ux9j2G3Yfp78Y3AIaxS+ljsOrAQk4rgJuLg1PalwLQGV6l1qnM7yLKL84HBTkbmAfg6h1KaNaQ== 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=MSEA8l4GpnUdg06v7YBTuaACyEdwxan4Gihb7XLUpmTGTDhfJcVPxjHsqzYSJgqIgxRb3bA2fu2Wkm1o4Vp99iCEHBwBryMi6txJanSgsnCo0oWuKv0bEu2O8qKCTFeltbQjsm3kqLvdwMWKaxfbCjqTEZ/naky7+XLIxDdrx6J6No8Y/2GV/egHrQ3Pxd9uN0zebV+0+q324BZnhtETG07zyUJIb7MalJ8cKFq92OENKjtJzO6xRyq5P3S+SG4Ar9pIdOWSKf6TQI0ACrIaeLwj7Lr8lnmLjazyw2qjrNns5ILCb+D46VWRqk8aDFRVx4nFxc5wU+QvXxj+CzCgKg== 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=Z6Pf5VvguBsKhuFiJkgUcnVPbqfmFeKhlxxflv5aMXenFES+hVdaZ5EvRWvzdAaOdFhfUfUbUt4WzDvBqUmpwwM0nAu7GuD7TySagKQ95ggbVqOEt3ylYASs6Z2DIe7wW2gYde4LlkLkNLaA8TP9wYfY9pxCGoEnRDpDvzONdHo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM6PR0402MB3591.eurprd04.prod.outlook.com (2603:10a6:209:8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Tue, 24 May 2022 07:18:46 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Tue, 24 May 2022 07:18:46 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, trini@konsulko.com, Simon Glass , Alper Nebi Yasak Cc: u-boot@lists.denx.de, Peng Fan , Tim Harvey Subject: [PATCH V5 8/9] binman_sym: guard with CONFIG_SPL_BINMAN_SYMBOLS Date: Tue, 24 May 2022 16:00:38 +0800 Message-Id: <20220524080040.28653-9-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220524080040.28653-1-peng.fan@oss.nxp.com> References: <20220524080040.28653-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI2PR01CA0045.apcprd01.prod.exchangelabs.com (2603:1096:4:193::19) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4764b7b8-af29-4c32-9468-08da3d55a434 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3591: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: Iyi1uNadtC0Vmtw9D9+yfEH0bK1wOfGesYAClCWc5lVBm7tDDCMTEUL22P3MXTLeWZ2VAEhShL8AvFRlwZx5VS5s0+wUfQSz6a70V3bQbNkRjinvHYgyAPpN+WGdjI/Qxe9AI/tJtlz0h4zKKdAAPQvQjCvvgM09dtXNL2Yg6aZorMrNnLTP0DUJYwEtxKWFdmurj+0ndsJwKSt7rd2KCse8GR/EGDS9etzabOt6tJAaHlMHoqBJ+QizR/OfqG+91EHrba44HQn2Pe51jQgJ1rjpeiPWc5kVd5BsAHkdMieEtXHHdASVdB/nuLwPYDXG4VGxgUrxgW/LqNwMXOWY8AI0FIJU39Uuqug7wBqNCaKlt6mJRCBZBoT5sXEl2QMUK0kwMZZCJ5oHTv9GVGKHxDGaOiMlg3tN3pdcIuORGiDhKqaqaCsuVv/X0GHXg8cieMXWIKWKrzmcNOx4xxYLS40fi080dpUIBzcD6EACkO0n67B1Gmjj/mfa4c7IAUQC5NiztS6repJBpZ5Lusx9BUNLfHnIZTvIIc3VLE5JGQH2lrx3cy8dBApKhGah4NYKtBKiFSHNmWD9zONt1D3l+Lq/dPFRZbmtaFZUk2c4V3Nl5ES79Om9hbLdAzMLe+CvJLyhxAeU13nll7jpdJaMZCCFAqj0KXfnBC1IkMmKiVjdEjH/pRjSHp1m7RoVW6TSqOLGcu5a/gqemgyqdIAGQg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(1076003)(66946007)(66556008)(6506007)(6666004)(66476007)(6512007)(26005)(8676002)(4326008)(2616005)(8936002)(5660300002)(110136005)(54906003)(316002)(52116002)(186003)(86362001)(38350700002)(38100700002)(6486002)(508600001)(83380400001)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bk/I3BQ0MmPkREw/0uHX8BjJjpJm5AOCZT6sOOy2qrKbaxp1oP3hMHmR4IFW?= =?us-ascii?Q?uLWv6TZErInjw1jBcQgHLrZTv8md+k5n2DW9IlPHvca8N/G/gdv/Hwi6Kv+S?= =?us-ascii?Q?7ZIns/VJpJ56yNPNJksxLpq6yH6tWBmczhH2JT8Pa2dhmJStnSsGwvquLDZU?= =?us-ascii?Q?CJAYzovAdPCXUTYXRQUPLrRT/fQTfKvngAUTbXvvFpQ9QNyaG0Y/dUxsqliB?= =?us-ascii?Q?ZIwgatvbdLgC0aFjtAFQzdkRTrEXOFfbHIMWBTi9WsIQlu+ePM1j8+ZwfHGY?= =?us-ascii?Q?S55KVwJ4g3o+9iL5VHLzBMnPyrbUSygFj9XBYKsgqYnN/4Vdh0ZO0TTb1S9M?= =?us-ascii?Q?9tkRzm0rJjtaQJMY35//AT+eMQdwj9OUxjYXU4JD65REUIu5ZZ09imUdmDv2?= =?us-ascii?Q?nP9v8ksXTn7Qb3llAYdQ66ElgJC5V196XB0rxAgAWFYOULoWsEZS9oyGpMHf?= =?us-ascii?Q?tYRaCY5gCFt7wKSfAS8/R14G5z+ep23PD+gOXjekvSdBqe9KSE1cgzHUiVp+?= =?us-ascii?Q?bYibpQtHyLo3wS3McFVQg2T230RnCra58utcyUex+rDajMSbXeFYOLCd0z3k?= =?us-ascii?Q?dP0FvjYaOIldQ4HE9bjQSubosgo349X6YffIKqN482oiwcfGH/1CDc8oTh0F?= =?us-ascii?Q?xxO5Hf6gCWlBeuVmFDryVukOsYq/P1XA4T5KfdDqz2b9pOusZCVA70TktD8b?= =?us-ascii?Q?P5F1+kropMmO1a5Ubag4M1XQL82B3eZtvCb7LMUfV6KWNxb7wyc7CxGaTfsA?= =?us-ascii?Q?U9FVDwXGp3FGO/fEY4yMhqGvedfCMqrlfcj5nzaWo3skJHLisTjGYIf5r2G5?= =?us-ascii?Q?O2Izpc6dLiukN9rBsL63byejBHYmPQAFOqmfzlXp9ZN38aQcZTsuxSFZMucH?= =?us-ascii?Q?tfrcGpSZPoWJxL8pKJpjBxIPAQHYxHTRi7cd8j8VPDhlZ7pR43gpQnJXnRpw?= =?us-ascii?Q?qSx4Rc8jPZhn4c5PFZe2u61gCzIp4sr3dvqUXvqrGEsacNPRdqXpqAjgJthU?= =?us-ascii?Q?+vfIeJiGFj5umJAUKbzXMD+eO4WwKtQ/YEKravZ/av2X16tgAwL2EDtIi5IU?= =?us-ascii?Q?ZcL8nlKeOsdTIqjY/sO7h2UT9kR9Royc/njeO/SqriIRyN/5N5KTm2o7JLGs?= =?us-ascii?Q?jIJk6FTygQ8p6wAiR0YDj+KtEYi5tzZKk+f2iwN7Zd9D7NjJNha6XyXjPdIJ?= =?us-ascii?Q?RclH6j40xjH7qCfJW2hRWIiKdN/5qkdWtQOd0xKPtNSbj8HNJYHAhJA5saeb?= =?us-ascii?Q?QOXNttAYRQJh/7by1wJPoFyhEADTm+alP2HDr5vNyiYHuxCLBI0z3ClsSoSp?= =?us-ascii?Q?D3BBI9xw1y8X+tUNA3HkMXCK4gZD9aHdE5ofvKA9m2fqDpuw4dqTNxYnURPO?= =?us-ascii?Q?5flKdyRC3i6G5MjjAZXy+rGnGAKePW7xhzeb6BezHcp5VFVETEQQFmX+j5sE?= =?us-ascii?Q?LTjnAoMCRDPWwdGho+eFXOYzjusCGky1q/Okmi7/XzGOpXw1qKtivBjuF5Rj?= =?us-ascii?Q?7hcwKfPUQ8G3QXUT97M/zWh7g/c0SwFNrr8uLri9QGeM1es+cSqAusAEjghn?= =?us-ascii?Q?YueqtWPBWX2g/MYlsswt3cA2haoQPrU2sNJw+Rt+o6vt5zzdnqkldG6DTb78?= =?us-ascii?Q?Z3ZmFT8TI8QchN0N4jS+wKoWwkV5TNwxfszJm/TzyEr8FGFI3L3WVoI0FRCm?= =?us-ascii?Q?4iHeUCEkmnUUBvw/P7fICcu2Pf0ydpJ/2qxncqdLWlPjKVVyG4SNRw1yty/w?= =?us-ascii?Q?JUsrj/9/1A=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4764b7b8-af29-4c32-9468-08da3d55a434 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2022 07:18:46.6050 (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: /dVtciShR1+NnEBDIuCFIkbd0CUVF4wz7Pb/B7HOAbdMsCZ8lIMrz8Yyf/8UDdp+4NPxwvVYgeISlL7tzk9ciQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3591 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