From patchwork Mon Dec 12 19:12:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1715126 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=SBrNpY0K; 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 4NWB9y29FJz23np for ; Tue, 13 Dec 2022 06:13:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3F0F48544A; Mon, 12 Dec 2022 20:13:26 +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="SBrNpY0K"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C3A1A85306; Mon, 12 Dec 2022 20:13:21 +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-db8eur05on2077.outbound.protection.outlook.com [40.107.20.77]) (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 21C1E8544A for ; Mon, 12 Dec 2022 20:13:19 +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=oFc3381/3as4kuQyfVMv2KAf8C4VwLg1SV3qAjxq4G1ycQw7rkPlOy3Oyb+9vPxxVwcg0hPjfd04ot+KAOFuxy/55en+5n7TRAlA2oEf8RFOwmubo7hUjHkl/MrQZ/HIIeu8ly/1MvH4iH+ZY31Nh+MlB3WUrKEbko9p0TDWLcxQFBb+ZaYutomlnngtqnwEpoG/EyBatJWLQ2rrX+nEdbck3pmJSUu6DvwJresGFxLSf2L8baDxgO90FOh0BUAtgQ37JXdPQ/X6SMSeCC5OW8mnfFmDvAbff6yIgPPiY9WSfDlMTmgDU3Lpm3tizsZkVTTQzfTP7IgXyU4r/TGZpw== 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=w8ajvEVyTvhApYt6Zm09HLrW5i77Ql8CeeG3DjJmQPU=; b=DfZr1xz5k54smL3HvexUWsTETS/lzlRVd771FJK8QoRfkFwW50U1dNF4N5xpETIsL6OP7Q1HopQfFoCx7yM5pBH1ZxKRYVL/fYeJGu8EhuPYnOuEDJ+Ijo3OkOWrg6gevaHergz5h8Ma8H8D2eVaJNyNXM17qxG/Yr4+X5cPldgPkWUSu78nyjzjddoKgIt3bojfziSKzIRc0ii5BjZ2p4QLNPDVBWT//9QmVwUNhPfhoy4Egr3nV8U686bW7ba4w1RpZtEoZ3tZKtVOYrqT7F/c8umJ4zHy0YbHGJKEdIOtPBNxXRoaav4KTXokK/wBC127HkavhF0zF5SEt6MIIg== 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=w8ajvEVyTvhApYt6Zm09HLrW5i77Ql8CeeG3DjJmQPU=; b=SBrNpY0KwE3sCti6D+OavlBvFO6vIou4y+iEuEUEox/1alADasZ/hoRZ1Adp6+czb53WO+vktJeOVzhSwAG36WRd5bvbusz5D1AcP5E4NMvz5opX7FMUHJQlVnrPQjV3gQFI/HHa8MyhnsqMKL1l2bwF5XX/Oeu2FuS1H5WAXxcUzuf7j1Sm6le7PZZEhVoaDpm7M4BiHj1yRE5P3UoRAUFvcCprYJm5fU9X3SXnk09U6Ai2t+lMAhY/sFHH2tG/DeqCZAH+YifTroAkdALeIGg59Bsj/EpOsQFycto7DOBJcA9wuTyCXoDkB3TpZV5z4Ru1ImEd4sj2CaJq7WDp7Q== 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:18 +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:18 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Rasmus Villemoes , Simon Glass , Sean Anderson Subject: [PATCH v4 1/5] image: Add fallback for fit_config_verify Date: Mon, 12 Dec 2022 14:12:07 -0500 Message-Id: <20221212191211.2105335-2-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: 3f817b0b-c995-405b-68c5-08dadc74ed44 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YsXG+XXbYSA89n/NU3apdzgPZrKaQcQZqKrBC9mAtupLsMEgivBgptYZ7UIsACSPBVo9zAJEf+JLDRoJxg8jB+JXHbYLQFOCIZqVbMPGT2FJF1UZpWibDA2qccdUZW6muUP7lHhtL0rz4scpl45lnM76Sk9jR59hUgOG64303AmnlA2pSk/ISeHrd9iKOpgOwVmiYhUBy+KE8mG/Mo1x/7QF1OCWWWabQ4yY8y8uMVKVoI/wLbMWrjcj2sA9lbEchsIeIDdyBNy2fa6NEw6XIR1Tcf4MquSu0S/6tMQyHLHFv7pT+GlfgCecuClwUAirWFM5rzJQFtG4b3s1TLqvKUE1eeHb4PX5kIfeontI5p4JHUkqBvfuWw1Y2JKrbhedFSDPJKN/tU3CAfwoUNdyZAG8qX6Z423Unx/58O7Lvqa1WLV5TCBJwRk6X2V7Jiuz8IfSpcOXYXkXlSvRYbV1zLGaMBhoYcwvWfZ8EesB75aoujVVS/7035mn/K24kIQB2UircdiqZrsLkW5PvxHOglw9Audrz5Buxk/E0CLUydB89CE3xC3+P42x+sGL7j0xUoNks1fXcX+R3P/q/FjS/4ocfRuWHpmoMlCZvrM/BNfJKSTXcnLTukcSYSkEc8c1HMStbAfwb8jVXI2umOFf7NQ02I3ITrmnHMT86dCx+0//cEYpvxYcRJQhqsWleuK6m0oWTrvKhCZzmG2eonArcw== 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)(107886003)(6666004)(6486002)(478600001)(186003)(1076003)(6506007)(26005)(2616005)(6512007)(44832011)(2906002)(4744005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 79L150FPi6hlkYtDIZP8fgN0AqgbMtV9BAjCHGfqi2ucebhBj4dLDHN+NUL+7OItMghTkMEpZOAQn3Xk63NxIK0riuuP8nhQaTvTHlyVyA7tAnFk/nXz+VNHqdlvcqFTeodiQKEC1r6Rlk2fUhzRsLrWgDxQF7WW+CCf8Rgrv9LGwlAsmcNL8EKY7dqUpby29nOBjZF0FZsgsDW3bca/0HXKsqgKpVHC0V3/XQIStmi6iEuHKMGzbBL0xPWxfgyn9S34ZAUsYcxVWkfgmtlir7UUjeuqybKJuSuaLJr0oML4TYGGbRturr3hJRPzLj7ADYXco6jxayxNBi+Q8MwTWSLBVNaOPUd5JJwxIgfgVqh70kSPY6EUMjGvr7rhCZvzV+gXTvr+ID+6pNzH0gd+7WBA2HBx+KQMEgDqqZdkHACzw6hkWJWrY+noGINJPzQHHNW+PqMpsuE4LYjDstMTdX3rSqzXfpmcpvDNgX8RyfFuSNrV9JaSujftAeOUgIexKZaLaprQWqDP0ilbtOxyYnWLDQh/8lvzQgO2JtoBhL0oWkodSuDOnBmsLwpMnjyhP2zeRIXyNzw699Cus2MX5kdMSLBBAX7CCxEeDvopWJttYWse6FOn+4kUzlCUTT5d7UmPwGjZTAuhXhbOaEqInuFce1mapjkDP4EHZjyqEzM1htqJdtsCWcY5zR7Y1SxjfgdsjU7ZsclidNsyNCdq/mVxZPcZ8pMmTg/lY38UffA3RSFTURWGSqFJnBenlIv44cHwmoADZLoiaQBZ2sNETN7ht6evlJbKmwRFlP7gR02jft5bj8LNHvo4nNSyTEqH47wxLEW+M+MzCQA+qdyIeD2kh7407fO8Kj5quIlnwY+9X7KD0VImH3QgLBM+uQLPk/wMBCVsM1uSwgF7qV6LjoeHU+Mp60IxfGe474v8pBxAihwG7z0Xm8jDDbAP9tCWKbgqpSDbmPHW/l1dvT8J+TclDp7DuUl7oUPxBlibJxmvoNY8rW3P4d2JqooOo//FQ7QwVVs3dFPLO75xbc6pXtXmUCk+WiaCuoArd4b14RzQY7j9NPRi9qaqwn1pax09jKuKReJ7RYArvzYa+9/J8L0M0HQJw0NgS17ramxGufGYTRSrFJR7t0FeFWkj1rSQO3jRUmvkAdvj+sd1MgAzusdPOru7xgr4GAOFIchCRo4s804U6hMjeJcFPQvO/rQuA1p+N8Wd0yyERPKcHYmBq12t5xrgKIAgFOnp/PLoatfc2TNO3DU7xo+jxI/mdIJh/SeczUUWg7aYhOJj+tyUoJyPngSgNfAvD+0g/DXk5+iVDU5w/y0DtNp1ANZ4zt8fXBN3wnO+zE+f13pr8Q4zbVEvJOXXj8UcZqFRPI4hm2dD77JMcWJE0Ah25SLp3qYt+N+jSNMe3gBDDEv1ajvHrWzUAxabCXEtJjOK8/NNwcpEdpZpOi/3FvXnF0QtkNHXj8QwZIXDnTJViP17vIVaRz9gdhzae3+ZSwqHoOHvF1CC92mf9nRc1Z8c820ucPGz0fZwM8olBjwyzHZGOX2Dd601WBEzSPQzQqtOHc6ePtkLbGsD71p9A9RE4KGMmR5M2T5D3o/0gHdD656lViAjQg== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f817b0b-c995-405b-68c5-08dadc74ed44 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:18.3533 (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: tYAPk0QngOing6d3C1KNqDF5UlF/4UFp3U1mq7bleD+wtB5ylV4Q1qa5kF7zxmIZ6beVO+gdZIZJzb50Meb44g== 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 Add a fallback for this function so it can be used without regard to whether FIT_SIGNATURE is enabled or not. Signed-off-by: Sean Anderson Reviewed-by: Tom Rini Reviewed-by: Simon Glass --- Changes in v4: - New include/image.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/image.h b/include/image.h index 6f21dafba8..2a53c30486 100644 --- a/include/image.h +++ b/include/image.h @@ -1258,7 +1258,14 @@ int fit_image_verify_with_data(const void *fit, int image_noffset, size_t size); int fit_image_verify(const void *fit, int noffset); +#if CONFIG_IS_ENABLED(FIT_SIGNATURE) int fit_config_verify(const void *fit, int conf_noffset); +#else +static inline int fit_config_verify(const void *fit, int conf_noffset) +{ + return 0; +} +#endif int fit_all_image_verify(const void *fit); int fit_config_decrypt(const void *fit, int conf_noffset); int fit_image_check_os(const void *fit, int noffset, uint8_t os); From patchwork Mon Dec 12 19:12:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1715127 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=geLb0zT5; 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 4NWBBH6yV2z23np for ; Tue, 13 Dec 2022 06:13:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DE5B08545D; Mon, 12 Dec 2022 20:13:30 +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="geLb0zT5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 351F285449; Mon, 12 Dec 2022 20:13:23 +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-db8eur05on2060.outbound.protection.outlook.com [40.107.20.60]) (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 8ACF684387 for ; Mon, 12 Dec 2022 20:13:20 +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=cgGWZURTLWLKoC0NcxAbfjTkqv8U67E7s9P3dzxEnO4mn70ygYHutyW6NRoopsSNx6nZ7gj912zgIJ27EpGgx/knV7Uuc+0Bn0c59ecJow2aQ2Kh7wSlAWioseKf+4jvCIfKDzGBQZEM48YHDWSEx7OfzWgqIL91ANyx/vOT6XeXkbPpkyYVunPCiJJYiTQpcS5a99MuEwfSQG4WQ3adiR/K9eCq+7S/gb8lk6AUcEY1IE2PupmnENE8CgcpOCv1rvRxlQfq2zEAXfMrRh8sbAFdM8thcAl6x5L4GxZyle5Hiq+pYgMvJIzdVIBuXV/55hcfKuI9reDEI/nVFgdeYg== 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=gyQi72Pt5XQ0VLA8tYA8enNgVy8XpZdUfoBzBMrOIgA=; b=gFyrrckqWxFc3LoxkEInbG2v2GvR78EPCWS88b3jO2Pu1FHLy1mm7gC/p9b7tMr0vasZ6bS0UePdzcqRbtmIKHtPalUbqsJJ5IihuA4eomQ2/42OuHJVmkb83p8JdqfYvLFfwidcU5wfrqViYgyT6HgX5Ue4UJVcFKiPBT7Ku24otqC6Sp8JFpwk+pm9enMbKYT05AhPSGjjE13TxDqwGL0bVhcvy3B+VB6iaKJey17vtBvuhkOb9mTylsVifY1YZ71JR5UCz8JNke16hQFaxLeFFHFVRXbIfv51n+JK23+UjvtcV8cPJEuhsw/Qc8pBqMNBr/NCYLowV12M42wg5Q== 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=gyQi72Pt5XQ0VLA8tYA8enNgVy8XpZdUfoBzBMrOIgA=; b=geLb0zT5AU1V3h4FTnek6/dgbL12pKwvcGE8BN/w64QTvW2i1gGYJGGbVTRtRXKypOi5f90CkZoCyUgwYeJEQmgWdshknl/KS6qnc4A/0cl3+qcD+ZVZCsE3T/HNHwQCjI1qdMQJju2Jf4u3hcoDmB2HCXhyb01Cucu9MkrB9MEz83CXMsV6+WJbuUGfSWBEq/jL9gSqx7PC/s9Ofi02n7X6dopTIOzS4mgskhW9/AYf37I01cQwn1mUZOlb4m43CZu3222Czgz21SbBNvlUDiQMnMsSmyhnDx5ppFnjcYQewFupDTU5/aODUaMbdeML5eIlcnhJ1PP4oJKxiyfb1w== 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:19 +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:19 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Rasmus Villemoes , Simon Glass , Sean Anderson Subject: [PATCH v4 2/5] test: Add test for source command Date: Mon, 12 Dec 2022 14:12:08 -0500 Message-Id: <20221212191211.2105335-3-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: 7a80e480-79e5-4d93-0c32-08dadc74edf7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aHY2u1SXR1ADcPzpsI6oVf3h07LtMYaO9eOYssIpec0xdgpth+oLCIp9kp/vjwqD47dLNDFeylrCpLx1gk1XCwk/IA0Ri7uBoxBXmG1ZUEF6PtYFJw7RqbS9FeGYd0u0WzYsxTExTNRq6BLFjj+FoHhCMtqYwD6UVMFmbjGAge8MCLDOYNVNfxKdWnmvdgxB7bVY0b5EYGk99kH+a71DKBqaaqk50OZ0bqJ4kiDi0vjpXgNfcAjqVOe+kbDtPYxdm8XfZAaAswarYIsxpybqk4xte4Paks1MhFAHVC5RURDW7kxEPi4XZXPWBHhlms1RFVfpUuEdYfqMvuwuNdhoZv+7hLmhrpd5jgFdDa14Lp5ZXWtBAJHgYDbpu9VRwqeWTreeCnTr8DrS/+n/OHzTCfsupOsl81eicFkADEYmzZasYbQxZH2ys8iSM+CXPUbLSrHaw7ty2Zshej5C+45Dm4yIUWen9E6QuyRvdm4uFcqIZ7JHKt+psWPxJLCOuq5lPSNkwhrtyIqn1lhM9o9Vxq+t92qhy0vCzo8ntJoC+5GD7qlUaLcpLVClhmHQbDjDFRnTtQtpUi8h7eLSFLhFeQm6m9jPFczbGurewHlWZajh9ZLcBHxPZSeD1KPGsK9Ua7gh0WCEBWL7mDkp8V/0WhDv3+iLP1dSp6coKn8EM+65yPDfPa/zfgNPoaaNF4N2CwN2Ue15yNx5R+cq6UjNOg== 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)(38350700002)(38100700002)(107886003)(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: PxG8vy7pyBYNGkN5gq0OQXF2A5/aOkwJPsf2XF42zVziSfQ45CLQ8nTNayfjgZUdquXcXD3B2OHA1VT9HEDrZXKyfBasOiInFLI1HuyASfMqNxBQshUCP00qNSE4l6A6fuD12vB0uUjqoEkJ+m+7nutR0BlINoj+K3z/cme2b1TH4G38prIdBhWbgPTNLjetU6e9uSLVprtPFNHRRnNNRsCpX1g8Ews4KeujUbliV4zWy7GE4pWqi1FQyKAMZ9gDCoATUiMR5sNBAfoUUunNi7I5a1AGf8VjsyVcVQd+PXLzNEEYX3asOO/RPV77SfiF4B7SxkleVQpJ76LG0lkKujwPQ8M90V8TWl1RIcR0OwNxj4oLl6DGyeFovl5YJQ+WnILjNZUl7iXeboyVcGf0EeYl1dBRAnDorBxwq0XhanDEPnAOQVmhXaBeRBJucP2d0GEYJnWXdzZdtdjC8gK7W5jX4U3q7yPCp/AwqAUW7b4hXoupEGeyPw5HKABvw94Hb97rEdkaa6M9jvjI0qtNt1fZO9PbeDtB41vQKB7G0WzTC5d8ZTdOhtIAfHCx+t8YWlzOXLUKYgnK2+kFxb+PFCskle68/3XASDH3PDE4lSkNlZmgOdZGPFRiWa/gPmmXw8wxJveo1RMxdkp7xvutQor/S/xs44zJ3ICXpWuq58Rc9Sz41xJd2h0VC8WaIFRsE3ylOJ0HTdOqMRym6eLgGmckktoSwqcKPrPbe/w1kh9lBM2ZhnRxdDFFlI0OQdkztJNoNDs1vXpD5HmCkSl6+RrO2idMnQEJpC6s8jRbt4v0sD/whIaNE7LE28GBf2osIee2nSWR5I44n78eEAtR3yZg0cfF1T0QHIuwpMZtcHQ8QG81mFaX5gPiMJyeWIe/CUfZXscPf83gENITJqUs7PBl/rTdYhmjKoAucR8djv4T7eDRUiaEMH+wZ4EwYJabMX4kKJxow8kpQC7ddC14iC4wUszJfvWvYBJiIjLEQCb2SYkhcYWxZtyIrlOX9h1NueOV9RmAFWgPN0HtcdgRGsSW7cmXbGFweqVeMersaDXymPqKrn8+3rpAGGpVQdCBuYtML2zrLAWLB4p35dfhVfe5h+u3x/PcxYJeDm2C0s80nfvWrghkrMjeeOFHlIED50hg/aLeI79aK4yhLSL4Ok6L/jQV4qoVyOBQnwA+96fPwqj2i4U0R6XB0X4iaJoTqPyrLMLrDs2sOHEg8Q9CulGH4mUu71bzujSdZPIHHue4fKuuOw+N+1XcbnRIG/yguuIWAtedKBJRX6gtI+LIC5TiVQMqotyV/LLsKUM4mWWl7Qk/EEV9GDj24Uj0mNy+q4ZTirMT08yY+KgZ7Yxgvqp3RUPuotSXUOPl2Rbuz4152B6nYsWHhf4J++rapKeTLoQJp7xVqdd7dR3ZWtWSFSeh9Pm55n8pPNJSb6Ap9wCpm007DesyzR4Nnh/w8S2pqN8AR45iWR9ivndgH35LCXaisk8fzWsPw2R5ttOGVOTPBnupzS/o2HssHtR7BO65ls1VZPgeWLXomI3p/7uvtOMEj5VIbniHxmT7TEW+n1V8KrLl2S25glAZbHD/WJt1++Snq0L4lQGYx4XPYzR5Tg== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a80e480-79e5-4d93-0c32-08dadc74edf7 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:19.4459 (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: +/4SQvfdl1zUXVqRu7OO8cgmrPUhqWKwM610sAuyXVp3+A8UmGDbBUuG6XoyE9Gr6Ucv2mnY3DX35R55j7WV3g== 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 This adds a basic test for FIT image handling by the source command. It's a python test becase we need to run mkimage. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v3) Changes in v3: - Halve the quotes Changes in v2: - New test/py/tests/source.its | 43 ++++++++++++++++++++++++++++++++++++ test/py/tests/test_source.py | 28 +++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 test/py/tests/source.its create mode 100644 test/py/tests/test_source.py diff --git a/test/py/tests/source.its b/test/py/tests/source.its new file mode 100644 index 0000000000..3c62f777f1 --- /dev/null +++ b/test/py/tests/source.its @@ -0,0 +1,43 @@ +/dts-v1/; + +/ { + description = "FIT image to test the source command"; + #address-cells = <1>; + + images { + default = "script-1"; + + script-1 { + data = "echo 1"; + type = "script"; + arch = "sandbox"; + compression = "none"; + }; + + script-2 { + data = "echo 2"; + type = "script"; + arch = "sandbox"; + compression = "none"; + }; + + not-a-script { + data = "echo 3"; + type = "kernel"; + arch = "sandbox"; + compression = "none"; + }; + }; + + configurations { + default = "conf-2"; + + conf-1 { + script = "script-1"; + }; + + conf-2 { + script = "script-2"; + }; + }; +}; diff --git a/test/py/tests/test_source.py b/test/py/tests/test_source.py new file mode 100644 index 0000000000..e5ffdfe3fc --- /dev/null +++ b/test/py/tests/test_source.py @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (C) 2022 Sean Anderson + +import os +import pytest +import u_boot_utils as util + +@pytest.mark.boardspec('sandbox') +@pytest.mark.buildconfigspec('cmd_echo') +@pytest.mark.buildconfigspec('cmd_source') +@pytest.mark.buildconfigspec('fit') +def test_source(u_boot_console): + # Compile our test script image + cons = u_boot_console + mkimage = os.path.join(cons.config.build_dir, 'tools/mkimage') + its = os.path.join(cons.config.source_dir, 'test/py/tests/source.its') + fit = os.path.join(cons.config.build_dir, 'source.itb') + util.run_and_log(cons, (mkimage, '-f', its, fit)) + cons.run_command(f'host load hostfs - $loadaddr {fit}') + + assert '1' in cons.run_command('source') + assert '1' in cons.run_command('source :script-1') + assert '2' in cons.run_command('source :script-2') + assert 'Fail' in cons.run_command('source :not-a-script || echo Fail') + + cons.run_command('fdt addr $loadaddr') + cons.run_command('fdt rm /images default') + assert 'Fail' in cons.run_command('source || echo Fail') 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 } From patchwork Mon Dec 12 19:12:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1715129 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=L5G/D58G; 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 4NWBBm6BTNz23np for ; Tue, 13 Dec 2022 06:14:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F2B1585472; Mon, 12 Dec 2022 20:13:37 +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="L5G/D58G"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE4EA853B8; Mon, 12 Dec 2022 20:13:25 +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 EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2085.outbound.protection.outlook.com [40.107.241.85]) (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 5E8DB8544A for ; Mon, 12 Dec 2022 20:13:23 +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=U3+/EG7BZwUaa179jvGSMuMoNF4odTVDuMM28pZg7dHv0M7NDN6vVHnVD8xckCspqudj9bIGM+Toh6tGebB+fYi84YEdRgqf93tQQuAPbhAQfnsXhV9g1iRUwITR6M0WeLtOxZyxR2bGuegZzY1yYtreTf5V9JYl4WihUIPT6uyMhVowBYlWSa9FIfe/8igxzbkqJsG8HUTPxpIUm4BlWHsGmDjrs28eg/5j8s7o9xiNW5IVG0LoGFKqgYHlrookKoY8OKhBdM/39xjOiPVIZuj6/UhLw1BWtG6Xbw4hsfi0YCxeEN/AHds63H/pmvbJwJGkn6KYxsI/YfEmi3Uq4A== 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=xs0fmTjy92SfFk+W6CJv9NyRtbUWzpiFLW9j8ebDWfk=; b=gq04SLikYWDQLihViRAY6Um7H28RNT0FGmCXXQ7FnFO5NjM3+qm5ah8qfbqLmhBYdg/fc1b62ajgHav5kRbq8Qh+v/2hoL9wv8blhxBu9AHqxPH6MPNB779ldQgNZjM2OANXffnjOtMDEjCmlR4itPdAotW1C3OBPAil48Kf5we+K2UZKn69Fp3X/26YOUgcykTNgYV9ZsvFxhaq4YZFv7B0MYHWsAkML3zDN4SnP4xxhWnE11g88zcfHMf637faaxWtWsBjZYak1P1NF9ZSI4fjaV1TgGs22e93rs/xPjqpCCmpAvZk5kfQ9boxH0wF5Ub7BRU+5rJQYmQMm3823w== 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=xs0fmTjy92SfFk+W6CJv9NyRtbUWzpiFLW9j8ebDWfk=; b=L5G/D58GKvzPh89ApitbU6RWjObYUfe7OYsWLMoJ3I9gWgFw3+9lNsjiyfVBk5YP9igpHQSFB7DAkxA9gQE4u3uTHzXj/tXOyq40UnHGb/BdwLWxb4n/a3yk365Nfa+7IwQ1qt9jqHbMc/GNwE9393wKz0lkH0LDoH+qjJp/t1mPEFbGeUVa/kJzFqyKu0NitIeG+EuIXIPwek7+NkMlZAV7i8PAwdvOOg0bivxzqiTjM8uUEJwTZVwzIeJSzxgYLoPalmwaHG2y7Wm/esEC4MA9q/15F8U7DgTxSkgXdsbQu1LghdSb6XZDNYsmmDvDdGwN4w4hUwBg2of8SekQTA== 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:22 +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:22 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Rasmus Villemoes , Simon Glass , Sean Anderson Subject: [PATCH v4 4/5] cmd: source: Clean up a few lines Date: Mon, 12 Dec 2022 14:12:10 -0500 Message-Id: <20221212191211.2105335-5-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: b7618b5c-feee-4c60-01c3-08dadc74ef77 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fo2KPmwX8fPoLMpovjHLDOK8J5X6143pRvdbI+j9Z9iGpyt29S8eAJXDJdhJB5AZZvtFPGglOEe1Qm31NYUVBDpcGWeHOJxQu03Da0s+SQEUc+IH3W0LuPoFVpZYF0b+udOCxkT3we8LFsaps0C9nPPRc6Xll+PGlcJmvtokhSMcnbr+DGxHTTtQwzY4RHoz6QMQPPSXtd5fH/VNKa6lmtjDXyqr6+uRwT8nbWjUkK3/w8bH0LDCPE+DoIdLPDNmfeWO1zFeKKXZe+5hzhUEb7oi4j1Y3nMBdFTJ50lghEDfuxDj84p1DwsL/bdELWUJbbxnvGdtoW4wojn+UaRf0+cXsDmiCWMNlHR+Kqtc5hG6N0HAT8NfCclItiQ9VAaTANGUaDZXBAgH10oLkZfmPeeK+bddAhZaYb6Smab16sN/o5VLUL+jpCmgzNBpXEFah2tQjruGeasyF3rTmyvrIcWyP8k5V2XAU0AEK1X5TqF3gPw9VgB5PJxlk6sAd27z6Cf6izUgg6WsRAYSWtaScJUDzvvH+aEWzeiosE/MZofGhD2vwR0DOhUSad2fgI5oDbEbbZxyOQxxMh4/hBgQu+nw8MbXHx9O+ObILSQ5eCAf4nsuLyFWohKtNJ1no/0DddipphtFcCkLn0B5fc8TwIM+3gmUP/F755EC8AUO6T1fEI0KjkXj5KvlMDbSnglN0xinl+aDPXzlJm9zz+gjag== 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)(107886003)(6666004)(6486002)(478600001)(186003)(1076003)(6506007)(26005)(2616005)(6512007)(44832011)(2906002)(4744005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TxTLc0u4m+ePqg8ouYMODEdFCJ0KRQqtnBsNTpGxXLbNbLxQ70hBZQ73jVr6unyGqiyaF18WplKkFkp3yrFc0zim1FgoWv1HtBwWvWKkOsDU8wbJw0wSsBZOyremximudqZEJAh7G/FKDHat4lFhyABIy9jN/SC/RoIYoXlhflU5DFszVdrMgHy0dC3x6gbcoS+ttjlRQgG0Zw1vEvMvPYWscWVNBXIYXHQLU9HwgdOk0Egp5Wg/CytZ7depM2nDuCwJIwmiTcmtLxNufs/ABMKDdvrihdbUi9+OVMQ9s7mfF2iNvWKcW7UX4FQLQcYv6SiJMRX948Kq9bm8XSJR6Tskfqdfmzrrpr8xsoChv5ijmRM8lqTtvv8t4ldfuEqHeTqSfYizNCKwr9vTnNx2kx4suP+A++BzeRercMBBiak5ch9Q8pGXFArUZku1nvAEJbh7rCJpMqoBPrpWqjWMIPaBysqyA9o/rGXw9ntQL7XNsaE8lHeqXoDuiFgwh3Dx35u+TqBOf4Jo1zrew/7nMYDgrIAn5emuvKNhcJTbU2Bs65LXhDYtz6a0f8OA/26NEKHwEUCJ8menA5XLfxm3RU3/SEMOTjbokn7LB2I1QfiBLPRb606Mlh88iihGusldV7UzvIBDyic9rNaQPKS5lX2D/UZEatq9e0vvqxH1kZjgIEsE8HnpMDdBCdDR9bsG0nxQyScMzO9ozz/8HPDgm7UXLZvT0epmBxKvUthUHyKZAqEEL4YNhXOKsNV4pxwaFbqQ2N9PVZaLnYRopw4zu/nV4GnMLreUKBgraMSWLL9oX88oXXixZIpiQMma6agSsQhn2aNy9rBWidi9YthBN6qlcGSOlb7GjSLpIxVYb3989rWiApqi81VpP+u1JXNv+odH7FpJtyICtbJ5+srz+lenefsuRFHfcDC0ScfDuVIscSVBUUIjtdap3K4KymZ9WPy75JGPXeQ8UBMet6ooXtFeuHSNzsMzMNym/XFeXqeJaFacpVFzcVlDB/A0sitKOOMaUAM/gEqeAbAG9PGnl3f4tKDSSgJpv/f3jn7XuhK+lM5JNZLXlXjH9ZpDtcmf5tgVYFune17m/qOhcjqwNHjSklS/MC7tnQm6ZSV84QYdoWhY/DW8dJD36Y818I0J7LZC5ftqFE1WIEZAlak2wga3mg1BYC2A69Kt1XU5wby+Orye30/XlauX/p+mX3aWfNa1CRQ+/1CAInaNqVlFKnjKWcGL86xWCowOR65yQeeIWW3l5WwZ63yvOd0pbaCte578B8ukfGnmgGG+6411QlZC3xaDfcZCFix4dtVR0/V2xy8xUkGnALhvnj3c/8579TuqntFf1q0RfMch8MjnrZ5+TfAx6lJSJQGExDv/GDGFsCT9HWkh7mHd+Bud5SjOYZ40+v6sI6Wjh47diujRcfwK3yty5Z2NFqBqaUYvnxw8rsnKagN1qxeLT0fpCJ2zP5UHQCgUBvF9pP81J65C0xWtKAXURhZrU2BRCaUKi7r4SAG6OPrfwNLvedwHUvxFqSZpjefRVZBpO5bAkEV+9OYmUXplXqynVmirqYRB6fhB7p8MNA7guMOLhoa9mzhE/UmoPlqaJ6qZuMWK0faqBw== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7618b5c-feee-4c60-01c3-08dadc74ef77 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:22.0248 (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: KDL/e6UaAz2gV23AkwMWryUWRf1uWWJK8LQ/SJYb2UfDRA8C1s60smMiMtkgLWkyz7TrpJ4g03juVkSlqv69ew== 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 This simplifies a few lines and corrects an error message. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) cmd/source.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cmd/source.c b/cmd/source.c index 698d9f86d9..5973824601 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -128,16 +128,14 @@ int image_source_script(ulong addr, const char *fit_uname) } if (!fit_image_check_type (fit_hdr, noffset, IH_TYPE_SCRIPT)) { - puts ("Not a image image\n"); + puts("Not a script image\n"); return 1; } /* verify integrity */ - if (verify) { - if (!fit_image_verify(fit_hdr, noffset)) { - puts ("Bad Data Hash\n"); - return 1; - } + if (verify && !fit_image_verify(fit_hdr, noffset)) { + puts("Bad Data Hash\n"); + return 1; } /* get script subimage data address and length */ From patchwork Mon Dec 12 19:12:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1715130 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=ISKj3h+E; 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 4NWBC160zPz23np for ; Tue, 13 Dec 2022 06:14:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4B30F85454; Mon, 12 Dec 2022 20:13:40 +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="ISKj3h+E"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AADA685455; Mon, 12 Dec 2022 20:13:28 +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 EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2083.outbound.protection.outlook.com [40.107.241.83]) (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 604F08544F for ; Mon, 12 Dec 2022 20:13:24 +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=hVjynDpOdjE1cpYIWtEK339QekXRQO3ITCq2Kj89iaAPSlf4YDuOntTkc061mRe2DRjvKrPgqT9ZWs/X6RovDFP6rIDatWKphBkB4bOnRkYBMcbpI6X6m4STS0eFnfTg6liTgzMtymjnwKtwx4vZP0MMIGOEAFnFxsDQwKqPirriIfo1LrpRMdcSMZPldRYd+lBbBGs1+QvQxMerKFXtNyDwU65wU2+6TsnWvP1OysNa2NFNaF3sepNtMdkSydiVlyUiSjuKzRpzr0w8s+oaAEXte0JK65xYlAWM5nM/5g/1XjrOP8Wie8NRGefX6Tklm4CyEWH278sMf8Fd1dWDRA== 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=tmg8h9SsQUBDhk7c6PPXA3iXPluDm8yHehPU5AJdXuo=; b=ijfYAci0NOeKRCU4wnc8+n+zLrtTFIZd9Pib1bur14wQ7bHqUOMBfW4GmWfQM9ivwYnyjtyUNbcww6LKHdrX8wXCcnuBqRkAW4jiy6LyhWF1qPloQxM+1SMmuhF7+2mK8PGUeFvETu+IY2PqOByqPp6Io8AWPP8ObCQ9zw5Kk7GybD84dz9QiXhgO7z+Eq38RIARiFidp46Jt3pyr6kLMWsyzyzfxkhd6GuI6n/OORf5r83ojOvsjfje6fREi4xry64e4C58LeCkbCuoMYxnVUFEIh/87AYQGFv/KTho+ybb0dNqUB2/n9WXcVlU6y/1Ets2HZZeUvybePPnrDbfUQ== 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=tmg8h9SsQUBDhk7c6PPXA3iXPluDm8yHehPU5AJdXuo=; b=ISKj3h+E48a72zkKKRjFdf7o5okyQR2mqYP3i/rkX2DnzGuqJw0+UfUSE/RHuDyPRt+SUflTrF57/ky9q+Z4875lJrOAq/2vkKCkRScNeVrt9Ve4tTYTIOuRoPrMQWNwnj1TUuytVG4lZEYF33fwETERP8EADn3P6wp43iGbZKshqioyenNka+pbQuEuiZWXSeZm+/Aw7F8r5/tU2krquQOStg5eKizZ+0L4ORNQDVcJ1TzcBUvH2GW+eckBlDoeA2eYuljlsQk07xkkvFpYTCJjnipviRwX4xJYsT8ZVfz4I7maevO+kutA426K65kZ2aUGE4TYINhDpcH6AHFrWA== 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:23 +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:23 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Rasmus Villemoes , Simon Glass , Sean Anderson Subject: [PATCH v4 5/5] cmd: source: Support specifying config name Date: Mon, 12 Dec 2022 14:12:11 -0500 Message-Id: <20221212191211.2105335-6-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: f2f53361-d0ad-46b8-817e-08dadc74f033 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xlxMK2PWD6MvTuuZK4BJAJ4/VGdqQDcjf0e1ZPd3Cvja8Y3gNmdLrlVQL+0RI2ZYN8DIQYHyzI9p+tKYxBfBL1oWZPrtI2hqVxGs4uwLeGwDfvcJbaI62751pHfYZdTfgcJ6BLlvi3FBP4qaS706zwAN6hMqqZDPupUwsqZKg8d5TffShuJ6z08gpe+fVVATg2i6jDavy3vBlM0SjyvhHZeQbwTuvNawmt5nRlA6+Mn63jaFrJH2Gluq3GuVpf4BMfflfFilfxDgWpl4rJTiasz49f50+aMv2cPiBHx6uZ4me1Tc7PpfvIbZDPm/ZN67kh1c0EnToc+iilDW4bTuSDI0V/2mml1KtWDUXu5LwfaDg/1ZOSZ1P5rckgLygrusMA2Tsypil4Z8S34fHTlR29yAmG+IRQ1Ck0xvGszMOGGmTG9LMI5EeNaP0JgDx6tf1s+vumlpbG10MXZOfDry3B1UA3bqIKGm0Ams8hd2PGXEaX8crliriJDSF2Sz+fsQYri3QoL8wTkxoPtdRqUgD6VWDPYC+HWpC9FxsyVfRjjVz3yCEavne+Ivh6EyxhN0Y/a2mIFlTbQihmXw1ivmzfwCI6qrz2TghooWK1qS8uGvg7Pzn1yCx7yHmDqy9p8e6HrHPEojvjyLk7IvvsGXb6b7tvbrEyI6M7WwdPHMMwtaqCEQR1unnESo2hZ2TBhpQwhiffn1NgoIgi3ZKfx6vSg+3KiFMC+eRhAjof7Ez74= 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)(107886003)(6666004)(966005)(6486002)(478600001)(186003)(1076003)(6506007)(26005)(2616005)(6512007)(44832011)(2906002)(30864003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: u4aLM7tE77w4aga37RZbeVFw1WONqAkYSQkf5PdML2LIjEzgWBaC8gMmRSYd3KMAH77ZP702kSGaxgQGfoZboMTFonuZWI0pynZ4wklJq1eAy07AVpY9bpfezRNtpcKx8IqFp35PqIlpyMNm+QVbgETzRG0depkclpWAV1riRQeJ/LCr/piuiQ9JQ0N9UXptXzQM9Exb6/6zf13311rXucwuRHGJlZaPwqno3vcGvKu02916iN1SDWlk49LtEZoqLbvrLBcL9X3uE+3SlRjeZvrky9JWsYv8LGtRbbq5dCDtMBzSpzrnf/rjmzD8o6C2Ki4ZYf3hYF2M6OH22GOu33f4ctzjUUhqBzH/Is44EGvcypQtCbPU/0M/gTnwqIkMAmreV24aRKg8z5Uj8UE0G/TgVNvhSJatuLzMx1yrlhEbzfZ3eS3Y33OFDffyWnsIhgdvEB4ss2sjEHNu7ARz8MN7SXhEfGGQzGE5d1fANssYhNyKx2SwJDtISPdm2hCugI58+Q3XuTaQJRb/3vthzLca0TIQYl69dMTc9wxM+eT4XCURwIOu2F+l+QtksWa0Y1oYoHAv40INM3zTsSrkgK4DuM2oWepN1vgmHP0yyqUwPFRRdJXdyw8Hl+55seS/OgqejtKOfy5hxsQN+vb4r+LOMmgGmiQ+mSeRodhrQsLeQiftMYOUen0zJHuQ7isbjFSrWVGqNScO4XgreToYJZ/j9sZs77sq9lrg8RIN14Q8jXqlk3hhX+UtduBITryedR1zlkLIdSTSTAepJI+1MIpodGgvBAcIKy0BZYzZPQm9WmmOZq3bQA493xmA0szDrjtHJ0JotZaYvWHFo/nBXdEqBbc8itObd1B1Gz4m47p7Ksug3SeLY8IADY9GSDe0lij+66BgSKfS0DDBzGZrXxRxZUVpbkw2ZluyFjrgSMistNe49FKoCYamVCy6XC8i+iMuxXtUE9o/EiyJI1DIYxVAfrUR2PiSGzjsXMw9Et3J6iXMoo9nLmMtKxMhFiUKcQlJ/bOtihr4d99l18AGcQYenB3kaVR591mjMLWUc37g+HbvsBCiqZ90sDplB8mb2svFoV3aYvaprmOBhXrGDwKKGJydfH+MY8usEjwzh1A7Tec55cy9q2UouEEQs7b/E2Ac9UNFaKDlHiZC3jFqD2mFB42YKFUOmSkOlPBFiV/U/wteuGqrdKa59z7gyOT+vDYmIzZEGBjq9PAih6MfHRcjeQRiDKAw5on3uqvhU4uq6rSrxXPh6NtQaYtoU5PjGhmw6TocFWxXbWbQn+Oxk0ihok6jVk9VF89lcwuzrF7Cxg7tvW3QVq004ru/afpks0eG2jop8blkWXqM7L//J/Vnxi1g99iezp+Tj3+vrPu502x5JDMAzSTKzsraPGL35LN2eIoRaDbkXx8SuiWR6ARKh66rj1RgIqDptuFcZKOhv0JHMK2MiL5hAgdcG7qqJ3TlZDo5Mm++wHCXwlzNcbShcP5z3Gr3n9HtYJGeguTDd69F3d8Qmg37zJ/4lQkD90ZaPfmizSDA89/68Mcf7CEk2HzRO4TZ3PwWBOmDqbz1ga47rJGDbRd5r+LLFbcvILndHZYLKxD+yl96fcrB0w== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2f53361-d0ad-46b8-817e-08dadc74f033 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:23.1665 (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: LfdQepsfQkrXljQ1vVXf6onPArOUbOEwsb+WmaqMAt79Lqps4URIpyNaH0LHxRPbu5lyJJM5yvXbFztUhZkADg== 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 As discussed previously [1,2], the source command is not safe to use with verified boot unless there is a key with required = "images" (which has its own problems). This is because if such a key is absent, signatures are verified but not required. It is assumed that configuration nodes will provide the signature. Because the source command does not use configurations to determine the image to source, effectively no verification takes place. To address this, allow specifying configuration nodes. We use the same syntax as the bootm command (helpfully provided for us by fit_parse_conf). By default, we first try the default config and then the default image. To force using a config, # must be present in the command (e.g. `source $loadaddr#my-conf`). For convenience, the config may be omitted, just like the address may be (e.g. `source \#`). This also works for images (`source :` behaves exactly like `source` currently does). [1] https://lore.kernel.org/u-boot/7d711133-d513-5bcb-52f2-a9dbaa9eeded@prevas.dk/ [2] https://lore.kernel.org/u-boot/042dcb34-f85f-351e-1b0e-513f89005fdd@gmail.com/ Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v4: - Fix fit_conf_get_prop_node missing a phase Changes in v3: - Halve the quotes .../cmd_stm32prog/cmd_stm32prog.c | 2 +- boot/bootmeth_script.c | 2 +- cmd/source.c | 74 +++++++++++++------ doc/uImage.FIT/source_file_format.txt | 3 + drivers/usb/gadget/f_sdp.c | 2 +- include/image.h | 19 +++-- test/py/tests/test_source.py | 11 ++- 7 files changed, 83 insertions(+), 30 deletions(-) diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index 3627b4c35c..cb13a14d82 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, NULL); + image_source_script(data->script, NULL, NULL); if (reset) { puts("Reset...\n"); diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index d1c3f94003..6c84721d1c 100644 --- a/boot/bootmeth_script.c +++ b/boot/bootmeth_script.c @@ -101,7 +101,7 @@ static int script_boot(struct udevice *dev, struct bootflow *bflow) log_debug("mmc_bootdev: %s\n", env_get("mmc_bootdev")); addr = map_to_sysmem(bflow->buf); - ret = image_source_script(addr, NULL); + ret = image_source_script(addr, NULL, NULL); if (ret) return log_msg_ret("boot", ret); diff --git a/cmd/source.c b/cmd/source.c index 5973824601..94da5d8d6a 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -42,7 +42,7 @@ static const char *get_default_image(const void *fit) } #endif -int image_source_script(ulong addr, const char *fit_uname) +int image_source_script(ulong addr, const char *fit_uname, const char *confname) { ulong len; #if defined(CONFIG_LEGACY_IMAGE_FORMAT) @@ -112,19 +112,47 @@ int image_source_script(ulong addr, const char *fit_uname) return 1; } - if (!fit_uname) - fit_uname = get_default_image(fit_hdr); - if (!fit_uname) { - puts("No FIT subimage unit name\n"); - return 1; - } + /* If confname is empty, use the default */ + if (confname && *confname) + noffset = fit_conf_get_node(fit_hdr, confname); + else + noffset = fit_conf_get_node(fit_hdr, NULL); + if (noffset < 0) { + if (!confname) + goto fallback; + printf("Could not find config %s\n", confname); + return 1; + } - /* get script component image node offset */ - noffset = fit_image_get_node (fit_hdr, fit_uname); - if (noffset < 0) { - printf ("Can't find '%s' FIT subimage\n", fit_uname); - return 1; + if (verify && fit_config_verify(fit_hdr, noffset)) + return 1; + + noffset = fit_conf_get_prop_node(fit_hdr, noffset, + FIT_SCRIPT_PROP, + IH_PHASE_NONE); + if (noffset < 0) { + if (!confname) + goto fallback; + printf("Could not find script in %s\n", confname); + return 1; + } + } else { +fallback: + if (!fit_uname || !*fit_uname) + fit_uname = get_default_image(fit_hdr); + if (!fit_uname) { + puts("No FIT subimage unit name\n"); + return 1; + } + + /* get script component image node offset */ + noffset = fit_image_get_node(fit_hdr, fit_uname); + if (noffset < 0) { + printf("Can't find '%s' FIT subimage\n", + fit_uname); + return 1; + } } if (!fit_image_check_type (fit_hdr, noffset, IH_TYPE_SCRIPT)) { @@ -164,7 +192,7 @@ static int do_source(struct cmd_tbl *cmdtp, int flag, int argc, { ulong addr; int rcode; - const char *fit_uname = NULL; + const char *fit_uname = NULL, *confname = NULL; /* Find script image */ if (argc < 2) { @@ -175,6 +203,9 @@ static int do_source(struct cmd_tbl *cmdtp, int flag, int argc, &fit_uname)) { debug("* source: subimage '%s' from FIT image at 0x%08lx\n", fit_uname, addr); + } else if (fit_parse_conf(argv[1], image_load_addr, &addr, &confname)) { + debug("* source: config '%s' from FIT image at 0x%08lx\n", + confname, addr); #endif } else { addr = hextoul(argv[1], NULL); @@ -182,21 +213,22 @@ static int do_source(struct cmd_tbl *cmdtp, int flag, int argc, } printf ("## Executing script at %08lx\n", addr); - rcode = image_source_script(addr, fit_uname); + rcode = image_source_script(addr, fit_uname, confname); return rcode; } #ifdef CONFIG_SYS_LONGHELP static char source_help_text[] = - "[addr]\n" - "\t- run script starting at addr\n" - "\t- A valid image header must be present" #if defined(CONFIG_FIT) - "\n" - "For FIT format uImage addr must include subimage\n" - "unit name in the form of addr:" + "[][:[]|#[]]\n" + "\t- Run script starting at addr\n" + "\t- A FIT config name or subimage name may be specified with : or #\n" + "\t (like bootm). If the image or config name is omitted, the\n" + "\t default is used."; +#else + "[]\n" + "\t- Run script starting at addr"; #endif - ""; #endif U_BOOT_CMD( diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index 4640e38e3c..269e1fa0b5 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -247,6 +247,7 @@ o config-1 |- kernel = "kernel sub-node unit name" |- fdt = "fdt sub-node unit-name" [, "fdt overlay sub-node unit-name", ...] |- loadables = "loadables sub-node unit-name" + |- script = " |- compatible = "vendor,board-style device tree compatible string" @@ -268,6 +269,8 @@ o config-1 of strings. U-Boot will load each binary at its given start-address and may optionally invoke additional post-processing steps on this binary based on its component image node type. + - script : The image to use when loading a U-Boot script (for use with the + source command). - compatible : The root compatible string of the U-Boot device tree that this configuration shall automatically match when CONFIG_FIT_BEST_MATCH is enabled. If this property is not provided, the compatible string will be diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index 1643d28947..5ae5b62741 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, NULL); + image_source_script(sdp_func->jmp_address, NULL, NULL); #endif } diff --git a/include/image.h b/include/image.h index 2a53c30486..6eaa9b2d12 100644 --- a/include/image.h +++ b/include/image.h @@ -710,15 +710,23 @@ int fit_image_load(struct bootm_headers *images, ulong addr, /** * image_source_script() - Execute a script - * - * Executes a U-Boot script at a particular address in memory. The script should - * have a header (FIT or legacy) with the script type (IH_TYPE_SCRIPT). - * * @addr: Address of script * @fit_uname: FIT subimage name + * @confname: FIT config name. The subimage is chosen based on FIT_SCRIPT_PROP. + * + * Executes a U-Boot script at a particular address in memory. The script should + * have a header (FIT or legacy) with the script type (IH_TYPE_SCRIPT). + * + * If @fit_uname is the empty string, then the default image is used. If + * @confname is the empty string, the default config is used. If @confname and + * @fit_uname are both non-%NULL, then @confname is ignored. If @confname and + * @fit_uname are both %NULL, then first the default config is tried, and then + * the default image. + * * Return: result code (enum command_ret_t) */ -int image_source_script(ulong addr, const char *fit_uname); +int image_source_script(ulong addr, const char *fit_uname, + const char *confname); /** * fit_get_node_from_config() - Look up an image a FIT by type @@ -1031,6 +1039,7 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong *size, #define FIT_FPGA_PROP "fpga" #define FIT_FIRMWARE_PROP "firmware" #define FIT_STANDALONE_PROP "standalone" +#define FIT_SCRIPT_PROP "script" #define FIT_PHASE_PROP "phase" #define FIT_MAX_HASH_LEN HASH_MAX_DIGEST_SIZE diff --git a/test/py/tests/test_source.py b/test/py/tests/test_source.py index e5ffdfe3fc..bbc311df6d 100644 --- a/test/py/tests/test_source.py +++ b/test/py/tests/test_source.py @@ -18,11 +18,20 @@ def test_source(u_boot_console): util.run_and_log(cons, (mkimage, '-f', its, fit)) cons.run_command(f'host load hostfs - $loadaddr {fit}') - assert '1' in cons.run_command('source') + assert '2' in cons.run_command('source') + assert '1' in cons.run_command('source :') assert '1' in cons.run_command('source :script-1') assert '2' in cons.run_command('source :script-2') assert 'Fail' in cons.run_command('source :not-a-script || echo Fail') + assert '2' in cons.run_command('source \\#') + assert '1' in cons.run_command('source \\#conf-1') + assert '2' in cons.run_command('source \\#conf-2') cons.run_command('fdt addr $loadaddr') + cons.run_command('fdt rm /configurations default') + assert '1' in cons.run_command('source') + assert 'Fail' in cons.run_command('source \\# || echo Fail') + cons.run_command('fdt rm /images default') assert 'Fail' in cons.run_command('source || echo Fail') + assert 'Fail' in cons.run_command('source \\# || echo Fail')