#423 Minor updates to Raspberry Pi firmware handling on ARMv7
Merged 5 years ago by pbrobinson. Opened 5 years ago by pbrobinson.
pbrobinson/fedora-kickstarts f29-arm-fixes  into  f29

file modified
+3 -5
@@ -6,7 +6,7 @@ 

  

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

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

file modified
-2
@@ -61,8 +61,6 @@ 

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

file modified
-2
@@ -34,9 +34,7 @@ 

  

  # 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

@@ -56,8 +56,6 @@ 

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

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 links with the following update: https://bodhi.fedoraproject.org/updates/FEDORA-2018-56bc88dfb2

Pull-Request has been merged by pbrobinson

5 years ago