Merge remote-tracking branch 'rmt-1/linaro-topic-misc' into release-prep

1 files changed, 9 insertions, 0 deletions

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
index a35b4f2d0..5134310d4 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
@@ -157,6 +157,15 @@ PartitionInstallMbrChildHandles (
                      BlockSize,

                      Mbr

                      );

+
+  // RMH - hack - Linaro's development boards use SD cards, currently we have
+  // a problem where each unique SD card has a different UUID when created
+  // with linaro-media-create / linaro-android-media create.
+  // This means that no one Boot Device configuration can boot Linaro images
+  // without some manual intervention from the user.
+  // This hack will zero the signature (UUID) read from the card.
+  ZeroMem(&(Mbr->UniqueMbrSignature[0]), sizeof (Mbr->UniqueMbrSignature));
+
   if (EFI_ERROR (Status)) {

     Found = Status;

     goto Done;