From patchwork Sat Nov 17 01:23:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151394 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp24966ljp; Fri, 16 Nov 2018 17:23:16 -0800 (PST) X-Google-Smtp-Source: AJdET5ft2p8BsHRfGDxesPI/erG7Q90pQaA8AvWRUkEaXSAqfEf5IWehjXMIG6CzzAak82ORDbdV X-Received: by 2002:aa7:87ce:: with SMTP id i14mr5799749pfo.20.1542417796299; Fri, 16 Nov 2018 17:23:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542417796; cv=none; d=google.com; s=arc-20160816; b=U8MWUd3fsKrpJ6LD4MLaF4490IJJKrH5YmuHTkn8mrfNhSKthAt9vKKFXHmiwV02FQ B01FGoP48xs3Xb4jVnAqUsSdRJZCj2bjcpbw2ncuK/ccuwTK5WN4PhFAjeTGyBKXqA7K aIrXZ2IzOjVZNOwjh3WMwya+eSPzavUBoxPa8fW0O4zYJXf4jvDyi8NqSFucU2/1sin8 1pevN5aadpi0vcmcQJozRfoH3kpoLzqPV2Ag5/15g3yPdbtob0QpOx5xdEUwpztGL71p L7p9aPiE/UxfhI7In9dW8q+vnSXmIpZtBVkENGV6NF+LhUJ/8xHqM2Eptf+M9VMGjlJV iQ3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=BDd8m3Ulakn4YQpa2hDdGsRl+KTtyx/X6Q7MKaUhQ70=; b=lT4WE9Hp6wM7RxTZ1tEFMqG4SBvw6IUQjnswXSRJNZcWMYnCQ90Ve0TvD0fFJwN6g6 PhIRGRniud70tZVRECGQ+xMs4qRDL7SI3rxSSZOO4ylf2SvGpHB24h+On/bSSUYv0mfg hOrdbXv/0+k8K7xvVVulyjiZNcPgTlf3nuGYsLTG7ENDf3roa8XwUDF/qyjLWkTU8rUP ALYHxUN0jrUbITthWPuXideYch4TDcZZBCBeKacHnnDGPPIWnwsJX1S9dEnxGnU5wMyL rD2HKe0KyBnkgRyZ53w9yrhb2EXDylBr3aaQ76ooP0v3WrJfpOnxgLQtt3QrtvMlLRFp x5DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=e9nM3L+3; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id a12si32300760pgk.291.2018.11.16.17.23.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Nov 2018 17:23:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=e9nM3L+3; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E0A1A21A07A92; Fri, 16 Nov 2018 17:23:14 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::441; helo=mail-pf1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 01B8E2118B7B2 for ; Fri, 16 Nov 2018 17:23:13 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id e22-v6so12179023pfn.8 for ; Fri, 16 Nov 2018 17:23:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ettS/QrRYp8fk2z3KOfCNxM1PLH0isxtaKZvNXIbjlU=; b=e9nM3L+3IhcKRtG1IVj+jIBetjv0kO/37jZ9FjrCI4giPLwfmYedQeiyiLhM4r6A1H qXhT81UaUPSNM60zZY6iYVmZkZbpQuMH1+CXjMOPkEY6iObWKQRCnOIgD+GLE0IpjYKR IeYxUkP8K7DsnZdnK4jCNkcV2BCzowicSArC0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ettS/QrRYp8fk2z3KOfCNxM1PLH0isxtaKZvNXIbjlU=; b=H+jZAE17In14bTAArSOIDk6L0aIX0zorzJBYRIsLmmaWzK0woO+tqd8L8pikygtv4w JEGXqqK2/0FlRsybK9i/oAr8fsibTkewl/Iu7ubYkWqfb+85J3Z6zPfTIKUH+ZPxM3Ey IQ0HrVRR2hgYxEINjsGzKAOzqUxbSUuzh+upJ5zV03BWjNuLzNb6KhYwaEKiHaiJi5u6 ZjMB/mIMizJfGrBIcQ5Ehdbs9D+841xKfwm/GCiKdQDZhPTjo+MUIc8zL4kJeYQdj8hl Cz1SWVQC4Hek8lB2kWLSaAVHRpFi7Ivqwt4xsMjaq21c7HjF5oyZ0mjX3MrqnDMEx31D nQ4w== X-Gm-Message-State: AGRZ1gJ0dsOwKGu6P7j7WT4U84R915XYa1yb1d1yroSs6Ul7SmtjNS5X tGsYHkaF2lg8qb/N3oKdBw2ea/YbIglWTQ== X-Received: by 2002:a62:a99:: with SMTP id 25mr13285497pfk.121.1542417793162; Fri, 16 Nov 2018 17:23:13 -0800 (PST) Received: from mba13.psav.com ([64.114.255.114]) by smtp.gmail.com with ESMTPSA id 186-v6sm35958235pfe.39.2018.11.16.17.23.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Nov 2018 17:23:12 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Fri, 16 Nov 2018 17:23:08 -0800 Message-Id: <20181117012308.32680-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Subject: [edk2] [PATCH edk2-platforms] Platform/ARM: replace hardcoded VenHW() device paths referring to NOR flash X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The ArmPlatformPkg NOR flash driver has been updated to use device paths consisting of a fixed GUID and a numeric index rather than a separate GUID for each flash bank on a given system. This means all explicit device path references to NOR flash banks have to be brought up to date as well. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/ARM/JunoPkg/ArmJuno.dec | 2 +- Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- Platform/ARM/SgiPkg/SgiPlatform.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Platform/ARM/JunoPkg/ArmJuno.dec b/Platform/ARM/JunoPkg/ArmJuno.dec index edbbb827ad45..c511796d8913 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dec +++ b/Platform/ARM/JunoPkg/ArmJuno.dec @@ -44,7 +44,7 @@ gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005 # Juno Device Trees are loaded from NOR Flash - gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/board.dtb"|VOID*|0x00000008 + gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,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 ac3d63bd4d39..55b9d64d3deb 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -176,7 +176,7 @@ gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24 # List of Device Paths that support BootMonFs - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)" + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)" # # ARM Architectural Timer Frequency diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc index 3f0ca9872e79..06d866d6dc30 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc @@ -163,7 +163,7 @@ gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000 # List of Device Paths that support BootMonFs - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)" + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,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 0542808f7d0c..3a3b4e3dbbc8 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -172,7 +172,7 @@ # # Define the device path to the FDT for the platform # - gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/ca15a7" + gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00)/ca15a7" # # ARM Architectural Timer Frequency diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 752e525c3469..713c5637b074 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -355,7 +355,7 @@ # # List of Device Paths that support BootMonFs - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59);VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)" + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,00);VenHw(93E34C7E-B50E-11DF-9223-2443DFD72085,02)" # RunAxf support via Dynamic Shell Command protocol # We want to use the Shell Libraries but don't want it to initialise