From b0824968930584cb85fcc4e70feaac1a285f2ab6 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Tue, 18 Feb 2014 18:31:11 +0000 Subject: [PATCH] ArmPlatformPkg/ArmRealViewEbPkg: Added MMC support Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15248 6f19259b-4bc3-4df7-8a09-765794883524 --- .../ArmRealViewEb-RTSM-MPCore.fdf | 10 ++++++++-- .../ArmRealViewEb-RTSM-UniCore.fdf | 10 ++++++++-- .../ArmRealViewEbPkg/ArmRealViewEb.dsc.inc | 15 +++++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf index 7b96b0e059..1d286616d7 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf @@ -1,6 +1,6 @@ # FLASH layout file for ARM RealView EB. # -# Copyright (c) 2011-2013, ARM Limited. All rights reserved. +# Copyright (c) 2011-2014, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -147,7 +147,13 @@ READ_LOCK_STATUS = TRUE # Semi-hosting filesystem # INF ArmPkg/Filesystem/SemihostFs/SemihostFs.inf - + + # + # Multimedia Card Interface + # + INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf + INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf + # # FAT filesystem + GPT/MBR partitioning # diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf index 705e21802b..5740eeba67 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf @@ -1,7 +1,7 @@ # FLASH layout file for ARM RealView EB. # # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.
-# Copyright (c) 2011 - 2013, ARM Limited. All rights reserved. +# Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -148,7 +148,13 @@ READ_LOCK_STATUS = TRUE # Semi-hosting filesystem # INF ArmPkg/Filesystem/SemihostFs/SemihostFs.inf - + + # + # Multimedia Card Interface + # + INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf + INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf + # # FAT filesystem + GPT/MBR partitioning # diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc index 3fb099ea6d..bbc1079d9b 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2012, ARM Limited. All rights reserved. +# Copyright (c) 2011-2014, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -285,7 +285,11 @@ # but not used). # gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x00000000 - + + ## PL180 MMC/SD card controller + gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress|0x10000048 + gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x10005000 + # # ARM OS Loader # @@ -299,3 +303,10 @@ gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)" gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10 + +[Components.common] + # + # Multimedia Card Interface + # + EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf + ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf -- 2.39.2