From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c06::242; helo=mail-io0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) (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 02993220D4BE9 for ; Thu, 16 Nov 2017 01:36:50 -0800 (PST) Received: by mail-io0-x242.google.com with SMTP id i38so4620804iod.2 for ; Thu, 16 Nov 2017 01:41:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=oGf+Q1Ag4c8rDi6khdWUrLSGr+mTHJXshER47yXQQwY=; b=HMR+haNOnh5wyZKKv9YMpUM7njO+1iEku5OMvvTHoaHwqMriACTdQlF4NlVmgsuxZb ekxY1/1eCSRR/OHJsh8+30wFYPwtpAWMqbimfWpsUKkz1J8gJizg2ehbuPDInsLToz63 LBw13XSTQ1zlFAH8m4Vt1qrHAN8T5efOotH34= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=oGf+Q1Ag4c8rDi6khdWUrLSGr+mTHJXshER47yXQQwY=; b=udsZ4Gl06OI/0EIeNcNc4fdM44UC5+/a/0+qeeYyCjYb3f0fUuT6qrb5uO79zdakAE TzqyCDS2t/+5OQOPq1y354EEceObq/+gsMOlxl2pJGmkfoGvYxfdu+cEjz19I7WWZ1oh liwXPvQnMtFUEXllTkyHL/r0nWb66HImUlX//FNPbcCtuykT6ikbUH93brfovHLTG0VU tsguxaA7tzL4jY5DfnrDZ/wKnz3dVE28TYDky17NeesMwm14Jll/uKz7lBJV9sPa5ST/ HzoNOGWpDmFGgXIpC+GyBe5ZWPx/61laq9ctjfvEfP3eTDrRFW03izIaloHK/WvdMArO 0Zcw== X-Gm-Message-State: AJaThX6oNF9MnO/qAy7/n619asTvUUAEfCBkY18s+xOiOIrjW7pGU06V qT+FLp3XwTkyjULpAGZXQ2mSORo9pgXufhERBIj4s9+2 X-Google-Smtp-Source: AGs4zMZ5vgTQPkIhPpuN1KXoK2tIN2oLfov7iXu/CmU00X7LdLLmHOeHbGP5H1dW8xMq7zztPb9Ze8/Z0AxlmGClpmc= X-Received: by 10.107.174.206 with SMTP id n75mr976443ioo.43.1510825259308; Thu, 16 Nov 2017 01:40:59 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.3 with HTTP; Thu, 16 Nov 2017 01:40:58 -0800 (PST) In-Reply-To: <20171115140319.32570-1-ard.biesheuvel@linaro.org> References: <20171115140319.32570-1-ard.biesheuvel@linaro.org> From: Ard Biesheuvel Date: Thu, 16 Nov 2017 09:40:58 +0000 Message-ID: To: "edk2-devel@lists.01.org" , Laszlo Ersek Cc: Leif Lindholm , Ard Biesheuvel Subject: Re: [PATCH] ArmVirtPkg: remove ArmPlatformSysConfigLib dependency X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Nov 2017 09:36:51 -0000 Content-Type: text/plain; charset="UTF-8" On 15 November 2017 at 14:03, Ard Biesheuvel wrote: > Now that the PL031 RTC driver library no longer depends on the ARM > platform specific ArmPlatformSysConfigLib, we no longer need to > implement ArmPlatform.h or have a resolution for that library. > This allows us to get rid of a rather dodgy practice of including > platform headers using compiler flags, which is a bad idea at various > levels. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel > --- > PL031 patch is on-list and pending. > > ArmVirtPkg/ArmVirtQemu.dsc | 7 ----- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 6 ---- > ArmVirtPkg/ArmVirtXen.dsc | 6 ---- > ArmVirtPkg/Include/ArmPlatform.h | 33 -------------------- > ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/QemuVirtMem.c | 1 - > ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/RelocatableVirt.c | 1 - > ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c | 1 - > ArmVirtPkg/Library/ArmVirtPlatformLib/VirtMem.c | 1 - > ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c | 1 - > ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c | 1 - > ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c | 7 ++++- > 11 files changed, 6 insertions(+), 59 deletions(-) > > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 8a60b61f2aa6..d1b3849d856a 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -49,7 +49,6 @@ [LibraryClasses.common] > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf > > ArmPlatformLib|ArmVirtPkg/Library/ArmVirtPlatformLib/ArmVirtPlatformLib.inf > - ArmPlatformSysConfigLib|ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf > > TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf > NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf > @@ -71,12 +70,6 @@ [LibraryClasses.common] > [LibraryClasses.common.UEFI_DRIVER] > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > > -[BuildOptions] > - RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmVirtPkg/Include > - GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmVirtPkg/Include Oops. I will need to retain the -mcpu setting here, or the 'hvc' instruction will be rejected by the assembler. > - *_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmVirtPkg/Include > - > - > ################################################################################ > # > # Pcd Section - list of all EDK II PCD Entries defined by this Platform > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 9a31ec93ca06..c7058718b0a6 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -49,7 +49,6 @@ [LibraryClasses.common] > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf > > ArmPlatformLib|ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ArmQemuRelocatablePlatformLib.inf > - ArmPlatformSysConfigLib|ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf > > TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf > NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf > @@ -71,11 +70,6 @@ [LibraryClasses.common] > [LibraryClasses.common.UEFI_DRIVER] > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > > -[BuildOptions] > - RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmVirtPkg/Include > - GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmVirtPkg/Include > - *_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmVirtPkg/Include > - > [BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE] > # Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE > # executable we build for the relocatable PrePi. They are not runtime > diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc > index e9437066ca56..7a443483d1ac 100644 > --- a/ArmVirtPkg/ArmVirtXen.dsc > +++ b/ArmVirtPkg/ArmVirtXen.dsc > @@ -44,7 +44,6 @@ [LibraryClasses] > VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf > > ArmPlatformLib|ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf > - ArmPlatformSysConfigLib|ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf > > TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf > > @@ -56,11 +55,6 @@ [LibraryClasses] > [LibraryClasses.common.UEFI_DRIVER] > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > > -[BuildOptions] > - RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmVirtPkg/Include > - GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmVirtPkg/Include > - GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmVirtPkg/Include > - > [BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE] > # Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE > # executable we build for the relocatable PrePi. They are not runtime > diff --git a/ArmVirtPkg/Include/ArmPlatform.h b/ArmVirtPkg/Include/ArmPlatform.h > deleted file mode 100644 > index 77178aabb310..000000000000 > --- a/ArmVirtPkg/Include/ArmPlatform.h > +++ /dev/null > @@ -1,33 +0,0 @@ > -/** @file > -* Header defining platform constants (Base addresses, sizes, flags) > -* > -* Copyright (c) 2011, ARM Limited. All rights reserved. > -* Copyright (c) 2014, Linaro Limited > -* > -* This program and the accompanying materials > -* are licensed and made available under the terms and conditions of the BSD License > -* which accompanies this distribution. The full text of the license may be found at > -* http://opensource.org/licenses/bsd-license.php > -* > -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > -* > -**/ > - > -#ifndef __PLATFORM_H__ > -#define __PLATFORM_H__ > - > -// > -// We don't care about this value, but the PL031 driver depends on the macro > -// to exist: it will pass it on to our ArmPlatformSysConfigLib:ConfigGet() > -// function, which just returns EFI_UNSUPPORTED. > -// > -#define SYS_CFG_RTC 0x0 > - > -#define QEMU_NOR_BLOCK_SIZE SIZE_256KB > -#define QEMU_NOR0_BASE 0x0 > -#define QEMU_NOR0_SIZE SIZE_64MB > -#define QEMU_NOR1_BASE 0x04000000 > -#define QEMU_NOR1_SIZE SIZE_64MB > - > -#endif > diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/QemuVirtMem.c b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/QemuVirtMem.c > index be512aa3d5b1..2ce5c48d52cf 100644 > --- a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/QemuVirtMem.c > +++ b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/QemuVirtMem.c > @@ -18,7 +18,6 @@ > #include > #include > #include > -#include > > // Number of Virtual Memory Map Descriptors > #define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 5 > diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/RelocatableVirt.c b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/RelocatableVirt.c > index c10c09fed2bd..6df207733ab2 100644 > --- a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/RelocatableVirt.c > +++ b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/RelocatableVirt.c > @@ -18,7 +18,6 @@ > #include > #include > #include > -#include > #include > > /** > diff --git a/ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c b/ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c > index fcaf3c681a97..140bdde8b2ac 100644 > --- a/ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c > +++ b/ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c > @@ -19,7 +19,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/ArmVirtPkg/Library/ArmVirtPlatformLib/VirtMem.c b/ArmVirtPkg/Library/ArmVirtPlatformLib/VirtMem.c > index 666edb47ce97..d10548f86dfc 100644 > --- a/ArmVirtPkg/Library/ArmVirtPlatformLib/VirtMem.c > +++ b/ArmVirtPkg/Library/ArmVirtPlatformLib/VirtMem.c > @@ -18,7 +18,6 @@ > #include > #include > #include > -#include > > // Number of Virtual Memory Map Descriptors > #define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 5 > diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c > index c10c09fed2bd..6df207733ab2 100644 > --- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c > +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c > @@ -18,7 +18,6 @@ > #include > #include > #include > -#include > #include > > /** > diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c > index 657b840059c2..63090586cf8b 100644 > --- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c > +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c > @@ -18,7 +18,6 @@ > #include > #include > #include > -#include > > // Number of Virtual Memory Map Descriptors > #define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 2 > diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c > index d63a2d989f69..e3bbae5b06c5 100644 > --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c > +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c > @@ -12,9 +12,14 @@ > > **/ > > -#include > #include > > +#define QEMU_NOR_BLOCK_SIZE SIZE_256KB > +#define QEMU_NOR0_BASE 0x0 > +#define QEMU_NOR0_SIZE SIZE_64MB > +#define QEMU_NOR1_BASE 0x04000000 > +#define QEMU_NOR1_SIZE SIZE_64MB > + > EFI_STATUS > NorFlashPlatformInitialization ( > VOID > -- > 2.11.0 >