Fixes for the ARM port of SCTs

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

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
index e9189bd6c86f9ffac7d823487570d27989df92cf..21d48d72390fb9b239458cee4911838b279d0410 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
@@ -366,6 +366,19 @@ typedef struct {
 #define ISCSI_LOGIN_OPTION_CHAP_BI                      0x0000\r
 #define ISCSI_LOGIN_OPTION_CHAP_UNI                     0x2000\r
 \r
+///\r
+/// VLAN Device Path SubType.\r
+///\r
+#define MSG_VLAN_DP               0x14\r
+typedef struct {\r
+  EFI_DEVICE_PATH_PROTOCOL        Header;\r
+  ///\r
+  /// VLAN identifier (0-4094).\r
+  ///\r
+  UINT16                          VlanId;\r
+} VLAN_DEVICE_PATH;\r
+\r
+\r
 //\r
 // Media Device Path\r
 //\r

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
index b0b22357e35f85d89e9252e9f8708907d6184d2e..2249a12a859eed5d88f7c3bf70cd38690f6f0676 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
@@ -537,7 +537,8 @@ typedef enum {
   IsaIa32 = EFI_IMAGE_MACHINE_IA32,\r
   IsaX64  = EFI_IMAGE_MACHINE_X64,\r
   IsaIpf  = EFI_IMAGE_MACHINE_IA64,\r
-  IsaEbc  = EFI_IMAGE_MACHINE_EBC\r
+  IsaEbc  = EFI_IMAGE_MACHINE_EBC,\r
+  IsaArm  = EFI_IMAGE_MACHINE_ARMTHUMB_MIXED\r
 } EFI_INSTRUCTION_SET_ARCHITECTURE;\r
 \r
 EFI_FORWARD_DECLARATION (EFI_DEBUG_SUPPORT_PROTOCOL);\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
index a7a3c65c36da01a69c2f410466c265aef3ace43c..de2835332004b8f44972ee119522dd738a00075a 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
@@ -89,5 +89,7 @@ COMPONENT_TYPE  = LIBRARY
 [libraries.ipf]\r
   CpuIA64Lib\r
   \r
+[libraries.ARM]
+  CompilerIntrinsicsLib
 \r
 [nmake.common]\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
index 934954bbc7bde21f5a24cbbb75d0964bc9268779..8aff8813ad81cda5e26e2e678266d1a0068ad060 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
@@ -94,4 +94,7 @@ COMPONENT_TYPE  = LIBRARY
 [libraries.common]\r
   EdkFrameworkGuidLib\r
 \r
+[libraries.ARM]
+  CompilerIntrinsicsLib
+\r
 [nmake.common]\r