| Message ID | 20160904131619.1263-1-leif.lindholm@linaro.org |
|---|---|
| State | Accepted |
| Commit | acc3a3776dc3fb3dc900819b1ee94a6d4f9cf759 |
| Headers | show |
Ruiyu - any comments? Regards, Leif On 4 September 2016 at 14:16, Leif Lindholm <leif.lindholm@linaro.org> wrote: > Drivers under OptionRomPkg wouldn't build standalone, since ARM and > AARCH64 were missing from SUPPORTED_ARCHITECTURES. So add them. > Also, add some compiler libraries needed for ARM/AARCH64 GCC > toolchains (CompilerIntrinsicsLib and BaseSwStackCheckLib). > > Also, the UsbNetworking drivers were not listed under [Components], > so failed to build standalone. This patch adds them. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > OptionRomPkg/OptionRomPkg.dsc | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/OptionRomPkg/OptionRomPkg.dsc b/OptionRomPkg/OptionRomPkg.dsc > index 03592f8..3365556 100644 > --- a/OptionRomPkg/OptionRomPkg.dsc > +++ b/OptionRomPkg/OptionRomPkg.dsc > @@ -7,6 +7,7 @@ > # A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1. > # > # Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR> > # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the BSD License > @@ -29,7 +30,7 @@ [Defines] > PLATFORM_VERSION = 0.1 > DSC_SPECIFICATION = 0x00010005 > OUTPUT_DIRECTORY = Build/OptionRomPkg > - SUPPORTED_ARCHITECTURES = IA32|IPF|X64|EBC > + SUPPORTED_ARCHITECTURES = IA32|IPF|X64|EBC|ARM|AARCH64 > BUILD_TARGETS = DEBUG|RELEASE > SKUID_IDENTIFIER = DEFAULT > > @@ -60,6 +61,12 @@ [LibraryClasses] > UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf > UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > > +[LibraryClasses.AARCH64, LibraryClasses.ARM] > + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + > +[LibraryClasses.ARM] > + NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > + > ################################################################################ > # > # Pcd Section - list of all EDK II PCD Entries defined by this Platform > @@ -105,6 +112,8 @@ [Components] > OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf > OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf > OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf > + OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf > + OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf > > [Components.IA32, Components.X64, Components.IPF] > OptionRomPkg/Application/BltLibSample/BltLibSample.inf > -- > 2.9.3 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/OptionRomPkg/OptionRomPkg.dsc b/OptionRomPkg/OptionRomPkg.dsc index 03592f8..3365556 100644 --- a/OptionRomPkg/OptionRomPkg.dsc +++ b/OptionRomPkg/OptionRomPkg.dsc @@ -7,6 +7,7 @@ # A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1. # # Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR> # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -29,7 +30,7 @@ [Defines] PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/OptionRomPkg - SUPPORTED_ARCHITECTURES = IA32|IPF|X64|EBC + SUPPORTED_ARCHITECTURES = IA32|IPF|X64|EBC|ARM|AARCH64 BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT @@ -60,6 +61,12 @@ [LibraryClasses] UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf +[LibraryClasses.AARCH64, LibraryClasses.ARM] + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + +[LibraryClasses.ARM] + NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform @@ -105,6 +112,8 @@ [Components] OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf + OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf + OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf [Components.IA32, Components.X64, Components.IPF] OptionRomPkg/Application/BltLibSample/BltLibSample.inf
Drivers under OptionRomPkg wouldn't build standalone, since ARM and AARCH64 were missing from SUPPORTED_ARCHITECTURES. So add them. Also, add some compiler libraries needed for ARM/AARCH64 GCC toolchains (CompilerIntrinsicsLib and BaseSwStackCheckLib). Also, the UsbNetworking drivers were not listed under [Components], so failed to build standalone. This patch adds them. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> --- OptionRomPkg/OptionRomPkg.dsc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 2.9.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel