X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UnixPkg%2FUnixPkg.fdf;h=81929cfc59e66df88546d9619e6d887d7a8fb5ae;hb=f6b4e53dfe43c27d448cedb57059e5b7ca236dd8;hp=bdc9494d7712a643ef6beb1e6ec65f206634d3c1;hpb=a0b1646f55423e4c2140a9366e8434c682927ff8;p=mirror_edk2.git diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf index bdc9494d77..81929cfc59 100644 --- a/UnixPkg/UnixPkg.fdf +++ b/UnixPkg/UnixPkg.fdf @@ -1,9 +1,9 @@ ## @file # This is Unix FDF file with UEFI HII features enabled # -# Copyright (c) 2008 - 2010, Intel Corporation +# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.
# -# All rights reserved. This program and the accompanying materials +# 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 @@ -189,13 +189,11 @@ INF UnixPkg/ResetRuntimeDxe/Reset.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf INF UnixPkg/UnixThunkDxe/UnixThunk.inf INF UnixPkg/CpuRuntimeDxe/Cpu.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf -INF IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf INF UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf INF UnixPkg/TimerDxe/Timer.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf @@ -239,48 +237,28 @@ INF MdeModulePkg/Application/HelloWorld/HelloWorld.inf #INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf #INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf #INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf +#INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf #INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf #INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf #INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf #INF UnixPkg/SnpUnixDxe/SnpUnixDxe.inf +# +# Build from source or use checked in binary +# #INF FatPkg/EnhancedFatDxe/Fat.inf +INF RuleOverride = BINARY USE = IA32 FatBinPkg/EnhancedFatDxe/Fat.inf +# If you build GccShellPkg you can source level debug shell +#FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { +# SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/IA32/ShellFull.efi +#} +INF RuleOverride = BINARY USE = IA32 EdkShellBinPkg/FullShell/FullShell.inf - -################################################################################ -# -# FILE statements are provided so that a platform integrator can include -# complete EFI FFS files, as well as a method for constructing FFS files -# using curly "{}" brace scoping. The following three FILEs are -# for binary shell, binary fat and logo module. -# -################################################################################ -FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { - SECTION COMPRESS PI_STD { - SECTION GUIDED { - SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi -# SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/IA32/ShellFull.efi -# SECTION PE32 = Build/Unix/DEBUG_XCODE32/IA32/Ebl.efi - } - } - } - -FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F { - SECTION COMPRESS PI_STD { - SECTION GUIDED { - SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi - } - } - } FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { - SECTION COMPRESS PI_STD { - SECTION GUIDED { - SECTION RAW = MdeModulePkg/Logo/Logo.bmp - } - } - } + SECTION RAW = MdeModulePkg/Logo/Logo.bmp +} ################################################################################ @@ -299,10 +277,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { # #[Rule.Common.DXE_DRIVER] # FILE DRIVER = $(NAMED_GUID) { -# DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex +# DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex # COMPRESS PI_STD { # GUIDED { -# PE32 PE32 $(MODULE_NAME).efi +# PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi # UI STRING="$(MODULE_NAME)" Optional # VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) # } @@ -313,33 +291,23 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { [Rule.Common.PEI_CORE] FILE PEI_CORE = $(NAMED_GUID) { - PE32 PE32 Align=32 $(MODULE_NAME).efi + PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING ="$(MODULE_NAME)" Optional VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } [Rule.Common.PEIM] FILE PEIM = $(NAMED_GUID) { - PEI_DEPEX PEI_DEPEX Optional $(MODULE_NAME).depex - PE32 PE32 Align=32 $(MODULE_NAME).efi + PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex + PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } -[Rule.Common.PEIM.TIANOCOMPRESSED] - FILE PEIM = $(NAMED_GUID) { - PEI_DEPEX PEI_DEPEX Optional $(MODULE_NAME).depex - GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE { - PE32 PE32 $(MODULE_NAME).efi - UI STRING="$(MODULE_NAME)" Optional - VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) - } - } - [Rule.Common.DXE_CORE] FILE DXE_CORE = $(NAMED_GUID) { COMPRESS PI_STD { - PE32 PE32 $(MODULE_NAME).efi + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } @@ -347,10 +315,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { [Rule.Common.UEFI_DRIVER] FILE DRIVER = $(NAMED_GUID) { - DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex + DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex COMPRESS PI_STD { GUIDED { - PE32 PE32 $(MODULE_NAME).efi + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } @@ -359,10 +327,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { [Rule.Common.DXE_DRIVER] FILE DRIVER = $(NAMED_GUID) { - DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex + DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex COMPRESS PI_STD { GUIDED { - PE32 PE32 $(MODULE_NAME).efi + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } @@ -371,10 +339,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { [Rule.Common.DXE_RUNTIME_DRIVER] FILE DRIVER = $(NAMED_GUID) { - DXE_DEPEX DXE_DEPEX Optional $(MODULE_NAME).depex + DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex COMPRESS PI_STD { GUIDED { - PE32 PE32 $(MODULE_NAME).efi + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } @@ -385,9 +353,26 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { FILE APPLICATION = $(NAMED_GUID) { COMPRESS PI_STD { GUIDED { - PE32 PE32 $(MODULE_NAME).efi + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } } } + + +[Rule.Common.UEFI_DRIVER.BINARY] + FILE DRIVER = $(NAMED_GUID) { + DXE_DEPEX DXE_DEPEX Optional |.depex + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) + } + +[Rule.Common.UEFI_APPLICATION.BINARY] + FILE APPLICATION = $(NAMED_GUID) { + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) + } +