From patchwork Thu Nov 3 21:35:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1699213 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=VKQjxxE1; 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 4N3HBv19mFz23lQ for ; Fri, 4 Nov 2022 08:36:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A9C7850D6; Thu, 3 Nov 2022 22:36:04 +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="VKQjxxE1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27F1F850BB; Thu, 3 Nov 2022 22:35:53 +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=unavailable autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20042.outbound.protection.outlook.com [40.107.2.42]) (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 A3D5A850D0 for ; Thu, 3 Nov 2022 22:35:47 +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=gVYYdQsyp/Ce/IJUJ6UReAaW+GmcBPKjXkYQHMQE337yZ8cgArhxfFlfudBfXkChpWrzFyLdGivYLpyzdO9nMycq2dNZ9ZUmSYfSDqYkEhb1gPPoEl3a+FcHM0Yt/+0YbT0kEJ+TnohBS8bSQnzml9vDoVW4MpA2zZOxRk6LwnTgFWIhejMpdRoPj1/YF2J9/RGRpolRUy2ek2v8Ls/sHrfYDX/nXORwELwXIaChWgeYXZ58MZMjyZds0Uo+HdtWsXpYMdxVqnJDXeQrWwHVUQi/2THimEPEKfxK/rQEzbqehbbbhtgulW5tfP5I4B458o/E3V+tyv6J9DiXvwuPhw== 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=4L76AoV1nEzZ50upEDn5ucbeif/RYiFJ4K1uWue55l4=; b=dNek+aIRAu72X1Y6rj+Zd7r+QCK0fTNyIjR7ix2pQ4/QkqV3+n/YcZmT+JqbVtgSUoRPpSLYXct1FYf/Vk4JIuBGcbjtk+fwNMOfy9SKPEpF1b3IjH4NQVk35pLSv0oeIRh0HtdjMSPLY6X8LWeAn2wJy+JwzUgGqZurTPOA7Ku4j+Nj4Za/K9BqCxRFsco9U82Bg3My1w046U+hHAIjw8R9RR30j8nZIQ90hvYuchAGKxWvUFNOHK6GTuB96OWxCBbVPdO8FLtStytlbzla4MYbok77PzO5LWJogXbGfNFWurMBMAG2TaN5J2xw2UgBWaCm/u8LvYaLm+xgf8qhdg== 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=4L76AoV1nEzZ50upEDn5ucbeif/RYiFJ4K1uWue55l4=; b=VKQjxxE12qHI00UW56qu5Dpwk+NxpfgwfNAz1vFO5Niq0zmf6QXTY4ZWiVfwvn+SEX0aCinfwJr5YiZqcMImHkE0VKk/iOS4FEqNhU91mIkccVXqTlcPYpirfiSJvGgr8jO800Z552CX13tVcuhdRZUuKpz9yFDS+Z6CKUZZsuB9QHNcUYefmLtnCySQ5O3HQnk/YqryDdK1QLjaBLPGR4JOYcVFuQQolLhLzq3K3mfQPu2n0011fWHHMDYT3uyWcqiJlbdPeAY1+8VNRDcK5nT9wkDT+bZTo4fneGErU2sE5N7MwXFh0ff3nXoV370myLDCl4HGDezS82pV2/yRNA== 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 DU0PR03MB9660.eurprd03.prod.outlook.com (2603:10a6:10:42c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.20; Thu, 3 Nov 2022 21:35:46 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::e9d6:22e1:489a:c23d]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::e9d6:22e1:489a:c23d%4]) with mapi id 15.20.5791.022; Thu, 3 Nov 2022 21:35:46 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Rasmus Villemoes , Tom Rini , Sean Anderson , Patrick Delaunay , Patrice Chotard , Stefan Agner , Stefano Babic , =?utf-8?q?=C5=81ukasz_Majewski?= Subject: [PATCH v3 2/4] treewide: Use NULL for script image name Date: Thu, 3 Nov 2022 17:35:31 -0400 Message-Id: <20221103213534.2336001-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221103213534.2336001-1-sean.anderson@seco.com> References: <20221103213534.2336001-1-sean.anderson@seco.com> X-ClientProxiedBy: BL1PR13CA0376.namprd13.prod.outlook.com (2603:10b6:208:2c0::21) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR03MB4972:EE_|DU0PR03MB9660:EE_ X-MS-Office365-Filtering-Correlation-Id: 507dec9f-65f6-421f-6b8f-08dabde35e6f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jEN5Wr4JCU2XwdBUPCVlMoRi0VMapwuvJkWoiT4F+y2iPxcXZwbxfQhLKDP4WZIgpO6jVvmCutdFmBn3D0XJfiymDqECi+HEzevnC6kuqTn6PLSnlry4lgk7F+BckRYjgKxxrvCc22yEzx8GIKuVxy6oML/wkQ3KxaKg/FuBPm8/ebjvePrdZFDkQU4+u+HnnLMfNcWGc0mkziTQZh/JxMf2x1f26so/Uh9QUgypFeJoyuRjR+34nfi0azgqdoH+NG+W8iq4DtnzSaC4UmP8zx9Dni2FIm0ZVpobWpYXwI4AG1ij5ZjtLg6l63jueEs/X81kEZcKlD7foFwxUEUzObhb1Vyy5KjiW4afcw1enUYyxjQfo7SKKy74K6c6AVAc4UjhiS/k01AW49+Y4WFm6/cszM0HF9kkEjhhX5eNhl12rVJ210RYeBBUdnRN0KutsywMopUVTC/80c16TGjw4EhBYno7tSXLRX+4NG/v4wNSlK2rAGa/B3UvpAd/2oD8V/Vk/XCp98s6RkAXhfUdTtcJVBrNtOBJmQuNEb4dpB0nBU1DVdTmneMcBfLuYCuM/o2t2+aNGxNgeF2rCOyGNy9et5suQKfD0oOh5aa7Zods5X7Uo+n8IJZFfNzXsYPuBcFRCmusYU8A03Q9yTNjqa3G57VvzZ47jdA5gDqQql3pgOTGZY1XiMtoEY4lDr1Vmrj+98iWcvuM8nejBfBi0aCyqem2YW3Q4gnd0TiAP6pD0HLMSC2y0GX/KzPBrWwkhcZDmbbZkDrgZgAtoalyBA== 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)(376002)(39850400004)(346002)(396003)(136003)(366004)(451199015)(5660300002)(316002)(52116002)(6666004)(54906003)(4326008)(66556008)(66946007)(8676002)(6506007)(66476007)(6486002)(44832011)(1076003)(2616005)(41300700001)(186003)(8936002)(36756003)(26005)(478600001)(6512007)(83380400001)(38350700002)(38100700002)(2906002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?4wGYboXOOrHFIirMgXthLnKYze0Y?= =?utf-8?q?AItTZHDG2DGM3Jfp/o200twEebs53oF1jHwbH69FzdqgQoe1gwLq4V069rxO/o+pu?= =?utf-8?q?53hIY93z5xkiqPD7l//8rKQ7FL4txyj+tYi68SnPTP4jLxxyFGkpee0hAdhju4o9W?= =?utf-8?q?UadX2ZxKjcdKR89fdr/oEEqVI94SpFavVI1u7MvEI8NWdKkh7TCmCzJ7iYM5nkeFm?= =?utf-8?q?8eC6OQLNrVwNRhdkTwbWe20uPOPMFr16gjbTejK+tt6USi0AKz54UGwO0XC5ysDiD?= =?utf-8?q?xUU53PmgZ6sp7f7rEP7JWJTe5ORxG3cRcOPM/p6qCqUIFAhJk7SU8sKW/7BTb3WqN?= =?utf-8?q?OmHf89tqEKMVQhe7u6O9EcmR1Ib2Pb5yDhB4ELy01eHyMXIE77kYYbSP9N3p311y9?= =?utf-8?q?FLmFAwJ09Ur3kcYQqGB3cTG/L+iPgPHHFjOfUDCsEhPIGfMfaxHVvpnirhek5oRBj?= =?utf-8?q?X/yQWB4EGgm2abZ6nlLZylMK/+E1EIGuu2bRgxZHWahpa3P7kcpT9F8vWTVLTHF20?= =?utf-8?q?c3GKyQj9iL0EU++bov5sqra52DnGhUiWq4MnXuxdRUkgZfK0eUAwvt27j3BviDWQh?= =?utf-8?q?6BucEX0eIHlISN2hF3oSYqH0cenwVOlny5febXBdKILX/wODZNBd0jpfHNHzGieos?= =?utf-8?q?2BtAlPiLD0gsNGiQgntxqxkbM4Ax96/akCoG8EDrAZ1miURP+H5+l0bJEOJ5Yo0c1?= =?utf-8?q?I2u9OXTQu/yulUNC2+DWR/+9CJwWr3C1Z4gkVRlCbr6BEtdGpjTSqz19hii4Qvha2?= =?utf-8?q?OtdS8ISL2Tck0Sepx2e5cc5UMPZu4ZMMAEuLa1/0wPqEwq/4C8KLaaVFUPAp60NOY?= =?utf-8?q?vKeqke1P8iblIUFxs/lwh0xvZ/zi9R+MRVqYxKPnhMNc29LGtEF8jGb6n8kfCQGYT?= =?utf-8?q?/aNL6dfAT8g3UQDEHI+VEco06UNPhGXNkM+8jjZiSKbRXmKZwCVG4GP6VMTGdJRBo?= =?utf-8?q?mMn8G7XQEuDp3uok6dqtvr4/HFAvj2J7q1fmnDAbdXvLEGI532dvm4CC/X7lEmmq8?= =?utf-8?q?rSD/iUU8ghtIBESKa9CHCb0eH/ZXjspqnrtCabjbRhxJoxRDMCty7d86VLxG4sXRT?= =?utf-8?q?AHTy/yYzDJVXhQZ+NmD52Ku1JddTEwigC3jgznLTbsD7e63qRddMcz60cZ1XOblAD?= =?utf-8?q?yAqN+gIMrQHqKN920Y39LhBX/jnqM7UyOL0dEY4mViIYBg4re9jwk8cmmYTns1Lgx?= =?utf-8?q?MTX/6JbXZmaDvTzwX1H6aqq0yMDYzEfrgnGLXJgLwdeu4dgCq/5mg7mU0ln+A0lqr?= =?utf-8?q?OxXDVUvc7yq5U1haDHE/kcGT1HPWgJF+Q45ZDkAvmLw8dGF8tf9uaDdPZRraDjvrX?= =?utf-8?q?vVoBY9cQtUQlrWGCL8oZ91ULPHB6z5iF7vE8OSl5JbBtnTdgGWgFC3hbi3o4SFujE?= =?utf-8?q?c6KxcXG8oiydjE3HgXPIEtzWkmPiWaNLmIbp8BXWsY6281w7q2WfGfV2Dl3YGnIpC?= =?utf-8?q?dXHjng++oIY17ghqsrexqFRTtaBob7KGeJOFmAjzeRCOBDI/tmrTagz7Yw+7RoIOq?= =?utf-8?q?Cs7EW2uLE3N9facTvnKpzmarvxiwGupebw=3D=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 507dec9f-65f6-421f-6b8f-08dabde35e6f X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2022 21:35:46.6870 (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: GkW/aLUjWNU6G1L45sG/161T7CWnbPLjsf/3D7yIJYV51k4DaFNRa8zO8q9Xb9FJFMpPZz3KdhRg1Up0RLYNOg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR03MB9660 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 007f7131306..3627b4c35c9 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 af4b167e17a..1643d289477 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 }