Chameleon

Chameleon Commit Details

Date:2017-07-16 23:14:02 (9 months 10 days ago)
Author:ErmaC
Commit:2891
Parents: 2890
Message:sync trunk with latest Enoch branch
Changes:
M/trunk/doc/BootHelp.txt
M/trunk/i386/libsaio/cpu.c
M/trunk/i386/libsaio/platform.h
M/trunk/package/OptionalSettings/Video.txt
M/trunk/i386/libsaio/nvidia.c
M/trunk/i386/boot2/boot.h
M/branches/ErmaC/Enoch/i386/boot2/boot.h
M/trunk/package/Resources/templates/Localizable.strings

File differences

trunk/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));
trunk/i386/libsaio/cpu.c
11121112
11131113
11141114
1115
11151116
11161117
11171118
......
11321133
11331134
11341135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
11351158
11361159
11371160
uint64_t cpuMult;
uint64_t divisor = 0;
uint64_t did;
uint64_t fid;
cofvid = rdmsr64(K10_COFVID_STATUS);
}
break;
case 0x17: /*** Bronya: For AMD Family 17h Ryzen ***/
{
uint64_t cpuMult;
uint64_t CpuDfsId;
uint64_t CpuFid;
uint64_t prfsts = 0;
prfsts = rdmsr64(AMD_PSTATE0_STS);
CpuDfsId = bitfield(prfsts, 13, 8);
CpuFid = bitfield(prfsts, 7, 0);
cpuMult = (CpuFid / CpuDfsId) * 2;
cpuMultN2 = (prfsts & (uint64_t)bit(0));
currdiv = cpuMultN2;
/****** Addon END ******/
}
break;
default:
{
typedef unsigned long long vlong;
trunk/i386/libsaio/platform.h
345345
346346
347347
348
348349
349350
350351
#define MSR_AMD_MPERF0x000000E7
#define MSR_AMD_APERF0x000000E8
#define AMD_PSTATE0_STS0xC0010064
#define DEFAULT_FSB100000 /* for now, hardcoding 100MHz for old CPUs */
trunk/i386/boot2/boot.h
137137
138138
139139
140
141
142
140143
141144
142145
#define kUseIntelHDMI"UseIntelHDMI"/* ati.c && nvidia.c && gma.c */
#define kNvidiaSingle"NvidiaSingle"/* nvidia.c */
/* FredWst: added this key */
#define kNvidiaNoEFI"NvidiaNoEFI"/* nvidia.c */
/* Signal64: added this key */
#define kLegacyOff"USBLegacyOff"/* usb.c */
trunk/package/OptionalSettings/Video.txt
3636
3737
3838
39
Bool@EnableDualLink:EnableDualLink=Yes
Bool@NvidiaGeneric:NvidiaGeneric=Yes
Bool@NvidiaSingle:NvidiaSingle=No
Bool@NvidiaNoEFI:NvidiaNoEFI=Yes
trunk/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
// ----------------------------------------------------------------------------
trunk/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.
branches/ErmaC/Enoch/i386/boot2/boot.h
137137
138138
139139
140
141
142
140143
141144
142145
#define kUseIntelHDMI"UseIntelHDMI"/* ati.c && nvidia.c && gma.c */
#define kNvidiaSingle"NvidiaSingle"/* nvidia.c */
/* FredWst: added this key */
#define kNvidiaNoEFI"NvidiaNoEFI"/* nvidia.c */
/* Signal64: added this key */
#define kLegacyOff"USBLegacyOff"/* usb.c */

Archive Download the corresponding diff file

Revision: 2891