diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2017-07-03 15:13:49 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-07-03 15:13:49 +0200 |
| commit | e9ea359db41fb116303dea98491e5465d349fb22 (patch) | |
| tree | 6a8e43914c3c1f0290dffcc8062ad8cd3cae37df | |
| parent | 710e1b013179ce3c2c8d53f1be3403e2d9453eeb (diff) | |
| download | imagefish-e9ea359db41fb116303dea98491e5465d349fb22.tar.gz | |
rpi firmware fixups for f26
| -rwxr-xr-x | scripts/tar-to-image.sh | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/scripts/tar-to-image.sh b/scripts/tar-to-image.sh index b498ca8..0d3bdaa 100755 --- a/scripts/tar-to-image.sh +++ b/scripts/tar-to-image.sh @@ -315,41 +315,39 @@ function fish_part_rpi() { fish mount /dev/sda4 / fish mkdir /boot fish mount /dev/sda2 /boot - fish mkdir /boot/fw - fish mount /dev/sda1 /boot/fw + fish mkdir /boot/efi + fish mount /dev/sda1 /boot/efi cat <<-EOF > "$fstab" LABEL=root / ext4 defaults 0 0 LABEL=boot /boot ext2 defaults 0 0 - LABEL=firm /boot/fw vfat ro 0 0 + LABEL=firm /boot/efi vfat ro 0 0 #LABEL=swap swap swap defaults 0 0 #UUID=${id_root} / ext4 defaults 0 0 #UUID=${id_boot} /boot ext2 defaults 0 0 - #UUID=${id_firm} /boot/fw vfat ro 0 0 + #UUID=${id_firm} /boot/efi vfat ro 0 0 #UUID=${id_swap} swap swap defaults 0 0 EOF } function fish_firmware_rpi32() { msg "rpi 32bit firmware setup" - fish glob cp-a "/usr/share/bcm283x-firmware/*" /boot/fw - fish cp /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin - fish cp /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin + fish glob cp-a "/usr/share/bcm283x-firmware/*" /boot/efi + fish cp /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin + fish cp /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin } function fish_firmware_rpi64() { msg "rpi 64bit firmware setup" - fish glob cp-a "/usr/share/bcm283x-firmware/*" /boot/fw - fish cp /usr/share/uboot/rpi_3/u-boot.bin /boot/fw/kernel8.img - - # HACK: config.txt from bcm283x-firmware.rpm works for 32bit only - cat <<-EOF > "$WORK/config.txt" - init_uart_clock=48000000 - gpu_mem=16 - boot_delay=1 -EOF - fish copy-in "$WORK/config.txt" /boot/fw + 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 + + # for uboot efi experiments ... + fish mkdir /boot/efi/EFITEST + fish copy-in /boot/efi/EFI/* /boot/efi/EFITEST } function fish_extlinux_rpi32() { |