From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (EUR01-HE1-obe.outbound.protection.outlook.com [40.107.13.41]) by mx.groups.io with SMTP id smtpd.web10.12260.1675336916174160734 for ; Thu, 02 Feb 2023 03:21:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=7E+7eRXD; spf=pass (domain: arm.com, ip: 40.107.13.41, mailfrom: sami.mujawar@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=GJv3WbKaLAtCqUC98frRZVwv9BsQcka++0i7xaSXUDk=; b=7E+7eRXDnZzfyjjTpWeGmSlCQaA+UkO1BAKHEcUy1k+K/v2K/pf05NbNgb7+ppWlbwbV1L9/Lmd3blQG+PVMydN9FI3lLnz9sXCQ8PMVG8NdE8v5C7xGTh4eYHLMw6lOsr8+ESWTmUt6/tWQw2fCvpDZzIEU08qGMzcMgRWVumc= Received: from AS8PR05CA0030.eurprd05.prod.outlook.com (2603:10a6:20b:311::35) by GV2PR08MB8485.eurprd08.prod.outlook.com (2603:10a6:150:c3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27; Thu, 2 Feb 2023 11:21:52 +0000 Received: from AM7EUR03FT034.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:311:cafe::68) by AS8PR05CA0030.outlook.office365.com (2603:10a6:20b:311::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27 via Frontend Transport; Thu, 2 Feb 2023 11:21:51 +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 AM7EUR03FT034.mail.protection.outlook.com (100.127.140.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.25 via Frontend Transport; Thu, 2 Feb 2023 11:21:51 +0000 Received: ("Tessian outbound 0d7b2ab0f13d:v132"); Thu, 02 Feb 2023 11:21:51 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ed71a06957519d42 X-CR-MTA-TID: 64aa7808 Received: from 1782f11839c7.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F29B229D-72B9-4486-A5E9-BE8D81F226D6.1; Thu, 02 Feb 2023 11:21:44 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 1782f11839c7.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 02 Feb 2023 11:21:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QyeedOW4LE5zCLNjadfTgGDZx+jza67bDWKYSjLkc3FGxyVOfsVhdSry6aJXTKbOW3m5ox/lXwwy9u3C5pYQFlNYZOH3ms7c6QEI3qnBFEEeh7/TaurUR+mdIMbwy3vNUaiQM4CPhx9VpblpJJJ6cCOh3lCs6Ai26Vd/LeAnXBR5ojTnh5hYPA5CrhUA4dJd3iS3wflgfN7NYsskDIwhSRpqmGi0dnSNAc+o49b0zm4/sZyKBiXen1ixr5Mn7OcZPG0JG2H/RRx3sPdBKpbaAZR8aatmHCgQJ8V4HyR07hoAw3Q0exYFBTDOWLZYhwNbL6gzcRAMPoyELyC6VAEhdw== 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=GJv3WbKaLAtCqUC98frRZVwv9BsQcka++0i7xaSXUDk=; b=DF2OUtRrA6KeZ0+8ncvMvASmQ2ssrAdKixY25E/80P8DFoHKw0JoCQ3fvdgNoQfkPycR5z7oml0Yq5gCsqg+KypWX6DhWmhJRKTwGmyE3BTXmN6pUr8xU27xFwfJUo7oSbsIvKJnvAFfWEaIJeVDnbaThYRiTjRYO908p1isMOZRo4WDyQkj0KMZtkNANVF7aUwVuTVC6+RXbna6i46HaWxdHPUpk4mddFgteSGojajyHy4RHFfAYRaF+Hw45f0lwk+/WYuvf53xGW7NBg2C3QwJy1jQy86ozUDsTODt6fRjlapCvsZ0F1XsftTdHqZnNV+wM7ve2SH23dNqO6/0qQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); 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=GJv3WbKaLAtCqUC98frRZVwv9BsQcka++0i7xaSXUDk=; b=7E+7eRXDnZzfyjjTpWeGmSlCQaA+UkO1BAKHEcUy1k+K/v2K/pf05NbNgb7+ppWlbwbV1L9/Lmd3blQG+PVMydN9FI3lLnz9sXCQ8PMVG8NdE8v5C7xGTh4eYHLMw6lOsr8+ESWTmUt6/tWQw2fCvpDZzIEU08qGMzcMgRWVumc= Received: from DB6PR0601CA0031.eurprd06.prod.outlook.com (2603:10a6:4:17::17) by PAVPR08MB9283.eurprd08.prod.outlook.com (2603:10a6:102:304::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.24; Thu, 2 Feb 2023 11:21:42 +0000 Received: from DBAEUR03FT033.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:17:cafe::be) by DB6PR0601CA0031.outlook.office365.com (2603:10a6:4:17::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Thu, 2 Feb 2023 11:21:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT033.mail.protection.outlook.com (100.127.142.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.24 via Frontend Transport; Thu, 2 Feb 2023 11:21:41 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Thu, 2 Feb 2023 11:21:40 +0000 Received: from E114225.Arm.com (10.1.196.36) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Thu, 2 Feb 2023 11:21:39 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , Subject: [PATCH edk2-platforms v1 1/1] Platform/ARM: Fix BootMonFS device path Date: Thu, 2 Feb 2023 11:21:38 +0000 Message-ID: <20230202112138.40948-1-sami.mujawar@arm.com> X-Mailer: git-send-email 2.16.2.windows.1 MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DBAEUR03FT033:EE_|PAVPR08MB9283:EE_|AM7EUR03FT034:EE_|GV2PR08MB8485:EE_ X-MS-Office365-Filtering-Correlation-Id: e3ecd253-eb75-4304-5b17-08db050faeca 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: aGxmtVFwwbLP2FDQ3hjIskvib1WCoqqMrlIpD2Mod8vI6GDL48c8GfzfYGzzlTK13ybVIiAbKfQBcYjeBqpGkyuSWfrwCxZ0qafELmLJzPNl0ZCVhi4cKk5hV8DW7xvu6mns3buZbtYUnW3cvXh+RgBNu2uI4Dkpak25K51ZTK0nbHCrEV0eOB2xWdW3bzfRqhvTPsVT0R3IyGoqpW7O90QNN9X39KO8bZ+8Exs4wI+hJ44qOGRGBEcFhgtYGCb1WNv3oX3iPDu3iwoCVqezoaf/0PdBtYH5Fjw7+vRO3iLxHzWT7DjkC7tOxdM1EgOzgj4JWgULfB3wDccZ3Zgm962ECl5YYFTOOwtfWCTnfwH1d2gyb0tomo9jSYATJSV6O/N/bYRcAeDIw+lhl1tU9xzOVB5lhaOIUcbDtXdH4PEMjxcGjqbfjLGN/g0sP9NZ+CoanJm/sr3t7OTBqpS/39+SYB8Fe5NeeUK6gKpAu+imFRJsekQS7GhinauCMoaRbGFrTuLah0mJMPbqHaM6L3rdNC2p+chW8ul/o4dp3v+H5qjz99dIItIaQpejkY9iAEWVgU25YLhkFXMH4OqJ+BFeLhVhLhwbivcwFbKBWXqwTl8+NCbpjYpJHl7k3apTzrbclLwyOLGWir2th0GI71CZfR6NjlMLei8GrI9ksAKrKdamawia4NDMtJKtl19uIygbcqd1/Q72moVe/JUz1FhB9QK6AkKWuDmeadPnU7TY/krzU3NfmmViSOTGEMDMCUe5do2VMS6RwRln09Ma1A== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(396003)(346002)(39860400002)(376002)(136003)(451199018)(46966006)(36840700001)(40470700004)(26005)(186003)(44832011)(2616005)(1076003)(336012)(82740400003)(4326008)(426003)(86362001)(47076005)(70206006)(6916009)(70586007)(5660300002)(83380400001)(40480700001)(8936002)(478600001)(966005)(2906002)(82310400005)(7696005)(316002)(81166007)(40460700003)(54906003)(8676002)(36860700001)(356005)(36756003)(19627235002)(41300700001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR08MB9283 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT034.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 10c37090-5a26-4354-e6e7-08db050fa8ee X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GWIuzQmUhCTv/SGht5mow8+z1oNnRzjoiP6Yt4MgE62UxoQWe50pVkggf91BoQDmg+wk6gJ7WGIi2NdVq5snwqU6sEVhIEVW+uayWl21j9WiOqkR2GoY3/RxrA81bJFtr/NwI8e+haK20MmIUHtKjTFILa09LZGahxF3KT+B1af1rpbp1hKXLDhvjH1cE/L0UBdJIQDkIckmJOEtpwxfgfBDbCrtAYR1fr4cy28Z2pzFmRSUN1bBPVmeb/4GDd8cLVSb5qATMAuoGCXETwRfDC+AL7CrfBnZSPFMnE6J82vOxHNNTbqnLkkp5eL1wA6CY7PhRMuq/J7NyurT1eyjW7VdSsgK6yvf5Tvh6pGTWMTHWlDpATuixLkjK2aRjMkxNowvauydNDeP6dEFC5fLtgtcVYDSSTLndiDnbTNmlfz+IguzzA9/YQsQF4piGCNodxGwFOF/VEPktTMsHu3YytQ9bb24ya/lDbAHjWORj2N1fHYIDKUv9eaw5i0Hez+qn6GfxP2kq6rzqM1pwTb6lY/1iMTjPRWfmV20kew1KDfmEPkR4FMNufZEVGV41+Qcx7DjTpWOy7fK6jSRMpfcZ294/5brumykJZFT8gU8W6ppeq9dcBQPQ4BiI3e/922SezU4YRWOD3+jkA66tUIBykz28Hm7qdAnZU66dQ5wmwXFiKyouOxo2LyQLIDyy/8sfOizqGfkceuRz2PpTIYF3wumM9p0csIP7ft7bqa1tnA= 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:(13230025)(4636009)(396003)(346002)(136003)(376002)(39860400002)(451199018)(46966006)(40470700004)(36840700001)(44832011)(36756003)(2906002)(83380400001)(26005)(186003)(40460700003)(336012)(36860700001)(82740400003)(1076003)(426003)(47076005)(70206006)(2616005)(70586007)(86362001)(40480700001)(5660300002)(316002)(54906003)(19627235002)(4326008)(6916009)(41300700001)(8936002)(8676002)(81166007)(7696005)(966005)(478600001)(82310400005);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 11:21:51.7733 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3ecd253-eb75-4304-5b17-08db050faeca 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: AM7EUR03FT034.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR08MB8485 Content-Type: text/plain The NOR Flash driver was recently moved from the Tianocore\edk2 repository to the Tianocore\edk2-platforms repository at the following location: Platform\ARM\Drivers\NorFlashDxe\NorFlashDxe.inf As part of this move the FILE_GUID for the NorFlashDxe.inf at the new location was also updated from: 93E34C7E-B50E-11DF-9223-2443DFD72085 to: DE6AE758-D662-4E17-A97C-4C5964DA4C41 Correspondingly, the device paths for the BootMonFs also requires to be updated in gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths so that the file system is correctly mounted. Therefore, update the BootMonFS device path for the platforms that utilise it. Reported-by: Sudeep Holla Signed-off-by: Sami Mujawar --- The changes can be seen at: https://github.com/samimujawar/edk2-platforms/tree/2568_fix_bootmonfs_path_v1 Platform/ARM/JunoPkg/ArmJuno.dec | 2 +- Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Platform/ARM/JunoPkg/ArmJuno.dec b/Platform/ARM/JunoPkg/ArmJuno.dec index b6437d6fe98cc80c71cbe4dd763d920864458971..5ca42a6997ce1d477086ed8d84cd9241eb59e89b 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dec +++ b/Platform/ARM/JunoPkg/ArmJuno.dec @@ -41,7 +41,7 @@ [PcdsFixedAtBuild.common] gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005 # Juno Device Trees are loaded from NOR Flash - gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)/board.dtb"|VOID*|0x00000008 + gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00)/board.dtb"|VOID*|0x00000008 # MHU Register base used by SCMI Mailbox transport gArmJunoTokenSpaceGuid.PcdArmMtlDoorBell|0x2B1F0000|UINT64|0x00000024 diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index a00b866c5e9a775e360900ed72cc66bb8e3b0f08..14777d2082e325b0b05e8988cfe9c92df6e896b9 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -183,7 +183,7 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24 # List of Device Paths that support BootMonFs - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)" + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00)" # # ARM Architectural Timer Frequency diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc index a21faa249b07e6d3430645542ff6bb891239654c..26ecd9ed59a715c33589b41045182a0a3ced3e27 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc @@ -170,7 +170,7 @@ [PcdsFixedAtBuild.common] # List of Device Paths that support BootMonFs - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)" + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00)" # ARM OS Loader gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 5b0a929b6b25b552ef26b781906439a3b3f15ce4..6495e08db5906958892f68b911d9466fcde748fd 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -164,7 +164,7 @@ [PcdsFixedAtBuild.common] # # Define the device path to the FDT for the platform # - gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)/ca15a7" + gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00)/ca15a7" # # ARM Architectural Timer Frequency diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 81d35fb805c6b946d345b7f0fe8dae336e9be5bd..5e6886b30c8e507939a73b97366e2247a1430cef 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -380,7 +380,7 @@ [PcdsFixedAtBuild.common] # # List of Device Paths that support BootMonFs - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00);VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,02)" + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,00);VenHw(DE6AE758-D662-4E17-A97C-4C5964DA4C41,02)" # RunAxf support via Dynamic Shell Command protocol # We want to use the Shell Libraries but don't want it to initialise -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'