aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2017-07-09 18:50:24 +0200
committerGerd Hoffmann <kraxel@redhat.com>2017-07-09 18:50:24 +0200
commit64466225988069fdbb662516b79fe409a83a9037 (patch)
tree9b321bb5e492f9eaa9fd3f566cfdb10cb8cb7c8c /scripts
parenteecc8135a4997c8b6e3e956fe24a33b248a5066c (diff)
downloadimagefish-64466225988069fdbb662516b79fe409a83a9037.tar.gz
rpi3 64bit fixes
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/tar-to-image.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/tar-to-image.sh b/scripts/tar-to-image.sh
index 9fd2f95..e910b1f 100755
--- a/scripts/tar-to-image.sh
+++ b/scripts/tar-to-image.sh
@@ -345,11 +345,16 @@ function fish_firmware_rpi64() {
msg "rpi 64bit firmware setup"
fish glob cp-a "/usr/share/bcm283x-firmware/*" /boot/efi
fish cp /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
- fish rename /boot/efi/config.txt /boot/efi/config-32.txt
- fish rename /boot/efi/config-64.txt /boot/efi/config.txt
+ fish rename /boot/efi/config.txt /boot/efi/config-32.txt
+ fish rename /boot/efi/config-64.txt /boot/efi/config.txt
+
# copy kernel dtb to efi partition
- fish mkdir /boot/efi/dtb
- fish glob cp-a /boot/dtb-*/broadcom /boot/efi/dtb
+ fish mkdir /boot/efi/dtb
+ fish glob cp-a "/boot/dtb-*/broadcom" /boot/efi/dtb
+
+ # copy grub to boot (workaround u-boot bug)
+ fish mkdir /boot/efi/efi/boot
+ fish cp /boot/efi/efi/fedora/grubaa64.efi /boot/efi/efi/boot
}
function fish_extlinux_rpi32() {