Chameleon Commit Details - 767 - Chameleon open source boot loader project.

Date:

2011-05-08 23:01:31 (12 years 11 months ago)

Author:

MacMan

Commit:

767

Parents:

766

Message:

Updated to trunk r760 and added UseKernelCache=Yes|No to BootHelp

Changes:

D	/branches/Chimera/Chimera.xcodeproj/mike.mode1v3
D	/branches/Chimera/Chimera.xcodeproj/.svn/text-base/project.pbxproj.svn-base
D	/branches/Chimera/Chimera.xcodeproj/.svn/all-wcprops
D	/branches/Chimera/Chimera.xcodeproj/project.pbxproj
D	/branches/Chimera/Chimera.xcodeproj/mike.pbxuser
D	/branches/Chimera/Chimera.xcodeproj/.svn/entries
M	/branches/Chimera/i386/libsaio/bootstruct.c
M	/branches/Chimera/version
M	/branches/Chimera/i386/boot2/boot.h
M	/branches/Chimera/i386/libsaio/saio_internal.h
M	/branches/Chimera/i386/libsaio/load.c
M	/branches/Chimera/i386/boot2/drivers.c
M	/branches/Chimera/revision
M	/branches/Chimera/doc/BootHelp.txt
M	/branches/Chimera/i386/boot2/boot.c

File differences

