Single ppc boot image (#166625)

7 files changed, 30 insertions, 109 deletions

diff --git a/bootdisk/ppc/ofboot.b b/bootdisk/ppc/ofboot.b
index c593052d4..c811894e7 100644
--- a/bootdisk/ppc/ofboot.b
+++ b/bootdisk/ppc/ofboot.b
@@ -10,7 +10,14 @@ Boot Chooser
 <BOOT-SCRIPT>
 " screen" output
 load-base release-load-area
-boot cd:,\\yaboot
+" /cpus/@0" find-package if
+ " 64-bit" rot get-package-property 0= if
+  2drop
+  " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc64\yaboot.conf" eval
+ else
+  " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc32\yaboot.conf" eval
+ then
+then
 </BOOT-SCRIPT>
 
 <OS-BADGE-ICONS>
diff --git a/bootdisk/ppc/ofboot.b.auto b/bootdisk/ppc/ofboot.b.auto
deleted file mode 100644
index 98019f532..000000000
--- a/bootdisk/ppc/ofboot.b.auto
+++ /dev/null
@@ -1,74 +0,0 @@
-<CHRP-BOOT>
-<COMPATIBLE>
-MacRISC MacRISC3 MacRISC4
-</COMPATIBLE>
-
-<DESCRIPTION>
-Boot Chooser
-</DESCRIPTION>
-
-<BOOT-SCRIPT>
-" screen" output
-load-base release-load-area
-" /cpus/@0" find-package if
- " 64-bit" rot get-package-property 0= if
-  2drop
-  " boot cd:,\ppc\mac64\yaboot" eval
- else
-  " boot cd:,\ppc\mac\yaboot" eval
- then
-then
-</BOOT-SCRIPT>
-
-<OS-BADGE-ICONS>
-1010
-000000000000F8FEACF6000000000000
-0000000000F5FFFFFEFEF50000000000
-00000000002BFAFEFAFCF70000000000
-0000000000F65D5857812B0000000000
-0000000000F5350B2F88560000000000
-0000000000F6335708F8FE0000000000
-00000000005600F600F5FD8100000000
-00000000F9F8000000F5FAFFF8000000
-000000008100F5F50000F6FEFE000000
-000000F8F700F500F50000FCFFF70000
-00000088F70000F50000F5FCFF2B0000
-0000002F582A00F5000008ADE02C0000
-00090B0A35A62B0000002D3B350A0000
-000A0A0B0B3BF60000505E0B0A0B0A00
-002E350B0B2F87FAFCF45F0B2E090000
-00000007335FF82BF72B575907000000
-000000000000ACFFFF81000000000000
-000000000081FFFFFFFF810000000000
-0000000000FBFFFFFFFFAC0000000000
-000000000081DFDFDFFFFB0000000000
-000000000081DD5F83FFFD0000000000
-000000000081DDDF5EACFF0000000000
-0000000000FDF981F981FFFF00000000
-00000000FFACF9F9F981FFFFAC000000
-00000000FFF98181F9F981FFFF000000
-000000ACACF981F981F9F9FFFFAC0000
-000000FFACF9F981F9F981FFFFFB0000
-00000083DFFBF981F9F95EFFFFFC0000
-005F5F5FDDFFFBF9F9F983DDDD5F0000
-005F5F5F5FDD81F9F9E7DF5F5F5F5F00
-0083DD5F5F83FFFFFFFFDF5F835F0000
-000000FBDDDFACFBACFBDFDFFB000000
-000000000000FFFFFFFF000000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFFFF00000000
-00000000FFFFFFFFFFFFFFFFFF000000
-00000000FFFFFFFFFFFFFFFFFF000000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
-00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00
-00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFF000000
-</OS-BADGE-ICONS>
-</CHRP-BOOT>
diff --git a/bootdisk/ppc/yaboot.conf.3264 b/bootdisk/ppc/yaboot.conf.3264
new file mode 100644
index 000000000..1739e5fa7
--- /dev/null
+++ b/bootdisk/ppc/yaboot.conf.3264
@@ -0,0 +1,14 @@
+init-message = "\nWelcome to the %PRODUCT% %VERSION% installer!\nUse 'linux32' for 32-bit kernel.\n\n"
+timeout=6000
+default=linux
+
+image=/ppc/ppc64/vmlinuz
+	label=linux64
+	alias=linux
+	initrd=/ppc/ppc64/ramdisk.image.gz
+	read-only
+
+image=/ppc/ppc32/vmlinuz
+	label=linux32
+	initrd=/ppc/ppc64/ramdisk.image.gz
+	read-only
diff --git a/bootdisk/ppc/yaboot.conf.in b/bootdisk/ppc/yaboot.conf.in
new file mode 100644
index 000000000..d06768a5d
--- /dev/null
+++ b/bootdisk/ppc/yaboot.conf.in
@@ -0,0 +1,8 @@
+init-message = "\nWelcome to the %BITS%-bit %PRODUCT% %VERSION% installer!\nHit <TAB> for boot options.\n\n"
+timeout=6000
+default=linux
+
+image=/ppc/ppc%BITS%/vmlinuz
+	label=linux
+	initrd=/ppc/ppc%BITS%/ramdisk.image.gz
+	read-only
diff --git a/bootdisk/ppc/yaboot.conf.mac b/bootdisk/ppc/yaboot.conf.mac
deleted file mode 100644
index 6f2598079..000000000
--- a/bootdisk/ppc/yaboot.conf.mac
+++ /dev/null
@@ -1,8 +0,0 @@
-init-message = "\nWelcome!\nHit <TAB> for boot options.\n\n"
-timeout=6000
-enablecdboot
-
-image=cd:,/ppc/mac/vmlinuz
-	label=linux
-	initrd=cd:,/ppc/mac/ramdisk.image.gz    
-	read-only
diff --git a/bootdisk/ppc/yaboot.conf.mac64 b/bootdisk/ppc/yaboot.conf.mac64
deleted file mode 100644
index 097972553..000000000
--- a/bootdisk/ppc/yaboot.conf.mac64
+++ /dev/null
@@ -1,18 +0,0 @@
-init-message = "\nWelcome!\nHit <TAB> for boot options.\n\n"
-timeout=6000
-enablecdboot
-
-image=cd:,/ppc/mac64/vmlinuz
-	label=linux
-	initrd=cd:,/ppc/mac64/ramdisk.image.gz    
-	append="maxcpus=1 ramdisk_size=8192"
-	read-only
-init-message = "\nWelcome!\nHit <TAB> for boot options.\n\n"
-timeout=6000
-enablecdboot
-
-image=cd:,/ppc/mac64/vmlinuz
-	label=linux
-	initrd=cd:,/ppc/mac64/ramdisk.image.gz    
-	append="maxcpus=1 ramdisk_size=8192"
-	read-only
diff --git a/bootdisk/ppc/yaboot.conf.pseries b/bootdisk/ppc/yaboot.conf.pseries
deleted file mode 100644
index 86c9f8e75..000000000
--- a/bootdisk/ppc/yaboot.conf.pseries
+++ /dev/null
@@ -1,8 +0,0 @@
-init-message = "\nWelcome!\nHit <TAB> for boot options.\n\n"
-timeout=6000
-default=linux
-
-image=ppc/chrp/vmlinuz
-	label=linux
-	initrd=ppc/chrp/ramdisk.image.gz
-	read-only