From patchwork Mon Aug 21 16:05:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emekcan Aras X-Patchwork-Id: 29230 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E126EE49A6 for ; Mon, 21 Aug 2023 16:05:47 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.84]) by mx.groups.io with SMTP id smtpd.web10.903.1692633944398398981 for ; Mon, 21 Aug 2023 09:05:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=iCX1dcKa; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=iCX1dcKa; spf=pass (domain: arm.com, ip: 40.107.6.84, mailfrom: emekcan.aras@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eKy1zOwluTnDMEtx250NfwCezcV5WtQEiD3HVIexb88=; b=iCX1dcKahdOlTn81dda6UXOc6fS2Arhp/YNKibbFqLsKa8O69JiBZmc4MeadD5N8RpsO/zJtnsth5WLfqWBqOQcMNu4ZzDOYTuOEMe1OVcMaD/qA+b4QktgYyWntYMIGpUKRiwyDHIL0ohZ+dENpnehNHW0YJPoHlcDKtKq4XkI= Received: from DU2PR04CA0263.eurprd04.prod.outlook.com (2603:10a6:10:28e::28) by AS8PR08MB9268.eurprd08.prod.outlook.com (2603:10a6:20b:5a4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.24; Mon, 21 Aug 2023 16:05:40 +0000 Received: from DBAEUR03FT058.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:28e:cafe::67) by DU2PR04CA0263.outlook.office365.com (2603:10a6:10:28e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Mon, 21 Aug 2023 16:05:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT058.mail.protection.outlook.com (100.127.142.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6723.11 via Frontend Transport; Mon, 21 Aug 2023 16:05:39 +0000 Received: ("Tessian outbound 0b7d6027328f:v175"); Mon, 21 Aug 2023 16:05:39 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: f3136359de0c9399 X-CR-MTA-TID: 64aa7808 Received: from 19542b98e03f.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id ECB7991C-EBF8-4254-8B76-9F9285CE5D61.1; Mon, 21 Aug 2023 16:05:33 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 19542b98e03f.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 21 Aug 2023 16:05:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k61yImE2c9hG3dvTewAufsxGkvm7MjcM7TrIjfKrk2yqnJLmHoqJ+qwkTMnMeHiJMASG2XoGHxkemQdgGSRU0pzYmXy7/NVdsLf845V+KIksycefwaZe39+YNb2cEYxhDf+GnaooXnyDtcq7iNX5cxNXERnzRVkp3JsSpaZpISZxAOh9zmLfe4SshBdk+vZprtTdAb+MsJdDqsxhQ1Jp8tyBI/mG837oNNjPVM7DXr59mwwUakRwbK1YWLEvLoySVuVLa+6m6YXljLmLrYhOVw2eJSrOffUmC4MMhplb6xYVUf7XLgXM1CNNo+TUTU4n0OTonGKpP7UNyE2XevdcRA== 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=eKy1zOwluTnDMEtx250NfwCezcV5WtQEiD3HVIexb88=; b=Ny2pLvPLHrl4H6YqTs9jZpl+cCv5wsEltG8oyGNq8iXttvjRXPRzYORFbCQL9FZGGw05K+eqAz1/EzKDspP5Hn6gps8SB6JEKV4vWrNaMW41hDbUwi161onobjXQUaS1NwdD1V/2TEAB8ewGd0Fgj5KSBHIMioohZuWn9qi0+5bAzpmVvSL464o+erJR5LLwNhUCXOuQlrAgAxwSd8Ta3yC5GgRf53dtvYrf2xYyWkchpCwXl1cwSedwfzEnVDADR1Mmf/4I1IyRA89NSiXh1HDr9t+u64JnEQ732En3Pc/KAsmYW4o19BgAofyA9rTtu0k6OQ0XmGGOEWU05CP0VA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eKy1zOwluTnDMEtx250NfwCezcV5WtQEiD3HVIexb88=; b=iCX1dcKahdOlTn81dda6UXOc6fS2Arhp/YNKibbFqLsKa8O69JiBZmc4MeadD5N8RpsO/zJtnsth5WLfqWBqOQcMNu4ZzDOYTuOEMe1OVcMaD/qA+b4QktgYyWntYMIGpUKRiwyDHIL0ohZ+dENpnehNHW0YJPoHlcDKtKq4XkI= Received: from DBBPR08MB4838.eurprd08.prod.outlook.com (2603:10a6:10:f6::10) by AS8PR08MB5909.eurprd08.prod.outlook.com (2603:10a6:20b:297::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.24; Mon, 21 Aug 2023 16:05:31 +0000 Received: from DBBPR08MB4838.eurprd08.prod.outlook.com ([fe80::e2b5:7555:d797:426]) by DBBPR08MB4838.eurprd08.prod.outlook.com ([fe80::e2b5:7555:d797:426%4]) with mapi id 15.20.6699.022; Mon, 21 Aug 2023 16:05:31 +0000 From: Emekcan Aras To: "meta-arm@lists.yoctoproject.org" , Ross Burton , Jon Mason Subject: [PATCH 1/8] arm-bsp/u-boot: corstone1000: Fix EFI multiple protocol install failure Thread-Topic: [PATCH 1/8] arm-bsp/u-boot: corstone1000: Fix EFI multiple protocol install failure Thread-Index: AQHZ1EhmZiVMyCvt00qooOCbiemMu6/06SHD Date: Mon, 21 Aug 2023 16:05:31 +0000 Message-ID: References: <20230821155840.9899-1-emekcan.aras@arm.com> <20230821155840.9899-3-emekcan.aras@arm.com> In-Reply-To: <20230821155840.9899-3-emekcan.aras@arm.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-traffictypediagnostic: DBBPR08MB4838:EE_|AS8PR08MB5909:EE_|DBAEUR03FT058:EE_|AS8PR08MB9268:EE_ X-MS-Office365-Filtering-Correlation-Id: b468047b-4093-427d-07d0-08dba26076fb x-checkrecipientrouted: true nodisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Aw4iq7DZt3BC6SlOLXJeJImFXKNmUw24VGjbkoyAIqZ5iW2k0y3eHtWjcZyXY3qftngeToPuSvIOfMusJdDQC5RxDFkBCKGFh2mMKJQMZ5filwDOHNdd5yiHUNj5dh/Mz6yEQqQE3zxPmzf/StzPDumoXbrd5QUV1mbUf9eN1g5wvw75WBuiUPoCYjf4WAGBEQ4clot3EWbJdI2bxKezgPRadpHJtYNnpI7XRqNjVtkRkKGuzoHsP5ulUX3KUUeTrWTThcFkQAh3uJnwdoSyJx72/EAGmR+oAjEyBLfhPYE3IuiLgoKuyI5E7nSXByoaVd3G655tCkHMR2d9hT2tMXoYpiEsXHsC3o1IsYf6Wt+U03XgJYVJVfyWpg18PskAhI5qmvY2sXoxnm8XDlmHCL3lvGMfMhOSmVPb6Egm2Q8lZy473Xj+T/N+rYJkLnmSHJhW4FvLFyg5OYUaVkSJY3nA3D2bala9/vqQ4uxkGJEQuE0Ek9RM7zyEP7PFMvy+xorbSR743VGU36KiVlnpfCiWBR64Ehs5xjRprr7d90lx3/+UkTdvTF7ZxsTgYlBEAONbHwQf+DTFEdiUkniZTsyP56eaz6yrCdy8prD7OKYCI+usH9YgOD2rDaWaawCN X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DBBPR08MB4838.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(396003)(376002)(366004)(346002)(39860400002)(186009)(1800799009)(451199024)(66446008)(6636002)(66476007)(76116006)(66556008)(64756008)(316002)(66946007)(9686003)(110136005)(91956017)(8676002)(8936002)(41300700001)(122000001)(478600001)(71200400001)(55016003)(38100700002)(38070700005)(53546011)(6506007)(83380400001)(2906002)(86362001)(19627405001)(7696005)(5660300002)(33656002)(26005)(52536014);DIR:OUT;SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5909 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT058.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: a6d6bda7-8206-451c-c414-08dba26071d3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Wssr6MoUS4nWgvzJ5Y/cvLE9A4ejaY6Hw7Ga9CTyp/WHN/TbaXm7jnuj1vciJ6Ea/DJVQnNuP8HeGXmyt7nabeMWFR7Ee8prHty5N1FlHkpLArzJhyYDppA+iODVm/UMW+FNIJ6gBw1mV6bgzyJ4cYXnelStyU2lQEV1A9bvcAYcEmRGGVkpvIyMDMv/2obWA3JbwFjPda9DdblKEN6bguubVg6r3GQV5jVzUdChAADDc5LqRcosvvwSp9vK3gEdHKHVAUf6CrYmMeGyVMNtfELMgoHDLfLC+zpCkc5iwTMxHaJF2kz4rAMozAJMIk2yO7VRMTNXLvUdkPenVcvI8AVb6iSUW4KIN0zrTeZbb8Yd6JjGYU/dmjiH4KzltB1pz6MMPpz9Eabn5b/W+eoBWSzN+7W9AXlphroRyC5NqIc5bbgyrMEbpRQ36VKxq0LtX6AvYW5ZHDdFkZ8t8lLK3RSXE148so/aD0G5aviub3NBzjHd9+uofx/yU6TsGYzIsMFpFJiRyv3OZbNrtmNm3KUI8SG/HGnQNaR29ztf/iBt5r4iKjv4siCizvf8Xi0OCjAfIepfmkZqNd3XFButEj4C6WFBIPKmxe2kZf4TRwvWxaY4oal+aT4twHceF8OmJP14unb9as3rgbSP7HMNKkLW84u4q+hzjQM7xToyMu5du/xWKujl9wLEIEDzb3fm9uGPVH6AGLLd09uXahfW84vEraBoIxyT36DrPwsh6fO2JkPI+WEPOfqVmdyrJj9 X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230031)(4636009)(136003)(396003)(376002)(346002)(39860400002)(186009)(1800799009)(82310400011)(451199024)(36840700001)(40470700004)(46966006)(6636002)(70586007)(70206006)(316002)(9686003)(110136005)(8676002)(8936002)(41300700001)(40460700003)(82740400003)(356005)(81166007)(478600001)(55016003)(33964004)(53546011)(6506007)(40480700001)(83380400001)(30864003)(2906002)(86362001)(19627405001)(7696005)(47076005)(36860700001)(336012)(5660300002)(33656002)(26005)(52536014);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2023 16:05:39.9780 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b468047b-4093-427d-07d0-08dba26076fb X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT058.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9268 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 21 Aug 2023 16:05:47 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4982 ________________________________ From: emekcan.aras@arm.com Sent: Monday, August 21, 2023 4:58 PM To: meta-arm@lists.yoctoproject.org ; Ross Burton ; Jon Mason Cc: nd ; Emekcan Aras ; Gowtham Suresh Kumar Please ignore all the patchsets sent today with the header "arm-bsp/u-boot: corstone1000". Sent already merged changes by mistake. Subject: [PATCH 1/8] arm-bsp/u-boot: corstone1000: Fix EFI multiple protocol install failure From: Emekcan Aras From: Gowtham Suresh Kumar The patch fixes the ACS InstallMultipleProtocolInterfaces_Conf failures in corstone1000 platform by dropping a workaround u-boot patch. The NVMXIP initialization had some issues during u-boot boot stage which led to the workaround patch. Upstream-Status: Pending [Not submitted to upstream yet] Signed-off-by: Emekcan Aras Signed-off-by: Gowtham Suresh Kumar --- ...ime-allow-to-reset-a-path-after-boot.patch | 31 ------------------- ...ata-make-sure-structures-are-packed.patch} | 0 ...=> 0035-corstone1000-add-boot-index.patch} | 0 ...djust-boot-bank-and-kernel-location.patch} | 0 ...dd-nvmxip-fwu-mdata-and-gpt-options.patch} | 0 ... 0038-nvmxip-move-header-to-include.patch} | 0 ...0-set-kernel_addr-based-on-boot_idx.patch} | 0 ...corstone1000-boot-index-from-active.patch} | 0 ...0041-corstone1000-enable-PSCI-reset.patch} | 0 .../recipes-bsp/u-boot/u-boot_%.bbappend | 17 +++++----- 10 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-efi_boottime-allow-to-reset-a-path-after-boot.patch rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0035-fwu_metadata-make-sure-structures-are-packed.patch => 0034-fwu_metadata-make-sure-structures-are-packed.patch} (100%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0036-corstone1000-add-boot-index.patch => 0035-corstone1000-add-boot-index.patch} (100%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0037-corstone1000-adjust-boot-bank-and-kernel-location.patch => 0036-corstone1000-adjust-boot-bank-and-kernel-location.patch} (100%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0038-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch => 0037-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch} (100%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0039-nvmxip-move-header-to-include.patch => 0038-nvmxip-move-header-to-include.patch} (100%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0040-corstone1000-set-kernel_addr-based-on-boot_idx.patch => 0039-corstone1000-set-kernel_addr-based-on-boot_idx.patch} (100%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0041-corstone1000-boot-index-from-active.patch => 0040-corstone1000-boot-index-from-active.patch} (100%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0042-corstone1000-enable-PSCI-reset.patch => 0041-corstone1000-enable-PSCI-reset.patch} (100%) -- 2.17.1 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-efi_boottime-allow-to-reset-a-path-after-boot.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-efi_boottime-allow-to-reset-a-path-after-boot.patch deleted file mode 100644 index 5c053974..00000000 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-efi_boottime-allow-to-reset-a-path-after-boot.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eb8e224290149fd39ca4b3a774abef2e31237943 Mon Sep 17 00:00:00 2001 -From: Rui Miguel Silva -Date: Wed, 1 Feb 2023 16:11:25 +0000 -Subject: [PATCH 34/42] efi_boottime: allow to reset a path after boot - -Allow to install multiple protocol interfaces in an -already installed root interface. -This may need to be fix in other way, but for now -looks like the get away fix. - -Upstream-Status: Pending -Signed-off-by: Rui Miguel Silva ---- - lib/efi_loader/efi_boottime.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c -index fea4eb7a34..90f43ff9a6 100644 ---- a/lib/efi_loader/efi_boottime.c -+++ b/lib/efi_loader/efi_boottime.c -@@ -2669,7 +2669,6 @@ efi_install_multiple_protocol_interfaces_int(efi_handle_t *handle, - EFI_PRINT("Path %pD already installed\n", - protocol_interface); - ret = EFI_ALREADY_STARTED; -- break; - } - } - ret = EFI_CALL(efi_install_protocol_interface(handle, protocol, --- -2.25.1 - diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-fwu_metadata-make-sure-structures-are-packed.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-fwu_metadata-make-sure-structures-are-packed.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-fwu_metadata-make-sure-structures-are-packed.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-fwu_metadata-make-sure-structures-are-packed.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-corstone1000-add-boot-index.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-corstone1000-add-boot-index.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-corstone1000-add-boot-index.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-corstone1000-add-boot-index.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-adjust-boot-bank-and-kernel-location.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-corstone1000-adjust-boot-bank-and-kernel-location.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-adjust-boot-bank-and-kernel-location.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-corstone1000-adjust-boot-bank-and-kernel-location.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-nvmxip-move-header-to-include.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-nvmxip-move-header-to-include.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-nvmxip-move-header-to-include.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-nvmxip-move-header-to-include.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-corstone1000-set-kernel_addr-based-on-boot_idx.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-set-kernel_addr-based-on-boot_idx.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-corstone1000-set-kernel_addr-based-on-boot_idx.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-set-kernel_addr-based-on-boot_idx.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0041-corstone1000-boot-index-from-active.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-corstone1000-boot-index-from-active.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0041-corstone1000-boot-index-from-active.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-corstone1000-boot-index-from-active.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0042-corstone1000-enable-PSCI-reset.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0041-corstone1000-enable-PSCI-reset.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0042-corstone1000-enable-PSCI-reset.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0041-corstone1000-enable-PSCI-reset.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index 8a8f8f02..c6e90383 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -51,15 +51,14 @@ SRC_URI:append:corstone1000 = " \ file://0031-corstone1000-add-NVM-XIP-QSPI-device-tree-node.patch \ file://0032-sandbox64-add-a-test-case-for-UCLASS_NVMXIP.patch \ file://0033-corstone1000-add-fwu-metadata-store-info.patch \ - file://0034-efi_boottime-allow-to-reset-a-path-after-boot.patch \ - file://0035-fwu_metadata-make-sure-structures-are-packed.patch \ - file://0036-corstone1000-add-boot-index.patch \ - file://0037-corstone1000-adjust-boot-bank-and-kernel-location.patch \ - file://0038-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch \ - file://0039-nvmxip-move-header-to-include.patch \ - file://0040-corstone1000-set-kernel_addr-based-on-boot_idx.patch \ - file://0041-corstone1000-boot-index-from-active.patch \ - file://0042-corstone1000-enable-PSCI-reset.patch \ + file://0034-fwu_metadata-make-sure-structures-are-packed.patch \ + file://0035-corstone1000-add-boot-index.patch \ + file://0036-corstone1000-adjust-boot-bank-and-kernel-location.patch \ + file://0037-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch \ + file://0038-nvmxip-move-header-to-include.patch \ + file://0039-corstone1000-set-kernel_addr-based-on-boot_idx.patch \ + file://0040-corstone1000-boot-index-from-active.patch \ + file://0041-corstone1000-enable-PSCI-reset.patch \ " #