summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-07-16 15:53:39 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-07-16 15:53:39 +0000
commit1beb1af9380ec2fce859fd8fae98a992de471f7d (patch)
tree5343c5ec5e6995bdbc303debfb256f594c7bdfc2
parent4196f91ec0e615ecbddd2fc267a39fd7f3c59b91 (diff)
downloadedk2-platforms-1beb1af9380ec2fce859fd8fae98a992de471f7d.tar.xz
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
-rw-r--r--EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h13
-rw-r--r--EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h3
-rw-r--r--EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf2
-rw-r--r--EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf3
4 files changed, 20 insertions, 1 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
index e9189bd6c8..21d48d7239 100644
--- 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
#define ISCSI_LOGIN_OPTION_CHAP_UNI 0x2000
+///
+/// VLAN Device Path SubType.
+///
+#define MSG_VLAN_DP 0x14
+typedef struct {
+ EFI_DEVICE_PATH_PROTOCOL Header;
+ ///
+ /// VLAN identifier (0-4094).
+ ///
+ UINT16 VlanId;
+} VLAN_DEVICE_PATH;
+
+
//
// Media Device Path
//
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
index b0b22357e3..2249a12a85 100644
--- 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,
IsaX64 = EFI_IMAGE_MACHINE_X64,
IsaIpf = EFI_IMAGE_MACHINE_IA64,
- IsaEbc = EFI_IMAGE_MACHINE_EBC
+ IsaEbc = EFI_IMAGE_MACHINE_EBC,
+ IsaArm = EFI_IMAGE_MACHINE_ARMTHUMB_MIXED
} EFI_INSTRUCTION_SET_ARCHITECTURE;
EFI_FORWARD_DECLARATION (EFI_DEBUG_SUPPORT_PROTOCOL);
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
index a7a3c65c36..de28353320 100644
--- 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]
CpuIA64Lib
+[libraries.ARM]
+ CompilerIntrinsicsLib
[nmake.common]
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
index 934954bbc7..8aff8813ad 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
@@ -94,4 +94,7 @@ COMPONENT_TYPE = LIBRARY
[libraries.common]
EdkFrameworkGuidLib
+[libraries.ARM]
+ CompilerIntrinsicsLib
+
[nmake.common]