Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader

2024-12-03 13:13:30 +01:00 · 2019-10-22 15:00:24 +03:00 · 2019-10-22 15:00:24 +03:00 · 5cfeecbb6c
commit 5cfeecbb6c
parent ced0ba8e2b 1c1ea703ff
12 changed files with 10544 additions and 12087 deletions
--- a/CloverPackage/makeiso
+++ b/CloverPackage/makeiso
@ -30,6 +30,7 @@ IMGROOT=${SYMROOT}/CloverCD
 IMGSKELROOT=${SRCROOT}/imgskel
 CDBOOT=${IMGROOT}/usr/standalone/i386/cdboot
 EFIROOT=${SRCROOT}/CloverV2/EFI
+BASETOOLS_DIR=${SRCROOT}/../BaseTools/Source/C/bin

 REVISION=$(git describe --tags $(git rev-list --tags --max-count=1))
 PRODUCT=Clover-v2.5k-${REVISION}
@ -188,7 +189,7 @@ echo "[LZMA] CloverISO-${REVISION}"
 if [[ "$SYSNAME" == Linux ]]; then
 xz -f -S .lzma ${SYMROOT}/CloverISO-${REVISION}.tar
 else
-${CLOVERROOT}/BootSectors/lzma e ${SYMROOT}/CloverISO-${REVISION}.tar ${SYMROOT}/CloverISO-${REVISION}.tar.lzma
+"$BASETOOLS_DIR"/LzmaCompress -e -o ${SYMROOT}/CloverISO-${REVISION}.tar.lzma ${SYMROOT}/CloverISO-${REVISION}.tar 
 fi
 rm -rf ${SYMROOT}/CloverISO-${REVISION}.tar

--- a/CloverPackage/package/po/clover.pot
+++ b/CloverPackage/package/po/clover.pot
@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Clover v2.5k-r5089\n"
-"POT-Creation-Date: 2019-09-21 17:34+0200\n"
+"Project-Id-Version: Clover v2.5k-r5097\n"
+"POT-Creation-Date: 2019-10-19 08:17+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/Drivers/AudioDxe/AudioDxe.inf
+++ b/Drivers/AudioDxe/AudioDxe.inf
@ -73,3 +73,4 @@

 [BuildOptions]
  XCODE:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
--- a/Drivers/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+++ b/Drivers/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
@ -74,6 +74,6 @@

 [BuildOptions]
  XCODE:*_*_*_CC_FLAGS = -O0  -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -O0 -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -O0 -fno-lto -DMDEPKG_NDEBUG
  MSFT:*_*_*_CC_FLAGS = /D MDEPKG_NDEBUG

--- a/Drivers/PartitionDxe/PartitionDxe.inf
+++ b/Drivers/PartitionDxe/PartitionDxe.inf
@ -87,5 +87,5 @@
  
 [BuildOptions]
  XCODE:*_*_*_CC_FLAGS = -Os  -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -O0 -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -O0 -fno-lto -DMDEPKG_NDEBUG
  MSFT:*_*_*_CC_FLAGS = /D MDEPKG_NDEBUG
--- a/FileSystems/ApfsDriverLoader/ApfsDriverLoader.inf
+++ b/FileSystems/ApfsDriverLoader/ApfsDriverLoader.inf
@ -67,3 +67,7 @@
 [Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang
  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
+
+[BuildOptions]
+  XCODE:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
--- a/FileSystems/FatPkg/EnhancedFatDxe/EnhancedFat.inf
+++ b/FileSystems/FatPkg/EnhancedFatDxe/EnhancedFat.inf
@ -114,3 +114,7 @@
 [Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang
  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
+
+[BuildOptions]
+  XCODE:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
--- a/FileSystems/VBoxFsDxe/VBoxHfs.inf
+++ b/FileSystems/VBoxFsDxe/VBoxHfs.inf
@ -79,9 +79,8 @@
  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang

 [BuildOptions.common]
-  GCC:*_*_*_CC_FLAGS =  -O3 -DFSTYPE=hfs
+  GCC:*_*_*_CC_FLAGS =  -O3  -fno-lto -DFSTYPE=hfs
  XCODE:*_*_*_CC_FLAGS = -Os -DFSTYPE=hfs
 # -DFSW_DEBUG_LEVEL=3
  INTEL:*_*_*_CC_FLAGS = -DFSTYPE=hfs
  MSFT:*_*_*_CC_FLAGS = -DFSTYPE=hfs
-
--- a/MemoryFix/AptioMemoryFix/AptioMemoryFix.inf
+++ b/MemoryFix/AptioMemoryFix/AptioMemoryFix.inf
@ -74,8 +74,8 @@
  gOcReadOnlyVariableGuid                     ## CONSUMES
  gOcWriteOnlyVariableGuid                    ## CONSUMES
  gOcVendorVariableGuid                       ## CONSUMES
-  gEfiAppleBootGuid                      ## SOMETIMES_CONSUMES
-  gEfiAppleNvramGuid                    ## SOMETIMES_CONSUMES
+  gEfiAppleBootGuid                           ## SOMETIMES_CONSUMES
+  gEfiAppleNvramGuid                          ## SOMETIMES_CONSUMES
  gEfiMiscSubClassGuid                        ## SOMETIMES_CONSUMES
  gEfiProcessorSubClassGuid                   ## SOMETIMES_CONSUMES
  gEfiMemorySubClassGuid                      ## SOMETIMES_CONSUMES
@ -104,3 +104,7 @@
 #  MSFT:*_*_*_ASM_FLAGS = /Fl
 #  GCC:*_*_*_ASM_FLAGS = -Wa,-a=AsmList.txt
 #  GCC:*_*_*_NASM_FLAGS = -l NasmList.txt
+
+  XCODE:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
+
--- a/MemoryFix/OsxAptioFixDrv/OsxAptioFix3Drv.inf
+++ b/MemoryFix/OsxAptioFixDrv/OsxAptioFix3Drv.inf
@ -87,3 +87,6 @@
 #  MSFT:*_*_*_ASM_FLAGS = /Fl
 #  GCC:*_*_*_ASM_FLAGS = -Wa,-a=AsmList.txt
 #  GCC:*_*_*_NASM_FLAGS = -l NasmList.txt
+
+  XCODE:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
--- a/Protocols/DataHubDxe/DataHubDxe.inf
+++ b/Protocols/DataHubDxe/DataHubDxe.inf
@ -79,3 +79,7 @@

 [UserExtensions.TianoCore."ExtraFiles"]
  DataHubDxeExtra.uni
+
+[BuildOptions]
+  XCODE:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
--- a/Xcode/Clover/Clover.xcodeproj/project.pbxproj
+++ b/Xcode/Clover/Clover.xcodeproj/project.pbxproj