From 002453811c64509e89e35be673d46f7c1188d55d Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sat, 4 May 2019 21:30:47 +0200
Subject: [PATCH] powerpc: Switch bootloader from yaboot to grub-ieee1275

---
 build/boot/powerpc/boot.msg                   |  19 --
 build/boot/powerpc/bootinfo.txt               | 266 ------------------
 build/boot/powerpc/grub-cdrom.cfg             |  40 +++
 build/boot/powerpc/hfs.map                    |  12 -
 build/boot/powerpc/ofboot.b                   |  13 -
 build/boot/powerpc/yaboot.conf                |  35 ---
 build/boot/powerpc/yaboot.conf.hd-media       |  35 ---
 build/boot/powerpc/yaboot.conf.netboot        |  35 ---
 build/config/powerpc.cfg                      | 142 ++++------
 build/config/powerpc/cdrom.cfg                |   8 +
 build/config/powerpc/netboot.cfg              |   8 +
 build/config/powerpc/powerpc.cfg              |  18 --
 build/config/powerpc/powerpc/cdrom.cfg        |   9 -
 build/config/powerpc/powerpc/floppy.cfg       |  35 ---
 .../powerpc/powerpc/floppy/boot-ofonly.cfg    |  17 --
 build/config/powerpc/powerpc/floppy/boot.cfg  |  15 -
 .../powerpc/powerpc/floppy/cd-drivers.cfg     |  18 --
 .../powerpc/powerpc/floppy/net-drivers.cfg    |  18 --
 build/config/powerpc/powerpc/floppy/root.cfg  |  18 --
 build/config/powerpc/powerpc/hd-media.cfg     |  31 --
 build/config/powerpc/powerpc/monolithic.cfg   |   8 -
 build/config/powerpc/powerpc/netboot-gtk.cfg  |  19 --
 build/config/powerpc/powerpc/netboot.cfg      |   9 -
 build/config/powerpc/powerpc64.cfg            |  18 --
 build/config/powerpc/powerpc64/cdrom.cfg      |   9 -
 build/config/powerpc/powerpc64/monolithic.cfg |   8 -
 .../config/powerpc/powerpc64/netboot-gtk.cfg  |  16 --
 build/config/powerpc/powerpc64/netboot.cfg    |   9 -
 build/config/powerpc/prep.cfg                 |  17 --
 build/config/powerpc/prep/cdrom.cfg           |   9 -
 build/config/powerpc/prep/hd-media.cfg        |  19 --
 build/config/powerpc/prep/netboot.cfg         |   9 -
 debian/changelog                              |   1 +
 debian/control                                |   4 +-
 38 files changed, 118 insertions(+), 867 deletions(-)
 delete mode 100644 build/boot/powerpc/boot.msg
 delete mode 100644 build/boot/powerpc/bootinfo.txt
 create mode 100644 build/boot/powerpc/grub-cdrom.cfg
 delete mode 100644 build/boot/powerpc/hfs.map
 delete mode 100644 build/boot/powerpc/ofboot.b
 delete mode 100644 build/boot/powerpc/yaboot.conf
 delete mode 100644 build/boot/powerpc/yaboot.conf.hd-media
 delete mode 100644 build/boot/powerpc/yaboot.conf.netboot
 create mode 100644 build/config/powerpc/cdrom.cfg
 create mode 100644 build/config/powerpc/netboot.cfg
 delete mode 100644 build/config/powerpc/powerpc.cfg
 delete mode 100644 build/config/powerpc/powerpc/cdrom.cfg
 delete mode 100644 build/config/powerpc/powerpc/floppy.cfg
 delete mode 100644 build/config/powerpc/powerpc/floppy/boot-ofonly.cfg
 delete mode 100644 build/config/powerpc/powerpc/floppy/boot.cfg
 delete mode 100644 build/config/powerpc/powerpc/floppy/cd-drivers.cfg
 delete mode 100644 build/config/powerpc/powerpc/floppy/net-drivers.cfg
 delete mode 100644 build/config/powerpc/powerpc/floppy/root.cfg
 delete mode 100644 build/config/powerpc/powerpc/hd-media.cfg
 delete mode 100644 build/config/powerpc/powerpc/monolithic.cfg
 delete mode 100644 build/config/powerpc/powerpc/netboot-gtk.cfg
 delete mode 100644 build/config/powerpc/powerpc/netboot.cfg
 delete mode 100644 build/config/powerpc/powerpc64.cfg
 delete mode 100644 build/config/powerpc/powerpc64/cdrom.cfg
 delete mode 100644 build/config/powerpc/powerpc64/monolithic.cfg
 delete mode 100644 build/config/powerpc/powerpc64/netboot-gtk.cfg
 delete mode 100644 build/config/powerpc/powerpc64/netboot.cfg
 delete mode 100644 build/config/powerpc/prep.cfg
 delete mode 100644 build/config/powerpc/prep/cdrom.cfg
 delete mode 100644 build/config/powerpc/prep/hd-media.cfg
 delete mode 100644 build/config/powerpc/prep/netboot.cfg

