From patchwork Mon Dec 12 19:12:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1715128 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=CEs42lS3; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NWBBX58gYz23np for ; Tue, 13 Dec 2022 06:14:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0D79B8546E; Mon, 12 Dec 2022 20:13:35 +0100 (CET) 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="CEs42lS3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9325E85450; Mon, 12 Dec 2022 20:13:24 +0100 (CET) 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=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2067.outbound.protection.outlook.com [40.107.20.67]) (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 0074485207 for ; Mon, 12 Dec 2022 20:13:21 +0100 (CET) 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=A5GHITPLdR8iQK+Cc73jU7ch5WTt8yRHtj/u6M2UDbpoi/9j6mwCJa/G+Ov6FYoJC5q5/2jo7TAu7mm6OK8Z5M4uV9bi/2UKxXq4j5j82JDCIfdTIPWaBfSMV0KKKLADxRqxyQQftKuB45oKB/wiTh8Su87/5ImKhZzpO3bnSy4gm4aVz7wI+9VMJliko3shkgb36N/jI3NkxjZMEzpkYTQRVyEguQNIU7Of+J5PAMPng91FqMzv0BLq55UUlDw8MK9E9QqvJMfU5mTt7mQmXq/pAuakQo+s35VppQ+R/qvh74ju+8wvNuEFFXLHWEDBpeegIpa5fkHdBVI0QtBXpA== 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=SiMpdFuZeH5bdikQFnQNd8nyl5GK8sbCJ5XY6gyP+XI=; b=G25JVevFeHGpuv/K0ISawNBwgKeYElKOgebArDHfAfpOp9A+XY2MvIpdRqJK5RzHOYYuK8FPnUen7tVEJTkPe+Zxv/ZApvuIHOKltCenw0mABJvlq0fDTH4rsgYX0XE23fD6mJf8jij5WVpvHBa0m8FcHtr2XLwW7TT56aJDRaW16sMrao+1XLxXVk2Cu8Zx68+QtGXotKiYDC4tccCj9978PItxwY6XMrMBHPJKdRKcGj0fEZDTThM80MVlWL1N2TFdzB8ebrcTnP6RyPxhGedihO7kTfgMaq/fYqXjBUae3X20iXI3B/JzhFCjUBZwzUfsX5m6hwF11FW9MDgSXg== 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=SiMpdFuZeH5bdikQFnQNd8nyl5GK8sbCJ5XY6gyP+XI=; b=CEs42lS34nLd2qxthK5GL3TZGlSr98dwe9ED7dAwfyxZL5pO+eN14GaDo/Ilt+ZcZ05cRlsLzPAzM0o7lRvzyaOu7sgVImOxtx0haqkG1QMy0pTcA+RzaXDl+H2ptEcko5CL4Xf89HM7YlQj4a21gkXEynxaV6EfydoLFOJyz7DadwPIbnP4w1T1rPVEKDNg9QNQMfrXMo1m5JCy6unPXo+TI9tJzwjGHUOvYnSJT0TXpgNW9BKZuOIg3Ni3uOZVIAKHrVWoePyCX4EMxViDCe6OfbHj6QEYgUWnuADbJMyUB+0YY491DutwyzN27OG3JypDQI7xs9fQ7QK35MLX5Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) by AM9PR03MB7980.eurprd03.prod.outlook.com (2603:10a6:20b:43d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Mon, 12 Dec 2022 19:13:21 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::2b95:1fe4:5d8f:22fb]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::2b95:1fe4:5d8f:22fb%7]) with mapi id 15.20.5880.019; Mon, 12 Dec 2022 19:13:21 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Rasmus Villemoes , Simon Glass , Sean Anderson , Patrick Delaunay , Patrice Chotard , Stefan Agner , Stefano Babic , =?utf-8?q?=C5=81ukasz_Majewski?= Subject: [PATCH v4 3/5] treewide: Use NULL for script image name Date: Mon, 12 Dec 2022 14:12:09 -0500 Message-Id: <20221212191211.2105335-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221212191211.2105335-1-sean.anderson@seco.com> References: <20221212191211.2105335-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0046.namprd20.prod.outlook.com (2603:10b6:208:235::15) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|AM9PR03MB7980:EE_ X-MS-Office365-Filtering-Correlation-Id: 912b59fa-2269-426c-d6ff-08dadc74eee0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M+yE7EOoqFa6xrRTj8NO1nTr1dSbO0xS/4luC8xA94thWrnEgSEU6JvkCAQAqTWPrLIFXWW6xcqieUAuEJQ+ta2vWGelc/tFvxOb1G70GpP4vvSXT+H/luPx1ghePRnk29ZzqjSGrK7lEv8hDuO5DaGhQmD+teLEUtNE2a9U6jR6mATfceb4qaKHY3yzxCa1xNg4YY8Vi+HN3mQ3XD0ZycngCCr9LSWkJb++sNAHi6Gf3phOUzpLhtEIUV/JSozbyih5doHGjWEEyW34oSyhxRO/nCV58wy4NphhUUcIuQQNxlhVmF54YsYfnhD3nOdR0DESzURhDRgBvW9SNFAs0gjMyboqqU8NyCp7AyZr6ln+vt7VlczDhVh7LnH0c6pT//v4PWsO00AtISO++3G1MS4hmEv9MSclaskpkzI7QJfsLB+dLL8fYd79jAqDW9Lkhgv7ipWmhBxdiSra1US+QZooTpg2cpZylIKjaRs+tWYCDyhNqLaDBOZTPYuiK0zD8Gh6icjYw8nBfKrR5c/lNAVB7poDN62FO6Yfeh9eemfWwe6dQDQxVdd1u0UYLMAQ0afHHVNBVL+2ldMexRWgHEyFwFpmTPrDaBJUq0o+Guj/FJiMuBOKNeRYDznrI4gcb5r3+jlaFB2CkJaXMDzZsawkWPGzRZHjojzF87saLotngnB2G1moaq5uQpUGn+txCfWD+lSBnRLphTMkDdXJOw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR03MB8847.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(136003)(366004)(396003)(376002)(39850400004)(451199015)(66556008)(36756003)(41300700001)(52116002)(66476007)(8676002)(66946007)(4326008)(6916009)(5660300002)(54906003)(316002)(8936002)(86362001)(83380400001)(38350700002)(38100700002)(6666004)(6486002)(478600001)(186003)(1076003)(6506007)(26005)(2616005)(6512007)(44832011)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?JyzsjLwYIj2lh4rMqUFr150GGSEA?= =?utf-8?q?HxcxbFAc9eh/4mk7jcOD66CfBYYeHqjSpgUTAf4hAffexxiWIVUAIHYlLi40RFsOi?= =?utf-8?q?oVQXQFgTgLUhhqmd+YAhhExU/uJ3cJnHTDRvQ3q8bfnRxznIUy3LDjOAAh1GorgwT?= =?utf-8?q?HmvT+RV2jPlvGWKtLM2jHCar8Wwv5eIFEKJOsokxvoIkgzBf4zGiA207JPFKI32/8?= =?utf-8?q?rpZul3+SS8mFkh6tPAlob5Y0R0fWDxQ1cX6H7a7D/x5nkKsR2ka3jGKl/InT6vPRO?= =?utf-8?q?J7/JlaKZgis4zE/R6CXOBZEgpCdixZezMFGSL6BZzk1/WiiYcAK88dq6xSw7SeyJY?= =?utf-8?q?jB1HzgKIyspWonL6IQUh1IA1idMtQJIAy9F+I5lOvZadyLNlvS73JP9LsPh3tQfbJ?= =?utf-8?q?Bxxd1ewn8hbcTf8n7AS7xguUGvSn9XjXqiYR8bEWHEDsJWlr/FDf12OqMx4uq6CuM?= =?utf-8?q?yCbfyd+Y/GYACL0Tqp+v6rtLghEd5fhQVSgUwAAaJ37hNze//wXZF7zplzgozKMx6?= =?utf-8?q?+9nsrAqD1HQnpBYA6ItL9o98zT3KevSDmQrjGuVtwtfT7LCrLbspe4PagiPBwBAtu?= =?utf-8?q?QJIvAyfuTCUp/IFVYjNCGDuOSo88R4kPg81KFIgcrl5K/1qWGBApwWiWbqMGf91F6?= =?utf-8?q?z8/qso7RnW9hxhp3dET0XlihGdOtWOXmJnAcoQYsDhriQUi3ZJ4sMKSvYhYS6fyGy?= =?utf-8?q?rsq4sntofqajg+m6Z9HC5PrwyDHeQI5Q0hxDojh6/ewlysrf7ETf8Skfs4HhvGs5s?= =?utf-8?q?0YNBcRFAD663HR0t3wfGnLOjD5tGsW0r9mXe8NNbJHPcQ+RnsPsIuqaxX9Z1DdOh5?= =?utf-8?q?o8VXSCkV3IJ+t9ES7uN25mwVjvDLlmygTkLf1PwEvrnJ2/lscSwxLfuEAmYop6E+0?= =?utf-8?q?tY59PbSZo1NFoultIzzzOau4vyz5C63fiP3ZeGvR04AodDe6myLrIpkB7mZz80MYZ?= =?utf-8?q?tPMa0267FVQVoqzGIpf6C55izaTPAgJhwsUkuFUHA2xpM92zGYP7MP4hfW4PYoBkW?= =?utf-8?q?bpge6Ss/oYG8ItRmpyeEwo/wVzIDdRjUaUH7XShKgNpxJcXkL+sWL81FZQt0kaUeS?= =?utf-8?q?RJA6iJR1NLudddSUdSdwbHLGWzXtguIY0yeA3yJKoT70jjy0Ddg4cl/fu6OqGqTuu?= =?utf-8?q?FHvzfuLmdOx8LlqY0C7CwZJzfCDPnMzRsNw9EyqPLdzBytbYIFKSp8JwHGLShSA2P?= =?utf-8?q?485dD0kARQiSgAVrJz7tMxg1+4MMqKUgHnLxqJhQ9MjyOemdT41v0DYEgVQCHwwi2?= =?utf-8?q?WJNAubDr0mvx8AR40SJFWQLvgatSpKxesPtXFoDSLwBCnRwJt658qAaohSYIdd4Eq?= =?utf-8?q?i3Ta5ZMqHtJkLnx5eiM/9I6akA+1TjBF7cRV4XlpsU8IcODPxAfvjul5yYlD/98Dl?= =?utf-8?q?FvDCAPAH2tYYOWDIGEdzv7nYESTx5NKK+CmqTqeD4ueXWHzrl5L0xcu5BUOR9ou96?= =?utf-8?q?6nY64tGllYIB8EG6dwTEEChlgiHDt3jq3up8j1RICtR+T/iUBZFHQTnDrVXqEBm+e?= =?utf-8?q?XUO5SbD8kMUkmg1bJ2A2sQ9tYMQaDWPV3g=3D=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 912b59fa-2269-426c-d6ff-08dadc74eee0 X-MS-Exchange-CrossTenant-AuthSource: DB9PR03MB8847.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2022 19:13:20.9313 (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: VHYcMXLwpekFcQe3LkLF/0CqshJR8fUmtV9XIhwrzS62O+Zc+1sxL4JyfSNgeKgCNcbgNwbdN/SW89QyXCNs0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR03MB7980 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 007f713130..3627b4c35c 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 af4b167e17..1643d28947 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 }