Chameleon

Chameleon Commit Details

Date:2011-08-28 17:35:39 (9 years 1 month ago)
Author:Azimutz
Commit:1467
Parents: 1466
Message:Sync these with trunk (r1465).
Changes:
M/branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
M/branches/azimutz/Package/doc/BootHelp.txt
M/branches/azimutz/Package/i386/boot2/boot.c
M/branches/azimutz/trunkAutoResolution/doc/BootHelp.txt
M/branches/azimutz/trunkAutoResolution/i386/boot2/boot.c
M/branches/azimutz/trunkGraphicsEnablerModules/doc/BootHelp.txt

File differences

branches/azimutz/trunkAutoResolution/i386/boot2/boot.c
702702
703703
704704
705
705
706
707
708
709
710
711
706712
707713
708714
......
719725
720726
721727
722
723
724
725
726
727
728
729
730
731
732
733
734
735728
736729
737730
verbose("Loading Darwin %s\n", gMacOSVersion);
useKernelCache = false; // by default don't use prelink kernel cache
// If boot from boot helper partitions and OS is Lion use prelink kernel.
// We need to find a solution to load extra mkext with a prelink kernel.
if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7"))
useKernelCache = true;
else
useKernelCache = false; // by default don't use prelink kernel cache
getBoolForKey(kUseKernelCache, &useKernelCache, &bootInfo->chameleonConfig);
if (useKernelCache) do {
kernelCacheFile[0] = 0; // Use default kernel cache file
}
// If boot from boot helper partitions and OS is Lion use prelink kernel.
// We need to find a solution to load extra mkext with a prelink kernel.
if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7")) {
verbose("Booting from Lion RAID volume so forcing to use KernelCache\n");
useKernelCache = true;
break;
}
if ((gBootMode & kBootModeSafe) == 1) {
verbose("Booting in 'Boot Safe' mode, KernelCache will not be used\n");
useKernelCache = false;
break;
}
if (gOverrideKernel && kernelCacheFile[0] == 0) {
verbose("Using a non default kernel (%s) without specifying 'Kernel Cache' path, KernelCache will not be used\n",
bootInfo->bootFile);
branches/azimutz/trunkAutoResolution/doc/BootHelp.txt
6868
6969
7070
71
72
71
72
73
7374
7475
7576
PciRoot=<value> Use an alternate value for PciRoot (default value 0).
UseKernelCache=Yes|No Default is No. Yes will load pre-linked kernel and will
ignore /E/E and /S/L/E/Extensions.mkext.
UseKernelCache=Yes|No Yes will load pre-linked kernel and will ignore /E/E
and /S/L/E/Extensions.mkext.
Default is No but Yes if you use Lion on a Raid partition.
GraphicsEnabler=Yes|No Automatic device-properties generation for gfx cards.
AtiConfig=<cardcfg> Use a different card config, e.g. AtiConfig=Megalodon.
branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
610610
611611
612612
613
613
614
615
616
617
618
619
614620
615621
616622
......
627633
628634
629635
630
631
632
633
634
635
636
637
638
639
640
641
642
643636
644637
645638
verbose("Loading Darwin %s\n", gMacOSVersion);
useKernelCache = false; // by default don't use prelink kernel cache
// If boot from boot helper partitions and OS is Lion use prelink kernel.
// We need to find a solution to load extra mkext with a prelink kernel.
if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7"))
useKernelCache = true;
else
useKernelCache = false; // by default don't use prelink kernel cache
getBoolForKey(kUseKernelCache, &useKernelCache, &bootInfo->chameleonConfig);
if (useKernelCache) do {
kernelCacheFile[0] = 0; // Use default kernel cache file
}
// If boot from boot helper partitions and OS is Lion use prelink kernel.
// We need to find a solution to load extra mkext with a prelink kernel.
if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7")) {
verbose("Booting from Lion RAID volume so forcing to use KernelCache\n");
useKernelCache = true;
break;
}
if ((gBootMode & kBootModeSafe) == 1) {
verbose("Booting in 'Boot Safe' mode, KernelCache will not be used\n");
useKernelCache = false;
break;
}
if (gOverrideKernel && kernelCacheFile[0] == 0) {
verbose("Using a non default kernel (%s) without specifying 'Kernel Cache' path, KernelCache will not be used\n",
bootInfo->bootFile);
branches/azimutz/trunkGraphicsEnablerModules/doc/BootHelp.txt
6868
6969
7070
71
72
71
72
73
7374
7475
7576
PciRoot=<value> Use an alternate value for PciRoot (default value 0).
UseKernelCache=Yes|No Default is No. Yes will load pre-linked kernel and will
ignore /E/E and /S/L/E/Extensions.mkext.
UseKernelCache=Yes|No Yes will load pre-linked kernel and will ignore /E/E
and /S/L/E/Extensions.mkext.
Default is No but Yes if you use Lion on a Raid partition.
GraphicsEnabler=Yes|No Automatic device-properties generation for gfx cards.
AtiConfig=<cardcfg> Use a different card config, e.g. AtiConfig=Megalodon.
branches/azimutz/Package/i386/boot2/boot.c
610610
611611
612612
613
613
614
615
616
617
618
619
614620
615621
616622
......
627633
628634
629635
630
631
632
633
634
635
636
637
638
639
640
641
642
643636
644637
645638
verbose("Loading Darwin %s\n", gMacOSVersion);
useKernelCache = false; // by default don't use prelink kernel cache
// If boot from boot helper partitions and OS is Lion use prelink kernel.
// We need to find a solution to load extra mkext with a prelink kernel.
if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7"))
useKernelCache = true;
else
useKernelCache = false; // by default don't use prelink kernel cache
getBoolForKey(kUseKernelCache, &useKernelCache, &bootInfo->chameleonConfig);
if (useKernelCache) do {
kernelCacheFile[0] = 0; // Use default kernel cache file
}
// If boot from boot helper partitions and OS is Lion use prelink kernel.
// We need to find a solution to load extra mkext with a prelink kernel.
if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7")) {
verbose("Booting from Lion RAID volume so forcing to use KernelCache\n");
useKernelCache = true;
break;
}
if ((gBootMode & kBootModeSafe) == 1) {
verbose("Booting in 'Boot Safe' mode, KernelCache will not be used\n");
useKernelCache = false;
break;
}
if (gOverrideKernel && kernelCacheFile[0] == 0) {
verbose("Using a non default kernel (%s) without specifying 'Kernel Cache' path, KernelCache will not be used\n",
bootInfo->bootFile);
branches/azimutz/Package/doc/BootHelp.txt
6868
6969
7070
71
72
71
72
73
7374
7475
7576
PciRoot=<value> Use an alternate value for PciRoot (default value 0).
UseKernelCache=Yes|No Default is No. Yes will load pre-linked kernel and will
ignore /E/E and /S/L/E/Extensions.mkext.
UseKernelCache=Yes|No Yes will load pre-linked kernel and will ignore /E/E
and /S/L/E/Extensions.mkext.
Default is No but Yes if you use Lion on a Raid partition.
GraphicsEnabler=Yes|No Automatic device-properties generation for gfx cards.
AtiConfig=<cardcfg> Use a different card config, e.g. AtiConfig=Megalodon.

Archive Download the corresponding diff file

Revision: 1467