summaryrefslogtreecommitdiffstats
path: root/meta-raspberrypi/recipes-kernel/linux
diff options
context:
space:
mode:
Diffstat (limited to 'meta-raspberrypi/recipes-kernel/linux')
-rw-r--r--meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg1
-rw-r--r--meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc2
-rw-r--r--meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb4
3 files changed, 5 insertions, 2 deletions
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg b/meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg
new file mode 100644
index 000000000..07b14371b
--- /dev/null
+++ b/meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg
@@ -0,0 +1 @@
+CONFIG_SENSORS_RPI_POE_FAN=m
diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
index 65c2ab759..03acfb410 100644
--- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
@@ -11,6 +11,8 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
inherit kernel siteinfo
require recipes-kernel/linux/linux-yocto.inc
+SRC_URI += "file://rpi-kernel-misc.cfg"
+
KCONFIG_MODE = "--alldefconfig"
KBUILD_DEFCONFIG_raspberrypi0-wifi ?= "bcmrpi_defconfig"
KBUILD_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig"
diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb
index acbd2250c..54936fa79 100644
--- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb
+++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb
@@ -1,6 +1,6 @@
-LINUX_VERSION ?= "4.14.58"
+LINUX_VERSION ?= "4.14.68"
-SRCREV = "a06f9e522301dfacc1f382d72e6a9792d8350328"
+SRCREV = "8c8666ff6c1254d325cfa300d16f9928b3f31fc0"
SRC_URI = " \
git://github.com/raspberrypi/linux.git;branch=rpi-4.14.y \
file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
OpenPOWER on IntegriCloud