From ea6dc59cd7e5b5a0c16c4696ce5f5dad3b6bfa0b Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Thu, 30 Nov 2017 18:04:26 +0000 Subject: linux-raspberrypi: Update dev version to 4.14.y The patch to add dtbo rules to the arm64 Makefile is no longer needed. Signed-off-by: Paul Barker --- recipes-kernel/linux/linux-raspberrypi-dev.bb | 5 ++-- ...-Add-rules-for-.dtbo-files-for-dts-overla.patch | 29 ---------------------- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 recipes-kernel/linux/linux-raspberrypi-dev/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch diff --git a/recipes-kernel/linux/linux-raspberrypi-dev.bb b/recipes-kernel/linux/linux-raspberrypi-dev.bb index b947659..ae76572 100644 --- a/recipes-kernel/linux/linux-raspberrypi-dev.bb +++ b/recipes-kernel/linux/linux-raspberrypi-dev.bb @@ -7,12 +7,11 @@ python __anonymous() { FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:" -LINUX_VERSION ?= "4.13" -LINUX_RPI_DEV_BRANCH ?= "rpi-4.13.y" +LINUX_VERSION ?= "4.14" +LINUX_RPI_DEV_BRANCH ?= "rpi-4.14.y" SRCREV = "${AUTOREV}" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=${LINUX_RPI_DEV_BRANCH} \ - file://0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch \ " require linux-raspberrypi.inc diff --git a/recipes-kernel/linux/linux-raspberrypi-dev/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch b/recipes-kernel/linux/linux-raspberrypi-dev/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch deleted file mode 100644 index e8bc52e..0000000 --- a/recipes-kernel/linux/linux-raspberrypi-dev/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 922ce1fd0eb810b713f6ffa9a7ab97c11b6e38cf Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 10 Feb 2017 17:57:08 -0800 -Subject: [PATCH] build/arm64: Add rules for .dtbo files for dts overlays - -We now create overlays as .dtbo files. - -Signed-off-by: Khem Raj ---- - arch/arm64/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 3635b8662724..822fefeb1cd0 100644 ---- a/arch/arm64/Makefile -+++ b/arch/arm64/Makefile -@@ -113,6 +113,9 @@ zinstall install: - %.dtb: scripts - $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ - -+%.dtbo: | scripts -+ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ -+ - PHONY += dtbs dtbs_install - - dtbs: prepare scripts --- -2.11.1 - -- cgit v1.2.3-54-g00ecf