Integrate the patch contributed by Andrew Fish to port MdeModulePkg to support ARM.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9174 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 121 insertions, 96 deletions

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/Arm/PxeArch.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/Arm/PxeArch.h
new file mode 100644
index 0000000000..de40902e35
--- /dev/null
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/Arm/PxeArch.h
@@ -0,0 +1,22 @@
+/** @file
+  Defines PXE Arch type.
+  
+Copyright (c) 2006, Intel Corporation.<BR>
+Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
+
+All rights reserved. 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 _EFI_PXE_ARCH_H_
+#define _EFI_PXE_ARCH_H_
+
+#define SYS_ARCH  0x0A
+
+#endif
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index 7f8acd73d4..7b4978c962 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -1,96 +1,99 @@
-#/** @file

-# Component name for module UefiPxeBc

-#

-# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.

-#

-#  All rights reserved. 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.

-#

-#

-#**/

-

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = UefiPxeBcDxe

-  FILE_GUID                      = 3B1DEAB5-C75D-442e-9238-8E2FFB62B0BB

-  MODULE_TYPE                    = UEFI_DRIVER

-  VERSION_STRING                 = 1.0

-  ENTRY_POINT                    = PxeBcDriverEntryPoint

-

-#

-# The following information is for reference only and not required by the build tools.

-#

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

-#

-#  DRIVER_BINDING                =  gPxeBcDriverBinding                        

-#  COMPONENT_NAME                =  gPxeBcComponentName

-#  COMPONENT_NAME2               =  gPxeBcComponentName2

-#

-

-[Sources.common]

-  PxeBcMtftp.c

-  PxeBcSupport.h

-  PxeBcSupport.c

-  PxeBcDriver.c

-  PxeBcDhcp.h

-  ComponentName.c

-  PxeBcImpl.c

-  PxeBcImpl.h

-  PxeBcDhcp.c

-  PxeBcMtftp.h

-  PxeBcDriver.h

-

-[Sources.IA32]

-  Ia32/PxeArch.h

-

-[Sources.X64]

-  X64/PxeArch.h

-

-[Sources.IPF]

-  Ipf/PxeArch.h

-

-[Sources.EBC]

-  Ebc/PxeArch.h

-  Ebc/PxeArch.c

-

-[Packages]

-  MdePkg/MdePkg.dec

-  MdeModulePkg/MdeModulePkg.dec

-

-

-

-[LibraryClasses]

-  BaseLib

-  UefiLib

-  UefiBootServicesTableLib

-  UefiDriverEntryPoint

-  BaseMemoryLib

-  MemoryAllocationLib

-  DebugLib

-  NetLib

-  DpcLib

-

-[Guids]

-  gEfiSmbiosTableGuid                              # ALWAYS_CONSUMED

-

-[Protocols]

-  gEfiArpServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

-  gEfiArpProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED

-  gEfiMtftp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED

-  gEfiMtftp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED

-  gEfiUdp4ServiceBindingProtocolGuid               # PROTOCOL ALWAYS_CONSUMED

-  gEfiDhcp4ServiceBindingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED

-  gEfiPxeBaseCodeCallbackProtocolGuid              # PROTOCOL ALWAYS_PRODUCED

-  gEfiPxeBaseCodeProtocolGuid                      # PROTOCOL ALWAYS_PRODUCED

-  gEfiLoadFileProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED

-  gEfiDhcp4ProtocolGuid                            # PROTOCOL ALWAYS_CONSUMED

-  gEfiUdp4ProtocolGuid                             # PROTOCOL ALWAYS_CONSUMED

-  gEfiNetworkInterfaceIdentifierProtocolGuid_31    ## SOMETIMES_CONSUMES

-  gEfiIp4ServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

-  gEfiIp4ProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED

+#/** @file
+# Component name for module UefiPxeBc
+#
+# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.
+#
+#  All rights reserved. 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.
+#
+#
+#**/
+
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = UefiPxeBcDxe
+  FILE_GUID                      = 3B1DEAB5-C75D-442e-9238-8E2FFB62B0BB
+  MODULE_TYPE                    = UEFI_DRIVER
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = PxeBcDriverEntryPoint
+
+#
+# The following information is for reference only and not required by the build tools.
+#
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#
+#  DRIVER_BINDING                =  gPxeBcDriverBinding                        
+#  COMPONENT_NAME                =  gPxeBcComponentName
+#  COMPONENT_NAME2               =  gPxeBcComponentName2
+#
+
+[Sources.common]
+  PxeBcMtftp.c
+  PxeBcSupport.h
+  PxeBcSupport.c
+  PxeBcDriver.c
+  PxeBcDhcp.h
+  ComponentName.c
+  PxeBcImpl.c
+  PxeBcImpl.h
+  PxeBcDhcp.c
+  PxeBcMtftp.h
+  PxeBcDriver.h
+
+[Sources.IA32]
+  Ia32/PxeArch.h
+
+[Sources.X64]
+  X64/PxeArch.h
+
+[Sources.IPF]
+  Ipf/PxeArch.h
+
+[Sources.ARM]
+  Arm/PxeArch.h
+
+[Sources.EBC]
+  Ebc/PxeArch.h
+  Ebc/PxeArch.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
+
+
+
+[LibraryClasses]
+  BaseLib
+  UefiLib
+  UefiBootServicesTableLib
+  UefiDriverEntryPoint
+  BaseMemoryLib
+  MemoryAllocationLib
+  DebugLib
+  NetLib
+  DpcLib
+
+[Guids]
+  gEfiSmbiosTableGuid                              # ALWAYS_CONSUMED
+
+[Protocols]
+  gEfiArpServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
+  gEfiArpProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED
+  gEfiMtftp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
+  gEfiMtftp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED
+  gEfiUdp4ServiceBindingProtocolGuid               # PROTOCOL ALWAYS_CONSUMED
+  gEfiDhcp4ServiceBindingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED
+  gEfiPxeBaseCodeCallbackProtocolGuid              # PROTOCOL ALWAYS_PRODUCED
+  gEfiPxeBaseCodeProtocolGuid                      # PROTOCOL ALWAYS_PRODUCED
+  gEfiLoadFileProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED
+  gEfiDhcp4ProtocolGuid                            # PROTOCOL ALWAYS_CONSUMED
+  gEfiUdp4ProtocolGuid                             # PROTOCOL ALWAYS_CONSUMED
+  gEfiNetworkInterfaceIdentifierProtocolGuid_31    ## SOMETIMES_CONSUMES
+  gEfiIp4ServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
+  gEfiIp4ProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED