From patchwork Thu Oct 20 19:24:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1692692 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=F9as/c5H; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MtcxQ16Sbz23jc for ; Fri, 21 Oct 2022 06:24:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1E9C884FC1; Thu, 20 Oct 2022 21:24:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject 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 (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="F9as/c5H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ADB6F84BB9; Thu, 20 Oct 2022 21:24:23 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20059.outbound.protection.outlook.com [40.107.2.59]) (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 1F33184E9D for ; Thu, 20 Oct 2022 21:24:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject 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=CWhidpthMhYvGjtI4mHOSj86Uw4dU9RfprJvkm05EBBg5EwA14yb1dafcO9ELgvD42MrwOmIVtLb6xJT5La6WpL3zgwyFKu2wK5xADsugSKvQlbOgiHDD3bj/5wx2BeEEVAYrZGcLXeOAPZri4qgRbqz7aakSMt73+L5cZv+lXeqZNDmj1h7XK1rODO1hIOnd0Ifd73WQHFGzQ4aK/VOqmjNfJqiZ0lTig17iecynEAl8KKRixIrtZ3Ai1fk10nEiMDtkKutGsk6D0ehu8SaWR2HTIMENIf+HLvhSFSq/jJM4s2H0OIrCcjwtsfhwLy6Zxp42/bdSKIioqvEg97kxA== 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=EcEsj7jR8RC0jPoa5wvnX2zlYC8PR23wXeAXNbVfqh4=; b=C9VxNfgIkVU4LjmHdHiEQqU0U2DDPS2PVld3WHIqhdDH8cty38q3gyN72hS8B0sh1ozxxmljE++eX10NdgG+4RPS0rwpVQf001iJy2yM3EWj1VxXSyh6unO6lzwZ68kOamBWHlIHPLXULc67tz4BdEb7TJqOEezwrEE0c07LKF0gPhODSprJwTWKTse3ndunbcKEKa04FQXe223+ehFgN8hhTetQuYsx9tkO2QUi+FBORANqN6IDuQhWQC4yR+OQLvrmqEIxOPhJTwfsZmdDI0VoiiZLzKcO7hNydx/EQc6gktM9NUlBWNeVQWFQpE3F//MfFp4VtSjeWGKhMwoBYA== 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=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EcEsj7jR8RC0jPoa5wvnX2zlYC8PR23wXeAXNbVfqh4=; b=F9as/c5HWDrUuK7ZMRj/r7aPEe1IHZ7Smo8l0uln+684Qx32a5ltFT4oC5K2P1soNz8zD5lzrFCwvt4t0VVPe42CBWJGpwurGX2UmKoh3HgN6Xjk6tKtuaI9IoR5W0E7nohNl5qpK3Xe/BfEjGjNr922l7KJSiaFbBJBQNYpMKAwSGioRObLiE92PktlflofaV3/kRYJ2JFJ0cXL6uNhzfei2nR6tXDdu4UI8zp0guZF0qosV5qUkxKlbBStRg49c03TGk7QL7+Qvbpb1/JL4HCRImgTyFzXEHC5MbDsMHgSAdmDG2u0pQFule+WSyV9SlOCGaa+T/iHOjORIJAGrg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by GVXPR03MB8450.eurprd03.prod.outlook.com (2603:10a6:150:4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Thu, 20 Oct 2022 19:24:16 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::204a:de22:b651:f86d]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::204a:de22:b651:f86d%6]) with mapi id 15.20.5723.034; Thu, 20 Oct 2022 19:24:16 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Tom Rini , Rasmus Villemoes , Sean Anderson , Patrice Chotard , Patrick Delaunay , Stefan Agner , Stefano Babic , =?utf-8?q?=C5=81ukasz_Majewski?= Subject: [PATCH v2 2/4] treewide: Use NULL for script image name Date: Thu, 20 Oct 2022 15:24:02 -0400 Message-Id: <20221020192404.2500251-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221020192404.2500251-1-sean.anderson@seco.com> References: <20221020192404.2500251-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR16CA0044.namprd16.prod.outlook.com (2603:10b6:208:234::13) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR03MB4972:EE_|GVXPR03MB8450:EE_ X-MS-Office365-Filtering-Correlation-Id: cd8fc4c9-43a1-457f-6915-08dab2d0ad92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0drfSDMDKYLfqziPOcsc72/bBfZILNdsk9M91CEmeEgRetukco1Eo+ycmplmh0M62uj5YP9xnr2olQq5CMpESqF/8BxwkPuU+hlnanLyvd9FnNsN/gKBugYH9ZtgEjVKijav4Wa0bKVPYQjVfGpJiXR5aTN3iEhZgzde7+UcvDVVmHosmZP3OXXLwIHRqTnPl67YJmjo0Z3QSw7HFvovpfRTFsEr2i6Pn53g/kSoVd6nepsKLtcNTTEZy8LyCAs/8EWUlqfuqN5iKlHRQatAg9lNME8XmHETuL0AUyrCVJe/vnkYTJvd2cpBJH2C27AjtvAvhH3MLZ9BQ9tWAYLnYyN574LJ/XhKhoj7uvytfUB2G6VCLHV+BJ1NggZ0vrRrx96NiGRL9AqE1I+O9FCh+iBZMVjfNQsP94zC4/S4IAwQtd1CdELN1CRpSL6dip4jKVN5XxTNJble+msS6XZnDqPPN804plfPr+vGsn3mgOzxCpon+GGjbx9Hk3B4UMfFcBlWGApz1C0DmhbyY1WB3oNs9XDnwB/Q84bClV3vVJTeFKZGCeWQtK7f84LZBXBL32HNhA8Ze4Amy5VhH7hs09u72QuhbFyaV/oPqrdQMemRVUYzeTqjqOLBQw0LNAf/jbk+pQBVLAzat61zuOpTSBJvpqx1/N4t709pVVUew3A6ZBY7qkYjtEhgfJjpN3l6yg3amBht/hHw8I8sgwSNXaHGhULIB4C55NvO8+ADhlaVPbomzguUj4Ks9zC0p1jCRNMhCJjafGDElzJAjMsnOg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(366004)(39850400004)(136003)(346002)(376002)(451199015)(66556008)(38100700002)(38350700002)(8936002)(41300700001)(6666004)(6506007)(52116002)(86362001)(316002)(6512007)(26005)(54906003)(4326008)(6486002)(66946007)(44832011)(478600001)(36756003)(83380400001)(8676002)(66476007)(5660300002)(186003)(2616005)(2906002)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?uHIO+ajb36kJ6U58Ax89wOrip6Gm?= =?utf-8?q?0lmsnlA8GlVOhM0zat9sRT0zKnQcdrPrvtfgysX1ta1vJ983lgULuk8yfdrotodEL?= =?utf-8?q?VUHjtGlR2t8y3yK6LbnNRkekFgZiD8nLx1MFSZdfhpZJOAwuIrATlAzRBJ+pzQ8V4?= =?utf-8?q?V/M3mL2i2mlL8aV7h7hEx8s3NwLNZTSokxp6WzBxksAshMg+KTJNR5ciOXs888poj?= =?utf-8?q?9M/o4P8NHLdpeMUfq1UbQzUmc7pMM0Mva0FatjzHKQkAq4Zk3e8g8CBHAgMkwyZhx?= =?utf-8?q?WrDnw1OeIYUAimFuzE6/IZlp60wroH5KmMfz1ZcoLDTMmp9p/ZwpC3c88cTcLWWpW?= =?utf-8?q?rbVHCTtZu33P0Kz77TiOaJLqhQ0vlXjhKe09U4DbhGfmD7YAXZ9M6y0AY6ASBunSb?= =?utf-8?q?rB/9xCVWaJCWCWAg1iPQF8E9+4IFt1H/buElbxj/FDLT6HQUQtuBj6NWO8TKwfAKA?= =?utf-8?q?CS1JepuGTJ78+9P/5LzhfIUr9cBZVgh6PPXaM3aOL2wngag1LO3Su+rHklYJ69gXP?= =?utf-8?q?0CWsde0Ki1gkFNV8nJ2g3yIOloxqGCo7Ei1my1yvj+Y8NuvjFbX1JOgATv403sRgF?= =?utf-8?q?sWqPiK7V9QEO0x1b/csx04q37SH5FZ50qLa3J46GMNmpQm7glUQO3EuLr3MbePCcJ?= =?utf-8?q?iammfUCyzmd6o1UsGg66mofoTMtdCahhKk4J9bhMSdZR9Ab+mVhDQxBEv6Ou+Ua3a?= =?utf-8?q?R++AqRFWR6xdi8OlCTIUrU2DTEEMCLk18DOhL+BDFCl7w/3Wy0n1Xkq3yGi4QuQbD?= =?utf-8?q?Afa7QRaSQl5h1Ea0AYqxrI18PDeVbqwmYzdtOVi1JLMQCwHQUr/PLQ0tkxSTo7QLw?= =?utf-8?q?eB5ilxAW7QCCIjaTruKTbmnzPEqcEkY9YTwW5pIwmYxNDnwYjl2HEMjAwoxISrv8m?= =?utf-8?q?V76wYjY8Ws09XHOG4E7g0HI4p2tWYIwRAd+nBJyHYYv42P+0f/yVIWq7sOgv5JW2r?= =?utf-8?q?vJq/CW4ohjUHd2xpPWq54VllnrDyije09lkIItzzpK7XFSrVWJV1W6ZU+KMnxrQYE?= =?utf-8?q?QBV/yeKUa0Bv9XIZtXvqlfrmZL/LC3zY81aiVEDCJPmiqYGqHSMNKyLiPmIbEzW6R?= =?utf-8?q?SLg+5Zb5zvHvPULC+8ug3e4fZkTR+wqw0fNJOkQcOEEaVRegR8OcEeaetzCu+6nJE?= =?utf-8?q?7e9ViozjPA3ITMlBQZfcKtjeXljVPjjPDaHm2W3CZj5fz8V0GyJrZuk5egH+iyPpx?= =?utf-8?q?S00LaBXtC/1qDWfNUMZ1rkP/BuauDIVlCkvQFdM+Of+iV9KfEJYsTmEcX/rTnKx+d?= =?utf-8?q?5Tig5aO27dyrG9EXbb5Y67tNPyc50pehvqNiSEwM+m+YWt9cuiBTMyVOvOrphpP1F?= =?utf-8?q?VyQqZrfGullP8FntUm3Z6JIctFbuvARfjVb6oPtpFVgayOBEH1hagsCkdFD4ZUFhE?= =?utf-8?q?ifK4m5ltlwueUWCZknSGZpXycp7UCAN4HjR7p6YExyWkoX1srOx+e6tZ6elb85a0t?= =?utf-8?q?utwJXTE/FKClVef0mQ5dqq8PZEFDvBT74WI8XwxbtCH/1jH4W3EeyQR46sMfyZP3w?= =?utf-8?q?DPN9Mkq1kRy3jolVDg5P4IZqf0P1LP9sBQ=3D=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd8fc4c9-43a1-457f-6915-08dab2d0ad92 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 19:24:16.2435 (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: IG00EsRf9JQbBNVAc1uwQiHRlXhuc4QQjIVKGyr6BOgNeUWwCbPeXmkFGQbaAloi29LnYCUytNVdOROw1lTnBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR03MB8450 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.6 at phobos.denx.de X-Virus-Status: Clean Two callers of image_source_script specify an image name. However, both use the deprecated @ syntax, indicating that they have not been updated in a while. If CONFIG_FIT_SIGNATURE is enabled, we will reject such names outright. Back in commit 152576a598c ("stm32mp: stm32prog: handle U-Boot script in flashlayout alternate"), we even renamed one of the nodes. Instead of hard-coding a script image name, just use the default image. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass Reviewed-by: Patrick Delaunay --- This has a non-zero chance of breaking something, especially for SDP. It's not strictly necessary for the following patches, so I can drop it if there are any issues. (no changes since v1) arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 +- drivers/usb/gadget/f_sdp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index f59414e716f..9b4098da461 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -154,7 +154,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc, do_bootz(cmdtp, 0, 4, bootm_argv); } if (data->script) - image_source_script(data->script, "script@stm32prog"); + image_source_script(data->script, NULL); if (reset) { puts("Reset...\n"); diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index 0fa7230b992..c80698663cd 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -868,7 +868,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image, jump_to_image_no_args(&spl_image); #else /* In U-Boot, allow jumps to scripts */ - image_source_script(sdp_func->jmp_address, "script@1"); + image_source_script(sdp_func->jmp_address, NULL); #endif }