Fix merge conflicts.linaro-edk2-2014.04

Merge branch 'release-prep'

Conflicts:
	ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
	ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
	ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
	ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
	ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc

Signed-off-by: Steven Kinney <steven.kinney@amd.com>

1 files changed, 21 insertions, 1 deletions

diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index 1b8ef158a..c219befc3 100644
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -3,6 +3,7 @@
 #

 # This Package provides headers and libraries that conform to EFI/PI Industry standards.

 # Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2012-2014, ARM Ltd. All rights reserved.<BR>

 #

 #    This program and the accompanying materials are licensed and made available under

 #    the terms and conditions of the BSD License which accompanies this distribution.

@@ -57,7 +58,10 @@
   gEmbeddedGpioProtocolGuid           = { 0x17a0a3d7, 0xc0a5, 0x4635, { 0xbb, 0xd5, 0x07, 0x21, 0x87, 0xdf, 0xe2, 0xee }}

   gPeCoffLoaderProtocolGuid =  { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xFE, 0xD8, 0x85, 0x91, 0xFA, 0x11, 0xAB } }

   gEfiMmcHostProtocolGuid              = { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }}

-

+  gAndroidFastbootTransportProtocolGuid = { 0x74bd9fe0, 0x8902, 0x11e3, {0xb9, 0xd3, 0xf7, 0x22, 0x38, 0xfc, 0x9a, 0x31}}

+  gAndroidFastbootPlatformProtocolGuid =  { 0x524685a0, 0x89a0, 0x11e3, {0x9d, 0x4d, 0xbf, 0xa9, 0xf6, 0xa4, 0x03, 0x08}}

+  gUsbDeviceProtocolGuid =  { 0x021bd2ca, 0x51d2, 0x11e3, {0x8e, 0x56, 0xb7, 0x54, 0x17, 0xc7,  0x0b, 0x44 }}

+
 [PcdsFeatureFlag.common]

   gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|FALSE|BOOLEAN|0x00000001

   gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE|BOOLEAN|0x00000002

@@ -125,14 +129,30 @@
   gEmbeddedTokenSpaceGuid.PcdGdbMaxPacketRetryCount|10000000|UINT32|0x0000004c

   gEmbeddedTokenSpaceGuid.PcdGdbTimerPeriodMilliseconds|250|UINT32|0x0000004d

 

+  #

+  # Android FastBoot

+  #

+

+  # The Android FastBoot utility has hard-coded USB Vendor IDs that it recognises

+  # (and 0xf00d isn't one of them!).

+  # You'll need to pass it "-i 0xf00d" to get it to recognise this device.

+  gEmbeddedTokenSpaceGuid.PcdAndroidFastbootUsbVendorId|0xf00d|UINT32|0x00000022

+  gEmbeddedTokenSpaceGuid.PcdAndroidFastbootUsbProductId|0xbeef|UINT32|0x00000023

+

 [PcdsFixedAtBuild.ARM]

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32|UINT8|0x00000010

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011

 

+  # ISP1761 USB OTG Controller

+  gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0|UINT32|0x00000021

+

 [PcdsFixedAtBuild.AARCH64]

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|48|UINT8|0x00000010

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011

 

+  # ISP1761 USB OTG Controller

+  gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0|UINT64|0x00000021

+

 [PcdsFixedAtBuild.IA32]

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36|UINT8|0x00000010

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011