diff --git a/build/boot/powerpc/boot.msg b/build/boot/powerpc/boot.msg
deleted file mode 100644
index 30723098e..000000000
--- a/build/boot/powerpc/boot.msg
+++ /dev/null
@@ -1,19 +0,0 @@
-Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
-
-This is a Debian installation ${MEDIA_TYPE},
-built on ${BUILD_DATE}.
-
-The default option is 'install'. For maximum
-control, you can use the 'expert' option.
-
-If the system fails to boot at all (the typical
-symptom is a white screen which doesn't go away),
-use 'install video=ofonly' or 'expert video=ofonly'.
-
-Press the tab key for a list of options, or type
-'help' for help.
-
-************************************
-If in doubt, just choose 'install', and if that 
-doesn't work, try 'install video=ofonly'.
-************************************
diff --git a/build/boot/powerpc/bootinfo.txt b/build/boot/powerpc/bootinfo.txt
deleted file mode 100644
index bbaa4d3c5..000000000
--- a/build/boot/powerpc/bootinfo.txt
+++ /dev/null
@@ -1,266 +0,0 @@
-<chrp-boot>
-<description>Debian/GNU Linux Installation on IBM CHRP hardware</description>
-<os-name>Debian/GNU Linux for PowerPC</os-name>
-<boot-script>boot &device;:\install\yaboot</boot-script>
-<icon size=64,64 color-space=3,3,2>
-<bitmap>
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-</bitmap> 
-</icon> 
-</chrp-boot>
-
diff --git a/build/boot/powerpc/grub-cdrom.cfg b/build/boot/powerpc/grub-cdrom.cfg
new file mode 100644
index 000000000..41af6af63
--- /dev/null
+++ b/build/boot/powerpc/grub-cdrom.cfg
@@ -0,0 +1,40 @@
+set default=2
+set timeout=-1
+
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+
+menuentry "Debian GNU/Linux installer boot menu" {
+	true
+}
+
+menuentry "" {
+	true
+}
+
+function boot_one {
+	echo "Loading ..."
+	linux	${KERNEL} $options --- quiet
+	initrd	${INITRD}
+}
+
+menuentry "Default install" {
+        boot_one
+}
+
+menuentry "Automated install" {
+	set options="auto=true priority=critical"
+	boot_one
+}
+
+menuentry "Expert install" {
+	set options="priority=low"
+	boot_one
+}
+
+menuentry "Rescue mode" {
+	set options="rescue/enable=true"
+	boot_one
+}
diff --git a/build/boot/powerpc/hfs.map b/build/boot/powerpc/hfs.map
deleted file mode 100644
index 0d8b4cfce..000000000
--- a/build/boot/powerpc/hfs.map
+++ /dev/null
@@ -1,12 +0,0 @@
-# ext.  xlate  creator  type    comment
-.hqx    Ascii  'BnHx'   'TEXT'  "BinHex file"
-.sit    Raw    'SIT!'   'SITD'  "StuffIT Expander"
-.mov    Raw    'TVOD'   'MooV'  "QuickTime Movie"
-.deb    Raw    'Debn'   'bina'  "Debian package"
-.bin    Raw    'ddsk'   'DDim'  "Floppy or ramdisk image"
-.img    Raw    'ddsk'   'DDim'  "Floppy or ramdisk image"
-.b      Raw    'UNIX'   'tbxi'  "bootstrap"
-yaboot  Raw    'UNIX'   'boot'  "bootstrap"
-vmlinux Raw    'UNIX'   'boot'  "bootstrap"
-.conf   Raw    'UNIX'   'conf'  "bootstrap"
-*       Ascii  '????'   '????'  "Text file"
diff --git a/build/boot/powerpc/ofboot.b b/build/boot/powerpc/ofboot.b
deleted file mode 100644
index ffa91e802..000000000
--- a/build/boot/powerpc/ofboot.b
+++ /dev/null
@@ -1,13 +0,0 @@
-<CHRP-BOOT>
-<COMPATIBLE>
-MacRISC MacRISC3 MacRISC4
-</COMPATIBLE>
-<DESCRIPTION>
-Debian GNU/Linux PowerPC first stage CDROM bootloader
-</DESCRIPTION>
-<BOOT-SCRIPT>
-" screen" output
-load-base release-load-area
-boot cd:,\install\yaboot
-</BOOT-SCRIPT>
-</CHRP-BOOT>
diff --git a/build/boot/powerpc/yaboot.conf b/build/boot/powerpc/yaboot.conf
deleted file mode 100644
index d0e13a166..000000000
--- a/build/boot/powerpc/yaboot.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-## This yaboot.conf is for CD booting only, do not use as reference.
-## Debian GNU/Linux PowerPC
-
-default=install
-root=/dev/ram
-
-message=/install/boot.msg
-
-image=/install/${TYPE}-linux
-	label=install
-	initrd=/install/${TYPE}-initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="--"
-	read-only
-
-image=/install/${TYPE}-linux
-	label=expert
-	initrd=/install/${TYPE}-initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="priority=low --"
-	read-only
-
-image=/install/${TYPE}-linux
-	label=rescue
-	initrd=/install/${TYPE}-initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="rescue/enable=true --"
-	read-only
-
-image=/install/${TYPE}-linux
-	label=auto
-	initrd=/install/${TYPE}-initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="auto=true priority=critical --"
-	read-only
diff --git a/build/boot/powerpc/yaboot.conf.hd-media b/build/boot/powerpc/yaboot.conf.hd-media
deleted file mode 100644
index 4e5c35a33..000000000
--- a/build/boot/powerpc/yaboot.conf.hd-media
+++ /dev/null
@@ -1,35 +0,0 @@
-## This yaboot.conf is for hd-media booting only, do not use as reference.
-## Debian GNU/Linux PowerPC
-
-default=install
-root=/dev/ram
-
-message=/boot.msg
-
-image=/vmlinux
-	label=install
-	initrd=/initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="--"
-	read-only
-
-image=/vmlinux
-	label=expert
-	initrd=/initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="priority=low --"
-	read-only
-
-image=/vmlinux
-	label=rescue
-	initrd=/initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="rescue/enable=true --"
-	read-only
-
-image=/vmlinux
-	label=auto
-	initrd=/initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="auto=true priority=critical --"
-	read-only
diff --git a/build/boot/powerpc/yaboot.conf.netboot b/build/boot/powerpc/yaboot.conf.netboot
deleted file mode 100644
index 0c2e7e3f5..000000000
--- a/build/boot/powerpc/yaboot.conf.netboot
+++ /dev/null
@@ -1,35 +0,0 @@
-## This yaboot.conf is for netbooting only, do not use as reference.
-## Debian GNU/Linux PowerPC
-
-default=install
-root=/dev/ram
-
-message=/boot.msg
-
-image=/vmlinux
-	label=install
-	initrd=/initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="--"
-	read-only
-
-image=/vmlinux
-	label=expert
-	initrd=/initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="priority=low --"
-	read-only
-
-image=/vmlinux
-	label=rescue
-	initrd=/initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="rescue/enable=true --"
-	read-only
-
-image=/vmlinux
-	label=auto
-	initrd=/initrd.gz
-	initrd-size=${RAMDISK_SIZE}
-	append="auto=true priority=critical --"
-	read-only
diff --git a/build/config/powerpc.cfg b/build/config/powerpc.cfg
index 5aaf67ef3..d6ca649ca 100644
--- a/build/config/powerpc.cfg
+++ b/build/config/powerpc.cfg
@@ -1,93 +1,69 @@
-SUBARCH_SUPPORTED = powerpc powerpc64 # apus prep
+MEDIUM_SUPPORTED = cdrom netboot
 
 KERNELMAJOR = 2.6
 BASEVERSION = $(LINUX_KERNEL_ABI)
+KERNELVERSION = $(BASEVERSION)-powerpc
+KERNELNAME = vmlinux
+
+GRUB_CFG_CDROM = boot/powerpc/grub-cdrom.cfg
 
 DEBIAN_RELEASE = unstable
 
 KEYRING = /usr/share/keyrings/debian-ports-archive-keyring.gpg
 
-# create the kernels with builtin initrd.
-builtin_initrd: $(TEMP_KERNEL) $(TEMP_INITRD)
-	for subarch in $(SUBARCHES); do	\
-		rm -f $(DEST)/vmlinuz-$$subarch.initrd;	\
-		mkvmlinuz -v				\
-			-a $$subarch			\
-			-r $(KERNELVERSION)		\
-			-k $(TEMP_KERNEL)		\
-			-z -i $(TEMP_INITRD)		\
-			-d $(TEMP)/lib			\
-			-o $(DEST)/vmlinuz-$$subarch.initrd;	\
-	done
-
-# cd content for powerpc, includes yaboot for booting 
-# apple powerpc (newworld) computers
-cd_content_common:
-	mkdir -p $(TEMP_CD_TREE)/$(dir install/$(TYPE))
-
-	cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/$(TYPE)-linux
-	ln -f $(TEMP_INITRD) $(TEMP_CD_TREE)/install/$(TYPE)-initrd.gz
-
-	# New-world bootability
-	cp -f boot/powerpc/ofboot.b $(TEMP_CD_TREE)/install/
-	cp -f /usr/lib/yaboot/yaboot $(TEMP_CD_TREE)/install/
-	bootvars-subst MEDIA_TYPE "${MEDIA_TYPE}" \
-		DEBIAN_VERSION "${DEBIAN_VERSION}" \
-		BUILD_DATE "${BUILD_DATE}" \
-		< boot/powerpc/boot.msg > $(TEMP_CD_TREE)/install/boot.msg
-	ramdisk-size-subst $(TEMP_INITRD) \
-		< boot/powerpc/yaboot.conf \
-		| sed 's,\$${TYPE},$(TYPE),g' \
-		> $(TEMP_CD_TREE)/install/yaboot.conf
-	# CHRP bootability
-	mkdir -p $(TEMP_CD_TREE)/etc
-	mkdir -p $(TEMP_CD_TREE)/ppc/chrp
-	cp -f $(TEMP_CD_TREE)/install/yaboot.conf $(TEMP_CD_TREE)/etc
-	cp -f boot/powerpc/bootinfo.txt $(TEMP_CD_TREE)/ppc
-
-# Adds yaboot to netboot dirs.
-netboot_content_common:
-	cp -f /usr/lib/yaboot/yaboot $(DEST)
-	bootvars-subst MEDIA_TYPE "${MEDIA_TYPE}" \
-		DEBIAN_VERSION "${DEBIAN_VERSION}" \
-		BUILD_DATE "${BUILD_DATE}" \
-		< boot/powerpc/boot.msg > $(DEST)/boot.msg
-	ramdisk-size-subst $(TEMP_INITRD) \
-	< boot/powerpc/yaboot.conf.netboot \
-	| sed 's,\$${TYPE},$(TYPE),g' \
-	> $(DEST)/yaboot.conf
-
-# creates a bootable cd image for powerpc
-arch_miniiso_common: cd_content_common
-	genisoimage -r -T --netatalk -chrp-boot -hfs -probe -map boot/powerpc/hfs.map -part -no-desktop -hfs-bless $(TEMP_CD_TREE)/install -hfs-volid Debian-Installer/PPC -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
-
-# creates a bootable HFS filesystem, used for USB sticks
-hd_media_common: $(TEMP_KERNEL) $(TEMP_INITRD)
-	mkdir -p $(dir $(TEMP_BOOT))
-	: | dd of=$(TEMP_BOOT) bs=1024 seek=$(FLOPPY_SIZE)
-	HOME=$(TEMP) hformat -l $(DISK_LABEL) $(TEMP_BOOT)
-	HOME=$(TEMP) hmount $(TEMP_BOOT)
-	HOME=$(TEMP) hcopy -r $(TEMP_KERNEL) :vmlinux
-	HOME=$(TEMP) hcopy -r $(TEMP_INITRD) :initrd.gz
-	cp -a /usr/lib/yaboot/yaboot $(TEMP)/yaboot # used later
-	HOME=$(TEMP) hcopy -r $(TEMP)/yaboot :yaboot
-	HOME=$(TEMP) hattrib -c UNIX -t tbxi :yaboot
-
-	bootvars-subst MEDIA_TYPE "${MEDIA_TYPE}" \
-		DEBIAN_VERSION "${DEBIAN_VERSION}" \
-		BUILD_DATE "${BUILD_DATE}" \
-		< boot/powerpc/boot.msg > $(TEMP)/boot.msg
-	ramdisk-size-subst $(TEMP_INITRD) \
-		< boot/powerpc/yaboot.conf.hd-media \
-		> $(TEMP)/yaboot.conf
-	HOME=$(TEMP) hcopy -r $(TEMP)/boot.msg :boot.msg
-	HOME=$(TEMP) hcopy -r $(TEMP)/yaboot.conf :yaboot.conf
-
-	HOME=$(TEMP) hattrib -b :
-	HOME=$(TEMP) humount
-	rm -f $(TEMP)/.hcwd # clean up after hfsutils
-
-	$(if $(GZIPPED),gzip -v9f $(TEMP_BOOT))
-
+# GRUB modules
+GRUB_MODULES = echo gzio linux minicmd normal
+GRUB_MODULES_CDROM = iso9660
 
+arch_boot_screens:
 arch_tree:
+
+# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
+.PHONY: arch_miniiso
+arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
+	-rm -f $(TEMP_CD_TREE)/*
+	mkdir -p $(TEMP_CD_TREE)/boot/grub/powerpc-ieee1275 \
+		 $(TEMP_CD_TREE)/ppc/chrp \
+		 $(TEMP_CD_TREE)/install
+
+	cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinux
+	cp $(TEMP_INITRD) $(TEMP_CD_TREE)/install/initrd.gz
+
+	cp -a /usr/lib/grub/powerpc-ieee1275 $(TEMP_CD_TREE)/boot/grub
+
+	bootvars-subst \
+		KERNEL /install/vmlinux \
+		INITRD /install/initrd.gz \
+	< $(GRUB_CFG_CDROM) > $(TEMP_CD_TREE)/boot/grub/grub.cfg
+
+	cp -p /usr/lib/grub/powerpc-ieee1275/bootinfo.txt \
+		$(TEMP_CD_TREE)/ppc/
+
+	grub-mkrescue --output=$(TEMP_MINIISO) $(TEMP_CD_TREE)
+
+# genisoimage CD info directory, including GRUB and configuration files.
+.PHONY: arch_cd_info_dir
+arch_cd_info_dir:
+	rm -rf $(TEMP_CD_INFO_DIR)
+	mkdir -p $(TEMP_CD_INFO_DIR)/boot/grub/powerpc-ieee1275 \
+		 $(TEMP_CD_INFO_DIR)/ppc/chrp
+
+	cp -a /usr/lib/grub/powerpc-ieee1275 $(TEMP_CD_INFO_DIR)/boot/grub/
+
+	bootvars-subst \
+		KERNEL /install/vmlinux \
+		INITRD /install/initrd.gz \
+	< $(GRUB_CFG_CDROM) > $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
+	grub-mkimage -O powerpc-ieee1275 -p '()/boot/grub' \
+		-o $(TEMP_CD_INFO_DIR)/boot/grub/powerpc.elf \
+		$(GRUB_MODULES) $(GRUB_MODULES_CDROM)
+	cp -p /usr/lib/grub/powerpc-ieee1275/bootinfo.txt \
+		$(TEMP_CD_INFO_DIR)/ppc/
+
+# Netboot files
+.PHONY: arch_netboot_dir
+arch_netboot_dir:
+	-rm -f $(TEMP_NETBOOT_DIR)
+	mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+	cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
+	cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
diff --git a/build/config/powerpc/apus.cfg b/build/config/powerpc/apus.cfg
deleted file mode 100644
index c64ee6f1b..000000000
--- a/build/config/powerpc/apus.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-MEDIUM_SUPPORTED = nativehd cdrom-apus netboot-apus
-
-# The version of the kernel to use.
-KERNELMAJOR = 2.4
-KERNELVERSION = 2.4.27-apus
-KERNELNAME = vmlinuz
-INITRD_FS = ext2
diff --git a/build/config/powerpc/apus/cdrom-apus.cfg b/build/config/powerpc/apus/cdrom-apus.cfg
deleted file mode 100644
index 5ec1506c7..000000000
--- a/build/config/powerpc/apus/cdrom-apus.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL)
-EXTRANAME = cdrom/
-
-MANIFEST-BOOT = "CDROM image for most powerpc/apus amiga"
-MANIFEST-INITRD = "initrd for use with powerpc/apus CDROM"
-MANIFEST-KERNEL = "kernel for use with powerpc/apus CDROM"
-
-arch_boot_screens:
diff --git a/build/config/powerpc/apus/nativehd.cfg b/build/config/powerpc/apus/nativehd.cfg
deleted file mode 100644
index 05023aa15..000000000
--- a/build/config/powerpc/apus/nativehd.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-MEDIA_TYPE = nativehd
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "Native HD image for most powerpc/apus amiga"
-MANIFEST-INITRD = "initrd for use with powerpc/apus nativehd"
-MANIFEST-KERNEL = "kernel for use with powerpc/apus nativehd"
-
diff --git a/build/config/powerpc/apus/netboot-apus.cfg b/build/config/powerpc/apus/netboot-apus.cfg
deleted file mode 100644
index 820f619bc..000000000
--- a/build/config/powerpc/apus/netboot-apus.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL)
-EXTRANAME = netboot/
-
-MANIFEST-BOOT = "netboot image for most powerpc/apus amiga"
-MANIFEST-INITRD = "initrd for use with powerpc/apus netboot"
-MANIFEST-KERNEL = "kernel for use with powerpc/apus netboot"
-
-arch_boot_screens:
diff --git a/build/config/powerpc/cdrom.cfg b/build/config/powerpc/cdrom.cfg
new file mode 100644
index 000000000..38547cbd0
--- /dev/null
+++ b/build/config/powerpc/cdrom.cfg
@@ -0,0 +1,8 @@
+MEDIA_TYPE = CD-ROM
+
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
diff --git a/build/config/powerpc/netboot.cfg b/build/config/powerpc/netboot.cfg
new file mode 100644
index 000000000..e38305f14
--- /dev/null
+++ b/build/config/powerpc/netboot.cfg
@@ -0,0 +1,8 @@
+MEDIA_TYPE = netboot image
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of boot directory"
diff --git a/build/config/powerpc/powerpc.cfg b/build/config/powerpc/powerpc.cfg
deleted file mode 100644
index 80cffbadf..000000000
--- a/build/config/powerpc/powerpc.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-MEDIUM_SUPPORTED = cdrom netboot netboot-gtk hd-media # floppy
-MEDIUM_SUPPORTED_EXTRA = monolithic
-
-# The version of the kernel to use.
-KERNELVERSION = $(BASEVERSION)-powerpc
-KERNELNAME = vmlinux
-
-SUBARCHES = chrp # coff ppcbug
-
-cd_content: cd_content_common
-
-netboot_content: netboot_content_common
-
-arch_miniiso: arch_miniiso_common
-
-arch_boot_screens:
-
-#arch_boot: arch_boot_initrd
diff --git a/build/config/powerpc/powerpc/cdrom.cfg b/build/config/powerpc/powerpc/cdrom.cfg
deleted file mode 100644
index a78093012..000000000
--- a/build/config/powerpc/powerpc/cdrom.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL) builtin_initrd
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "CDROM image for most PowerPC CPUs"
-MANIFEST-INITRD = "initrd for use with powerpc CDROM"
-MANIFEST-KERNEL = "kernel for use with powerpc CDROM"
diff --git a/build/config/powerpc/powerpc/floppy.cfg b/build/config/powerpc/powerpc/floppy.cfg
deleted file mode 100644
index 4ef5bb154..000000000
--- a/build/config/powerpc/powerpc/floppy.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-FLAVOUR_SUPPORTED = root net-drivers cd-drivers boot boot-ofonly
-MEDIA_TYPE = floppy
-FLOPPY_SIZE = 1440
-KERNELVERSION = $(BASEVERSION)-powerpc-miboot
-
-# media where images may be written to (via dd).
-WRITE_MEDIA += $(FLAVOUR_SUPPORTED)
-
-$(TEMP_KERNEL).gz: $(TEMP_KERNEL)
-	#mkvmlinuz -a miboot -r $(KERNELVERSION) -k $(TEMP_KERNEL) -n -d $(TEMP)/lib -o $(TEMP_KERNEL).gz
-	# Let's do it the good old fashioned way.
-	gzip -c -9 $(TEMP_KERNEL) >$(TEMP_KERNEL).gz
-
-$(TEMP_BOOT).new: $(TEMP_KERNEL).gz
-	dd if=/dev/zero of=$@ bs=1024 count=$(FLOPPY_SIZE)
-	hformat -l $(DISK_LABEL) $@
-	# miboot it not in the archive yet, but it makes no sense to build the
-	# floppies when it is not, and cause a support nightmare, so better
-	# not build boot and boot-ofonly for official debian-installer.
-	echo DOING MIBOOT; \
-	echo device $(TEMP_BOOT).new > $(TEMP)/miboot.conf;			\
-	echo kernel $(TEMP_KERNEL).gz $(KERNEL_CMDL) >> $(TEMP)/miboot.conf;	\
-	miboot -c $(TEMP)/miboot.conf;			\
-	echo MIBOOT DONE;
-
-arch_boot:
-	mkdir -p $(dir $(TEMP_BOOT))
-	HOME=$(TEMP) $(MAKE) $(TEMP_BOOT).new
-	mv $(TEMP_BOOT).new $(TEMP_BOOT)
-	rm -f $(TEMP)/.hcwd # clean up after hfsutils
-
-arch_root:
-	cp $(TEMP_INITRD) $(TEMP_ROOT)
-
-arch_boot_screens:
diff --git a/build/config/powerpc/powerpc/floppy/boot-ofonly.cfg b/build/config/powerpc/powerpc/floppy/boot-ofonly.cfg
deleted file mode 100644
index 593e2de89..000000000
--- a/build/config/powerpc/powerpc/floppy/boot-ofonly.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-DISK_LABEL = "boot floppy"
-TARGET = $(BOOT)
-MANIFEST-BOOT = "alternative video=ofonly boot floppy"
-EXTRANAME = ofonly
-
-KERNEL_CMDL = root=0200 load_ramdisk=1 prompt_ramdisk=1 devfs=mount \
-             video=ofonly  debconf/priority=medium
-# We don't want the initrd to be generated, but we still want the tree.
-TEMP_INITRD = 
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE = bootfloppy
-
-# Release info not needed on boot floppy
-OMIT_RELEASE_INFO=1
-
-EXTRAUDEBS=
-TRANSSTATUS=
diff --git a/build/config/powerpc/powerpc/floppy/boot.cfg b/build/config/powerpc/powerpc/floppy/boot.cfg
deleted file mode 100644
index 11d49fe12..000000000
--- a/build/config/powerpc/powerpc/floppy/boot.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-DISK_LABEL = "boot floppy"
-TARGET = $(BOOT)
-MANIFEST-BOOT = "boot floppy for network or CD installs"
-
-KERNEL_CMDL = root=0200 load_ramdisk=1 prompt_ramdisk=1 devfs=mount debconf/priority=medium
-# We don't want the initrd to be generated, but we still want the tree.
-TEMP_INITRD = 
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE = bootfloppy
-
-# Release info not needed on boot floppy
-OMIT_RELEASE_INFO=1
-
-EXTRAUDEBS=
-TRANSSTATUS=
diff --git a/build/config/powerpc/powerpc/floppy/cd-drivers.cfg b/build/config/powerpc/powerpc/floppy/cd-drivers.cfg
deleted file mode 100644
index 9c6c60964..000000000
--- a/build/config/powerpc/powerpc/floppy/cd-drivers.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-DISK_LABEL = "CD-ROM drivers floppy"
-
-TARGET = $(EXTRA)
-EXTRANAME = $(FLAVOUR)
-
-IMAGE_SIZE = $(FLOPPY_SIZE)
-
-MANIFEST-EXTRA = "CD drivers, including all SCSI drivers"
-
-# No kernel or translation statistics.
-KERNELNAME =
-TRANSSTATUS =
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=cd_drivers
-DRIVER_FOR=floppy
-
-INITRD_FS=cramfs
diff --git a/build/config/powerpc/powerpc/floppy/net-drivers.cfg b/build/config/powerpc/powerpc/floppy/net-drivers.cfg
deleted file mode 100644
index c1a11614a..000000000
--- a/build/config/powerpc/powerpc/floppy/net-drivers.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-DISK_LABEL = "Network drivers floppy"
-
-TARGET = $(EXTRA)
-EXTRANAME = $(FLAVOUR)
-
-IMAGE_SIZE = $(FLOPPY_SIZE)
-
-MANIFEST-EXTRA = "network drivers, including PCMCIA and wireless"
-
-# No kernel or translation statistics.
-KERNELNAME =
-TRANSSTATUS =
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=net_drivers
-DRIVER_FOR=floppy
-
-INITRD_FS=cramfs
diff --git a/build/config/powerpc/powerpc/floppy/root.cfg b/build/config/powerpc/powerpc/floppy/root.cfg
deleted file mode 100644
index 2cab080a6..000000000
--- a/build/config/powerpc/powerpc/floppy/root.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-DISK_LABEL = "root floppy"
-
-# Library and font reduction need the dependencies of additional drivers.
-EXTRADRIVERS = $(BASE_TMP)powerpc_floppy_cd-drivers/tree \
-	$(BASE_TMP)powerpc_floppy_net-drivers/tree
-EXTRATARGETS = build_powerpc_floppy_cd-drivers \
-	build_powerpc_floppy_net-drivers
-TARGET = $(ROOT)
-
-MANIFEST-ROOT = "second floppy for network or CD installs"
-
-# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-TYPE=floppy
-
-# Drop all languages from the floppy to save space. If you need a localised
-# floppy, modify the list below, adding your language(s) in addition to en.
-# for example: DROP_LANG = '(?!en|es|pt_BR)'
-DROP_LANG = '(?!en)'
diff --git a/build/config/powerpc/powerpc/hd-media.cfg b/build/config/powerpc/powerpc/hd-media.cfg
deleted file mode 100644
index 4af9577f4..000000000
--- a/build/config/powerpc/powerpc/hd-media.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-# Not really a floppy, this is a 953 MiB image, large enough to put a
-# netinst iso in (being able to fit the full CD on it is just a bonus..),
-# and small enough to fit on a low-end memory stick, such as those
-# advertised as being 1 gigabyte in size.
-FLOPPY_SIZE = 976560
-
-DISK_LABEL = "bootable drive"
-MEDIA_TYPE = bootable drive
-
-GZIPPED = .gz
-EXTRANAME = hd-media/
-
-TARGET = $(KERNEL) $(INITRD) $(BOOT) $(DEST)/yaboot.conf $(DEST)/boot.msg
-
-MANIFEST-BOOT = "1 gb image (compressed) for USB memory stick"
-MANIFEST-INITRD = "for use on USB memory sticks"
-MANIFEST-KERNEL = "for use on USB memory sticks"
-
-arch_boot: hd_media_common
-
-$(DEST)/yaboot: hd_media_common
-	cp $(TEMP)/yaboot $@
-	update-manifest $@ "Open Firmware boot loader"
-
-$(DEST)/yaboot.conf: hd_media_common
-	cp $(TEMP)/yaboot.conf $@
-	update-manifest $@ "yaboot configuration file"
-
-$(DEST)/boot.msg: hd_media_common
-	cp $(TEMP)/boot.msg $@
-	update-manifest $@ "yaboot boot message"
diff --git a/build/config/powerpc/powerpc/monolithic.cfg b/build/config/powerpc/powerpc/monolithic.cfg
deleted file mode 100644
index 2ad48413d..000000000
--- a/build/config/powerpc/powerpc/monolithic.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-MEDIA_TYPE = boot image
-
-TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-INITRD = "initrd"
-MANIFEST-KERNEL = "kernel image"
-MANIFEST-MINIISO = "small bootable CD image for network install"
diff --git a/build/config/powerpc/powerpc/netboot-gtk.cfg b/build/config/powerpc/powerpc/netboot-gtk.cfg
deleted file mode 100644
index c222bac9b..000000000
--- a/build/config/powerpc/powerpc/netboot-gtk.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TYPE = netboot/gtk
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd
-EXTRANAME = netboot/gtk/
-
-#Only chrp works, so let's not waste bandwidth and disk space with the other images.
-SUBARCHES = chrp
-
-MANIFEST-BOOT = "tftp boot image for most PowerPC CPUs"
-MANIFEST-INITRD = "initrd for use with powerpc netboot"
-MANIFEST-KERNEL = "kernel for use with powerpc netboot"
-
-KEEP_GI_LANGS = 1
-
-# All images that include cdebconf should include symbols needed by these
-# plugins.
-EXTRAUDEBS += cdebconf-gtk-entropy
diff --git a/build/config/powerpc/powerpc/netboot.cfg b/build/config/powerpc/powerpc/netboot.cfg
deleted file mode 100644
index f0d8274f8..000000000
--- a/build/config/powerpc/powerpc/netboot.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd netboot_content
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "tftp boot image for most PowerPC CPUs"
-MANIFEST-INITRD = "initrd for use with powerpc netboot"
-MANIFEST-KERNEL = "kernel for use with powerpc netboot"
-MANIFEST-MINIISO = "small bootable CD image for powerpc netboot"
diff --git a/build/config/powerpc/powerpc64.cfg b/build/config/powerpc/powerpc64.cfg
deleted file mode 100644
index 05428a139..000000000
--- a/build/config/powerpc/powerpc64.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-MEDIUM_SUPPORTED = cdrom netboot netboot-gtk
-MEDIUM_SUPPORTED_EXTRA = monolithic
-
-# The version of the kernel to use.
-KERNELVERSION = $(BASEVERSION)-powerpc64
-KERNELNAME = vmlinux
-
-SUBARCHES = chrp
-
-cd_content: cd_content_common
-
-netboot_content: netboot_content_common
-
-arch_miniiso: arch_miniiso_common
-
-arch_boot_screens:
-
-arch_boot: arch_boot_initrd
diff --git a/build/config/powerpc/powerpc64/cdrom.cfg b/build/config/powerpc/powerpc64/cdrom.cfg
deleted file mode 100644
index 886b0af76..000000000
--- a/build/config/powerpc/powerpc64/cdrom.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL) builtin_initrd
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "CDROM image for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-INITRD = "initrd for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-KERNEL = "kernel for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
diff --git a/build/config/powerpc/powerpc64/monolithic.cfg b/build/config/powerpc/powerpc64/monolithic.cfg
deleted file mode 100644
index 727e191a0..000000000
--- a/build/config/powerpc/powerpc64/monolithic.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-MEDIA_TYPE = boot image
-
-TARGET = pkg-lists/standard-udebs pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-INITRD = "initrd for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-KERNEL = "kernel image for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-MINIISO = "small bootable CD image for network install on 64bit Power and PowerPC machines (except pre-power5 iSeries)"
diff --git a/build/config/powerpc/powerpc64/netboot-gtk.cfg b/build/config/powerpc/powerpc64/netboot-gtk.cfg
deleted file mode 100644
index d263cef0b..000000000
--- a/build/config/powerpc/powerpc64/netboot-gtk.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TYPE = netboot/gtk
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd
-EXTRANAME = netboot/gtk/
-
-MANIFEST-BOOT = "tftp boot image for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-INITRD = "initrd for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-KERNEL = "kernel for use with 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-
-KEEP_GI_LANGS = 1
-
-# All images that include cdebconf should include symbols needed by these
-# plugins.
-EXTRAUDEBS += cdebconf-gtk-entropy
diff --git a/build/config/powerpc/powerpc64/netboot.cfg b/build/config/powerpc/powerpc64/netboot.cfg
deleted file mode 100644
index 2d65a9c8d..000000000
--- a/build/config/powerpc/powerpc64/netboot.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd netboot_content
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "tftp boot image for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-INITRD = "initrd for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-KERNEL = "kernel for 64bit Power and PowerPC cpus (except pre-power5 iSeries)"
-MANIFEST-MINIISO = "small bootable CD image for powerpc64 netboot"
diff --git a/build/config/powerpc/prep.cfg b/build/config/powerpc/prep.cfg
deleted file mode 100644
index 0e7c8e33f..000000000
--- a/build/config/powerpc/prep.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-MEDIUM_SUPPORTED = cdrom netboot hd-media
-
-# The version of the kernel to use.
-KERNELVERSION = $(BASEVERSION)-prep
-KERNELNAME = vmlinux
-
-SUBARCHES = prep 
-
-cd_content: cd_content_common
-
-netboot_content: netboot_content_common
-
-arch_miniiso: arch_miniiso_common
-
-arch_boot_screens:
-
-#arch_boot: arch_boot_initrd
diff --git a/build/config/powerpc/prep/cdrom.cfg b/build/config/powerpc/prep/cdrom.cfg
deleted file mode 100644
index 8ded75634..000000000
--- a/build/config/powerpc/prep/cdrom.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-MEDIA_TYPE = CD-ROM
-
-# cd booting does not need floppy images on powerpc
-TARGET = $(INITRD) $(KERNEL) builtin_initrd
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "CDROM image for PowerPC prep subarch"
-MANIFEST-INITRD = "initrd for use with powerpc CDROM for prep subarch"
-MANIFEST-KERNEL = "kernel for use with powerpc CDROM for prep subarch"
diff --git a/build/config/powerpc/prep/hd-media.cfg b/build/config/powerpc/prep/hd-media.cfg
deleted file mode 100644
index fcf025dd7..000000000
--- a/build/config/powerpc/prep/hd-media.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Not really a floppy, this is a 953 MiB image, large enough to put a
-# netinst iso in (being able to fit the full CD on it is just a bonus..),
-# and small enough to fit on a low-end memory stick, such as those
-# advertised as being 1 gigabyte in size.
-FLOPPY_SIZE = 976560
-
-DISK_LABEL = "bootable drive"
-MEDIA_TYPE = bootable drive
-
-GZIPPED = .gz
-EXTRANAME = hd-media/
-
-TARGET = $(KERNEL) $(INITRD) $(BOOT) 
-
-MANIFEST-BOOT = "1 gb image (compressed) for USB memory stick"
-MANIFEST-INITRD = "for use on USB memory sticks"
-MANIFEST-KERNEL = "for use on USB memory sticks"
-
-arch_boot: hd_media_common
diff --git a/build/config/powerpc/prep/netboot.cfg b/build/config/powerpc/prep/netboot.cfg
deleted file mode 100644
index f100849e8..000000000
--- a/build/config/powerpc/prep/netboot.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL) $(MINIISO) builtin_initrd netboot_content
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-BOOT = "tftp boot image for PowerPC prep subarch"
-MANIFEST-INITRD = "initrd for use with netboot on powerpc prep subarch"
-MANIFEST-KERNEL = "kernel for use with netboot on powerpc prep subarch"
-MANIFEST-MINIISO = "small bootable CD image for netboot on powerpc prep subarch"
diff --git a/debian/changelog b/debian/changelog
index 5061fb092..4132cbe35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ debian-installer (20190411) UNRELEASED; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
   * ia64: Switch bootloader from elilo to grub-efi-ia64.
+  * powerpc: Switch bootloader from yaboot to grub-ieee1275.
 
   [ Vagrant Cascadian ]
   * [arm64] Add u-boot images for a64-olinuxino, orangepi_zero_plus2 and
diff --git a/debian/control b/debian/control
index 62344ec07..6cf6694e9 100644
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,7 @@ Build-Depends:
 	pxelinux [i386 amd64],
 	syslinux-common (>= 3:6) [i386 amd64],
 #		With isohybrid.
-	yaboot [powerpc ppc64],
+	yaboot [ppc64],
 #		For all our powerpc boot needs. Well, not really.
 	aboot (>= 0.9b-2) [alpha],
 #		A previous version didn't have netabootwrap.
@@ -116,7 +116,7 @@ Build-Depends:
 	grub-efi-arm-bin [armhf],
 	grub-common [amd64 arm64 i386], xorriso,
 #		Used to make EFI bootable images
-	grub-ieee1275-bin [ppc64el],
+	grub-ieee1275-bin [powerpc ppc64el],
 #		IEEE1275 bootloader support.
 	u-boot-imx (>= 2019.01+dfsg-3) [armhf],
 	u-boot-omap (>= 2016.09~rc1) [armhf],
-- 
2.20.1