From patchwork Thu Oct 13 18:27:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1689680 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=0aHtuZnf; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MpJ1H1npfz23k6 for ; Fri, 14 Oct 2022 05:28:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C0F284DAD; Thu, 13 Oct 2022 20:28:07 +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="0aHtuZnf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AFEF084EAE; Thu, 13 Oct 2022 20:28:02 +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_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2071.outbound.protection.outlook.com [40.107.104.71]) (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 15EBD84DC5 for ; Thu, 13 Oct 2022 20:27:58 +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=ltQth+k8h0r8sDd/tuJwv8Na85CUX0CJGK0+IMzYX5kk7CRYXHz4EQdXHmuMp+3QUgefvsw6LMacENaqWv1P0mi1lVFZEUPnRB+bw8+pXGylFJ03gIFSX7iWs9xILNxB6NaisqHKxrYO5UL1DQS6xx3cI9ioTXb0zjb3TgU4d2Sq9tJgNrB0AlXLmUABTMTRrnDm5XMl1yuet3dsuS+4OMjuEHLP/jQATPTlw5a5y0lSwT4aXbR5OFMwodRSB50PJqkADYOhzCExB14DUb7dLlt9to9vg7NjWBcwrbLgJB1VJ8UGneD0vA9MY5gtKekk7zxQ8a6oJ3nDPMo8SDj7Sw== 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=4EUfXfijp5DHeJk8GK4n6/zdzpeVWi4MMYyv+cDH4a0=; b=dBq2L5VL57hd7qE55wI51sNRTtN1gNwlPEM5wRYy/WCisLhkVd4kYLrd+X0r0g2t17z0iLdDZEMtxmjK1rdRM0DKcZNwDNBpOiSmTqXnF0C4jgbZDNw7JBmrQX2VAWXX+nXyZm5tkjDuZ/ijWV6wy4G3EyzLcR88v0KM9b9Y/5dDXY5LvybwGZLBkI7J8l5yf1ur77e3DUei6H0aqyRp5t4sG+lV92ZlbDR7JcFr6nlqtxNumO93C7+88lFSyooWzoPKVeRSMA7NJf4j5a360BFTHmL9gCwAW5oJlsfYrdZYvGyqEjuK+eBSQLtfLQGd++gtxcAWJY5xSLaJjUoTBg== 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=4EUfXfijp5DHeJk8GK4n6/zdzpeVWi4MMYyv+cDH4a0=; b=0aHtuZnfLR8OxA9Vqx4B8xV8PYq0JpXgMdaI5FwQFCz8/xkoahrDEG3g+qqnJxEJ6ENe4iypaSkpMr1seQhY1g5TGg56w4cjtFiEkX01Pg2krZVXR4MaJdmq+3vHX/k5wOlyOdo+O8Dto3W5S8vcdKE+VgiHemd6RDpOSB+CHtBBvPFTg5SFGRlTj4WxyW8+qL3C+QqAQerVLiA3nbRKpttZOgaslJ0PCUj28SjWYXlrAkdbdSGdS9Kq/i2VNqF6h8QNF7FSTSUM8rNfp5XanR+H8f7E9X2D2UDcSEq8SBiGS4cVWVnJZb9PBrQN4JcXNBgDTR9owx3kmjK4ru1hfQ== 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 AS2PR03MB9718.eurprd03.prod.outlook.com (2603:10a6:20b:60e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Thu, 13 Oct 2022 18:27:57 +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.5709.015; Thu, 13 Oct 2022 18:27:57 +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 1/3] treewide: Use NULL for script image name Date: Thu, 13 Oct 2022 14:27:29 -0400 Message-Id: <20221013182731.407192-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221013182731.407192-1-sean.anderson@seco.com> References: <20221013182731.407192-1-sean.anderson@seco.com> X-ClientProxiedBy: BLAPR03CA0084.namprd03.prod.outlook.com (2603:10b6:208:329::29) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR03MB4972:EE_|AS2PR03MB9718:EE_ X-MS-Office365-Filtering-Correlation-Id: e5442b36-ec95-4824-a4af-08daad48a67c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BBIkMFbSUdqzeytShVxgQpXEXhIDUPz8qaUshBcPm8LClztDB89dOID0sE35heu2AerLuGyD8FETwGT5wB2VmzSkzqwaJswbyOr1pIS8bqDKXrVYTK9c+WQiNUp5YNJXJzHRBSOILOeTwbjTaIfabG8REAFwk9gI8QkF2gcNEWCqKWt943sZZgf1YQoKoZmwx8fet6Etl9Vq5Eim40LZfQtrcRGkLM7M0QN8yTo/2mjzC0vqZKuS3f4jxQbfTK5WeP1zDAOT0Z8fsSrc0bo3IBKdvScpdlVfP54HRTh3DKf15vj272p69/+8ZoRFyAUmClTh5nVQD/F3CczfjpjmW1AHNO5814YaeKTnR2jcijBkEqUpuWcz2zTElEOtz9x4KvMhgPuyAd41PZkAb4x4asPVZpAZwX+2BQoria7C4/pcBkOWZBPiVZNimkAVX5gBlyz3cVuOGBZFKrvFPi4ZmIFVLpCey6m4PzW9SGx3ZYEP8HJmsiQ5n/QAtIxDfFbBAgP9GiY00GPEtcIcB7lJtoqRph1W2Wj0uZ6hsJspjuPWiDlKpNgNNUuh5hVa2aACBgL1VwJsfd0bLl58BfTag2dxTcWDaDMTO6PxkmvJE0Zzy9aFoHKYjTt2PWkRal2Tk59HHpOHwAlEqx37TsJAcT4gWQ79F08ryDubmNgMzyfZsuiydC1FpdF6BHJtprTnFMt27NBzp5kdpM70YlRL5F47RVkQP8Ckfa3uGt3W7R4YehBjqznedRLW/n5Pb7h2VU1QLWLqNo8Fwh7wlPZ73Q== 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)(136003)(396003)(346002)(39850400004)(366004)(376002)(451199015)(8936002)(8676002)(41300700001)(52116002)(5660300002)(66946007)(66476007)(38350700002)(86362001)(4326008)(38100700002)(6512007)(2906002)(36756003)(26005)(66556008)(6486002)(6666004)(54906003)(1076003)(2616005)(44832011)(186003)(478600001)(316002)(6506007)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?FEdxXaSwnBPB3RyqfekexhDfPmmx?= =?utf-8?q?503MiWgFJ0tz2zcgIu8V27fhxBaRuZ/tYtcHtBi6QOMwE/7izPzVyy9QBzs0Ychhq?= =?utf-8?q?gbTuxkAtrFVzu7weOGZ9y1ZAgAKFMNd3MPkkyUQ7obYsb0u6YjThKngT9SoU+BMr5?= =?utf-8?q?5kOW2uqH9N9FddZDpTbdHxMgzzOmvKQZCnx+/xW8OKDQXNVpNvKhU5Gn9Hsi3aER/?= =?utf-8?q?kdkXB6N0eJatJCkKct9QjVSBRLtWH6QrT21nXzMliRbpSGqXZP/aivqY5q4Z5Sa0s?= =?utf-8?q?I1x8sTbWktJQMPtPEhQ4bGW4Zc1gVXnCgG3cNgz9jK6hvd/gjDH+PJnTFyOH80cCV?= =?utf-8?q?mEWa62eE5mOPR6V3QZdVIuXGnE0IIOa+dRakhrVdtkfC92afyi/WVTuvE+ugdZIvX?= =?utf-8?q?7YUeLahsjEMblHmPdATTmMeLSkAXESFxOwBt6Fe+tPHuM5nZmn/DNmXA2LHSBT8/F?= =?utf-8?q?Vb2eVaWbPbYqTR7zCSuyPbQWwZxROVMvgAamGSYcKlvP9k/Dz+JXAQxggcaFkkFMG?= =?utf-8?q?it6dyPuJAq6fl6Ua24VRrCFLE11tJC52d7gmd8hw8uzL5PdaTxSt3giHGXcJwbWBR?= =?utf-8?q?mzIqC0DLY8wDq65Z1gukrj2vopCF1cMbAYl/pYt588poawDGSy/sh4luj6nTnui3I?= =?utf-8?q?1HpfxKVupVvK2Xr8Ed0dDiiCnumT9axx/pJoe3W8vbh0UVKN02mU6tM3FWqZzZXHh?= =?utf-8?q?NQPd3iKGVrr0YUWHbqw3v+X9ulQwzyvCpxuCEVg7//F4F6VY1Itj2XvvIWWHOle7Y?= =?utf-8?q?UT6a0M2RBQaXq65wEtIKniYY14OZRDY+EwvuNjOxtOQc3/6G6TVAF9t/RBe6YO3oW?= =?utf-8?q?h4gT3hdz6MDmbjd0i4t6eFEKM92HSxhRMS4wxwunPhmrMgt1BobYyBHMJC+z8Ahti?= =?utf-8?q?nNoceIxFXOq9Uh8VTlWNv4pEexR46DuXYFWF7qVvydiRpn4bI6Bkr+ng2tMYBM2jb?= =?utf-8?q?d+N0h6WOWju9Rx7pBLmxMIpJFWcP5pDVEA6snf7+WyOfk29FMl9JgisoR2k3+otu2?= =?utf-8?q?sVZH1S5jOAD50ZvR7FAwcRzAzhVQ2d1oMG8Rof2/NfzWhUsl2zcvzGXuDOE5WyvmT?= =?utf-8?q?dCdsq/Izu+Iab7KexHIX8K6LK7OUydf+JQEEmG6Ou/QkOjHS/1YQuipLlLQ2NPdvE?= =?utf-8?q?01eBxu9AjQLQnz/ACXx5EPC8aFZblLv7W9yA+XMZH/Cs1IK3aWOruPRvW7OjcVGVs?= =?utf-8?q?277IczH4/gnMJOkzoIyy5EUsbCjcJleo+V2GCLJfClDGA6HbdkKi4cjFMXyfht4nw?= =?utf-8?q?Bo+cQLxQwFVVl/yDtjIyhnzDQj5M8aJG/2x76JIeaLITeLMwms0fkN0UVLem5nune?= =?utf-8?q?OPvHYSqP8dWzPVaKLtFf7niyPTzF44N6zU2d+vEI+b2Nn4IJNjQJ4KbqrrHebVQsW?= =?utf-8?q?9h74AfJkym9OxvMZE1KSALZKmQ+NmOdpgr5GUQJrKsfpqD3mkvb2o94cfud/3H0ef?= =?utf-8?q?D1JJhZcHCblyqI0y0ALm9B7h1wkQqbN3tdL4mW647tsW+joReEQFbwHfW+vgy92Hg?= =?utf-8?q?o2WGxP2uCzUaCU48TexJKThzGKiK65qclw=3D=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5442b36-ec95-4824-a4af-08daad48a67c X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2022 18:27:56.9564 (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: tB1K3ZYzOdJtvhCHkBm6KGSrHylS35Btt2u6WZeJYzCN8Ei0uXSRASogouwoZHX7zDqYd2L/IIWnNzf58Y+ukA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR03MB9718 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 --- 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. 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 }