From e8933cda384a4017bce8bd7f64f03a811c074c60 Mon Sep 17 00:00:00 2001
From: Slice <sergey.slice@gmail.com>
Date: Wed, 5 Jun 2024 22:15:32 +0300
Subject: [PATCH] autofill SMBIOS in the case of manual change product

Signed-off-by: Slice <sergey.slice@gmail.com>
---
 CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist | 2 ++
 OpenCorePkg                                           | 2 +-
 buildme                                               | 6 +++---
 rEFIt_UEFI/Platform/platformdata.cpp                  | 5 +++--
 rEFIt_UEFI/Settings/ConfigManager.cpp                 | 7 ++++---
 rEFIt_UEFI/refit/menu.cpp                             | 2 ++
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist b/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist
index c27d8a208..d409e8918 100755
--- a/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist
+++ b/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist
@@ -990,6 +990,8 @@
             <false/>
             <key>ExternalDiskIcons</key>
             <false/>
+            <key>ForceAquantiaEthernet</key>
+            <false/>
             <key>ForceExitBootServices</key>
             <false/>
             <key>ForceOcWriteFlash</key>
diff --git a/OpenCorePkg b/OpenCorePkg
index 8865f8741..5f5428cc8 160000
--- a/OpenCorePkg
+++ b/OpenCorePkg
@@ -1 +1 @@
-Subproject commit 8865f874167989c020973b467dacf4461f7298f6
+Subproject commit 5f5428cc8b9ad2ad0ce0d416d5dd24ad5f6a15a2
diff --git a/buildme b/buildme
index c362f67fa..5eda5400d 100755
--- a/buildme
+++ b/buildme
@@ -126,7 +126,7 @@ if [[ "$SYSNAME" == Darwin ]]; then
   if [[ $MYTOOLCHAIN == GCC* ]] && [[ ! -x "${GCC131_BIN}" ]]; then
     if [[ $MYTOOLCHAIN == GCC131 ]]; then
       cd "${CLOVERROOT}"
-      ./build_gcc13.sh
+      ./build_gcc14.sh
     else
       MYTOOLCHAIN=XCODE8
     fi
@@ -264,7 +264,7 @@ BLC() {
 if [[ ! -d "${CLOVERROOT}"/CloverPackage/BootLoaderChooser ]]; then
   mkdir -p "${CLOVERROOT}"/CloverPackage/BootLoaderChooser
 fi
-curl -sLq https://github.com/jief666/BootloaderChooser/releases/download/0.5/BootX64.efi > "${CLOVERROOT}"/CloverPackage/BootLoaderChooser/BootX64.efi
+curl -sLq https://github.com/jief666/BootloaderChooser/releases/download/1.4/BootX64.efi  > "${CLOVERROOT}"/CloverPackage/BootLoaderChooser/BootX64.efi
 chmod 775 "${CLOVERROOT}"/CloverPackage/BootLoaderChooser/BootX64.efi
 }
 
@@ -846,7 +846,7 @@ done
 Extra
 }
 
-menu() {
+menu() 
 #clear
 echo
 echo -e $COL_GREEN" ---------------------------------------------------------------------------------"
diff --git a/rEFIt_UEFI/Platform/platformdata.cpp b/rEFIt_UEFI/Platform/platformdata.cpp
index c5f07a67b..b36be32da 100644
--- a/rEFIt_UEFI/Platform/platformdata.cpp
+++ b/rEFIt_UEFI/Platform/platformdata.cpp
@@ -804,8 +804,9 @@ XString8 GetReleaseDate(MacModel Model)
 
 void SetDMISettingsForModel(MacModel Model, SETTINGS_DATA* settingsData)
 {
-//  GlobalConfig.CurrentModel = Model; // 2022-05 Not using Goblal config to avoid inter-dependancy. CCPV wouldn't compile anymore.
-                                       //         be sure to to assign GlobalConfig.CurrentModel if you need to.
+//  GlobalConfig.CurrentModel = Model; // 2022-05 Not using Goblal config to avoid inter-dependancy.
+                                       // CCPV wouldn't compile anymore.
+                                       //   be sure to to assign GlobalConfig.CurrentModel if you need to.
   settingsData->Smbios.BiosVersion = ApplePlatformDataArray[Model].firmwareVersion;
   settingsData->Smbios.BiosReleaseDate = GetReleaseDate(Model);
   settingsData->Smbios.EfiVersion = ApplePlatformDataArray[Model].efiversion;
diff --git a/rEFIt_UEFI/Settings/ConfigManager.cpp b/rEFIt_UEFI/Settings/ConfigManager.cpp
index 687437025..41211a685 100644
--- a/rEFIt_UEFI/Settings/ConfigManager.cpp
+++ b/rEFIt_UEFI/Settings/ConfigManager.cpp
@@ -599,16 +599,17 @@ EFI_STATUS ConfigManager::LoadSMBIOSPlist(const XStringW& ConfName)
 void ConfigManager::ReloadSmbios(XStringW& str)
 {
   size_t N = SmbiosList.size();
-  if (OldChosenSmbios == 0) {
+  if (OldChosenSmbios == 0) {  // this is auto fill by OSName
     for (size_t i=1; i<N; i++) {
       if (SmbiosList[i].contains(str)) {
         OldChosenSmbios = i;
         break;
       }
     }
+    FillSmbiosWithDefaultValue(GlobalConfig.CurrentModel, configPlist.getSMBIOS());
+    DBG("SMBIOS reloaded with model %s\n", gSettings.Smbios.ProductName.c_str());
   }
-  FillSmbiosWithDefaultValue(GlobalConfig.CurrentModel, configPlist.getSMBIOS());
-  DBG("SMBIOS reloaded with model %s\n", gSettings.Smbios.ProductName.c_str());
+
 }
 
 void ConfigManager::FillSmbiosWithDefaultValue(MacModel Model, const SmbiosPlistClass::SmbiosDictClass& smbiosDictClass)
diff --git a/rEFIt_UEFI/refit/menu.cpp b/rEFIt_UEFI/refit/menu.cpp
index 2ddfff65d..d04b84cf2 100644
--- a/rEFIt_UEFI/refit/menu.cpp
+++ b/rEFIt_UEFI/refit/menu.cpp
@@ -101,6 +101,7 @@ XBool gResetSMC = false;
 extern APPLE_SMC_IO_PROTOCOL        *gAppleSmc;
 extern ConfigManager gConf;
 
+
 void FillInputs(XBool New)
 {
   UINTN i,j; //for loops
@@ -790,6 +791,7 @@ void ApplyInputs(void)
     if (Model != MaxMacModel) {
       GlobalConfig.CurrentModel = Model;
       SetDMISettingsForModel(Model, &gSettings);
+      FillInputs(false);
     }
   }