From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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-Google-Smtp-Source: AJdET5dRXFwuYawzULsipxZWkcTMYTJdTvB+CqUiQ21TV2EkJfa/cfckMXeOPxjDjOxFusIHaxArqw== 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 Cc: leif.lindholm@linaro.org, thomas.abraham@arm.com, nariman.poushin@linaro.org, masahisa.kojima@linaro.org, Ard Biesheuvel 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: [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: , X-List-Received-Date: Wed, 21 Nov 2018 12:01:55 -0000 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(-) 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 } } } }; -- 2.17.1