From 26e4beaa6b6010b921ff99c1a3a7be148fbbfcbc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 30 Nov 2020 19:54:03 -0600 Subject: meta-raspberrypi: subtree update:09a3c11696..3a1fec22c0 Jan-Simon Moeller (1): python3-sense-hat: Switch to using pillow instead of imaging module Jose Quaresma (3): gstreamer1.0-plugins-good: add package config knob to enable rpicamsrc plugin gstreamer1.0-plugins-good: enable rpicamsrc plugin gstreamer1.0-plugins-base: drop custom cppflags Khem Raj (9): linux-raspberrypi: Do not use += with append python3-sense-hat: Move to dynamic-layers layer.conf: Add hardknott (3.3) to acceptable releases linux-raspberrypi_5.4.bb: Update to 5.4.79 raspberrypi-firmware: Update to latest to take 5.4.79 prebuilts userland: Upgrade to latest as of 20201027 raspberrypi-tools: Update to latest on master armstubs: Always use gcc compiler packagegroup-rpi-test: Add python3-sense-hat in a meta-python specific bbappend Madhavan Krishnan (1): libcamera: Enabled camera overlays define based Martin Jansa (3): gstreamer1.0-omx: rename bbappend to match new 1.18.0 version from oe-core layer.conf: Remove older releases from LAYERSERIES_COMPAT Revert "gstreamer1.0-plugins-good: add package config knob to enable rpicamsrc plugin" Ming Liu (1): rpi-u-boot-scr: drop hard-coded 'arm' Paul Barker (9): linux-raspberrypi: Convert dynamic config patching to config fragments sdcard_image-rpi: Drop redundant dependency on rpi-config:do_deploy rpi-cmdline: Move cmdline.txt generation to a separate recipe bootfiles: Use BOOTFILES_DIR_NAME variable rpi-bootfiles: Rename recipe to avoid ambiguity linux-raspberrypi: Remove obsolete kernel versions linux-raspberrypi: Drop unused rpi-kernel-misc config fragment linux-raspberrypi: Merge v5.4 recipe & inc file linux-raspberrypi-dev: Update for testing v5.10.y Trevor Woerner (1): userland: add knob for ALL_APPS Signed-off-by: Andrew Geissler Change-Id: I90e0cba993e7f5bae2e56f2d40fd2f69211c2648 --- ...check-lxdiaglog.sh-Allow-specification-of.patch | 62 ---------------------- ...ake-perf-able-to-build-with-latest-libbfd.patch | 57 -------------------- ...est-bpf-Use-CHECK-macro-instead-of-RET_IF.patch | 40 -------------- .../linux/files/initramfs-image-bundle.cfg | 3 ++ .../recipes-kernel/linux/files/rpi-kernel-misc.cfg | 1 - .../recipes-kernel/linux/files/vc4graphics.cfg | 6 +++ 6 files changed, 9 insertions(+), 160 deletions(-) delete mode 100644 meta-raspberrypi/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch delete mode 100644 meta-raspberrypi/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch delete mode 100644 meta-raspberrypi/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch create mode 100644 meta-raspberrypi/recipes-kernel/linux/files/initramfs-image-bundle.cfg delete mode 100644 meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg create mode 100644 meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg (limited to 'meta-raspberrypi/recipes-kernel/linux/files') diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch deleted file mode 100644 index a9e9213b7..000000000 --- a/meta-raspberrypi/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e6ebc8e654bba53f28af5229a1069fc74fa58b7b Mon Sep 17 00:00:00 2001 -From: Jason Wessel -Date: Thu, 25 Sep 2014 11:26:49 -0700 -Subject: [PATCH] menuconfig,check-lxdiaglog.sh: Allow specification of ncurses - location - -In some cross build environments such as the Yocto Project build -environment it provides an ncurses library that is compiled -differently than the host's version. This causes display corruption -problems when the host's curses includes are used instead of the -includes from the provided compiler are overridden. There is a second -case where there is no curses libraries at all on the host system and -menuconfig will just fail entirely. - -The solution is simply to allow an override variable in -check-lxdialog.sh for environments such as the Yocto Project. Adding -a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing -compiling and linking against the right headers and libraries. - -Upstream-Status: submitted [https://lkml.org/lkml/2013/3/3/103] - -Signed-off-by: Jason Wessel -cc: Michal Marek -cc: linux-kbuild@vger.kernel.org -Signed-off-by: Bruce Ashfield -Signed-off-by: California Sullivan ---- - scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++ - 1 file changed, 8 insertions(+) - mode change 100755 => 100644 scripts/kconfig/lxdialog/check-lxdialog.sh - -diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh -old mode 100755 -new mode 100644 -index 5075ebf2d3b9..ba9242101190 ---- a/scripts/kconfig/lxdialog/check-lxdialog.sh -+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh -@@ -4,6 +4,10 @@ - # What library to link - ldflags() - { -+ if [ "$CROSS_CURSES_LIB" != "" ]; then -+ echo "$CROSS_CURSES_LIB" -+ exit -+ fi - pkg-config --libs ncursesw 2>/dev/null && exit - pkg-config --libs ncurses 2>/dev/null && exit - for ext in so a dll.a dylib ; do -@@ -21,6 +25,10 @@ ldflags() - # Where is ncurses.h? - ccflags() - { -+ if [ x"$CROSS_CURSES_INC" != x ]; then -+ echo "$CROSS_CURSES_INC" -+ exit -+ fi - if pkg-config --cflags ncursesw 2>/dev/null; then - echo '-DCURSES_LOC="" -DNCURSES_WIDECHAR=1' - elif pkg-config --cflags ncurses 2>/dev/null; then --- -2.14.3 - diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch deleted file mode 100644 index e0e7b8583..000000000 --- a/meta-raspberrypi/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch +++ /dev/null @@ -1,57 +0,0 @@ -From e66a0be4fac135d67ab228a6fd1453b9e36a3644 Mon Sep 17 00:00:00 2001 -From: Changbin Du -Date: Tue, 28 Jan 2020 23:29:38 +0800 -Subject: [PATCH] perf: Make perf able to build with latest libbfd - -libbfd has changed the bfd_section_* macros to inline functions -bfd_section_ since 2019-09-18. See below two commits: - o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html - o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html - -This fix make perf able to build with both old and new libbfd. - -Signed-off-by: Changbin Du -Acked-by: Jiri Olsa -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/perf/util/srcline.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c -index af3f9b9f1e8b..b8e77617fdc4 100644 ---- a/tools/perf/util/srcline.c -+++ b/tools/perf/util/srcline.c -@@ -191,16 +191,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) - bfd_vma pc, vma; - bfd_size_type size; - struct a2l_data *a2l = data; -+ flagword flags; - - if (a2l->found) - return; - -- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) -+#ifdef bfd_get_section_flags -+ flags = bfd_get_section_flags(abfd, section); -+#else -+ flags = bfd_section_flags(section); -+#endif -+ if ((flags & SEC_ALLOC) == 0) - return; - - pc = a2l->addr; -+#ifdef bfd_get_section_vma - vma = bfd_get_section_vma(abfd, section); -+#else -+ vma = bfd_section_vma(section); -+#endif -+#ifdef bfd_get_section_size - size = bfd_get_section_size(section); -+#else -+ size = bfd_section_size(section); -+#endif - - if (pc < vma || pc >= vma + size) - return; diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch deleted file mode 100644 index 182893481..000000000 --- a/meta-raspberrypi/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4cd12df48b83cef9cc7d6b80b128afbf68746718 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 14 Mar 2020 07:31:34 -0700 -Subject: [PATCH] selftest/bpf: Use CHECK macro instead of RET_IF - -backporting 634efb750435d0a489dc58477d4fcb88b2692942 causes build -failures because RET_IF is defined in 7ee0d4e97b889c0478af9c1a6e5af658b181423f -but that is not backported - -Upstream-Status: Submitted -Signed-off-by: Khem Raj -Cc: Jakub Sitnicki -Cc: Alexei Starovoitov -Signed-off-by: Bruce Ashfield ---- - tools/testing/selftests/bpf/test_select_reuseport.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/testing/selftests/bpf/test_select_reuseport.c b/tools/testing/selftests/bpf/test_select_reuseport.c -index 079d0f5a2909..7e4c91f2238d 100644 ---- a/tools/testing/selftests/bpf/test_select_reuseport.c -+++ b/tools/testing/selftests/bpf/test_select_reuseport.c -@@ -668,12 +668,12 @@ static void cleanup_per_test(void) - - for (i = 0; i < NR_RESULTS; i++) { - err = bpf_map_update_elem(result_map, &i, &zero, BPF_ANY); -- RET_IF(err, "reset elem in result_map", -+ CHECK(err, "reset elem in result_map", - "i:%u err:%d errno:%d\n", i, err, errno); - } - - err = bpf_map_update_elem(linum_map, &zero, &zero, BPF_ANY); -- RET_IF(err, "reset line number in linum_map", "err:%d errno:%d\n", -+ CHECK(err, "reset line number in linum_map", "err:%d errno:%d\n", - err, errno); - - for (i = 0; i < REUSEPORT_ARRAY_SIZE; i++) --- -2.26.0 - diff --git a/meta-raspberrypi/recipes-kernel/linux/files/initramfs-image-bundle.cfg b/meta-raspberrypi/recipes-kernel/linux/files/initramfs-image-bundle.cfg new file mode 100644 index 000000000..ea540031c --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/files/initramfs-image-bundle.cfg @@ -0,0 +1,3 @@ +CONFIG_OVERLAY_FS=y +CONFIG_SQUASHFS=y +CONFIG_UBIFS_FS=y diff --git a/meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg b/meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg deleted file mode 100644 index 07b14371b..000000000 --- a/meta-raspberrypi/recipes-kernel/linux/files/rpi-kernel-misc.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SENSORS_RPI_POE_FAN=m diff --git a/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg b/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg new file mode 100644 index 000000000..0b4ba4843 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/files/vc4graphics.cfg @@ -0,0 +1,6 @@ +CONFIG_I2C_BCM2835=y +CONFIG_DRM=y +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_VC4=y +CONFIG_SND=y +CONFIG_SND_SOC=y -- cgit v1.2.3