From patchwork Wed Mar 31 18:32:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1460674 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=12yQ50wu; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F9Zgq0WfVz9sW4 for ; Thu, 1 Apr 2021 05:33:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B721781FBA; Wed, 31 Mar 2021 20:32:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.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=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="12yQ50wu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0F2D780462; Wed, 31 Mar 2021 20:32:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062b.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::62b]) (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 0B9FF80462 for ; Wed, 31 Mar 2021 20:32:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KP3gbWAahBUAUzUZ1b9v6WuA7KwM4E39ndSLzirNrNAz/1ECcGS9bW12Qe3iXbr2dFox95UxqXpKfKgGFcnnZS9YQ/7eRDCbl25oiaZhXVenYXlZuePV+MfFBU+RA4GN1cO6p4KNv2q+YnkB4ybVQxkk9/Rh1ue9zh5YO4Sa7g3V2NdOOkGAotf453E7t1SSN18w7bBAojvGIBdrKhuMQFQx6Lxb8Os0tLV9d5YlyxzC2rkxq/Y6+iHPrsLD8lSUoBcE3RmlGqXfj2ZhU4+7i5E01g81Aj6xrNucvBqMX11u69vQpmD7pDCjo0Sjq21hc6qn7z3gv7GjKhB6niWYeQ== 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=aOBqjqMGgcBc4X/akvC7QDrJu3n3kRxx9e83kV+Wwns=; b=jjQxpEny0yGtCFmvOmYZbhvO7EKGOTHFUOF3z2eMGIUcLJXmg4T1wlK85wSDYcH7Qm0LCj5kP89LxWGbI1QZ2Sp1csu8Mi8E2QrzbDOzjnZKP9RKREXucr+dvpwSRk17KOZJVRwKAl1hOciNt92PsU7LVLFrXXkfGXUfRexMkjYU8znPcAlmWORcv44F0ShWEne339QtRFxFW4qW4p6udydjMam94mh0a5ftzEGQRvVcZ31o8T4CDtlLrxiXw0xjdP5i5QDV12Hj0UJVZ6Z6rW5R8hTvkP/mz9vPSNhWba8c6is8dBDAmrI1zupn0gvtalVDT8r+eLpJ80IsrwlNJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aOBqjqMGgcBc4X/akvC7QDrJu3n3kRxx9e83kV+Wwns=; b=12yQ50wu9sIP3Uv6Q1T8o3DVjI/jd+F5wc2yif+24WnbUhHF2bDGnfAY8QTPGTmxdGetRaUTWydnjnkXIOaZnUxOeDz8GqKSUhMeHQMbZm6O1sz3XB7kUaqPlCnRflzMH1htipnjdJs8451nW0SpuWR1CP3M1dpytI9uCcxeJOE= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25; Wed, 31 Mar 2021 18:32:39 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922%7]) with mapi id 15.20.3999.027; Wed, 31 Mar 2021 18:32:39 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Simon Glass Cc: Sean Anderson , Kever Yang , Michael Walle , Philipp Tomsich Subject: [PATCH] common: fit: Add weak board_fit_config_name_match Date: Wed, 31 Mar 2021 14:32:27 -0400 Message-Id: <20210331183227.2159361-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: MN2PR14CA0030.namprd14.prod.outlook.com (2603:10b6:208:23e::35) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR14CA0030.namprd14.prod.outlook.com (2603:10b6:208:23e::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.30 via Frontend Transport; Wed, 31 Mar 2021 18:32:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08f614c1-c0d1-48a1-957f-08d8f4735c9a X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:561; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z+Z1RqtUvsDTFc/5s46Y/5ijCZtESa6HoNRs/xzqn+Gpb78fVdpR29SxvBpORB+AWmvpZQ/y12NngToUg20WoXJ4AHFcd4vEGtnkuBq0ZF2MFZJZDpyp/uvpqZvhXrbEj8dmIh6Xxd9v8j9KSDtY7Qug/ubO8Iw8o2tT0eR/Q/jtwpNvmd/Th/i8VEaE2SG0p1aNIZcQYZY+lnlIXEHIrLvCgb4BlueQaf0h1xDb8y/2d6mpmTXN13wOf1nJVZ6XqUWM6eBi7Xdf+STMWeByIZCAndY4s1+WicMcJ53AvbC8+4s2pQsUAcDhIg1FyWqjIo5rJOIhwK5NfFuSXZU/ocVdvjp+9nr8SJbDRMw7082e3vYjW8bJD22HFYLnZ1y/u14ZjQItjnJ1KKlqZC43TuqcwcedUsi9FUv/XGIkPEMSn6QNzG1FgXOcIiWRQ2bTtNGrtsPyNED17Rb8NaTyADmyYh33Tizrob/yneUsvMjU79Za416568uYhhO6EWBZPoNTOpKqeUn5cjo5ySULTkUhIRQ8bhbY97fgSN5uo8X+jgcFu9AyqYQ6mDmrPtXb/eoD2pAAOayYln1H2+eVQj4e3kUh9ZRTFmR04+ucuTckUikH4u3O8pmgXNZZNqe5NOgGecUvmYAcSlXhWouZug== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(136003)(366004)(346002)(396003)(39830400003)(6916009)(83380400001)(2906002)(186003)(5660300002)(6486002)(6506007)(6666004)(6512007)(54906003)(36756003)(16526019)(44832011)(2616005)(86362001)(478600001)(38100700001)(52116002)(66476007)(316002)(8676002)(66556008)(956004)(4326008)(66946007)(8936002)(26005)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: w6P0fYnwiwxyrRenVvAva8Gxwgvmfh3oTGzB9CsetdZKy0sV8UScvYZ/CbDVlvNuxmNxmp91DpQZJ1DGeqUnDK6lu2Lr6m3cZK3vJzmUErQ/Pe190w+giVAJb0BRBW0Ul/YPo20uiSl7HGQimja/iMCKr8+7bNSWO5jLeExAV3X9xjgjVRxlONPxp9STbp47Q6D0BoF5zj9IYyiDaBWBkbPTCPnyjcPVUXhuRXSTVkECAKCIOBQYgSDHKrifdUO7wg0ZJm1knG4PU1bYdVM4k4rpWskKOZ5yODUZK9ZLJCgqUx6t6H1S4VwYgnXmcCKTCjhcHOO21tJ6Gqzcw3Wk+Lfum1ps/t9nzhXceLm1q1KBfsQFZqvPgVxss1iW7a5w1GPdslZzPKOpUAEO518dhrFpktd8JCDHZsmoa+c4WsiJ0FTrexE4ttYSLV8pny7hWcXoPGQjIlFYlIUAHdLvSyFPksgQ4U1xWxH0wjsWGcOhthDttqupfXMu+/bBsAgOpEnjKrSsROWBd+Z7sJIB03k22hbiKqYzfUmEhSkVZNtTMjbTyb8PzzwNnE29slVILP/JK4YzOjC2LvmkrJ8wtPbPX6rlY7P8Vkr2EhEBQnTy6wGj7V8/kJm+Zm19n9iAEB7BpG+dm/XkjC3aDc3QxLi1sS+WJWq0L8MEBnd1A/XWzcBHE9IhztFzQ2rXFu4syXqwuTKok7G73mRuBYHzB4Ck+5iZjC32TSuE1f3FDNGTxCYgupyUA/O4h4d79xRcZWUc064sTq6+0xFil6ree1sGEt/JEtMqesTFu4YIG6ISoIxs2HH9KQifIKx+KhZF1BWvptc64E60gNn8lviF5Qp1XVGptpsV0E8swqb9AnA0dfsDnxPkFEhVaNJ/o3JGx0bX5I6mCZNiS449PoMARFS1Gy+9L+psOxq87t6R3WiZ2aPsSfr4XGzkqcKIENbKO3yUuOJYR/mQ6hCvB104bAfY9lILsMN8/KKZbsKCndcqqhpJTjtRYisFs1iUvqUScubd7U1JAW9/3W3zN0k8zCf3oDGMUFLRMDNgsrqPCWvJUhhjPexv9WTzGvjup+cKKjCEeJTOH3nJ0quqPqDTduMRBEAU3pPE7I9NvfNeyWbApx9+EA4KV+8T3tZlNdH7giJp/sH0k9Z1PLWyH+BNr4d80O7hTCWY63HJHPAlJJ0WgWMwc3gJU6kIny4ZMl9AFXmS8/189HFCK40vrmXOZEYKsQNLCv8Pn5x72GszNjIEJLQBhI+VKrnXj8sFk2S1PEiq2/hhyJe5NcOZ8WS0i0thh9Rys4a9+ZQakpoxGIwGxzQMJtepZgobOOqwcaeG X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08f614c1-c0d1-48a1-957f-08d8f4735c9a X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2021 18:32:38.6305 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Sjuo4llG4P2Xo6tVOBSmam2l1v0fh0VK9ruKu7jM6JkcCneVP7Euz35S8J+tSfZCZkF1GxxMDYpGWjzzeeL77Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean Several architectures had a default board_fit_config_name_match already; this provides a generic weak version. We default to rejecting all configs. This will use the FIT's default config, instead of the first config. This may result in boot failures if there are multiple configurations and the first config is *not* the default. Signed-off-by: Sean Anderson --- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 9 --------- arch/arm/mach-rockchip/spl.c | 10 ---------- common/common_fit.c | 5 +++++ 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index d5131bcf4b..46e8af8ebd 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -139,13 +139,4 @@ int spl_start_uboot(void) return 1; } #endif /* CONFIG_SPL_OS_BOOT */ -#ifdef CONFIG_SPL_LOAD_FIT -__weak int board_fit_config_name_match(const char *name) -{ - /* Just empty function now - can't decide what to choose */ - debug("%s: %s\n", __func__, name); - - return 0; -} -#endif #endif /* CONFIG_SPL_BUILD */ diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index 4b5c22dc13..02c40fb37e 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -151,13 +151,3 @@ void board_init_f(ulong dummy) #endif preloader_console_init(); } - -#ifdef CONFIG_SPL_LOAD_FIT -int __weak board_fit_config_name_match(const char *name) -{ - /* Just empty function now - can't decide what to choose */ - debug("%s: %s\n", __func__, name); - - return 0; -} -#endif diff --git a/common/common_fit.c b/common/common_fit.c index 219674d467..cde2dc45e9 100644 --- a/common/common_fit.c +++ b/common/common_fit.c @@ -22,6 +22,11 @@ ulong fdt_getprop_u32(const void *fdt, int node, const char *prop) return fdt32_to_cpu(*cell); } +__weak int board_fit_config_name_match(const char *name) +{ + return -EINVAL; +} + /* * Iterate over all /configurations subnodes and call a platform specific * function to find the matching configuration.