Chameleon

Chameleon Commit Details

Date:2017-07-16 22:55:53 (6 years 9 months ago)
Author:ErmaC
Commit:2889
Parents: 2888
Message:Add flag NvidiaNoEFI for injection of NVDA,noEFI (thx to FredWst) http://www.insanelymac.com/forum/topic/306156-clover-bugissue-report- and-patch/page-107?p=2443062#entry2443062
Changes:
M/branches/ErmaC/Enoch/package/Resources/templates/Localizable.strings
M/branches/ErmaC/Enoch/doc/BootHelp.txt
M/branches/ErmaC/Enoch/Enoch.xcodeproj/project.pbxproj
M/branches/ErmaC/Enoch/package/OptionalSettings/Video.txt
M/branches/ErmaC/Enoch/i386/libsaio/nvidia.c

File differences

branches/ErmaC/Enoch/Enoch.xcodeproj/project.pbxproj
157157
158158
159159
160
161
160
161
162162
163163
164164
......
342342
343343
344344
345
346
347
348
345349
346350
347351
......
14161420
14171421
14181422
1419
1420
1421
1422
14231423
14241424
1425
1426
14271425
14281426
14291427
......
16151613
16161614
16171615
1618
16191616
16201617
16211618
......
33043301
33053302
33063303
3307
3308
33093304
3305
3306
33103307
33113308
33123309
33133310
33143311
33153312
3313
3314
33163315
3317
3318
3319
33203316
33213317
33223318
......
34563452
34573453
34583454
3459
3460
3455
3456
34613457
34623458
34633459
......
41244120
41254121
41264122
4127
4123
41284124
41294125
41304126
......
48064802
48074803
48084804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
48094819
4820
4821
4822
48104823
48114824
48124825
......
48164829
48174830
48184831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
48194845
4846
4847
4848
48204849
48214850
48224851
3696B2121A1D2DB5004272A6 /* ntfs_private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ntfs_private.h; sourceTree = "<group>"; };
3696B2131A1D2DB5004272A6 /* ntfs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ntfs.c; sourceTree = "<group>"; };
3696B2141A1D2DB5004272A6 /* ntfs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ntfs.h; sourceTree = "<group>"; };
3696B2151A1D2DB5004272A6 /* nvidia_helper.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = nvidia_helper.c; sourceTree = "<group>"; };
3696B2161A1D2DB5004272A6 /* nvidia_helper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nvidia_helper.h; sourceTree = "<group>"; };
3696B2151A1D2DB5004272A6 /* gfx_helper.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gfx_helper.c; sourceTree = "<group>"; };
3696B2161A1D2DB5004272A6 /* gfx_helper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gfx_helper.h; sourceTree = "<group>"; };
3696B2171A1D2DB5004272A6 /* nvidia.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = nvidia.c; sourceTree = "<group>"; };
3696B2181A1D2DB5004272A6 /* nvidia.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nvidia.h; sourceTree = "<group>"; };
3696B2191A1D2DB5004272A6 /* openbsd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = openbsd.c; sourceTree = "<group>"; };
52DF7A2F17EDFA5900A88D32 /* kernel_patcher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = kernel_patcher.h; path = KernelPatcher/kernel_patcher.h; sourceTree = "<group>"; };
52DF7A3017EDFA5900A88D32 /* KernelPatcher.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = KernelPatcher.dylib; path = KernelPatcher/KernelPatcher.dylib; sourceTree = "<group>"; };
52DF7A3117EDFA5900A88D32 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = Makefile; path = KernelPatcher/Makefile; sourceTree = "<group>"; };
54D082B71ECC8C760077DB8D /* FakeSMC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FakeSMC.h; sourceTree = "<group>"; };
54D082B81ECC8C860077DB8D /* FakeSMCInfo.plist.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FakeSMCInfo.plist.h; sourceTree = "<group>"; };
54D082B91ECC8CA90077DB8D /* kernel_patcher_internal.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = kernel_patcher_internal.c; sourceTree = "<group>"; };
54D082BA1ECC8CBB0077DB8D /* kernel_patcher_internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = kernel_patcher_internal.h; sourceTree = "<group>"; };
54EE60B01E83478900D682EB /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
6DBAFD1813B0D4590047ED33 /* _structs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _structs.h; sourceTree = "<group>"; };
6DBAFD1913B0D4590047ED33 /* _types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _types.h; sourceTree = "<group>"; };
B4B3DE7F15B8E914002FAA73 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = Welcome.rtfd; sourceTree = "<group>"; };
E51057BF1BD174E0002FC0A7 /* IntelBdw.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = IntelBdw.txt; path = OptionalSettings/IntelBdw.txt; sourceTree = "<group>"; };
E51057C01BD174FE002FC0A7 /* IntelSkl.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = IntelSkl.txt; path = OptionalSettings/IntelSkl.txt; sourceTree = "<group>"; };
E51057C11BD17514002FC0A7 /* CrsActiveConfig.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = CrsActiveConfig.txt; path = OptionalSettings/CrsActiveConfig.txt; sourceTree = "<group>"; };
E511B6D21D187A3D00600004 /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
E5B3BF4F1B45C86F0063920E /* kernel_patcher.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = kernel_patcher.c; sourceTree = "<group>"; };
E5B3BF501B45C86F0063920E /* kernel_patcher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = kernel_patcher.h; sourceTree = "<group>"; };
E5B3BF511B45C8810063920E /* sse3_5_patcher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sse3_5_patcher.h; sourceTree = "<group>"; };
E5B3BF521B45C8810063920E /* sse3_patcher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sse3_patcher.h; sourceTree = "<group>"; };
E5EDE7221BC2F10A008602AF /* DriverFileNVRAM_bin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DriverFileNVRAM_bin.h; sourceTree = "<group>"; };
E5EDE7231BC2F10A008602AF /* DriverFileNVRAM_Info.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DriverFileNVRAM_Info.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
children = (
36B83692167832FC00314162 /* Audio.txt */,
36AB75E514BD095E005B8045 /* Control.txt */,
E51057C11BD17514002FC0A7 /* CrsActiveConfig.txt */,
36AB75E614BD095E005B8045 /* General.txt */,
36CF786716A0DD3D00EE5DC1 /* HDAULayout.txt */,
36B836941678330900314162 /* HDEFLayout.txt */,
3617E24817503A9300AE753C /* boot2.s */,
54EE60B01E83478900D682EB /* config.h */,
3617E24917503A9300AE753C /* Cconfig */,
E5EDE7221BC2F10A008602AF /* DriverFileNVRAM_bin.h */,
E5EDE7231BC2F10A008602AF /* DriverFileNVRAM_Info.h */,
3617E24A17503A9300AE753C /* drivers.c */,
54D082B71ECC8C760077DB8D /* FakeSMC.h */,
54D082B81ECC8C860077DB8D /* FakeSMCInfo.plist.h */,
3617E24B17503A9300AE753C /* graphic_utils.c */,
3617E24C17503A9300AE753C /* graphic_utils.h */,
3617E24D17503A9300AE753C /* graphics.c */,
3617E24E17503A9300AE753C /* graphics.h */,
3617E24F17503A9300AE753C /* gui.c */,
3617E25017503A9300AE753C /* gui.h */,
54D082B91ECC8CA90077DB8D /* kernel_patcher_internal.c */,
54D082BA1ECC8CBB0077DB8D /* kernel_patcher_internal.h */,
3617E25117503A9300AE753C /* IOHibernatePrivate.h */,
E5B3BF4F1B45C86F0063920E /* kernel_patcher.c */,
E5B3BF501B45C86F0063920E /* kernel_patcher.h */,
E50528B51B93E0FE001EFF67 /* kext_patcher.c */,
3608A84D1A42F33500602D1C /* lzvn.c */,
3617E25417503A9300AE753C /* lzss.c */,
3617E25517503A9300AE753C /* Makefile */,
3696B2121A1D2DB5004272A6 /* ntfs_private.h */,
3696B2131A1D2DB5004272A6 /* ntfs.c */,
3696B2141A1D2DB5004272A6 /* ntfs.h */,
3696B2151A1D2DB5004272A6 /* nvidia_helper.c */,
3696B2161A1D2DB5004272A6 /* nvidia_helper.h */,
3696B2151A1D2DB5004272A6 /* gfx_helper.c */,
3696B2161A1D2DB5004272A6 /* gfx_helper.h */,
3696B2171A1D2DB5004272A6 /* nvidia.c */,
3696B2181A1D2DB5004272A6 /* nvidia.h */,
3696B2191A1D2DB5004272A6 /* openbsd.c */,
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0620;
LastUpgradeCheck = 0830;
};
buildConfigurationList = 1DEB919308733D9F0010E9CD /* Build configuration list for PBXProject "Enoch" */;
compatibilityVersion = "Xcode 6.3";
1DEB919408733D9F0010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
1DEB919508733D9F0010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
SDKROOT = macosx;
};
branches/ErmaC/Enoch/i386/libsaio/nvidia.c
24722472
24732473
24742474
2475
2476
2477
2478
2479
2480
2481
2482
24752483
24762484
24772485
}
/************************ End Audio *************************/
/************************ NvidiaNoEFI ***********************/
doit = false;
if(getBoolForKey(kNvidiaNoEFI, &doit, &bootInfo->chameleonConfig) && doit)
{
devprop_add_value(device, "NVDA,noEFI", (uint8_t *)"true", 5);
}
/************************ End NvidiaNoEFI *************************/
if (getBoolForKey(kVBIOS, &doit, &bootInfo->chameleonConfig) && doit)
{
devprop_add_value(device, "vbios", rom, (nvBiosOveride > 0) ? nvBiosOveride : (rom[2] * 512));
branches/ErmaC/Enoch/package/OptionalSettings/Video.txt
3636
3737
3838
39
Bool@EnableDualLink:EnableDualLink=Yes
Bool@NvidiaGeneric:NvidiaGeneric=Yes
Bool@NvidiaSingle:NvidiaSingle=No
Bool@NvidiaNoEFI:NvidiaNoEFI=Yes
branches/ErmaC/Enoch/package/Resources/templates/Localizable.strings
783783
784784
785785
786
787
788
786789
787790
788791
"NvidiaSingle_title" = "NvidiaSingle=No";
"NvidiaSingle_description" = "If you have two cards Nvidia and wants to inject only first one then you can set this parameter (enabled by default).";
"NvidiaNoEFI_title" = "NvidiaNoEFI=Yes";
"NvidiaNoEFI_description" = "Inject value NVDA,noEFI to true.":
// ----------------------------------------------------------------------------
// Boot options - KERNEL FLAGS
// ----------------------------------------------------------------------------
branches/ErmaC/Enoch/doc/BootHelp.txt
9797
9898
9999
100
101
100
101
102102
103
103104
104105
105106
SkipNvidiaGfx=Yes|No Skip the Automatic device-properties generation for Nvidia cards.
SkipAtiGfx=Yes|No Skip the Automatic device-properties generation for Ati cards.
NvidiaGeneric =Yes|No Use the classic Nvidia name for the SystemProfiler (disabled by default).
NvidiaSingle =Yes|No If you have two cards Nvidia and wants to inject only
NvidiaGeneric=Yes|No Use the classic Nvidia name for the SystemProfiler (disabled by default).
NvidiaSingle=Yes|No If you have two cards Nvidia and wants to inject only
first one then you can set this parameter (enbaled by default).
NvidiaNoEFI=Yes|No Inject NVDA,noEFI value as true
AtiConfig=<cardcfg> Use a different card config, e.g. AtiConfig=Megalodon.
AtiPorts=<value> Specify the number of ports, e.g. AtiPorts=2.

Archive Download the corresponding diff file

Revision: 2889