aboutsummaryrefslogtreecommitdiff
path: root/package/rpi-firmware/Config.in
diff options
context:
space:
mode:
authorGravatar Michael Cullen <michael@michaelcullen.name>2019-06-29 19:32:37 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-08-03 11:06:44 +0200
commita47328a22aa5fac2fe92aab2d8d75d8c3481b9ed (patch)
tree18fbdcdc39f29d68ea543c8972344abb1883f4be /package/rpi-firmware/Config.in
parent4c2b6978f6439138870720c85be99a4eb056fc3c (diff)
downloadbuildroot-a47328a22aa5fac2fe92aab2d8d75d8c3481b9ed.tar.gz
buildroot-a47328a22aa5fac2fe92aab2d8d75d8c3481b9ed.tar.bz2
package/rpi-firmware: bump version for pi4 support
This commit pulls in the latest version of rpi-firmware to enable support for the new Pi4. The Pi4 uses a different set of start files, so it adds variant selection and copies the Pi4 variant of the files if selected. Signed-off-by: Michael Cullen <michael@michaelcullen.name> [Peter: reword / rework slightly] Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/rpi-firmware/Config.in')
-rw-r--r--package/rpi-firmware/Config.in24
1 files changed, 22 insertions, 2 deletions
diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in
index 0ebbe7a4cd..7cebc5e7ca 100644
--- a/package/rpi-firmware/Config.in
+++ b/package/rpi-firmware/Config.in
@@ -12,6 +12,24 @@ config BR2_PACKAGE_RPI_FIRMWARE
if BR2_PACKAGE_RPI_FIRMWARE
choice
+ bool "rpi variant"
+ help
+ The Raspberry Pi 4 introduced a slightly different naming
+ convention and set of boot files. This option controls which
+ format to use.
+
+config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI
+ bool "rpi 0/1/2/3"
+ help
+ The default set of files, for versions pre-4
+
+config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4
+ bool "rpi 4"
+ help
+ The Raspberry Pi 4 files
+endchoice
+
+choice
bool "Firmware to boot"
default BR2_PACKAGE_RPI_FIRMWARE_DEFAULT
help
@@ -45,8 +63,10 @@ endchoice
config BR2_PACKAGE_RPI_FIRMWARE_BOOT
string
default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT
- default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X
- default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD
+ default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI
+ default "x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4
+ default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI
+ default "cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4
config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS
bool "Install Device Tree Blobs (DTBs)"