Index: branches/iFabio/Chameleon/i386/libsaio/nvidia.c
===================================================================
--- branches/iFabio/Chameleon/i386/libsaio/nvidia.c (revision 333)
+++ branches/iFabio/Chameleon/i386/libsaio/nvidia.c (revision 334)
@@ -504,8 +504,6 @@
{ 0x10DE06D9, "Quadro 5000" },
{ 0x10DE06DA, "Quadro 5000M" },
{ 0x10DE06DC, "Quadro 6000" },
- { 0x10DE06DE, "Tesla M2050" },
- { 0x10DE06DE, "Tesla M2070" },
{ 0x10DE06DD, "Quadro 4000" },
{ 0x10DE06DE, "Tesla M2050" }, // TODO: sub-device id: 0x0846
{ 0x10DE06DE, "Tesla M2070" }, // TODO: sub-device id: ?
Index: branches/iFabio/Chameleon/i386/libsaio/ati.c
===================================================================
--- branches/iFabio/Chameleon/i386/libsaio/ati.c (revision 333)
+++ branches/iFabio/Chameleon/i386/libsaio/ati.c (revision 334)
@@ -204,19 +204,7 @@
} radeon_card_info_t;
static radeon_card_info_t radeon_cards[] = {
- //Azi: added devices
-// temporary placement
- // issue #88
- { 0x6741, 0x1646103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6750M", kNull },
- // issue #89
- { 0x68A8, 0x050E1025, CHIP_FAMILY_CYPRESS, "AMD Radeon HD 6850M", kUakari }, //Azi: CHIP_FAMILY_GRANVILLE ??
- // issue #90
- { 0x68E4, 0x1c921043, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470M", kEulemur },
- // issue #91
- { 0x68C0, 0x1594103C, CHIP_FAMILY_REDWOOD, "AMD Radeon HD 6570M", kNull },
- //==================================//================================//============================//
-
/* Earlier cards are not supported */
{ 0x9400, 0x30001002, CHIP_FAMILY_R600, "ATI Radeon HD 2900 PRO", kNull },
{ 0x9400, 0x25521002, CHIP_FAMILY_R600, "ATI Radeon HD 2900 XT", kNull },
@@ -251,6 +239,9 @@
{ 0x944E, 0x30101787, CHIP_FAMILY_RV770, "ATI Radeon HD 4810 Series", kMotmot },
{ 0x944E, 0x31001787, CHIP_FAMILY_RV770, "ATI Radeon HD 4820", kMotmot },
+ { 0x9480, 0x3628103C, CHIP_FAMILY_RV730, "ATI Radeon HD 4650M", kGliff },
+ { 0x9480, 0x9035104D, CHIP_FAMILY_RV730, "ATI Radeon HD 4650M", kGliff },
+
{ 0x9490, 0x20031787, CHIP_FAMILY_RV730, "ATI Radeon HD 4670", kFlicker },
{ 0x9490, 0x30501787, CHIP_FAMILY_RV730, "ATI Radeon HD 4710", kNull },
{ 0x9490, 0x4710174B, CHIP_FAMILY_RV730, "ATI Radeon HD 4710", kNull },
@@ -334,12 +325,13 @@
{ 0x954F, 0x29201682, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull },
{ 0x954F, 0x29211682, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull },
{ 0x954F, 0x30901682, CHIP_FAMILY_RV710, "XFX Radeon HD 4570", kNull },
- { 0x954F, 0x4450174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull },
- { 0x954F, 0x3000174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4520", kNull },
{ 0x954F, 0x30501787, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull },
{ 0x954F, 0x31001787, CHIP_FAMILY_RV710, "ATI Radeon HD 4520", kNull },
- { 0x954F, 0x4570174B, CHIP_FAMILY_RV710, "Sapphire Radeon HD4570", kNull },
{ 0x954F, 0x301017AF, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull },
+ { 0x954F, 0x4450174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull },
+ { 0x954F, 0x3000174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4520", kNull },
+ { 0x954F, 0x4570174B, CHIP_FAMILY_RV710, "Sapphire Radeon HD 4570", kNull },
+ { 0x954F, 0xE990174B, CHIP_FAMILY_RV710, "Sapphire Radeon HD 4350", kNull },
{ 0x9552, 0x3000148C, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull },
{ 0x9552, 0x3000174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull },
@@ -347,6 +339,9 @@
{ 0x9552, 0x300017AF, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull },
{ 0x9552, 0x04341028, CHIP_FAMILY_RV710, "ATI Mobility Radeon 4330", kShrike },
+ { 0x9553, 0x18751043, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4570", kShrike },
+ { 0x9553, 0x1B321043, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4570", kShrike },
+
{ 0x9581, 0x95811002, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull },
{ 0x9581, 0x3000148C, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull },
@@ -364,12 +359,12 @@
//Azi: most of the 9598 are rv630, according to http://developer.amd.com/gpu_assets/ATI_Device_IDs_xxx_xx.txt
{ 0x9598, 0xB3831002, CHIP_FAMILY_RV635, "ATI All-in-Wonder HD", kNull },
{ 0x9598, 0x30011043, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull },
- { 0x9598, 0x30001043, CHIP_FAMILY_RV635, "HD3730", kNull },
+ { 0x9598, 0x30001043, CHIP_FAMILY_RV635, "HD3730", kNull },
{ 0x9598, 0x3000148C, CHIP_FAMILY_RV635, "ATI Radeon HD 3730", kNull },
{ 0x9598, 0x3031148C, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull },
{ 0x9598, 0x3001148C, CHIP_FAMILY_RV635, "ATI Radeon HD 4580", kNull },
- { 0x9598, 0x30011545, CHIP_FAMILY_RV635, "VisionTek Radeon HD 2600 Pro", kNull },
- { 0x9598, 0x30001545, CHIP_FAMILY_RV635, "VisionTek Radeon HD 2600 XT", kNull },
+ { 0x9598, 0x30011545, CHIP_FAMILY_RV635, "VisionTek Radeon HD 2600 Pro", kNull },
+ { 0x9598, 0x30001545, CHIP_FAMILY_RV635, "VisionTek Radeon HD 2600 XT", kNull },
{ 0x9598, 0x4570174B, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull },
{ 0x9598, 0x4580174B, CHIP_FAMILY_RV635, "ATI Radeon HD 4580", kNull },
{ 0x9598, 0x4610174B, CHIP_FAMILY_RV635, "ATI Radeon HD 4610", kNull },
@@ -411,10 +406,12 @@
{ 0x6899, 0x22901787, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari },
{ 0x6899, 0xE140174B, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari },
- { 0x689C, 0x03521043, CHIP_FAMILY_HEMLOCK, "ASUS ARES", kUakari },
+ { 0x689C, 0x03521043, CHIP_FAMILY_HEMLOCK, "ASUS ARES", kUakari },
{ 0x689C, 0x039E1043, CHIP_FAMILY_HEMLOCK, "ASUS EAH5870 Series", kUakari },
{ 0x689C, 0x30201682, CHIP_FAMILY_HEMLOCK, "ATI Radeon HD 5970", kUakari },
+ { 0x68A8, 0x050E1025, CHIP_FAMILY_CYPRESS, "AMD Radeon HD 6850M", kUakari }, // issue #89
+
{ 0x68B8, 0xE147174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet },
{ 0x68B8, 0x21D71458, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet },
{ 0x68B8, 0x1482174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet },
@@ -424,6 +421,12 @@
{ 0x68B8, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet },
{ 0x68B8, 0x00CF106B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kHoolock },
+ { 0x68C0, 0x1594103C, CHIP_FAMILY_REDWOOD, "AMD Radeon HD 6570M", kNull }, // issue #91
+ //Azi: from Slice { 0x100268C0, "ATI Radeon 5670 Series", "Galago"}
+ // http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1695482
+
+ { 0x68C1, 0x033E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5650", kNull },
+
{ 0x68D8, 0x301117AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5690", kNull },
{ 0x68D8, 0x301017AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5730", kNull },
{ 0x68D8, 0x30001787, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5730", kNull },
@@ -440,8 +443,8 @@
{ 0x68E1, 0x1426103C, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5430M", kEulemur },
{ 0x68E0, 0x1433103C, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470M", kEulemur },
{ 0x68E0, 0x04561028, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470M", kEulemur },
- { 0x68F9, 0x20091787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur },
- { 0x68F9, 0x22911787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur },
+ { 0x68F9, 0x20091787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur },
+ { 0x68F9, 0x22911787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur },
{ 0x68F9, 0x301317AF, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull },
{ 0x68F9, 0x301117AF, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull },
{ 0x68F9, 0x30001787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull },
@@ -461,8 +464,14 @@
{ 0x6739, 0x67391002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed },
{ 0x6739, 0x21F81458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed },
+ { 0x6741, 0x050E1025, CHIP_FAMILY_TURKS, "AMD Radeon HD 6650M", kNull }, // issue 121
+ { 0x6741, 0x05131025, CHIP_FAMILY_TURKS, "AMD Radeon HD 6650M", kNull }, // Nai22
+ { 0x6741, 0x1646103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6750M", kNull }, // issue 88
+
{ 0x6759, 0xE193174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kNull },
+ { 0x6760, 0x1CB21043, CHIP_FAMILY_RV730, "AMD Radeon HD 6470M", kNull },
+
/* standard/default models */
{ 0x9400, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 XT", kNull },
{ 0x9405, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 GT", kNull },
@@ -494,6 +503,7 @@
{ 0x9519, 0x00000000, CHIP_FAMILY_RV670, "AMD FireStream 9170", kMegalodon },
{ 0x9540, 0x00000000, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull },
{ 0x954F, 0x00000000, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull },
+ { 0x9553, 0x00000000, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4500/5100 Series", kShrike },
{ 0x9588, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 XT", kLamna },
{ 0x9589, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 PRO", kLamna },
{ 0x958A, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 X2 Series", kLamna },
@@ -521,8 +531,6 @@
{ 0x68B9, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5600 Series", kVervet },
{ 0x68B8, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet },
{ 0x68BE, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet },
- //Azi: from Slice { 0x100268C0, "ATI Radeon 5670 Series", "Galago"}
- // http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1695482
{ 0x68D8, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5600 Series", kBaboon },
{ 0x68D9, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5500 Series", kBaboon },
@@ -537,6 +545,8 @@
{ 0x6739, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850 Series", kDuckweed },
{ 0x673E, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790 Series", kNull },
+ { 0x6741, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6600M/6700M Series", kNull },
+
{ 0x6758, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670 Series", kNull },
{ 0x6759, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6500 Series", kNull },
@@ -568,7 +578,7 @@
#define FLAGTRUE MKFLAG(0)
#define EVERGREEN MKFLAG(1)
-static uint8_t atN = 0;
+//static uint8_t atN = 0;
typedef struct {
type_t type;
@@ -1126,10 +1136,11 @@
static bool init_card(pci_dt_t *pci_dev)
{
- char name[24];
- char name_parent[24];
- int i;
- bool add_vbios = true;
+ bool add_vbios = true;
+ char name[24];
+ char name_parent[24];
+ int i;
+ int n_ports = 0;
card = malloc(sizeof(card_t));
if (!card)
@@ -1182,16 +1193,8 @@
}
}
- card->ports = 2; // default
+// atN = 0;
- if (card->info->chip_family >= CHIP_FAMILY_CEDAR)
- {
- card->flags |= EVERGREEN;
- card->ports = 3;
- }
-
- atN = 0;
-
card->cfg_name = getStringForKey(kAtiConfig, &bootInfo->chameleonConfig);
if (!card->cfg_name)
{
@@ -1205,11 +1208,16 @@
card->ports = card_configs[i].ports;
}
- //Azi: http://forum.voodooprojects.org/index.php/topic,1959.msg10402.html#msg10402
- // get around this...
- if (pci_dev->device_id == 0x9552 && pci_dev->subsys_id.subsys_id == 0x04341028 )
- card->ports = 2;
+ if (card->info->chip_family >= CHIP_FAMILY_CEDAR)
+ {
+ card->flags |= EVERGREEN;
+ card->ports = 3; //Azi: not sure of the usefulness ??
+ }
+ getIntForKey(kAtiPorts, &n_ports, &bootInfo->bootConfig);
+ if (n_ports > 0)
+ card->ports = n_ports;
+
sprintf(name, "ATY,%s", card->cfg_name);
aty_name.type = kStr;
aty_name.size = strlen(name) + 1;
Index: branches/iFabio/Chameleon/i386/libsaio/pci.h
===================================================================
--- branches/iFabio/Chameleon/i386/libsaio/pci.h (revision 333)
+++ branches/iFabio/Chameleon/i386/libsaio/pci.h (revision 334)
@@ -10,7 +10,7 @@
typedef struct {
uint32_t :2;
uint32_t reg :6;
- uint32_t func:3;
+ uint32_t func :3;
uint32_t dev :5;
uint32_t bus :8;
uint32_t :7;
Index: branches/iFabio/Chameleon/i386/libsaio/saio_types.h
===================================================================
--- branches/iFabio/Chameleon/i386/libsaio/saio_types.h (revision 333)
+++ branches/iFabio/Chameleon/i386/libsaio/saio_types.h (revision 334)
@@ -213,7 +213,7 @@
};
enum {
-
+
kPartitionTypeHFS = 0xAF,
kPartitionTypeHPFS = 0x07,
kPartitionTypeFAT16 = 0x06,
@@ -221,7 +221,7 @@
kPartitionTypeEXT3 = 0x83,
kPartitionTypeBEFS = 0xEB,
kPartitionTypeFreeBSD = 0xa5,
- kPartitionTypeOpenBSD = 0xa6,
+ kPartitionTypeOpenBSD = 0xa6
};
//#define BIOS_DEV_TYPE(d) ((d) & kBIOSDevTypeMask)
Index: branches/iFabio/Chameleon/i386/libsaio/fake_efi.c
===================================================================
--- branches/iFabio/Chameleon/i386/libsaio/fake_efi.c (revision 333)
+++ branches/iFabio/Chameleon/i386/libsaio/fake_efi.c (revision 334)
@@ -73,7 +73,7 @@
*/
/* Identify ourselves as the EFI firmware vendor */
-static EFI_CHAR16 const FIRMWARE_VENDOR[] = {'C','h','a','m','e','l','e','o','n','_','2','.','0', 0};
+static EFI_CHAR16 const FIRMWARE_VENDOR[] = {'.',':','E','r','m','a','C',':','.','_','1','.','0', 0};
static EFI_UINT32 const FIRMWARE_REVISION = 132; /* FIXME: Find a constant for this. */
/* Default platform system_id (fix by IntVar) */
Index: branches/iFabio/Chameleon/i386/boot2/boot.c
===================================================================
--- branches/iFabio/Chameleon/i386/boot2/boot.c (revision 333)
+++ branches/iFabio/Chameleon/i386/boot2/boot.c (revision 334)
@@ -428,6 +428,7 @@
} else {
archCpuType = CPU_TYPE_I386;
}
+
if (getValueForKey(karch, &val, &len, &bootInfo->chameleonConfig)) {
if (strncmp(val, "i386", 4) == 0) {
archCpuType = CPU_TYPE_I386;
@@ -440,8 +441,7 @@
}
}
-
- // Notify moduals that we are attempting to boot
+ // Notify modules that we are attempting to boot
execute_hook("PreBoot", NULL, NULL, NULL, NULL);
if (!getBoolForKey (kWake, &tryresume, &bootInfo->chameleonConfig)) {
@@ -537,7 +537,7 @@
// Reset cache name.
bzero(gCacheNameAdler + 64, sizeof(gCacheNameAdler) - 64);
- sprintf(gCacheNameAdler + 64, "%s,%s", gRootDevice, bootInfo->chameleonConfig);
+ sprintf(gCacheNameAdler + 64, "%s,%s", gRootDevice, bootInfo->bootFile);
adler32 = Adler32((unsigned char *)gCacheNameAdler, sizeof(gCacheNameAdler));
Index: branches/iFabio/Chameleon/i386/boot2/boot.h
===================================================================
--- branches/iFabio/Chameleon/i386/boot2/boot.h (revision 333)
+++ branches/iFabio/Chameleon/i386/boot2/boot.h (revision 334)
@@ -108,6 +108,7 @@
#define kUseAtiROM "UseAtiROM" /* ati.c */
#define kAtiConfig "AtiConfig" /* ati.c */
+#define kAtiPorts "AtiPorts" /* ati.c */
#define kATYbinimage "ATYbinimage" /* ati.c */
#define kUseNvidiaROM "UseNvidiaROM" /* nvidia.c */
Index: branches/iFabio/Chameleon/package/slimpkg.sh
===================================================================
--- branches/iFabio/Chameleon/package/slimpkg.sh (revision 333)
+++ branches/iFabio/Chameleon/package/slimpkg.sh (revision 334)
@@ -62,13 +62,13 @@
mkdir -p ${1}/Core/Root/usr/sbin
mkdir -p ${1}/Core/Root/usr/local/bin
mkdir -p ${1}/Core/Root/usr/standalone/i386
- if [ "$(ls -A ${1%/*}/i386/modules)" ]; then
- echo "Found Module :)"
- mkdir -p ${1}/Core/Root/usr/standalone/i386/modules
- cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386
- else
- echo "No found module into dir module"
- fi
+# if [ "$(ls -A "${1%/*}/i386/modules")" ]; then
+# echo "Modules found."
+# mkdir -p ${1}/Core/Root/usr/standalone/i386/modules
+# cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386
+# else
+# echo "No found modules into dir module"
+# fi
cp -f ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386
cp -f ${1%/*}/i386/boot0 ${1}/Core/Root/usr/standalone/i386
cp -f ${1%/*}/i386/boot0md ${1}/Core/Root/usr/standalone/i386
@@ -114,7 +114,16 @@
# build Modules package
echo "================= Modules ================="
- if [ "$(ls -A ${1%/*}/i386/modules)" ]; then
+ ###############################
+ # AMDGraphicsEnabler.dylib #
+ # ATiGraphicsEnabler.dylib #
+ # IntelGraphicsEnabler.dylib #
+ # klibc.dylib #
+ # NVIDIAGraphicsEnabler.dylib #
+ # Resolution.dylib #
+ # uClibcxx.dylib #
+ ###############################
+ if [ "$(ls -A "${1%/*}/i386/modules")" ]; then
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
choices[$((choicescount++))]="\n\n"
((xmlindent++))
@@ -132,7 +141,7 @@
((xmlindent--))
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
else
- echo " -= no module/s to include =-"
+ echo " -= no modules to include =-"
fi
# End build Modules packages
Index: branches/iFabio/Chameleon/package/buildpkg.sh
===================================================================
--- branches/iFabio/Chameleon/package/buildpkg.sh (revision 333)
+++ branches/iFabio/Chameleon/package/buildpkg.sh (revision 334)
@@ -62,13 +62,13 @@
mkdir -p ${1}/Core/Root/usr/sbin
mkdir -p ${1}/Core/Root/usr/local/bin
mkdir -p ${1}/Core/Root/usr/standalone/i386
- if [ "$(ls -A ${1%/*}/i386/modules)" ]; then
- echo "Found Module :)"
- mkdir -p ${1}/Core/Root/usr/standalone/i386/modules
- cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386
- else
- echo "No found module into dir module"
- fi
+# if [ "$(ls -A "${1%/*}/i386/modules")" ]; then
+# echo "Modules found."
+# mkdir -p ${1}/Core/Root/usr/standalone/i386/modules
+# cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386
+# else
+# echo "No found modules into dir module"
+# fi
cp -f ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386
cp -f ${1%/*}/i386/boot0 ${1}/Core/Root/usr/standalone/i386
cp -f ${1%/*}/i386/boot0md ${1}/Core/Root/usr/standalone/i386
@@ -116,7 +116,16 @@
# build Modules package
echo "================= Modules ================="
- if [ "$(ls -A ${1%/*}/i386/modules)" ]; then
+ ###############################
+ # AMDGraphicsEnabler.dylib #
+ # ATiGraphicsEnabler.dylib #
+ # IntelGraphicsEnabler.dylib #
+ # klibc.dylib #
+ # NVIDIAGraphicsEnabler.dylib #
+ # Resolution.dylib #
+ # uClibcxx.dylib #
+ ###############################
+ if [ "$(ls -A "${1%/*}/i386/modules")" ]; then
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
choices[$((choicescount++))]="\n\n"
((xmlindent++))
@@ -134,7 +143,7 @@
((xmlindent--))
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
else
- echo " -= no module/s to include =-"
+ echo " -= no modules to include =-"
fi
# End build Modules packages
Index: branches/iFabio/Chameleon/doc/BootHelp.txt
===================================================================
--- branches/iFabio/Chameleon/doc/BootHelp.txt (revision 333)
+++ branches/iFabio/Chameleon/doc/BootHelp.txt (revision 334)
@@ -72,7 +72,8 @@
ignore /E/E and /S/L/E/Extensions.mkext.
GraphicsEnabler=Yes|No Automatic device-properties generation for gfx cards.
- AtiConfig= Use a different card config
+ AtiConfig= Use a different card config, e.g. AtiConfig=Megalodon.
+ AtiPorts= Specify the number of ports, e.g. AtiPorts=2.
UseAtiROM=Yes|No Use an alternate Ati ROM image
(path: /Extra/__.rom)
UseNvidiaROM=Yes|No Use an alternate Nvidia ROM image
Index: branches/iFabio/Chameleon/CHANGES
===================================================================
--- branches/iFabio/Chameleon/CHANGES (revision 333)
+++ branches/iFabio/Chameleon/CHANGES (revision 334)
@@ -1,3 +1,7 @@
+- Added AtiPorts option to GraphicsEnabler, so users can override the default number of ports. It proved
+ to be useful when used to limit the number of ports that a framebuffer registers, which seems to be a
+ requirement on laptops that can only use 2 ports at the same time. Thanks to AniV for the tip:
+ http://forum.voodooprojects.org/index.php/topic,1959.msg10402.html#msg10402
- Added NVidia ION AHCI controllers dev id to AHCIPortInjector kext.
Forgot to mention source on the commit: http://forum.voodooprojects.org/index.php/topic,1170.0.html
- Renamed com.apple.Boot.plist to org.chameleon.Boot.plist.
Index: branches/iFabio/Chameleon/Makefile
===================================================================
--- branches/iFabio/Chameleon/Makefile (revision 333)
+++ branches/iFabio/Chameleon/Makefile (revision 334)
@@ -132,12 +132,12 @@
pkg installer: all
@# TODO: remove sudo
- sudo ${SRCROOT}/package/buildpkg.sh ${SYMROOT}/package;
+ ${SRCROOT}/package/buildpkg.sh ${SYMROOT}/package;
dmg: all
@# TODO: remove sudo
- sudo ${SRCROOT}/package/slimpkg.sh ${SYMROOT}/package;
- sudo ${SRCROOT}/package/builddmg.sh ${SYMROOT}/package;
+ ${SRCROOT}/package/slimpkg.sh ${SYMROOT}/package;
+ ${SRCROOT}/package/builddmg.sh ${SYMROOT}/package;
$(SYMROOT)/i386/vers.h: version
@echo "#define I386BOOT_VERSION \"5.0.132\"" > $@