-41
42 42
43 43
44 
45 
46 
47 
48 
49 44
50 45
51 46
... ...
115 110
116 111
117 112
118 
113
119 114
120 115
121 116
+␊
static char platformName[64];␊
␊
bool checkOSVersion(const char * version) ␊
{␊
␉return ((gMacOSVersion[0] == version[0]) && (gMacOSVersion[1] == version[1]) && (gMacOSVersion[2] == version[2]) && (gMacOSVersion[3] == version[3]));␊
}␊
␊
void initKernBootStruct( void )␊
{␊
    Node *node;␊

void␊
reserveKernBootStruct(void)␊
{␊
␉if (checkOSVersion("10.7"))␊
␉if ((gMacOSVersion[0] == '1') && (gMacOSVersion[1] == '0') && (gMacOSVersion[2] == '.') && (gMacOSVersion[3] == '7'))␊
    {␊
␉␉void *oldAddr = bootArgs;␊
␉␉bootArgs = (boot_args *)AllocateKernelMemory(sizeof(boot_args));␊
 ...
 ␊
 static char platformName[64];␊
 ␊
-bool checkOSVersion(const char * version) ␊
-{␊
-␉return ((gMacOSVersion[0] == version[0]) && (gMacOSVersion[1] == version[1]) && (gMacOSVersion[2] == version[2]) && (gMacOSVersion[3] == version[3]));␊
-}␊
-␊
 void initKernBootStruct( void )␊
 {␊
     Node *node;␊
 void␊
 reserveKernBootStruct(void)␊
 {␊
-␉if (checkOSVersion("10.7"))␊
+␉if ((gMacOSVersion[0] == '1') && (gMacOSVersion[1] == '0') && (gMacOSVersion[2] == '.') && (gMacOSVersion[3] == '7'))␊
     {␊
 ␉␉void *oldAddr = bootArgs;␊
 ␉␉bootArgs = (boot_args *)AllocateKernelMemory(sizeof(boot_args));␊

-249
250 250
251 251
252 
252
253
253 254
254 255
255 256
+      stop("Kernel overflows available space");␊
  }␊
␊
  if (vmsize && ((strcmp(segname, "__PRELINK_INFO") == 0) || (strcmp(segname, "__PRELINK") == 0)))␉  gHaveKernelCache = true;␊
  if (vmsize && ((strcmp(segname, "__PRELINK_INFO") == 0) || (strcmp(segname, "__PRELINK") == 0)))␉  ␊
␉  gHaveKernelCache = true;␊
  ␊
  // Copy from file load area.␊
  if (vmsize>0 && filesize>0)␊
       stop("Kernel overflows available space");␊
   }␊
 ␊
-  if (vmsize && ((strcmp(segname, "__PRELINK_INFO") == 0) || (strcmp(segname, "__PRELINK") == 0)))␉  gHaveKernelCache = true;␊
+  if (vmsize && ((strcmp(segname, "__PRELINK_INFO") == 0) || (strcmp(segname, "__PRELINK") == 0)))␉  ␊
+␉  gHaveKernelCache = true;␊
   ␊
   // Copy from file load area.␊
   if (vmsize>0 && filesize>0)␊

-75
76 76
77 77
78 
79 78
80 79
81 80
+extern void   sleep(int n);␊
␊
/* bootstruct.c */␊
extern bool   checkOSVersion(const char * version);␊
extern void   initKernBootStruct(void);␊
extern void   reserveKernBootStruct(void);␊
extern void   copyKernBootStruct(void);␊
 extern void   sleep(int n);␊
 ␊
 /* bootstruct.c */␊
-extern bool   checkOSVersion(const char * version);␊
 extern void   initKernBootStruct(void);␊
 extern void   reserveKernBootStruct(void);␊
 extern void   copyKernBootStruct(void);␊

-69
70 70
71 71
72
72 73
73 74
74 75
+#define kWakeImage␉␉␉"WakeImage"␉␉␉/* boot.c */␊
#define kProductVersion␉␉"ProductVersion"␉/* boot.c */␊
#define karch␉␉␉␉"arch"␉␉␉␉/* boot.c */␊
#define kUseKernelCache␉␉"UseKernelCache"␉/* boot.c */␊
␊
#define kDSDT␉␉␉␉"DSDT"␉␉␉␉/* acpi_patcher.c */␊
#define kDropSSDT␉␉␉"DropSSDT"␉␉␉/* acpi_patcher.c */␊
 #define kWakeImage␉␉␉"WakeImage"␉␉␉/* boot.c */␊
 #define kProductVersion␉␉"ProductVersion"␉/* boot.c */␊
 #define karch␉␉␉␉"arch"␉␉␉␉/* boot.c */␊
+#define kUseKernelCache␉␉"UseKernelCache"␉/* boot.c */␊
 ␊
 #define kDSDT␉␉␉␉"DSDT"␉␉␉␉/* acpi_patcher.c */␊
 #define kDropSSDT␉␉␉"DropSSDT"␉␉␉/* acpi_patcher.c */␊

-39
40 40
41 41
42 
42
43 43
44 44
45 45
+#include "xml.h"␊
#include "ramdisk.h"␊
␊
//extern char gMacOSVersion;␊
//extern char gMacOSVersion[8];␊
␊
struct Module {  ␊
  struct Module *nextModule;␊
 #include "xml.h"␊
 #include "ramdisk.h"␊
 ␊
-//extern char gMacOSVersion;␊
+//extern char gMacOSVersion[8];␊
 ␊
 struct Module {  ␊
   struct Module *nextModule;␊

-
2 
3 
4 
5 
6 
7 
8 
9 
10 
11
+K 25␊
svn:wc:ra_dav:version-url␊
V 53␊
/svn/chameleon/!svn/ver/758/trunk/Chameleon.xcodeproj␊
END␊
project.pbxproj␊
K 25␊
svn:wc:ra_dav:version-url␊
V 69␊
/svn/chameleon/!svn/ver/758/trunk/Chameleon.xcodeproj/project.pbxproj␊
END␊
-K 25␊
-svn:wc:ra_dav:version-url␊
-V 53␊
-/svn/chameleon/!svn/ver/758/trunk/Chameleon.xcodeproj␊
-END␊
-project.pbxproj␊
-K 25␊
-svn:wc:ra_dav:version-url␊
-V 69␊
-/svn/chameleon/!svn/ver/758/trunk/Chameleon.xcodeproj/project.pbxproj␊
-END␊

-65
66 66
67 67
68
69
70
68 71
69 72
70 73
+  "Legacy Logo"=Yes|No    Use the legacy grey apple logo (disabled by default).␊
  ␊
  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.␊
␊
  GraphicsEnabler=Yes|No  Automatic device-properties generation for gfx cards.␊
    AtiConfig=<cardcfg>   Use a different card config␊
   "Legacy Logo"=Yes|No    Use the legacy grey apple logo (disabled by default).␊
   ␊
   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.␊
 ␊
   GraphicsEnabler=Yes|No  Automatic device-properties generation for gfx cards.␊
     AtiConfig=<cardcfg>   Use a different card config␊