From f4755b898eb195cd7081316e71f122b1d2957a68 Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 20 Jul 2020 11:15:34 +0200 Subject: [PATCH] MycroftOS: Fix for new rpi-firmware system (rpi4-64 only for now) --- buildroot-external/board/raspberrypi/config.txt | 5 +++++ .../board/raspberrypi/genimage-raspberrypi4-64.cfg | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/buildroot-external/board/raspberrypi/config.txt b/buildroot-external/board/raspberrypi/config.txt index 9509ea0a..b37d8228 100644 --- a/buildroot-external/board/raspberrypi/config.txt +++ b/buildroot-external/board/raspberrypi/config.txt @@ -4,6 +4,11 @@ # See http://buildroot.org/manual.html#rootfs-custom # and http://elinux.org/RPiconfig for a description of config.txt syntax +# We always use the same names, the real used variant is selected by +# BR2_PACKAGE_RPI_FIRMWARE_{DEFAULT,X,CD} choice +start_file=start.elf +fixup_file=fixup.dat + kernel=zImage # To use an external initramfs file diff --git a/buildroot-external/board/raspberrypi/genimage-raspberrypi4-64.cfg b/buildroot-external/board/raspberrypi/genimage-raspberrypi4-64.cfg index 3c480e98..854e0c7e 100644 --- a/buildroot-external/board/raspberrypi/genimage-raspberrypi4-64.cfg +++ b/buildroot-external/board/raspberrypi/genimage-raspberrypi4-64.cfg @@ -4,8 +4,8 @@ image boot.vfat { "bcm2711-rpi-4-b.dtb", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", - "rpi-firmware/fixup4.dat", - "rpi-firmware/start4.elf", + "rpi-firmware/fixup.dat", + "rpi-firmware/start.elf", "rpi-firmware/overlays", "Image" }