PowerPC: Transition back to CHRP script.
* After examining MacOS toolbox roms, I think i've got this nailed down. The MacOS Toolbox rom contains chrp code at the top and binary code at the bottom. * The Raw format for the chrp seemed to cause issues with the OpenFirmware boot process on some systems. NetBSD uses a '-' file type. * The format of the chrp seems a lot more sensitive across machines than described. Ensure our returns and spaces are even. * Booting with the 'c' key is still working on my older OpenFirmware machine with the chrp script. The bitmap logo is a half black, half white box. * I removed the &device; alias for now for troubleshooing. It also may of been causing compatibility issues. More testing is needed.
This commit is contained in:
@@ -1480,21 +1480,20 @@ actions BuildCDBootPPCImage1 bind MAPS
|
||||
mkdir -p $(HAIKU_OUTPUT_DIR)/cd/boot
|
||||
# CHRP Boot script
|
||||
cp $(>[3]) $(HAIKU_OUTPUT_DIR)/cd/ppc/bootinfo.txt
|
||||
# Haiku Bootloaders (Old World Mac + PReP partition)
|
||||
cp $(>[2]) $(HAIKU_OUTPUT_DIR)/cd/ofwboot.xcf
|
||||
# Haiku Bootloader (New World)
|
||||
cp $(>[1]) $(HAIKU_OUTPUT_DIR)/cd/ofwboot.elf
|
||||
cp $(>[1]) $(HAIKU_OUTPUT_DIR)/cd/boot/bootloader.b
|
||||
cp $(>[3]) $(HAIKU_OUTPUT_DIR)/cd/boot/boot.chrp
|
||||
# Haiku Bootloaders
|
||||
cp $(>[2]) $(HAIKU_OUTPUT_DIR)/cd/boot/haikuloader.xcf
|
||||
cp $(>[1]) $(HAIKU_OUTPUT_DIR)/cd/boot/haikuloader.elf
|
||||
# Extras (readme files, etc)
|
||||
cp $(>[4]) $(HAIKU_OUTPUT_DIR)/cd/
|
||||
|
||||
mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \
|
||||
-V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -prep-boot \
|
||||
ofwboot.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd \
|
||||
boot/haikuloader.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd \
|
||||
|| \
|
||||
genisoimage -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \
|
||||
-V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -prep-boot \
|
||||
ofwboot.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
|
||||
boot/haikuloader.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
|
||||
$(RM) -R $(HAIKU_OUTPUT_DIR)/cd
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user