summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@konsulko.com>2020-11-25 15:42:50 +0000
committerAndrei Gherzan <andrei@gherzan.ro>2020-11-27 14:29:55 +0000
commit64f6a1b7cc6526a49b180ebc632520bbaad195bd (patch)
treee7fe2d6efe86f87cd0aff76b7f2446c1663d17d8
parent2afeee9b82f670b8a3d24a66d31381131555b5d4 (diff)
downloadmeta-raspberrypi-64f6a1b7cc6526a49b180ebc632520bbaad195bd.tar.gz
linux-raspberrypi: Drop unused rpi-kernel-misc config fragment
This config fragment was unconditionally disabled for the v5.4 kernel so it can be dropped. Signed-off-by: Paul Barker <pbarker@konsulko.com>
-rw-r--r--recipes-kernel/linux/files/rpi-kernel-misc.cfg1
-rw-r--r--recipes-kernel/linux/linux-raspberrypi.inc1
-rw-r--r--recipes-kernel/linux/linux-raspberrypi_5.4.inc1
3 files changed, 0 insertions, 3 deletions
diff --git a/recipes-kernel/linux/files/rpi-kernel-misc.cfg b/recipes-kernel/linux/files/rpi-kernel-misc.cfg
deleted file mode 100644
index 07b1437..0000000
--- a/recipes-kernel/linux/files/rpi-kernel-misc.cfg
+++ /dev/null
@@ -1 +0,0 @@
1CONFIG_SENSORS_RPI_POE_FAN=m
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index 5b151a6..746c0c5 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -12,7 +12,6 @@ inherit kernel siteinfo
12require recipes-kernel/linux/linux-yocto.inc 12require recipes-kernel/linux/linux-yocto.inc
13 13
14SRC_URI += " \ 14SRC_URI += " \
15 file://rpi-kernel-misc.cfg \
16 ${@bb.utils.contains("INITRAMFS_IMAGE_BUNDLE", "1", "file://initramfs-image-bundle.cfg", "", d)} \ 15 ${@bb.utils.contains("INITRAMFS_IMAGE_BUNDLE", "1", "file://initramfs-image-bundle.cfg", "", d)} \
17 ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "file://vc4graphics.cfg", "", d)} \ 16 ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "file://vc4graphics.cfg", "", d)} \
18 " 17 "
diff --git a/recipes-kernel/linux/linux-raspberrypi_5.4.inc b/recipes-kernel/linux/linux-raspberrypi_5.4.inc
index 9e8934a..205d0b7 100644
--- a/recipes-kernel/linux/linux-raspberrypi_5.4.inc
+++ b/recipes-kernel/linux/linux-raspberrypi_5.4.inc
@@ -6,7 +6,6 @@ SRC_URI = " \
6 git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH} \ 6 git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH} \
7 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} \ 7 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} \
8 " 8 "
9SRC_URI_remove = "file://rpi-kernel-misc.cfg"
10 9
11require linux-raspberrypi.inc 10require linux-raspberrypi.inc
12 11