Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-30 12:43:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Build info unknown.

Browse Source
This commit is contained in:
jief 2020-04-16 15:24:21 +03:00
parent 79af8de0a0
commit 3388819d58
5 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rEFIt_UEFI/Platform/Settings.cpp
View File

@ -127,13 +127,15 @@ const INTN BCSMargin = 11;
DRIVERS_FLAGS gDriversFlags; //the initializer is not needed for global variables DRIVERS_FLAGS gDriversFlags; //the initializer is not needed for global variables
#ifdef FIRMWARE_REVISION #ifdef FIRMWARE_REVISION
//CONST CHAR16 gFirmwareRevisionM[] = FIRMWARE_REVISION;
//CONST CHAR16 *gFirmwareRevision = &gFirmwareRevisionM[0];
CONST CHAR16 *gFirmwareRevision = FIRMWARE_REVISION; CONST CHAR16 *gFirmwareRevision = FIRMWARE_REVISION;
CONST CHAR8* gRevisionStr = REVISION_STR; CONST CHAR8* gRevisionStr = REVISION_STR;
CONST CHAR8* gFirmwareBuildDate = FIRMWARE_BUILDDATE;
CONST CHAR8* gBuildInfo = BUILDINFOS_STR;
#else #else
CONST CHAR16 *gFirmwareRevision = NULL; CONST CHAR16 *gFirmwareRevision = "unknown";
CONST CHAR8* gRevisionStr = NULL; CONST CHAR8* gRevisionStr = "unknown";
CONST CHAR8* gFirmwareBuildDate = "unknown";
CONST CHAR8* gBuildInfo = NULL;
#endif #endif
EFI_GUID gUuid; EFI_GUID gUuid;

2
rEFIt_UEFI/Platform/Settings.h
View File

@ -667,6 +667,8 @@ extern CHAR16 *IconFormat;
extern CONST CHAR16 *gFirmwareRevision; extern CONST CHAR16 *gFirmwareRevision;
extern CONST CHAR8* gRevisionStr; extern CONST CHAR8* gRevisionStr;
extern CONST CHAR8* gFirmwareBuildDate;
extern CONST CHAR8* gBuildInfo;
extern BOOLEAN ResumeFromCoreStorage; extern BOOLEAN ResumeFromCoreStorage;
extern BOOLEAN gRemapSmBiosIsRequire; // syscl: pass argument for Dell SMBIOS here extern BOOLEAN gRemapSmBiosIsRequire; // syscl: pass argument for Dell SMBIOS here

6
rEFIt_UEFI/Platform/smbios.cpp
View File

@ -1105,11 +1105,7 @@ VOID PatchTableType11()
// AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.EfiVersion, iStrLen(gSettings.EfiVersion, 64)); // AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.EfiVersion, iStrLen(gSettings.EfiVersion, 64));
AsciiStrCatS(OEMString, MAX_OEM_STRING, " Board-ID : "); AsciiStrCatS(OEMString, MAX_OEM_STRING, " Board-ID : ");
AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.BoardNumber, iStrLen(gSettings.BoardNumber, 64)); AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.BoardNumber, iStrLen(gSettings.BoardNumber, 64));
//#ifdef REVISION_STR snprintf(TempRev, MAX_OEM_STRING, "\n⌘ Powered by Clover %s\n", gRevisionStr);
// snprintf(TempRev, MAX_OEM_STRING, "\n⌘ Powered by %s\n", REVISION_STR);
//#else
snprintf(TempRev, MAX_OEM_STRING, "\n⌘ Powered by Clover %ls\n", gFirmwareRevision);
//#endif
AsciiStrCatS(OEMString, MAX_OEM_STRING, TempRev); AsciiStrCatS(OEMString, MAX_OEM_STRING, TempRev);
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type11->StringCount, OEMString); UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type11->StringCount, OEMString);

10
rEFIt_UEFI/refit/main.cpp
View File

@ -1957,12 +1957,10 @@ RefitMain (IN EFI_HANDLE ImageHandle,
MsgLog("Now is %02d.%02d.%d, %02d:%02d:%02d (GMT+%d)\n", MsgLog("Now is %02d.%02d.%d, %02d:%02d:%02d (GMT+%d)\n",
Now.Day, Now.Month, Now.Year, Now.Hour, Now.Minute, Now.Second, GlobalConfig.Timezone); Now.Day, Now.Month, Now.Year, Now.Hour, Now.Minute, Now.Second, GlobalConfig.Timezone);
} }
//MsgLog("Starting Clover rev %ls on %ls EFI\n", FIRMWARE_REVISION, gST->FirmwareVendor); //MsgLog("Starting Clover rev %ls on %ls EFI\n", gFirmwareRevision, gST->FirmwareVendor);
MsgLog("Starting %s on %ls EFI\n", gRevisionStr, gST->FirmwareVendor); MsgLog("Starting %s on %ls EFI\n", gRevisionStr, gST->FirmwareVendor);
#ifdef BUILDINFOS_STR if ( gBuildInfo ) DBG("Build with: [%s]\n", gBuildInfo);
DBG("Build with: [%s]\n", BUILDINFOS_STR);
#endif // BUILDINFOS_STR
Status = InitRefitLib(gImageHandle); Status = InitRefitLib(gImageHandle);
@ -2026,10 +2024,6 @@ RefitMain (IN EFI_HANDLE ImageHandle,
PrepatchSmbios(); PrepatchSmbios();
//#ifdef REVISION_STR
// DBG(REVISION_STR);
//#endif
//replace / with _ //replace / with _
Size = iStrLen(gSettings.OEMProduct, 64); Size = iStrLen(gSettings.OEMProduct, 64);
for (i=0; i<Size; i++) { for (i=0; i<Size; i++) {

11
rEFIt_UEFI/refit/menu.cpp
View File

@ -1217,16 +1217,9 @@ VOID AboutRefit(VOID)
if (AboutMenu.Entries.size() == 0) { if (AboutMenu.Entries.size() == 0) {
// AboutMenu.AddMenuInfo_f(("Clover Version 5.0")); // AboutMenu.AddMenuInfo_f(("Clover Version 5.0"));
#ifdef REVISION_STR AboutMenu.AddMenuInfo_f(" %s ", gRevisionStr);
AboutMenu.AddMenuInfo_f(" %s ", REVISION_STR);
#else
AboutMenu.AddMenuInfo_f("Clover Revision %ls", gFirmwareRevision); AboutMenu.AddMenuInfo_f("Clover Revision %ls", gFirmwareRevision);
#endif AboutMenu.AddMenuInfo_f(" Build: %s", gFirmwareBuildDate);
#ifdef FIRMWARE_BUILDDATE
AboutMenu.AddMenuInfo_f(" Build: %s", FIRMWARE_BUILDDATE);
#else
AboutMenu.AddMenuInfo_f(" Build: unknown");
#endif
AboutMenu.AddMenuInfo_f(" "); AboutMenu.AddMenuInfo_f(" ");
AboutMenu.AddMenuInfo_f("Based on rEFIt (c) 2006-2010 Christoph Pfisterer"); AboutMenu.AddMenuInfo_f("Based on rEFIt (c) 2006-2010 Christoph Pfisterer");
AboutMenu.AddMenuInfo_f("Portions Copyright (c) Intel Corporation"); AboutMenu.AddMenuInfo_f("Portions Copyright (c) Intel Corporation");