From patchwork Wed Nov 21 12:01:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151680 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1832396ljp; Wed, 21 Nov 2018 04:01:55 -0800 (PST) X-Google-Smtp-Source: AJdET5fxejBwoaHQq2wRSQDPU+GvjszoPbex01L8WwkLrfwZrmI9f7gvDgHIIMrqtNn8+lzWIny0 X-Received: by 2002:a24:3797:: with SMTP id r145-v6mr4937991itr.156.1542801715172; Wed, 21 Nov 2018 04:01:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542801715; cv=none; d=google.com; s=arc-20160816; b=xXRE80Bje3+36ppQX4pKgQSWMDr8QxPyX6QO/U1tL/ZoSoHYoszTWScJ0rimBAQL8G mlkgbmPvFavcvyav+9U/V0Uup2dCLNI00ptKsZQNtmEkLgmFbIbPvaYKftvZ3q8NPid0 ek1tukFSvQMvVfIGtyeCes7Tgi/+3rCjyqs6GXiL8rxL399JodsAv0d//66/s7VPnWMO yFNy4hOVA4bl86jlwdLiMdoOjLj+tbO98858D1Fv/I5NxKS3AI3i/S+4sS0CQHmZayCa 0Iye4ffpBgMI/RALWH637+SiY/1t36CWLq1GzB957cyEr8WUifpt6gQYi/0ApMFzE6NI 7TOA== 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:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=BDd8m3Ulakn4YQpa2hDdGsRl+KTtyx/X6Q7MKaUhQ70=; b=VX24mFYZPDp6dgqrRb6zlQr/nhosBR8Son/HxT6KwPOlFBDvRnE1q4J8NXI+1sxpZp /s0h1mzYqi1EyHkugpUnl1W5C7b7vX+ApF9oTkF6pGtYxUqhfTOAmnBt4tsqZ0aOo8l5 jLgkZQcQoUDj0DxXKW1VeRjdvaisPl+DRQUqqimlYf7iGMYF+l5swhPqfL1WYXJzuQCZ egEi8XjYoZFQ9WKo0P8VdxyyCzqiMoSc+Fb/OFqeYT05srM0ypqlxQaEX18As1l3rV/9 wpm+SRdg94BcDzJq56sXUe0PuJaQwtRbd36uqyOLQ8tikGWuhDkdDOYAggDBdptbu7zP 5Z2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PLXzNFmz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id e130-v6si11162932iof.57.2018.11.21.04.01.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 04:01:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PLXzNFmz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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 2D8A921193780; Wed, 21 Nov 2018 04:01:54 -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=2a00:1450:4864:20::544; helo=mail-ed1-x544.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) (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 C3EB62119377C for ; Wed, 21 Nov 2018 04:01:52 -0800 (PST) Received: by mail-ed1-x544.google.com with SMTP id z28so4654168edi.8 for ; Wed, 21 Nov 2018 04:01:52 -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:in-reply-to:references; bh=ettS/QrRYp8fk2z3KOfCNxM1PLH0isxtaKZvNXIbjlU=; b=PLXzNFmz5ae4UlnWRZxOtW7U9tZgHL/9z71uwLp0FVYF5PHr19Vd99EoemYSVjhntA NcDdPlN8OI3sj6QV/XZ7nD4LVSJk0IEoqdO5ZyOjvXL8l6GP2E0Eqc8rHNumvc51RiHM KriU8GJUfjhVxxHWuGQfJKcPa2YszLuAcMCwU= 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:in-reply-to :references; bh=ettS/QrRYp8fk2z3KOfCNxM1PLH0isxtaKZvNXIbjlU=; b=IbL3tQn10pyaLvmKoxqb/EsL9vgvXUjCJt8tBo9oa/iX28K7wJuynZvzvogQs78Ktn 5PQTsRwZI5bdIVxokq2Ug6VChRbFuMluw1u88VXTESbA5pOSYFl8QVFCh7jg9LRQ1zdj crmVIQOnM845pI6FUmTeHYiMc9EGErUwVMwrX39r9nMHutN9d3wIhnXos939uRjv90XS dxXAg/pKTgynd2wVVboisI+7GqyUmBFYOrpKVwl8EPtbmMct2/RJcVAh1bYEDCeki6y7 /FFvqHTtK+Jo1JoCYsZbJqz8Ealcc+wtgIaQxyhQC5270hANxmE039P5xovKj8itHNFP v1sg== X-Gm-Message-State: AGRZ1gJcVhyQweLstLpvkFbPoBu7+J0m+lFeoCF8Vxn3kTmUOw2nqDwE GJJrKLTHN3b0YVrrQvCxt3v6w98P4Zkf4g== X-Received: by 2002:a17:906:1155:: with SMTP id i21-v6mr4870588eja.110.1542801710942; Wed, 21 Nov 2018 04:01:50 -0800 (PST) Received: from mba13.wifi.ns.nl (dhcp-077-251-017-237.chello.nl. [77.251.17.237]) by smtp.gmail.com with ESMTPSA id c2sm13044290edv.14.2018.11.21.04.01.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 04:01:50 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 21 Nov 2018 13:01:43 +0100 Message-Id: <20181121120145.3148-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181121120145.3148-1-ard.biesheuvel@linaro.org> References: <20181121120145.3148-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 1/3] 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: , Cc: nariman.poushin@linaro.org 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 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 From patchwork Wed Nov 21 12:01:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151681 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1832452ljp; Wed, 21 Nov 2018 04:01:58 -0800 (PST) X-Google-Smtp-Source: AJdET5dVI5PMMVMf767YbTKvI1PEKvYFqXwjru0ZGLITOgK+0Ct4x7S0DWkpSvZ+H7FgIMpqGx0s X-Received: by 2002:a24:2ecf:: with SMTP id i198-v6mr5078893ita.74.1542801718160; Wed, 21 Nov 2018 04:01:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542801718; cv=none; d=google.com; s=arc-20160816; b=xOQxXFHHf6DJSWAnmp7IWmE65/gC17Q5SmyhlvooaNrCQFv3E6TcqVZNpbZccG6Bft fBNENwQVghcTZxhHDsN8jmnXooHscxNNv6ypZ0zlfnr3BIz3aQgatv9G8NaaICcWxzv/ GUaptyzRhbsfz1OiMFSTSaJXY09i0TVxMo6xkXzTQtMYQztds+NHCrVKntnW/DFNM1gG L7ehfp102hay9Sl9WIzAvDq/lCoRcHGhxbez6u+VOzQonAcocXci0YEIXf85UfXSZ3R+ ddBZTxvDazMmeJN8IjeNDYV1+hkpEz1By5nWLoPVbb+dvnp6DGG5anva5zFeW1ImB15R TbUA== 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:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=JaTuv3bqqQAbSVnCjgk9xaLSHsskwRBnURm16S9hxIQ=; b=XShjlBuav9Qae/mZjOCr5Whm0jZBd6DvFVxaQlLhOHhQnDcUknX4YspXGDlM+yHdP1 lETrv4wUR33jPKNC0LKJHkzh7lrJKr+P8wGcvp5QoVDiG0qO/vl3bErdXT/TW2FjwLHP I6cuiBlzPRk2KBbnl4fQ0ekbApk/sEAG0VUQw0qVNzatmmxMUvyTwCKmQQO3Zh+e6MJO chFQ1dQKcrLAY26wNVn6DW/b74aCCU+kTUJPtLe46UZmZWc9DT0euh1C3Vr9Nk5MfMtP KVyjb426TR/G1zttQAWJ9tHJ9bu0GPurfBg3HzPnp0f0KUXoholAR+hheB64HmjuZlQN T7TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=QYHSurIy; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id 70-v6si32640423jay.69.2018.11.21.04.01.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 04:01:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=QYHSurIy; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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 6AA7321193782; Wed, 21 Nov 2018 04:01:55 -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=2a00:1450:4864:20::541; helo=mail-ed1-x541.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) (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 1C6AD2119377C for ; Wed, 21 Nov 2018 04:01:54 -0800 (PST) Received: by mail-ed1-x541.google.com with SMTP id z28so4654210edi.8 for ; Wed, 21 Nov 2018 04:01:53 -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:in-reply-to:references; bh=XbhndgSsfYJVM4LqLqu6mFJ7pBh67V2qsOWMF1kPcG8=; b=QYHSurIy+rKhzrRiHuXEjtGY0Eq2/nDU3QLaRN3fjrKe90mWemqZLMr8eLsnxwIhIZ Lh00e/3xUEu/I7hVBZL/6kt6x+XcMN1/W4QEkk0GT/fiWsbnR/VDDKMD/CK3qjFuydhM OzLlap2XnKSXRZhqUOVcARMK0HhootasBbT4Y= 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:in-reply-to :references; bh=XbhndgSsfYJVM4LqLqu6mFJ7pBh67V2qsOWMF1kPcG8=; b=qTeR8eC0b8q6JMg8SDkRmnM5pu2BtY54bi4/qP6V4kuT/sIufa7U05R6p1gqF7YrBN 1Xr+lN/H53UTUg/9Es4Kk6x+UiEP0Wm+GXvm2K4aK/+V2IvpNRhutkCbnt9FogJFn/m7 CyTRCRLShGnxZPt3cJTpeerPvZpDfSADzgZEqqq04+0XEqGXu4kVMTWCCTb8NTKqN4LJ 6fLiWJIPZMqIB7MhN20xT/sC89ZJL+ZxIwh1jk10ONvT4S4enBd1iIQkgeqoQBJRHlX7 noBu5JMfB0X+n9q3cyqu64gVlTNMaS9Kb6og5hKRFZFr1P8mJJb+lxXif7CNZZZJ4XJ9 wFqQ== X-Gm-Message-State: AGRZ1gLTaFLbGnD010sytGIy/hJdKcCbZMOP1saNjvUm4tUra0soKMFN v6faNqsHNW8rw0N9JLWu9blnrLlkDfjICw== X-Received: by 2002:a17:906:351a:: with SMTP id r26-v6mr4804076eja.193.1542801712200; Wed, 21 Nov 2018 04:01:52 -0800 (PST) Received: from mba13.wifi.ns.nl (dhcp-077-251-017-237.chello.nl. [77.251.17.237]) by smtp.gmail.com with ESMTPSA id c2sm13044290edv.14.2018.11.21.04.01.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 04:01:51 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 21 Nov 2018 13:01:44 +0100 Message-Id: <20181121120145.3148-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181121120145.3148-1-ard.biesheuvel@linaro.org> References: <20181121120145.3148-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 2/3] Silicon/SynQuacer: drop per-bank NOR flash GUIDs 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: , Cc: nariman.poushin@linaro.org MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Give the SynQuacer NOR flash driver the same treatment as we gave the one in ArmPlatformPkg: identify NOR flash banks by a single GUID identifying the driver, and use indexes to identify each device instance owned by the driver. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c | 14 +++++++------- Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.h | 3 +++ Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c | 6 ------ 3 files changed, 10 insertions(+), 13 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c index 8d6bca8739d0..98f3e4d5a012 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c +++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c @@ -1093,12 +1093,13 @@ STATIC CONST NOR_FLASH_INSTANCE mNorFlashInstanceTemplate = { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { - (UINT8)sizeof(VENDOR_DEVICE_PATH), - (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8) + (UINT8)(OFFSET_OF (NOR_FLASH_DEVICE_PATH, End)), + (UINT8)(OFFSET_OF (NOR_FLASH_DEVICE_PATH, End) >> 8) } }, { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }, }, + 0, // Index { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, @@ -1118,10 +1119,9 @@ NorFlashCreateInstance ( IN UINTN NorFlashDeviceBase, IN UINTN NorFlashRegionBase, IN UINTN NorFlashSize, - IN UINT32 MediaId, + IN UINT32 Index, IN UINT32 BlockSize, IN BOOLEAN HasVarStore, - IN CONST GUID *NorFlashGuid, IN CONST CSDC_DEFINITION *CommandTable, IN UINTN CommandTableSize, OUT NOR_FLASH_INSTANCE** NorFlashInstance @@ -1146,12 +1146,13 @@ NorFlashCreateInstance ( Instance->Size = NorFlashSize; Instance->BlockIoProtocol.Media = &Instance->Media; - Instance->Media.MediaId = MediaId; + Instance->Media.MediaId = Index; Instance->Media.BlockSize = BlockSize; Instance->Media.LastBlock = (NorFlashSize / BlockSize) - 1; Instance->OffsetLba = (NorFlashRegionBase - NorFlashDeviceBase) / BlockSize; - CopyGuid (&Instance->DevicePath.Vendor.Guid, NorFlashGuid); + CopyGuid (&Instance->DevicePath.Vendor.Guid, &gEfiCallerIdGuid); + Instance->DevicePath.Index = (UINT8)Index; Instance->CmdTable = CommandTable; Instance->CmdTableSize = CommandTableSize; @@ -1360,7 +1361,6 @@ NorFlashInitialise ( Index, NorFlashDevices[Index].BlockSize, ContainVariableStorage, - &NorFlashDevices[Index].Guid, mN25qCSDCDefTable, ARRAY_SIZE (mN25qCSDCDefTable), &mNorFlashInstances[Index] diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.h b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.h index 5e1e6adecf67..ef1257a64904 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.h +++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.h @@ -83,10 +83,13 @@ typedef struct _NOR_FLASH_INSTANCE NOR_FLASH_INSTANCE; typedef EFI_STATUS (*NOR_FLASH_INITIALIZE) (NOR_FLASH_INSTANCE* Instance); +#pragma pack(1) typedef struct { VENDOR_DEVICE_PATH Vendor; + UINT8 Index; EFI_DEVICE_PATH_PROTOCOL End; } NOR_FLASH_DEVICE_PATH; +#pragma pack() struct _NOR_FLASH_INSTANCE { UINT32 Signature; diff --git a/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c b/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c index d44fe3e4e94c..1b3995d799de 100644 --- a/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c +++ b/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c @@ -34,9 +34,6 @@ STATIC NOR_FLASH_DESCRIPTION mNorFlashDevices[] = { FW_CODE_REGION_BASE, // region base FW_CODE_REGION_SIZE, // region size SIZE_64KB, // block size - { - 0x19c118b0, 0xc423, 0x42be, { 0xb8, 0x0f, 0x70, 0x6f, 0x1f, 0xcb, 0x59, 0x9a } - } }, { // Environment variable region @@ -44,9 +41,6 @@ STATIC NOR_FLASH_DESCRIPTION mNorFlashDevices[] = { FW_ENV_REGION_BASE, // region base FW_ENV_REGION_SIZE, // region size SIZE_64KB, // block size - { - 0x3105bd7a, 0x82c3, 0x486f, { 0xb1, 0x03, 0x1e, 0x09, 0x54, 0xec, 0x85, 0x75 } - } }, }; From patchwork Wed Nov 21 12:01:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151682 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1832503ljp; Wed, 21 Nov 2018 04:02:00 -0800 (PST) X-Google-Smtp-Source: AJdET5cfPKxsiwGsIJu/YhtCk/YiH3kwTY3/agAkYChcKGECRTgeLsb/SPZ5EHOg4gv0vBZYf5E+ X-Received: by 2002:a62:cf84:: with SMTP id b126mr6459760pfg.98.1542801720746; Wed, 21 Nov 2018 04:02:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542801720; cv=none; d=google.com; s=arc-20160816; b=EM/OP+FN+62qOFXMx7gPB4gQ3xC/9MG7qTPFOoKShdqi2917zA92x/n515R2jT5VqZ 6VLe1k4g/9ZrksoJMTBaduKgak3Jl3IfnvoVnDipL9bsRe9eGIpwPIMLCkMmEtK8aBAg suId9R5yu1UVzkWxQxyOeDEkDk0ksL153qRnmdKqqQsMpAfmO0OpAbSyUeCvfmrTzn5H lP2d2iQjiNnEeo+eKOhjcKSAlAQWVQNQ6b053KJUFbi6HYEq77aEmwbbkM/tKYbluwB7 lOZWv3Iz4MIc0dhmH0U9azxPQTfzoxmK2BpZws8i/Io8TmpBc9rRk+lXU2b3xMD5deqQ HO/A== 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:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=xtciaWiBpkzW8FTKUXI8U5ZxKKe4RyonLEBtjHigf+s=; b=OUVY0M6sLY882ZELzw386ZCoE+vOTf/BO9bV+MbyaFOsXqbfUjXuBJf0p4OOU7HZP3 qUof2OtgR9HEyYVcFyrzV7bzxNdUBHszkw8cB9p5IYbSw/0+/qdNj9mjI29/1M7SNo5N PGNP4InfXs/s2FUupUgaHizrIzF6eqF0PpfK7J9IURyd58bD0sn/8DxOVOhN4Pp5w1qr RYyEUck3e1q/Y5mOp2dfWF0ttufqV1OQG+KDG1R+Kz4MWjsuPwYg1kQGw71x6XeK8sBW WyMGD65yMms9g5T27pjFJnDb8CrpwCEYW0D6InsS5ocOCIe52+LdzJ/N6f9pq4xnmMOT C4AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SF+dlwtB; 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 d128-v6si43129020pfc.256.2018.11.21.04.02.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 04:02:00 -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=SF+dlwtB; 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 983F121193787; Wed, 21 Nov 2018 04:01:56 -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=2a00:1450:4864:20::543; helo=mail-ed1-x543.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) (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 7AB9121193785 for ; Wed, 21 Nov 2018 04:01:55 -0800 (PST) Received: by mail-ed1-x543.google.com with SMTP id j6so4654242edp.9 for ; Wed, 21 Nov 2018 04:01:55 -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:in-reply-to:references; bh=VghGLqUcONJ31mC+g8TK2tIqJAYetyBvgVbXnFV23z0=; b=SF+dlwtB3Pi24znVUJ8xBxNld/8PjsPg9nlwlO9cskcN5Kr0McxkEbtQVmzoRRYnd4 ac/d8nDsngA/PTJVMv3fDF3dHHh+gAQAOMAjT2EUyNzkgm8y9mNv5UR0VkbWY89bBb01 pkeamsobS+ozuDA7KYbpDbKu1N68fkIzMeovE= 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:in-reply-to :references; bh=VghGLqUcONJ31mC+g8TK2tIqJAYetyBvgVbXnFV23z0=; b=PmW++M9PyLje6ghLGP2mHPmMtpQJ/GnDn2KZLTKjDPSsy9St25yxG28QCEr5O13XH+ gtoCnycmTmGSsrpANwIV3hz2wcLJ2c0TNaIqEE5UANBjmYdSZwQcuGMSKqriyH0VLkZ7 CguBDZNIcfdyBKxevI+KR2wCtB0Y10kyHdnf89iBZtvkJwrMbOcc3vabi80iIS1zuLZz SHGkGeWYlh7Cd++LYRd4K57ZlzZ0CyCdQttjsl24GFqt0GxS6XMHFtQ0LE8UxjnYDAZF QVyDtysdyyMb6b/kvUnJmgQAgDC8+Q8NG1XPbV+X7lMdCbxGFBdUDfDGKZX2PIUEcx11 aRjQ== X-Gm-Message-State: AGRZ1gKefyq1OpuByLEwc31Y/4A5a4xhbA/YhekG5Kh3KHi2kqnymfFm 228qnmtTV+cRqK3Sux4mJhPy0GcSr4Lxmg== X-Received: by 2002:a17:906:e287:: with SMTP id gg7-v6mr4920014ejb.128.1542801713548; Wed, 21 Nov 2018 04:01:53 -0800 (PST) Received: from mba13.wifi.ns.nl (dhcp-077-251-017-237.chello.nl. [77.251.17.237]) by smtp.gmail.com with ESMTPSA id c2sm13044290edv.14.2018.11.21.04.01.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 04:01:52 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 21 Nov 2018 13:01:45 +0100 Message-Id: <20181121120145.3148-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181121120145.3148-1-ard.biesheuvel@linaro.org> References: <20181121120145.3148-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 3/3] Platform/ARM: drop per-bank NOR flash GUIDs 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: , Cc: nariman.poushin@linaro.org MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove the GUID definitions from the NOR flash bank structure: the driver no longer uses them. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c | 2 -- Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c | 2 -- Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c | 4 ---- 3 files changed, 8 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c index b31b9635b7b7..2e49f3acfeb3 100644 --- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c +++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c @@ -24,14 +24,12 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[] = { ARM_VE_SMB_NOR0_BASE, SIZE_256KB * 255, SIZE_256KB, - {0xE7223039, 0x5836, 0x41E1, { 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59} } }, { ARM_VE_SMB_NOR0_BASE, ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255, SIZE_64KB * 4, SIZE_64KB, - {0x02118005, 0x9DA7, 0x443A, { 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB } } }, }; diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c index 3ab296aafda0..04e9710bf286 100644 --- a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c +++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c @@ -24,14 +24,12 @@ STATIC NOR_FLASH_DESCRIPTION mNorFlashDevices[] = { SGI_EXP_SMC_CS0_BASE, SIZE_256KB * 256, SIZE_256KB, - { 0xEBF0B9DF, 0x17d0, 0x4812, { 0xA9, 0x59, 0xCF, 0xD7, 0x92, 0xEE, 0x31, 0x13 } } }, { SGI_EXP_SMC_CS1_BASE, SGI_EXP_SMC_CS1_BASE, SIZE_256KB * 256, SIZE_256KB, - { 0x1F15DA3C, 0x37FF, 0x4070, { 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A } } }, }; diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c index a136bff4a1d6..ac270dc3a675 100644 --- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c +++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c @@ -26,28 +26,24 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = { ARM_VE_SMB_NOR0_BASE, SIZE_256KB * 255, SIZE_256KB, - { 0xE7223039, 0x5836, 0x41E1, { 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59 } } }, { // BootMon non-volatile storage ARM_VE_SMB_NOR0_BASE, ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255, SIZE_64KB * 4, SIZE_64KB, - { 0x02118005, 0x9DA7, 0x443A, { 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB } } }, { // UEFI ARM_VE_SMB_NOR1_BASE, ARM_VE_SMB_NOR1_BASE, SIZE_256KB * 255, SIZE_256KB, - { 0x1F15DA3C, 0x37FF, 0x4070, { 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A } } }, { // UEFI Variable Services non-volatile storage ARM_VE_SMB_NOR1_BASE, ARM_VE_SMB_NOR1_BASE + SIZE_256KB * 255, SIZE_64KB * 3, //FIXME: Set 3 blocks because I did not succeed to copy 4 blocks into the ARM Versatile Express NOR Flash in the last NOR Flash. It should be 4 blocks SIZE_64KB, - { 0xCC2CBF29, 0x1498, 0x4CDD, { 0x81, 0x71, 0xF8, 0xB6, 0xB4, 0x1D, 0x09, 0x09 } } } };