Index: branches/iFabio/Chameleon/i386/boot0/boot0md.s =================================================================== --- branches/iFabio/Chameleon/i386/boot0/boot0md.s (revision 328) +++ branches/iFabio/Chameleon/i386/boot0/boot0md.s (revision 329) @@ -343,36 +343,20 @@ jne .Pass2 .Pass1: -%if CONFIG_BOOT0_HFSFIRST cmp BYTE [si + part.type], kPartTypeHFS ; In pass 1 we're going to find a HFS+ partition - ; equipped with boot1h in its boot record - ; regardless if it's active or not. + ; equipped with boot1h in its boot record + ; regardless if it's active or not. jne .continue - mov dh, 1 ; Argument for loadBootSector to check HFS+ partition signature. -%else - cmp BYTE [si + part.bootid], kPartActive ; In pass 1 we are walking on the standard path - ; by trying to hop on the active partition. - jne .continue - xor dh, dh ; Argument for loadBootSector to skip HFS+ partition - ; signature check. -%endif + mov dh, 1 ; Argument for loadBootSector to check HFS+ partition signature. jmp .tryToBoot .Pass2: -%if CONFIG_BOOT0_HFSFIRST cmp BYTE [si + part.bootid], kPartActive ; In pass 2 we are walking on the standard path - ; by trying to hop on the active partition. + ; by trying to hop on the active partition. jne .continue xor dh, dh ; Argument for loadBootSector to skip HFS+ partition - ; signature check. -%else - cmp BYTE [si + part.type], kPartTypeHFS ; In pass 2 we're going to find a HFS+ partition - ; equipped with boot1h in its boot record - ; regardless if it's active or not. - jne .continue - mov dh, 1 ; Argument for loadBootSector to check HFS+ partition signature. -%endif + ; signature check. DebugChar('*') Index: branches/iFabio/Chameleon/package/buildpkg =================================================================== --- branches/iFabio/Chameleon/package/buildpkg (revision 328) +++ branches/iFabio/Chameleon/package/buildpkg (revision 329) @@ -66,7 +66,7 @@ cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386 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/boot0hfs ${1}/Core/Root/usr/standalone/i386 + cp -f ${1%/*}/i386/boot0md ${1}/Core/Root/usr/standalone/i386 cp -f ${1%/*}/i386/boot1f32 ${1}/Core/Root/usr/standalone/i386 cp -f ${1%/*}/i386/boot1h ${1}/Core/Root/usr/standalone/i386 cp -f ${1%/*}/i386/boot1he ${1}/Core/Root/usr/standalone/i386 Index: branches/iFabio/Chameleon/package/slimpkg =================================================================== --- branches/iFabio/Chameleon/package/slimpkg (revision 328) +++ branches/iFabio/Chameleon/package/slimpkg (revision 329) @@ -66,7 +66,7 @@ cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386 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/boot0hfs ${1}/Core/Root/usr/standalone/i386 + cp -f ${1%/*}/i386/boot0md ${1}/Core/Root/usr/standalone/i386 cp -f ${1%/*}/i386/boot1f32 ${1}/Core/Root/usr/standalone/i386 cp -f ${1%/*}/i386/boot1h ${1}/Core/Root/usr/standalone/i386 cp -f ${1%/*}/i386/boot1he ${1}/Core/Root/usr/standalone/i386 Index: branches/iFabio/Chameleon/BLOCKERS =================================================================== --- branches/iFabio/Chameleon/BLOCKERS (revision 328) +++ branches/iFabio/Chameleon/BLOCKERS (revision 329) @@ -1,11 +1,13 @@ - Memory Allocation Error on boot1 loading /boot: http://forge.voodooprojects.org/p/chameleon/issues/101/ Nvidia GT 540M && 310M : can't find rom to patch : http://forge.voodooprojects.org/p/chameleon/issues/99/ ** This is also http://forge.voodooprojects.org/p/chameleon/issues/48/ ** GT 440 --> http://forge.voodooprojects.org/p/chameleon/issues/98/ Extra Kext Loading dependency error: http://forge.voodooprojects.org/p/chameleon/issues/94/ AMD reported issues in cpu.c http://forge.voodooprojects.org/p/chameleon/issues/92/ Make Package: http://forge.voodooprojects.org/p/chameleon/issues/82/ - SMBus : http://forge.voodooprojects.org/p/chameleon/issues/10/ === Done === Multi Booting: http://forge.voodooprojects.org/p/chameleon/issues/62/ + Memory Allocation Error on boot1 loading /boot: http://forge.voodooprojects.org/p/chameleon/issues/101/ + +== Closed == + SMBus : http://forge.voodooprojects.org/p/chameleon/issues/10/