MdePkg/UefiBaseType.h: treat EBC as a non-native machine type

[mirror_edk2.git] / Nt32Pkg / Nt32Pkg.fdf

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index d104cb764504e7d9de0d08492f49b46fb9fd8fdb..3a3e8fae23b30f03d497e05ec11327613917c8fb 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -1,16 +1,10 @@
 ## @file\r
 # This is NT32 FDF file with UEFI HII features enabled\r
 #\r
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
-#    This program and the accompanying materials\r
-#    are licensed and made available under the terms and conditions of the BSD License\r
-#    which accompanies this distribution. The full text of the license may be found at\r
-#    http://opensource.org/licenses/bsd-license.php\r
-#\r
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#    SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 ################################################################################\r
@@ -28,10 +22,10 @@
 ################################################################################\r
 [FD.Nt32]\r
 BaseAddress   = 0x0|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress          #The base address of the FLASH Device.\r
-Size          = 0x00380000|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize  #The size in bytes of the FLASH Device\r
+Size          = 0x00480000|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize  #The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
-NumBlocks     = 0x38\r
+NumBlocks     = 0x48\r
 \r
 ################################################################################\r
 #\r
@@ -48,11 +42,11 @@ NumBlocks     = 0x38
 # RegionType <FV, DATA, or FILE>\r
 #\r
 ################################################################################\r
-0x00000000|0x00360000\r
+0x00000000|0x00460000\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize\r
 FV = FvRecovery\r
 \r
-0x00360000|0x0000c000\r
+0x00460000|0x0000c000\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
 #NV_VARIABLE_STORE\r
 DATA = {\r
@@ -93,11 +87,11 @@ DATA = {
   0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r
-0x0036c000|0x00002000\r
+0x0046c000|0x00002000\r
 #NV_EVENT_LOG\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize\r
 \r
-0x0036e000|0x00002000\r
+0x0046e000|0x00002000\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
 #NV_FTW_WORKING\r
 DATA = {\r
@@ -111,7 +105,7 @@ DATA = {
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r
-0x00370000|0x00010000\r
+0x00470000|0x00010000\r
 #NV_FTW_SPARE\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
 \r
@@ -257,19 +251,15 @@ INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
 INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
 INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
 INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
+INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
 INF  Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
 !if $(NETWORK_IP6_ENABLE) == TRUE\r
 INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
 INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
 INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
 INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
-INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!else\r
-INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
 !endif\r
 INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
 INF  NetworkPkg/DnsDxe/DnsDxe.inf\r
@@ -288,11 +278,7 @@ INF  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
 # for binary shell, binary fat and logo module.\r
 #\r
 ################################################################################\r
-!ifndef $(USE_OLD_SHELL)\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
-!else\r
-INF  EdkShellBinPkg/FullShell/FullShell.inf\r
-!endif\r
 \r
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r