From fae2f441602cd8640fc6d0d9a0b3305b40147b1d Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Tue, 28 Feb 2023 10:32:45 +0000
Subject: [PATCH] clean up some armhfp remnants

There's a few bits of armhfp dregs hanging around so lets
clean them up as they're no longer used.

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
---
 fedora-disk-base.ks | 13 +------------
 fedora-iot.ks       | 12 ------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks
index ea67746..68f2673 100644
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -34,8 +34,6 @@ firstboot --reconfig
 @hardware-support
 
 kernel
-# on 32bit arm make sure we only install one kernel
--kernel-lpae
 # remove this in %post
 dracut-config-generic
 -dracut-config-rescue
@@ -57,20 +55,11 @@ glibc-all-langpacks
 
 %post
 
-# Find the architecture we are on
-arch=$(uname -m)
-
 # Setup Raspberry Pi firmware
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
-else
-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
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
-fi
 fi
 
 releasever=$(rpm --eval '%{fedora}')
@@ -97,7 +86,7 @@ rm -f /var/lib/rpm/__db*
 # when you are using fedora via serial console as you do not get any output post grub
 # linux does a good job of knowing what consoles need to be enabled.
 # https://bugzilla.redhat.com/show_bug.cgi?id=2022757
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
+if [[ $arch == "aarch64" ]]; then
 sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
 fi
 
diff --git a/fedora-iot.ks b/fedora-iot.ks
index a52cb86..7b94a1f 100644
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -24,23 +24,11 @@ ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipk
 reboot
 
 %post --erroronfail
-# Find the architecture we are on
-arch=$(uname -m)
-if [[ $arch == "armv7l" ]]; then
-	arch="armhfp"
-fi
-
 # Setup Raspberry Pi firmware
-if [[ $arch == "aarch64" ]] || [[ $arch == "armhfp" ]]; then
 if [[ $arch == "aarch64" ]]; then
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
-else
-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
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
-fi
 fi
 
 # Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.