From a4cd65673fcc9556707074bf6773de3f285136aa Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Mon, 8 Jul 2019 10:44:12 -0400
Subject: [PATCH] rpi-firmware: support kernel selection

---
 package/rpi-firmware/Config.in         | 23 +++++++++++++++++++++++
 package/rpi-firmware/rpi-firmware.hash |  4 +++-
 package/rpi-firmware/rpi-firmware.mk   | 13 ++++++++++++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in
index 7cebc5e7ca..0b5ed7c3d9 100644
--- a/package/rpi-firmware/Config.in
+++ b/package/rpi-firmware/Config.in
@@ -29,6 +29,29 @@ config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4
 	  The Raspberry Pi 4 files
 endchoice
 
+choice
+	bool "Linux kernel version"
+	default BR2_PACKAGE_RPI_FIRMWARE_KERNEL_4_9
+	help
+	  Select firmware files for a particular Linux kernel
+
+config BR2_PACKAGE_RPI_FIRMWARE_KERNEL_4_9
+	bool "linux 4.9"
+	help
+	  Firmware from the Linux 4.9 branch
+
+config BR2_PACKAGE_RPI_FIRMWARE_KERNEL_4_14
+	bool "linux 4.14"
+	help
+	  Firmware from the Linux 4.14 branch
+
+config BR2_PACKAGE_RPI_FIRMWARE_KERNEL_4_19
+	bool "linux 4.19"
+	help
+	  Firmware from the Linux 4.19 branch
+
+endchoice
+
 choice
 	bool "Firmware to boot"
 	default BR2_PACKAGE_RPI_FIRMWARE_DEFAULT
diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
index 61834f7d42..e3498ec99b 100644
--- a/package/rpi-firmware/rpi-firmware.hash
+++ b/package/rpi-firmware/rpi-firmware.hash
@@ -1,3 +1,5 @@
 # Locally computed
-sha256 c82c40cf37fac36160a7f6b9c314506beb942bf113a55d30fa163c56a4f98946 rpi-firmware-bcf40b5c2b94178c7564fb451098d44968e44af5.tar.gz
+sha256 f72f3c621d95d41c536e977145970c169d1f9fa55921c535d7f0fac1d8889013 rpi-firmware-38e81f25e639d19fc0ce6e67fd39998c340a15d5.tar.gz
+sha256 f1d631920ed4ae15f368ba7b8b3caa4ed604f5223372cc6debbd39a101eb8d74 rpi-firmware-81cca1a9380c828299e884dba5efd0d4acb39e8d.tar.gz
+sha256 5edff641f216d2e09c75469dc2e9fc66aff290e212a1cd43ed31c499f99ea055 rpi-firmware-287af2a2be0787a5d45281d1d6183a2161c798d4.tar.gz
 sha256 ba76edfc10a248166d965b8eaf320771c44f4f432d4fce2fd31fd272e7038add boot/LICENCE.broadcom
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 717f705f66..77fd6cc954 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,18 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = bcf40b5c2b94178c7564fb451098d44968e44af5
+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_KERNEL_4_9),y)
+RPI_FIRMWARE_VERSION = 287af2a2be0787a5d45281d1d6183a2161c798d4
+else
+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_KERNEL_4_14),y)
+# In nerves_system_br 1.7.x, 81cca1a was used with Linux 4.14 and 4.19
+RPI_FIRMWARE_VERSION = 81cca1a9380c828299e884dba5efd0d4acb39e8d
+else
+# Linux 4.19
+RPI_FIRMWARE_VERSION = 38e81f25e639d19fc0ce6e67fd39998c340a15d5
+endif
+endif
+
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
-- 
2.17.1