Signed-off-by: Khem Raj <raj.k...@gmail.com> --- .../0001-fix-dtbo-rules.patch | 44 ++++++++++++++++++++++ ...835-camera-fix-compilation-warning-werror.patch | 35 +++++++++++++++++ recipes-kernel/linux/linux-raspberrypi_4.8.bb | 10 +++++ 3 files changed, 89 insertions(+) create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.8/0001-fix-dtbo-rules.patch create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.8/0001-media-bcm2835-camera-fix-compilation-warning-werror.patch create mode 100644 recipes-kernel/linux/linux-raspberrypi_4.8.bb
diff --git a/recipes-kernel/linux/linux-raspberrypi-4.8/0001-fix-dtbo-rules.patch b/recipes-kernel/linux/linux-raspberrypi-4.8/0001-fix-dtbo-rules.patch new file mode 100644 index 0000000..5113e23 --- /dev/null +++ b/recipes-kernel/linux/linux-raspberrypi-4.8/0001-fix-dtbo-rules.patch @@ -0,0 +1,44 @@ +From 13c8784da3dbd977f64cec740eba775b6fab11c2 Mon Sep 17 00:00:00 2001 +From: Herve Jourdain <herve.jourd...@neuf.fr> +Date: Fri, 20 May 2016 16:02:23 +0800 +Subject: [yocto][meta-raspberrypi][PATCH v4 4/5] linux-raspberrypi_4.4.inc: + support for .dtbo files for dtb overlays + +Upstream-Status: Pending + +Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb. +Patch the kernel, which has faulty rules to generate .dtbo the way yocto does + +Signed-off-by: Herve Jourdain <herve.jourd...@neuf.fr> +--- + .../0001-fix-dtbo-rules.patch | 27 ++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch + +diff --git a/arch/arm/Makefile b/arch/arm/Makefile +index a2e7cf7..673c1cb 100644 +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -333,6 +333,8 @@ $(INSTALL_TARGETS): + + %.dtb: | scripts + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ ++%.dtbo: | scripts ++ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ + + PHONY += dtbs dtbs_install + +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index 3079c4f..6cc3766 100644 +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -293,7 +293,8 @@ $(obj)/%.dtb: $(src)/%.dts FORCE + $(call if_changed_dep,dtc) + + quiet_cmd_dtco = DTCO $@ +-cmd_dtco = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ ++cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \ ++ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ + $(objtree)/scripts/dtc/dtc -@ -H epapr -O dtb -o $@ -b 0 \ + -i $(dir $<) $(DTC_FLAGS) \ + -d $(depfile).dtc.tmp $(dtc-tmp) ; \ diff --git a/recipes-kernel/linux/linux-raspberrypi-4.8/0001-media-bcm2835-camera-fix-compilation-warning-werror.patch b/recipes-kernel/linux/linux-raspberrypi-4.8/0001-media-bcm2835-camera-fix-compilation-warning-werror.patch new file mode 100644 index 0000000..ea9778f --- /dev/null +++ b/recipes-kernel/linux/linux-raspberrypi-4.8/0001-media-bcm2835-camera-fix-compilation-warning-werror.patch @@ -0,0 +1,35 @@ +From a8151cbe5d92d7487b7994522cbc83fed04ae1f9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.k...@gmail.com> +Date: Thu, 6 Oct 2016 19:42:55 -0700 +Subject: [PATCH] [media]: bcm2835-camera: fix compilation warning/werror + +| /a/builder/mnt/build/tmp-glibc/work-shared/raspberrypi3/kernel-source/drivers/media/platform/bcm2835/bcm2835-camera.c:656:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types +] +| .queue_setup = queue_setup, +| ^~~~~~~~~~~ +| /a/builder/mnt/build/tmp-glibc/work-shared/raspberrypi3/kernel-source/drivers/media/platform/bcm2835/bcm28 +35-camera.c:656:17: note: (near initialization for 'bm2835_mmal_video_qops.queue_setup') + +use struct device* instead of void* + +Signed-off-by: Khem Raj <raj.k...@gmail.com> +--- + drivers/media/platform/bcm2835/bcm2835-camera.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c +index 70f4db2..cb5bab6 100644 +--- a/drivers/media/platform/bcm2835/bcm2835-camera.c ++++ b/drivers/media/platform/bcm2835/bcm2835-camera.c +@@ -244,7 +244,7 @@ static struct mmal_fmt *get_format(struct v4l2_format *f) + + static int queue_setup(struct vb2_queue *vq, + unsigned int *nbuffers, unsigned int *nplanes, +- unsigned int sizes[], void *alloc_ctxs[]) ++ unsigned int sizes[], struct device *alloc_ctxs[]) + { + struct bm2835_mmal_dev *dev = vb2_get_drv_priv(vq); + unsigned long size; +-- +2.10.0 + diff --git a/recipes-kernel/linux/linux-raspberrypi_4.8.bb b/recipes-kernel/linux/linux-raspberrypi_4.8.bb new file mode 100644 index 0000000..92a69ad --- /dev/null +++ b/recipes-kernel/linux/linux-raspberrypi_4.8.bb @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" + +LINUX_VERSION ?= "4.8.0" + +SRCREV = "2fb843e0e50b2330e76acea03ff63a5b2b1e411f" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.8.y \ + file://0001-fix-dtbo-rules.patch \ + file://0001-media-bcm2835-camera-fix-compilation-warning-werror.patch \ +" +require linux-raspberrypi.inc -- 2.10.0 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto