diff options
Diffstat (limited to 'meta-raspberrypi/recipes-kernel/linux')
6 files changed, 42 insertions, 9 deletions
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/android-drivers.cfg b/meta-raspberrypi/recipes-kernel/linux/files/android-drivers.cfg index f74ac0e1c7..f1259a1653 100644 --- a/meta-raspberrypi/recipes-kernel/linux/files/android-drivers.cfg +++ b/meta-raspberrypi/recipes-kernel/linux/files/android-drivers.cfg @@ -1,8 +1,3 @@ -CONFIG_ANDROID=y - #CONFIG_ANDROID_BINDERFS is not set CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDER_DEVICES="binder" - -CONFIG_ASHMEM=y - diff --git a/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg b/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg index 0b4ba48434..3e5c19b7b8 100644 --- a/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg +++ b/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg @@ -1,4 +1,5 @@ CONFIG_I2C_BCM2835=y +CONFIG_I2C_BRCMSTB=y CONFIG_DRM=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_VC4=y diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-v7_6.12.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-v7_6.12.bb new file mode 100644 index 0000000000..f5677085c1 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-v7_6.12.bb @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com> +# +# SPDX-License-Identifier: MIT + +require linux-raspberrypi-v7.inc +require linux-raspberrypi_6.12.bb diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc index e62ff3ff7c..036ff220c1 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc @@ -28,7 +28,7 @@ KBUILD_DEFCONFIG:raspberrypi ?= "bcmrpi_defconfig" KBUILD_DEFCONFIG:raspberrypi-cm3 ?= "bcm2709_defconfig" KBUILD_DEFCONFIG:raspberrypi2 ?= "bcm2709_defconfig" KBUILD_DEFCONFIG:raspberrypi3 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG:raspberrypi3-64 ?= "bcmrpi3_defconfig" +KBUILD_DEFCONFIG:raspberrypi3-64 ?= "bcm2711_defconfig" KBUILD_DEFCONFIG:raspberrypi4 ?= "bcm2711_defconfig" KBUILD_DEFCONFIG:raspberrypi4-64 ?= "bcm2711_defconfig" KBUILD_DEFCONFIG:raspberrypi-armv7 ?= "bcm2711_defconfig" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.12.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.12.bb new file mode 100644 index 0000000000..e9b7951684 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.12.bb @@ -0,0 +1,31 @@ +LINUX_VERSION ?= "6.12.25" +LINUX_RPI_BRANCH ?= "rpi-6.12.y" +LINUX_RPI_KMETA_BRANCH ?= "yocto-6.12" + +SRCREV_machine = "3dd2c2c507c271d411fab2e82a2b3b7e0b6d3f16" +SRCREV_meta = "1f6ab68a1d86836bf1b82b791df03da3cfeacb3f" + +KMETA = "kernel-meta" + +SRC_URI = " \ + git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \ + file://powersave.cfg \ + file://android-drivers.cfg \ + " + +require linux-raspberrypi.inc + +KERNEL_DTC_FLAGS += "-@ -H epapr" + +RDEPENDS:${KERNEL_PACKAGE_NAME}:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-base" +RDEPENDS:${KERNEL_PACKAGE_NAME}-image:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-image" +RDEPENDS:${KERNEL_PACKAGE_NAME}-dev:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dev" +RDEPENDS:${KERNEL_PACKAGE_NAME}-vmlinux:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-vmlinux" +RDEPENDS:${KERNEL_PACKAGE_NAME}-modules:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-modules" +RDEPENDS:${KERNEL_PACKAGE_NAME}-dbg:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dbg" + +DEPLOYDEP = "" +DEPLOYDEP:raspberrypi-armv7 = "${RASPBERRYPI_v7_KERNEL}:do_deploy" +do_deploy[depends] += "${DEPLOYDEP}" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb index b4d9953e1e..3b67f16542 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb @@ -1,9 +1,9 @@ -LINUX_VERSION ?= "6.6.22" +LINUX_VERSION ?= "6.6.63" LINUX_RPI_BRANCH ?= "rpi-6.6.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-6.6" -SRCREV_machine = "c04af98514c26014a4f29ec87b3ece95626059bd" -SRCREV_meta = "6a24861d6504575a4a9f92366285332d47c7e111" +SRCREV_machine = "e442e5c1ab6bff5b5460b4fc949beb72aaf77970" +SRCREV_meta = "52ff0d75713ce61962b325a2090bd55e216f0cf3" KMETA = "kernel-meta" |