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 730DAC433F5 for ; Fri, 20 May 2022 13:29:05 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6394B83E66; Fri, 20 May 2022 15:29:00 +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="e0nyfFrv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7786783DEB; Fri, 20 May 2022 15:28:45 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20630.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::630]) (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 31E5283355 for ; Fri, 20 May 2022 15:28:39 +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=GIJ8HHKpZWTvRmUVOFgKPshshhC0ns2Hm3iLA1BGmKAwILn03PAKQUslEXihDU7O8YorvZMDwGCRJCEtu1cO3NTPyOHMpVdPL8LFHNdi9xHOR3FTnffvaflAAUxGuIV3UNumle5MtZwKffOnEyFKDdw+TYdKgl4CZKoQTYovFNQB4fSrIrunfzYuePWhwVcdfgufQafk5wtMFZibqMdA+nu1NSOn/Na1UOJg4YKS5DJKfD9YGqA7atGbg8G4CsUlzmYgqlaps5kY7DnMRxwY+iBzvlgetEKtTO2NENNFcx1od2jefq6PSfsdgPWdC+v3/x/CXO+Pi1V1G9l6AFoZzg== 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=Vuoykymwr6o5hedEyOudtC6sL8Cy60qmiK4jVTyHPY4=; b=CMhmJo66QFgMLu26afrexB2T8B3smUYlkyAduGgSD1+fZlmsik4jGYjdBQ1zOhidfnPxjtO8uc4W0WzlxOm30Fn+Isy1alwG1HlGnGOyTtPN/jHqd++OWVSvURQsuLUWs4tIlol40hjmYrdTKHe/Z+UcD69MUhdrPsc+6Y8/6zDIvd8XcmefaHai2V/34dhusmI56IR8klfMdpRy+5jAUUlWaSJNbfzaEIAHOn9u26y+oBunN9xMKNUkpZmwThqfwvwjvH/t/xAskxzUmP6agbJMqFMmRDacq3gDXhUqjt068uZLin0uBuqWl4dNteGw550+MLQBNvOViI5pn6JysQ== 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=Vuoykymwr6o5hedEyOudtC6sL8Cy60qmiK4jVTyHPY4=; b=e0nyfFrvI5MS82mpUJheLGWgfuHOszkrORdDAva6BpIEoCU4Vpbys/zHXGidu7+1C0zMH5ZrG2xJWudKcnvT71Lq9/AZUv8BVt2yNRLAEaNhHbYwrJQoOeEJEVE4x34+JxHX0MX06PlPmlLPSDod7/4iSbZO5cOvM9rpW+LWMWw= 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 AM6PR04MB4022.eurprd04.prod.outlook.com (2603:10a6:209:42::30) 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:28:37 +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:28:37 +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 1/8] spl: guard u_boot_any with X86 Date: Fri, 20 May 2022 22:10:40 +0800 Message-Id: <20220520141048.20034-2-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: fedeca61-ee45-47cd-8ce1-08da3a64a50c X-MS-TrafficTypeDiagnostic: AM6PR04MB4022: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: /K94FUJ6f1zyi0iL0+goEyUvHrRdWb6Io5/DlJfZAJ834tqzSrYuMu5irNq03ybC3RCNotcusta4ZWPeq/9mTjhbm6GkdDFCVibYt4UmLgl5Aa6d3iCj+vTpyurVkN2U/VmtnirCRxdDLwFxXMndfHZhjYklEQ1ql3SWg9Ac6JXxnSXtde3fx/ezAF6KYsAlRlmJLdRzpUO/NjAZOjKVUmAsz3mTWll8eW07hR8ibL5EqVrcFtG54fzTQn7oVXxiPS6nhWytVyfektaDRYZcVqh68CwirBoSQQSFxlBlhAqcIBD0rRAYYWb5hTvEb1Gajxx0rxznSATo40kmqKz+pFsDCt2mtff4YxxnvMWuVQYU/Lm8T4pzG39DHIQLb4QVQprT7NDp1zGjyxbYRg+nSkb9P9ol2toNMoWVs+NnDNCG32wlSh8SJzAlQXYjszvtHmHTPMHTfHWR4Jdqr3eqf6v6W6e1iruMXixWlPZZBPLJ7ZDmv0vgCAzD86IfrIwRm+TYE0ASWPr33/h3uYhToHGV7Rd6mQ5ezsRYctSE1tjhfWVW6zRJrLzpNpTLdPimYGUXzclPs6OkbwyZdb/AesoKQesml1p+l+ZKFz7nJDkKFbUfIHmDbs7xHLlPCYHJR7e465muH5iyzQqFN/dwHIox1aG5VU06iAabk+RWWsDr2ix8tf92owU7xiyy4+h9dE02YDtDWNuI8VwjxDRGYInCKPaH61OWLz+f66qn0PY= 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)(8936002)(6486002)(2616005)(4326008)(8676002)(6506007)(66946007)(5660300002)(921005)(2906002)(186003)(7416002)(83380400001)(26005)(6512007)(6666004)(66556008)(66476007)(38350700002)(508600001)(38100700002)(86362001)(1076003)(316002)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KV09HOFTjD6fCej7vikrzDXDmFE10MzjZMyQHKvzpxZPnK/smnoEguwmvTQ9?= =?us-ascii?Q?e3m2ahftkHRG9wKXHkSIfpG4aMjGTk/OBCJJOM+r5Y1Sy+N3sgXLdCfYjf3N?= =?us-ascii?Q?6FWefILBBSHzrpdsHXijaARCv1psgNo43uZ2zrw2qQ12rpkhKHnQmwk+8wfR?= =?us-ascii?Q?hvOv70gjcbw5dzoKthVRbslB7PKX7oz3Sv0xNt+wWt0RIIFJvbNCZ8lAXwVR?= =?us-ascii?Q?Sw7X85SHvk/+0CgPoy70B/zKn2LjUNRcng4cKxWjdwx4w0HxmJ/kdKhaQ78y?= =?us-ascii?Q?0l8ys2uwqLuQDYYfKBGxvz1nHTsDWVnqiT693UTVmsWpXHsEvf9XIBBrRoEH?= =?us-ascii?Q?3yvUzaR3iDNe4KCLU4y8xukfS4Op8sGzrnKGiRAsb1xaJIU8VvpO08UtALKe?= =?us-ascii?Q?8nZsIH3+dCSYdqhHih707VrsnyxPtJO8nDpejvqfOJeC7mGJUtJxcSV45SdU?= =?us-ascii?Q?+QDVStKZQmK/mRLl9XlIDRTY10muzTTw65bgNpk0Nc6ma1i7hkDz4Cyjg832?= =?us-ascii?Q?W/nZ2BZnUhjrcKQCFJD9X2Gz4dLPFNCaClWPot2y8WI7MnD1x0P0evCO+4aF?= =?us-ascii?Q?gwYe3c5PsqkaEGI69o3alu9vsOclWnA49OQPfh89srPTP1D+8G7ZikOdV8cS?= =?us-ascii?Q?47furpZFNFT6turPIyhnz0T83GNUtQzLmjvomVx93JShC2Z2QLyCklhrO448?= =?us-ascii?Q?W1wJbdTv4CkZ70pSx2k0uiK5l+7YINDqwaQNIsdmjxIYrqU6i5Nr1OEy8t6e?= =?us-ascii?Q?q1+oyj87DHSHzhs/fkAoDpezIuV1zn4M0OCfUyM/3K6lHv5K5Wv5qvmtENAw?= =?us-ascii?Q?4+xmFN9YlTDdeF8AWhrXpbS45Yr+ityLMljR+fS6p6/7ItEwPlJs2KBR/EK5?= =?us-ascii?Q?9RjQoSF31qGI7WYtQ4Yi+lLmBS3/t0WTAvCqe5u60kcqo4YYAQFez1b9q1lT?= =?us-ascii?Q?4oHJylAMihE9IfVZI9JpLVJ3zAKB/m4i+sD/lJ66yFUnOLFeRgS3RaAXWo39?= =?us-ascii?Q?7+/0WvxwOzcQIVPe49JoT/NmInAhf6WYh/JTxsU2QJq/vfS+WMuMIPiUGMOu?= =?us-ascii?Q?i99R1rgwyhWWgf0Babo6/lfUvS4XuV/t8FyqAfZq+1M91EU5T7XbURgaY/TR?= =?us-ascii?Q?kFiwhpeXpkGGRMI9iXpL4BfhYR46p/wxOUHu7G/Hav+D9kiLrNaVZXiLup33?= =?us-ascii?Q?sh1t+751rd7IQhcQJoots5F8W77e8FGdm8ztCBFw9YPrK/S8SKwHOfvJwmjx?= =?us-ascii?Q?aV+39Hs+tr66P0FnsR7QEg4eGVhZbvRZjnCyr932qyiKuuZGF6hXINkN+PCY?= =?us-ascii?Q?ehy/cRn3vd15wYyNiZJbQz5QkYet6AmpJK1z9yb4LJM7XBEx5joYGAbPbRKv?= =?us-ascii?Q?YDYOlxo9MvegMWuFHhzSSlfz2P5wjh/HUIQ5gkArHV1Fq0esqfVPhdNl4ypZ?= =?us-ascii?Q?LfdJPnhQiPTJKQz9A1jc05LOuMmeNvlNipWAgJ8thSLr+ArqOc8IYAkOwQns?= =?us-ascii?Q?C7cXLPjnB/N8i321zCfIOdaV6qP2aWVnM1RBwYqWc+EK+PwOsSVsWPZ5boMC?= =?us-ascii?Q?oGeRdFjV+qxQtrq3AWywONPzSUhhkL96Vxdfv65SQJbYHnpQ13rCUTQsOf0A?= =?us-ascii?Q?G7Y/9YlPfuZxFfTyUoJ3UkS5pTe3ebx6A6+VheDFrst1Ew4O6Xoax/7nnCS0?= =?us-ascii?Q?eAn108hS+oxn/V+c2MEoBNmTo6a+h6QryFwksjkhZbkvS9qRVLekDMVyho5O?= =?us-ascii?Q?aK6+zWT98w=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fedeca61-ee45-47cd-8ce1-08da3a64a50c 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:28:36.9362 (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: rVLrEAVq+MU0oIaYZiV7xPigL3/9V5bE9hRV5GpBRqAk6m5HrFqJQkx9nBaFemyydaM2dscPqYE7hFW1R58wpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4022 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 set the symbol as weak not work if LTO is enabled. Since u_boot_any is only used on X86 for now, so guard it with X86, otherwise build break if we use BINMAN_SYMBOLS on i.MX. Tested-by: Tim Harvey #imx8m[m,n,p]-venice Signed-off-by: Peng Fan --- common/spl/spl.c | 8 ++++++-- common/spl/spl_ram.c | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index c8c463f80bd..4b28180467a 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -50,7 +50,7 @@ DECLARE_GLOBAL_DATA_PTR; u32 *boot_params_ptr = NULL; -#if CONFIG_IS_ENABLED(BINMAN_SYMBOLS) +#if CONFIG_IS_ENABLED(BINMAN_SYMBOLS) && CONFIG_IS_ENABLED(X86) /* See spl.h for information about this */ binman_sym_declare(ulong, u_boot_any, image_pos); binman_sym_declare(ulong, u_boot_any, size); @@ -148,7 +148,7 @@ void spl_fixup_fdt(void *fdt_blob) #endif } -#if CONFIG_IS_ENABLED(BINMAN_SYMBOLS) +#if CONFIG_IS_ENABLED(BINMAN_SYMBOLS) && CONFIG_IS_ENABLED(X86) ulong spl_get_image_pos(void) { #ifdef CONFIG_VPL @@ -221,7 +221,11 @@ __weak struct image_header *spl_get_load_buffer(ssize_t offset, size_t size) void spl_set_header_raw_uboot(struct spl_image_info *spl_image) { +#if CONFIG_IS_ENABLED(X86) ulong u_boot_pos = binman_sym(ulong, u_boot_any, image_pos); +#else + ulong u_boot_pos = BINMAN_SYM_MISSING; +#endif spl_image->size = CONFIG_SYS_MONITOR_LEN; diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index 82964592571..083b14102ee 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -70,7 +70,11 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, load.read = spl_ram_load_read; spl_load_simple_fit(spl_image, &load, 0, header); } else { +#if CONFIG_IS_ENABLED(X86) ulong u_boot_pos = binman_sym(ulong, u_boot_any, image_pos); +#else + ulong u_boot_pos = BINMAN_SYM_MISSING; +#endif debug("Legacy image\n"); /* -- 2.36.0