From fcebc307adbaff11b00905ca3c3d946851cdb3e8 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Thu, 6 Sep 2018 11:58:38 +0100
Subject: [PATCH] Minor updates to Raspberry Pi firmware handling on ARMv7

Changes so we hangle the firmware more simply and in the same manner
across ARMv7 and aarch64. Enabling for UEFI on ARMv7 too.

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
---
 fedora-arm-base.ks             | 8 +++-----
 fedora-disk-base.ks            | 2 --
 fedora-iot.ks                  | 2 --
 fedora-modular-disk-minimal.ks | 2 --
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index 5bd441d..b8443a3 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -6,7 +6,7 @@ firewall --enabled --service=mdns,ssh
 
 bootloader --location=mbr
 
-part /boot/fw --size=30 --fstype vfat --asprimary
+part /boot/efi --size=80 --fstype vfat --asprimary
 part /boot --size=512 --fstype ext4 --asprimary
 part / --size=2800 --fstype ext4 --asprimary
 
@@ -51,10 +51,8 @@ glibc-all-langpacks
 %post
 
 # Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
-sed -i '/vfat/ d' /etc/fstab
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks
index 8212ed1..0520a51 100644
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -61,8 +61,6 @@ glibc-all-langpacks
 %post
 
 # Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
diff --git a/fedora-iot.ks b/fedora-iot.ks
index 54e14d5..7d31c3f 100644
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -34,9 +34,7 @@ arch=$(uname -m)
 
 # Setup Raspberry Pi firmware
 if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
-cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
 if [[ $arch == "aarch64" ]]; then
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 else
 cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
diff --git a/fedora-modular-disk-minimal.ks b/fedora-modular-disk-minimal.ks
index 6f29cb1..688fc9c 100644
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@@ -56,8 +56,6 @@ dhcp-client
 %post
 
 # Setup Raspberry Pi firmware
-#cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
 releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)