X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UnixPkg%2FUnixPkgX64.fdf;h=6ac1cdc8a6b41a786b74de11cc1bbe616543836e;hb=94c4575cd0ea35607f774dc3533e579542a32f72;hp=9f677464e1efe0ad0876bcffd2777250d4f9c2c3;hpb=bb111c2346bef02c18b30acced3f7b0311bbfe21;p=mirror_edk2.git

diff --git a/UnixPkg/UnixPkgX64.fdf b/UnixPkg/UnixPkgX64.fdf
index 9f677464e1..6ac1cdc8a6 100644
--- a/UnixPkg/UnixPkgX64.fdf
+++ b/UnixPkg/UnixPkgX64.fdf
@@ -2,6 +2,7 @@
 # This is Unix FDF file with UEFI HII features enabled
 #
 # Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
+# Portions copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
 #    are licensed and made available under the terms and conditions of the BSD License
@@ -32,10 +33,10 @@
 # relocated in place (works, but not a great idea).
 #
 BaseAddress   = 0x102000000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress   #The base address of the FLASH Device.
-Size          = 0x004a0000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize  #The size in bytes of the FLASH Device
+Size          = 0x005a0000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize  #The size in bytes of the FLASH Device
 ErasePolarity = 1
 BlockSize     = 0x10000
-NumBlocks     = 0x4a
+NumBlocks     = 0x5a
 
 ################################################################################
 #
@@ -52,11 +53,11 @@ NumBlocks     = 0x4a
 # RegionType <FV, DATA, or FILE>
 #
 ################################################################################
-0x00000000|0x00480000
+0x00000000|0x00580000
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase|gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize
 FV = FvRecovery
 
-0x00480000|0x0000c000
+0x00580000|0x0000c000
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
 #NV_VARIABLE_STORE
 DATA = {
@@ -90,11 +91,11 @@ DATA = {
   0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
 
-0x0048c000|0x00002000
+0x0058c000|0x00002000
 #NV_EVENT_LOG
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase|gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize
 
-0x0048e000|0x00002000
+0x0058e000|0x00002000
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
 #NV_FTW_WORKING
 DATA = {
@@ -108,7 +109,7 @@ DATA = {
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
 
-0x00490000|0x00010000
+0x00590000|0x00010000
 #NV_FTW_SPARE
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
 
@@ -217,7 +218,8 @@ INF  UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 INF  UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
 INF  UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
-INF  UnixPkg/UnixUgaDxe/UnixUga.inf
+#INF  UnixPkg/UnixUgaDxe/UnixUga.inf
+INF  UnixPkg/UnixGopDxe/UnixGop.inf
 #INF  UnixPkg/UnixConsoleDxe/UnixConsole.inf
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -228,21 +230,22 @@ INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
 INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 
 #
-# Need to port this to UnixPkg
 # Network stack drivers
-# To test network drivers, need network Io driver(SnpNt32Io.dll), please refer to NETWORK-IO Subproject.
 #
-#INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-#INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-#INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.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
+!if $(NETWORK_SUPPORT)
+INF  UnixPkg/UnixSnpDxe/UnixSnpDxe.inf
+!endif
+INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.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
+
  
 !if $(COMPILE_BINS)
 INF FatPkg/EnhancedFatDxe/Fat.inf