aboutsummaryrefslogtreecommitdiff
path: root/board/orangepi
diff options
context:
space:
mode:
authorGravatar Sergey Matyukevich <geomatsi@gmail.com>2021-01-27 09:05:20 +0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-01-28 08:09:05 +0100
commit247267c358136c721c8ac42ad57739627e8181d3 (patch)
tree6c06ec8930582ace93b5896a679289265277e8c7 /board/orangepi
parent065354f4a84f7c78a834705170dacf84e80e810f (diff)
downloadbuildroot-247267c358136c721c8ac42ad57739627e8181d3.tar.gz
buildroot-247267c358136c721c8ac42ad57739627e8181d3.tar.bz2
configs/orangepi_zero_plus2_defconfig: bump BSP versions
Bump Linux to 5.10.10 and U-Boot to 2020.10. In the new kernel sunxi-mmc driver has been switched to asynchronous probe. As a result, mmc indexes can be shuffled breaking board boot. Add patch that pins mmc indexes to their original ordered values. Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'board/orangepi')
-rw-r--r--board/orangepi/orangepi-zero-plus2/patches/linux/0001-ARM-dts-orange-pi-zero-plus2-use-fixed-mmc-indexes.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/board/orangepi/orangepi-zero-plus2/patches/linux/0001-ARM-dts-orange-pi-zero-plus2-use-fixed-mmc-indexes.patch b/board/orangepi/orangepi-zero-plus2/patches/linux/0001-ARM-dts-orange-pi-zero-plus2-use-fixed-mmc-indexes.patch
new file mode 100644
index 0000000000..8c4e19500c
--- /dev/null
+++ b/board/orangepi/orangepi-zero-plus2/patches/linux/0001-ARM-dts-orange-pi-zero-plus2-use-fixed-mmc-indexes.patch
@@ -0,0 +1,33 @@
+From f780fee2dc7d4a7bcfb2297342f7bfec2c0d1c28 Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Tue, 26 Jan 2021 23:19:13 +0300
+Subject: [PATCH 1/1] ARM: dts: orange-pi-zero-plus2: use fixed mmc indexes
+
+Driver sunxi-mmc has recently been switched to asynchronous probe.
+As a result, mmc indexes can be shuffled breaking existing setups
+where UUIDs are not used for boot devices. Pin mmc indexes to keep
+running the systems where fixed MMC or eMMC are specified,
+e.g. root=/dev/mmcblk0p2.
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+---
+ .../arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+index de19e68eb84e..c4854d3ba524 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+@@ -13,6 +13,9 @@ / {
+
+ aliases {
+ serial0 = &uart0;
++ mmc0 = &mmc0;
++ mmc1 = &mmc1;
++ mmc2 = &mmc2;
+ };
+
+ chosen {
+--
+2.30.0
+