configs/roseapplypi: bump kernel to 5.10.1
PATCH 1/1 configs/roseapplypi: bump kernel to 5.10.1
And drop now upstreamed patches. Mmc support is still not mainline, but enqueued for 5.12:
https://www.spinics.net/lists/linux-i2c/msg49279.html
Signed-off-by Peter Korsgaard <[email protected]>
--- ...1-arm-dts-owl-s500-Fix-incorrect-PPI.patch | 52 ----------- ...002-arm-dts-owl-s500-add-RoseapplePi.patch | 89 ------------------- configs/roseapplepi_defconfig | 6 +- 3 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch delete mode 100644 board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch
board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch deleted +0 -52
@@ -1,52 +0,0 @@ -From: Cristian Ciocaltea <[email protected]> -Subject: [PATCH 1/4] arm: dts: owl-s500: Fix incorrect PPI interrupt specifiers -To: Rob Herring <[email protected]>, - Andreas F?rber <[email protected]>, - Manivannan Sadhasivam <[email protected]> -Cc: devicetree at vger.kernel.org, linux-arm-kernel at lists.infradead.org, - linux-kernel at vger.kernel.org -Date: Mon, 15 Jun 2020 03:19:08 +0300 (10 weeks, 3 days, 20 hours ago) -X-Mailer: git-send-email 2.27.0 - -The PPI interrupts for cortex-a9 were incorrectly specified, fix them. - -Fixes: fdfe7f4f9d85 ("ARM: dts: Add Actions Semi S500 and LeMaker Guitar") -Signed-off-by: Cristian Ciocaltea <[email protected]> -Signed-off-by: Peter Korsgaard <[email protected]> ---- - arch/arm/boot/dts/owl-s500.dtsi | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/owl-s500.dtsi b/arch/arm/boot/dts/owl-s500.dtsi -index 5ceb6cc4451d..1dbe4e8b38ac 100644 ---- a/arch/arm/boot/dts/owl-s500.dtsi -+++ b/arch/arm/boot/dts/owl-s500.dtsi -@@ -84,21 +84,21 @@ scu: scu at b0020000 { - global_timer: timer at b0020200 { - compatible = "arm,cortex-a9-global-timer"; - reg = <0xb0020200 0x100>; -- interrupts = <GIC_PPI 0 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; -+ interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; - status = "disabled"; - }; - - twd_timer: timer at b0020600 { - compatible = "arm,cortex-a9-twd-timer"; - reg = <0xb0020600 0x20>; -- interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; -+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; - status = "disabled"; - }; - - twd_wdt: wdt at b0020620 { - compatible = "arm,cortex-a9-twd-wdt"; - reg = <0xb0020620 0xe0>; -- interrupts = <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; -+ interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; - status = "disabled"; - }; - --- -2.27.0 - -
board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch deleted +0 -89
89 lines not on this page · raw message
configs/roseapplepi_defconfig +3 -3
@@ -3,15 +3,15 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" -# Linux headers same as kernel, a 5.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" BR2_LINUX_KERNEL_UIMAGE=y
Signature · 1 line
2.20.1
PATCH 1/1 configs/roseapplypi: bump kernel to 5.10.1
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
And drop now upstreamed patches. Mmc support is still not mainline, but enqueued for 5.12:
https://www.spinics.net/lists/linux-i2c/msg49279.html
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard