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>
This commit is contained in:
Peter Robinson 2018-09-06 11:58:38 +01:00
parent 19a58f0fc6
commit fcebc307ad
4 changed files with 3 additions and 11 deletions

View File

@ -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*

View File

@ -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)

View File

@ -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

View File

@ -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)