From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk0-x242.google.com (mail-qk0-x242.google.com [IPv6:2607:f8b0:400d:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 09AEB80354 for ; Mon, 6 Mar 2017 19:14:38 -0800 (PST) Received: by mail-qk0-x242.google.com with SMTP id o135so8866786qke.2 for ; Mon, 06 Mar 2017 19:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zKA4kPmDfUq6SUVG4c9znOYy3kDzgMcMHHvdi6roZws=; b=brIYKuop3GGHvU4awZCbQ2c+LeIYROPPhLwMLjT7+h+1ZEQHKiFF7dxwk95mcoshOu c71zZXvyIks5ce5znDMGSkh7jIeFQwWBjwaqt/q7uSByPiW8CCiI6AcJ4znVpx+GZjXe SqQg/G9UgwBmUVtwYmJrBVrYrBCzFOUjMM2oYe8sDAeCmSX19JTuKt9T3jZ68so2hTAA RYJt0blymgPjm83AnuwbtR++73i7126rCATJdNK2eKayb8H92MqJo/Q18liJRIFDI2lC oLmNBUbeQMXhovkg+wE/r74C3nxWv4OHXGuF8nVRpIz8x43ageZSMWQNaMwv0Qk9ocj5 +sjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zKA4kPmDfUq6SUVG4c9znOYy3kDzgMcMHHvdi6roZws=; b=NbTMrK7JIBbblLU2br/Ql0IXoImqHmKIfae15UoB5fnDWeiN61Z8MSFdXW9IYwhukO oB3peDTuZ6lRDTNulLQ+cEvVNIGofGf6MnekX0CASDPvQmOrtIAoUW8cr6VqgbAv+3lS mPcfWi5wKveKE3g26LUo0S3Ur/R54QdPIFybtM1szFgapucPv1ozc9AOiOTsuM76Egmx N6bY4mycWECi7hZzL0Fss/Q4L25V8WankYBMe97cUGkaqBj4tWXkD/lvnswovZ3umkSv TiuUm1mu3Lci9NwfdQuOYaJmKkrR1fg+fapy3POQrRyGLqHSyW7p+79Cpmy5QwQ4elDx 2FQw== X-Gm-Message-State: AMke39kdCU1gj8GkNI3yrAnxUDRu+Au9XtVFlF0+NtLKJprTtm5KQuH4gfDKr3qGW2Jiow== X-Received: by 10.233.232.21 with SMTP id a21mr19877947qkg.180.1488856477063; Mon, 06 Mar 2017 19:14:37 -0800 (PST) Received: from foober.ini.cmu.edu (pool-108-39-248-175.pitbpa.fios.verizon.net. [108.39.248.175]) by smtp.gmail.com with ESMTPSA id v26sm2901013qtc.13.2017.03.06.19.14.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 19:14:36 -0800 (PST) From: "Gabriel L. Somlo" To: edk2-devel@ml01.01.org Cc: lersek@redhat.com, jordan.l.justen@intel.com, reza.jelveh@tuhh.de, agraf@suse.de, kraxel@redhat.com Date: Mon, 6 Mar 2017 22:14:25 -0500 Message-Id: <1488856465-8965-7-git-send-email-gsomlo@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488856465-8965-1-git-send-email-gsomlo@gmail.com> References: <1488856465-8965-1-git-send-email-gsomlo@gmail.com> Subject: [RFC PATCH 6/6] OvmfPkg: enable AppleSupport library for Ovmf firmware X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2017 03:14:38 -0000 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Reza Jelveh Signed-off-by: Gabriel Somlo --- OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 10 ++++++++++ OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h | 1 + .../Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 + OvmfPkg/OvmfPkgIa32.dsc | 8 ++++++++ OvmfPkg/OvmfPkgIa32.fdf | 3 +++ OvmfPkg/OvmfPkgIa32X64.dsc | 8 ++++++++ OvmfPkg/OvmfPkgIa32X64.fdf | 3 +++ OvmfPkg/OvmfPkgX64.dsc | 8 ++++++++ OvmfPkg/OvmfPkgX64.fdf | 3 +++ 9 files changed, 45 insertions(+) diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c index cc35630..9f6be90 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -381,6 +381,11 @@ Returns: } // + // Initialize AppleSupport library + // + InitializeAppleSupport (gImageHandle, gST); + + // // Prevent further changes to LockBoxes or SMRAM. // Handle = NULL; @@ -1474,6 +1479,11 @@ Routine Description: RemoveStaleFvFileOptions (); SetBootOrderFromQemu (); + + // + // Locate and launch Apple's OS X bootloader + // + BdsBootApple (); } /** diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h index ec58efa..3fa7712 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h @@ -49,6 +49,7 @@ Abstract: #include #include #include +#include #include #include diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index f9e35c9..66d31a5 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -40,6 +40,7 @@ OvmfPkg/OvmfPkg.dec [LibraryClasses] + AppleSupportLib BaseLib MemoryAllocationLib UefiBootServicesTableLib diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 0bce56b..da83cba 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -176,6 +176,8 @@ OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf + AppleSupportLib|OvmfPkg/Library/AppleSupportLib/AppleSupportLib.inf + [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -696,6 +698,12 @@ MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf # + # Apple Support + # + OvmfPkg/FswHfsPlus/FswHfsPlus.inf + IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf + + # # Network Support # MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 09c1658..0e00bd9 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -280,6 +280,9 @@ INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf +INF OvmfPkg/FswHfsPlus/FswHfsPlus.inf +INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf + INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(USE_OLD_SHELL) diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 56f7ff9..a38dc9b 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -181,6 +181,8 @@ OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf + AppleSupportLib|OvmfPkg/Library/AppleSupportLib/AppleSupportLib.inf + [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -705,6 +707,12 @@ MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf # + # Apple Support + # + OvmfPkg/FswHfsPlus/FswHfsPlus.inf + IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf + + # # Network Support # MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 5233314..2bd2d77 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -280,6 +280,9 @@ INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf +INF OvmfPkg/FswHfsPlus/FswHfsPlus.inf +INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf + INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(USE_OLD_SHELL) diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index d0b0b0e..2bff68d 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -181,6 +181,8 @@ OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf + AppleSupportLib|OvmfPkg/Library/AppleSupportLib/AppleSupportLib.inf + [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -703,6 +705,12 @@ MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf # + # Apple Support + # + OvmfPkg/FswHfsPlus/FswHfsPlus.inf + IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf + + # # Network Support # MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 3615010..0165a63 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -280,6 +280,9 @@ INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf +INF OvmfPkg/FswHfsPlus/FswHfsPlus.inf +INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf + INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(USE_OLD_SHELL) -- 2.7.4