From 9392c69cb94f33ad32d35e907d14da19eeb88986 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 7 Sep 2018 15:37:17 +0100 Subject: meta-raspberrypi: sumo refresh ade31d6d01..2d40b00002 Update meta-raspberrypi to sumo HEAD. Andrei Gherzan (4): firmware: Update to 20180817 linux-raspberrypi: Update to 4.14.68 linux-raspberrypi: Build rpi poe fan driver rpi-base.inc: Build rpi-poe dtb overlay Change-Id: I391098025c3bdec7c372da978c3aaf815d03b9de Signed-off-by: Brad Bishop --- meta-raspberrypi/conf/machine/include/rpi-base.inc | 1 + meta-raspberrypi/recipes-bsp/common/firmware.inc | 9 +++++---- meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg | 1 + meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc | 2 ++ meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg (limited to 'meta-raspberrypi') diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index 2af15886b..539d1bc12 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -29,6 +29,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ + overlays/rpi-poe.dtbo \ overlays/w1-gpio.dtbo \ overlays/w1-gpio-pullup.dtbo \ overlays/pi3-disable-bt.dtbo \ diff --git a/meta-raspberrypi/recipes-bsp/common/firmware.inc b/meta-raspberrypi/recipes-bsp/common/firmware.inc index 26cafb746..3baa1f8b1 100644 --- a/meta-raspberrypi/recipes-bsp/common/firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/firmware.inc @@ -1,10 +1,11 @@ -RPIFW_DATE ?= "20180619" -SRCREV ?= "748fb17992426bb29d99224b93cb962fefbdc833" +RPIFW_DATE ?= "20180817" +SRCREV ?= "53ac68e1eb02138f72a5056efed9dac9d3883a3f" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[md5sum] = "02edb854e9b72499225f3f93d322fe12" -SRC_URI[sha256sum] = "07b2dc9d0779e15666e3ab596387e18cefc265d863c4bf6f8a0572b58a4fb793" +SRC_URI[md5sum] = "6b3d901decf2fe4fad151e3ebb28cb62" +SRC_URI[sha256sum] = "3680de3ea9817b10fa8998b0dfa6811e58c96945474f4c782710dcd0a56c8cf0" + PV = "${RPIFW_DATE}" 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 \ -- cgit v1.2.1