EmbeddedPkg: Move Universal/MmcDxe from ArmPkg to EmbeddedPkg

The MmcDxe is not ARM architecture specific. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11725 6f19259b-4bc3-4df7-8a09-765794883524
2011-06-03 09:07:31 +00:00 · 2011-06-03 09:07:31 +00:00 · ce73d60afb
parent 033d0e5ff6
commit ce73d60afb
14 changed files with 7 additions and 8 deletions
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@ -44,9 +44,6 @@
 [Protocols.common]
  gVirtualUncachedPagesProtocolGuid = { 0xAD651C7D, 0x3C22, 0x4DBF, { 0x92, 0xe8, 0x38, 0xa7, 0xcd, 0xae, 0x87, 0xb2 } }

-  ## Include/Protocol/MmcHost.h
-  gEfiMmcHostProtocolGuid              = { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }}
-
 [PcdsFeatureFlag.common]
  gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport|FALSE|BOOLEAN|0x00000001

--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@ -134,6 +134,5 @@
  ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf
  ArmPkg/Drivers/PL390Gic/PL390GicSec.inf
  ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
-  ArmPkg/Universal/MmcDxe/MmcDxe.inf


--- a/ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
+++ b/ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
@ -27,6 +27,7 @@

 [Packages]
  ArmPkg/ArmPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
  MdePkg/MdePkg.dec

 [LibraryClasses]
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@ -492,7 +492,7 @@
  #
  # Multimedia Card Interface
  #
-  ArmPkg/Universal/MmcDxe/MmcDxe.inf
+  EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
  ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
  
  #
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@ -178,7 +178,7 @@ READ_LOCK_STATUS   = TRUE
  #
  # Multimedia Card Interface
  #
-  INF ArmPkg/Universal/MmcDxe/MmcDxe.inf
+  INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
  INF ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
  
  #
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@ -56,7 +56,8 @@
  gEmbeddedExternalDeviceProtocolGuid = { 0x735F8C64, 0xD696, 0x44D0, { 0xBD, 0xF2, 0x44, 0x7F, 0xD0, 0x5A, 0x54, 0x06 }}
  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 }}
+
 [PcdsFeatureFlag.common]
  gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|FALSE|BOOLEAN|0x00000001
  gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE|BOOLEAN|0x00000002
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@ -259,6 +259,7 @@
  EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
  EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

+  EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
  
  

--- a/EmbeddedPkg/Include/Protocol/MmcHost.h
+++ b/EmbeddedPkg/Include/Protocol/MmcHost.h
--- a/EmbeddedPkg/Universal/MmcDxe/ComponentName.c
+++ b/EmbeddedPkg/Universal/MmcDxe/ComponentName.c
--- a/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c
+++ b/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c
--- a/EmbeddedPkg/Universal/MmcDxe/Mmc.c
+++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.c
--- a/EmbeddedPkg/Universal/MmcDxe/Mmc.h
+++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.h
--- a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
--- a/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
@ -29,7 +29,7 @@
  Diagnostics.c

 [Packages]
-  ArmPkg/ArmPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
  MdePkg/MdePkg.dec

 [LibraryClasses]