Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Linux kernel v6.1 #1149

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Update to Linux kernel v6.1 #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9c0c08
linux-raspberrypi: default to v6.1
alexgg Jul 10, 2024
9cd496a
linux-raspberrypi: remove configuration checks warning for 6.1
alexgg Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion layers/meta-balena-raspberrypi/conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ RPI_KERNEL_DEVICETREE:append:revpi-connect-s = " broadcom/bcm2711-rpi-cm4s.dtb"
RPI_KERNEL_DEVICETREE:remove:revpi-connect = "bcm2711-rpi-cm4s.dtb"
RPI_KERNEL_DEVICETREE:remove:revpi-core-3 = "bcm2711-rpi-cm4s.dtb"

PREFERRED_VERSION:linux-raspberrypi = "5.10.%"
PREFERRED_VERSION_linux-raspberrypi = "6.1%"

FIRMWARE_COMPRESSION:raspberrypi4-64 ?= "1"
FIRMWARE_COMPRESSION:raspberrypi0-2w-64 ?= "1"
Expand Down
12 changes: 4 additions & 8 deletions ...rypi/recipes-kernel/linux/linux-raspberrypi/0001-Add-tpm-slb9670-tis-spi-DT-overlay.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
From d211b4e01d2621ce03854f722f8db5acfe457ae0 Mon Sep 17 00:00:00 2001
From: Michal Toman <michalt@balena.io>
Date: Mon, 1 Feb 2021 16:05:38 +0100
Subject: [PATCH] Add tpm-slb9670-tis-spi DT overlay
Expand All @@ -11,17 +10,17 @@ Signed-off-by: Michal Toman <michalt@balena.io>
create mode 100644 arch/arm/boot/dts/overlays/tpm-slb9670-tis-spi-overlay.dts

diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
index d8a3677b583e..696b5789e64c 100644
index 9203448db803..f6d410d31f8c 100644
--- a/arch/arm/boot/dts/overlays/Makefile
+++ b/arch/arm/boot/dts/overlays/Makefile
@@ -194,6 +194,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -276,6 +276,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
tc358743-audio.dtbo \
tinylcd35.dtbo \
tpm-slb9670.dtbo \
+ tpm-slb9670-tis-spi.dtbo \
tpm-slb9673.dtbo \
uart0.dtbo \
uart1.dtbo \
uart2.dtbo \
uart0-pi5.dtbo \
diff --git a/arch/arm/boot/dts/overlays/tpm-slb9670-tis-spi-overlay.dts b/arch/arm/boot/dts/overlays/tpm-slb9670-tis-spi-overlay.dts
new file mode 100644
index 000000000000..e43f8cd248ec
Expand Down Expand Up @@ -49,6 +48,3 @@ index 000000000000..e43f8cd248ec
+ };
+ };
+};
--
2.26.2

28 changes: 12 additions & 16 deletions ...rrypi/recipes-kernel/linux/linux-raspberrypi/0006-overlays-Add-Hyperpixel4-overlays.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
From ee5c0bab10e280cf54d3d2c06c6a4cc6b6ed627b Mon Sep 17 00:00:00 2001
From: Florin Sarbu <florin@balena.io>
Date: Thu, 17 Oct 2019 11:16:39 +0200
Subject: [PATCH] overlays: Add Hyperpixel4 overlays
Expand All @@ -13,22 +12,22 @@ They each are taken from:
Upstream-status: Inappropriate [not author]
Signed-off-by: Florin Sarbu <florin@balena.io>
---
arch/arm/boot/dts/overlays/Makefile | 4 +
.../boot/dts/overlays/hyperpixel4-pi3-overlay.dts | 98 ++++++++++++++++++++
.../boot/dts/overlays/hyperpixel4-pi4-overlay.dts | 98 ++++++++++++++++++++
.../overlays/hyperpixel4-square-pi3-overlay.dts | 103 +++++++++++++++++++++
.../overlays/hyperpixel4-square-pi4-overlay.dts | 103 +++++++++++++++++++++
arch/arm/boot/dts/overlays/Makefile | 4 +
.../dts/overlays/hyperpixel4-pi3-overlay.dts | 98 +++++++++++++++++
.../dts/overlays/hyperpixel4-pi4-overlay.dts | 98 +++++++++++++++++
.../hyperpixel4-square-pi3-overlay.dts | 103 ++++++++++++++++++
.../hyperpixel4-square-pi4-overlay.dts | 103 ++++++++++++++++++
5 files changed, 406 insertions(+)
create mode 100644 arch/arm/boot/dts/overlays/hyperpixel4-pi3-overlay.dts
create mode 100644 arch/arm/boot/dts/overlays/hyperpixel4-pi4-overlay.dts
create mode 100644 arch/arm/boot/dts/overlays/hyperpixel4-square-pi3-overlay.dts
create mode 100644 arch/arm/boot/dts/overlays/hyperpixel4-square-pi4-overlay.dts

diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
index 87082d6..554756c 100644
index dd34b091565d..9203448db803 100644
--- a/arch/arm/boot/dts/overlays/Makefile
+++ b/arch/arm/boot/dts/overlays/Makefile
@@ -59,6 +59,10 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -99,6 +99,10 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
hy28a.dtbo \
hy28b.dtbo \
hy28b-2017.dtbo \
Expand All @@ -38,10 +37,10 @@ index 87082d6..554756c 100644
+ hyperpixel4-square-pi4.dtbo \
i-sabre-q2m.dtbo \
i2c-bcm2708.dtbo \
i2c-gpio.dtbo \
i2c-fan.dtbo \
diff --git a/arch/arm/boot/dts/overlays/hyperpixel4-pi3-overlay.dts b/arch/arm/boot/dts/overlays/hyperpixel4-pi3-overlay.dts
new file mode 100644
index 0000000..78bf59e
index 000000000000..78bf59ebcf19
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/hyperpixel4-pi3-overlay.dts
@@ -0,0 +1,98 @@
Expand Down Expand Up @@ -145,7 +144,7 @@ index 0000000..78bf59e
+};
diff --git a/arch/arm/boot/dts/overlays/hyperpixel4-pi4-overlay.dts b/arch/arm/boot/dts/overlays/hyperpixel4-pi4-overlay.dts
new file mode 100644
index 0000000..3757a99
index 000000000000..3757a996aabd
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/hyperpixel4-pi4-overlay.dts
@@ -0,0 +1,98 @@
Expand Down Expand Up @@ -249,7 +248,7 @@ index 0000000..3757a99
+};
diff --git a/arch/arm/boot/dts/overlays/hyperpixel4-square-pi3-overlay.dts b/arch/arm/boot/dts/overlays/hyperpixel4-square-pi3-overlay.dts
new file mode 100644
index 0000000..f544a6c
index 000000000000..f544a6c7592f
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/hyperpixel4-square-pi3-overlay.dts
@@ -0,0 +1,103 @@
Expand Down Expand Up @@ -358,7 +357,7 @@ index 0000000..f544a6c
+
diff --git a/arch/arm/boot/dts/overlays/hyperpixel4-square-pi4-overlay.dts b/arch/arm/boot/dts/overlays/hyperpixel4-square-pi4-overlay.dts
new file mode 100644
index 0000000..f544a6c
index 000000000000..f544a6c7592f
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/hyperpixel4-square-pi4-overlay.dts
@@ -0,0 +1,103 @@
Expand Down Expand Up @@ -465,6 +464,3 @@ index 0000000..f544a6c
+ };
+};
+
--
2.7.4

12 changes: 4 additions & 8 deletions ...nel/linux/linux-raspberrypi_5.15.bbappend → ...nel/linux/linux-raspberrypi_6.1%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:${THISDIR}/${MACHINE}:"

SRC_URI:append:fincm3 = " \
file://0001-overlays-fin-add-internal-pull-ups-to-i2c_soft.patch \
file://0004-mmc-pwrseq-Repurpose-for-Marvell-SD8777.patch \
file://0005-balena-fin-wifi-sta-uap-mode.patch \
file://0007-overlays-Add-spyfly.dts.patch \
"

SRC_URI:append:raspberrypi4-superhub = " \
file://0001-Add-gpio-wdt-DT-overlay-for-Phoenix-Board.patch \
file://0002-Add-infineon-tpm-DT-overlay-for-Phoenix-Board.patch \
Expand Down Expand Up @@ -66,9 +59,12 @@ BALENA_CONFIGS[fbtft] = " \
CONFIG_FB_TFT_TLS8204=m \
CONFIG_FB_TFT_UC1701=m \
CONFIG_FB_TFT_UPD161704=m \
CONFIG_FB_TFT_WATTEROTT=m \
"


BALENA_CONFIGS:append = " ${@configure_from_version("5.17", "", " fb_tft_watterott", d)}"
BALENA_CONFIGS[fb_tft_watterott] = "CONFIG_FB_TFT_WATTEROTT=m"

BALENA_CONFIGS:append = " pca955_gpio_expander"
BALENA_CONFIGS[pca955_gpio_expander] = " \
CONFIG_GPIO_PCA953X=y \
Expand Down