[Buildroot] [PATCH 0/3] allwinner: update BSP for several boards

[Buildroot] [PATCH 0/3] allwinner: update BSP for several boards

[Sergey Matyukevich]

Hi Peter, Thomas, and all

Here is a patch series that updates BSP for several boards with
Allwinner CPU. U-Boot version updated to 2020.10 and Linux
version updated to 5.10.10.

Note that in the new kernel sunxi-mmc driver has been switched to
asynchronous probe. As a result, on OrangePi Zero Plus2 board
SDCard/WiFi/eMMC indexes can be shuffled breaking its boot. Add
patch that pins mmc indexes to their original ordered values.
This patch has been also submitted to Linux mailing lists, so
it will be removed during one of the next BSP updates.

Regards,
Sergey

Sergey Matyukevich (3):
  configs/linksprite_pcduino: bump BSP versions
  configs/orangepi_zero_defconfig: bump BSP versions
  configs/orangepi_zero_plus2_defconfig: bump BSP versions

 ...-pi-zero-plus2-use-fixed-mmc-indexes.patch | 33 +++++++++++++++++++
 configs/linksprite_pcduino_defconfig          |  9 ++---
 configs/orangepi_zero_defconfig               |  6 ++--
 configs/orangepi_zero_plus2_defconfig         |  8 +++--
 4 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 board/orangepi/orangepi-zero-plus2/patches/linux/0001-ARM-dts-orange-pi-zero-plus2-use-fixed-mmc-indexes.patch

-- 
2.30.0

[Buildroot] [PATCH 1/3] configs/linksprite_pcduino: bump BSP versions

[Sergey Matyukevich]

Bump Linux to 5.10.10 and U-Boot to 2020.10.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/linksprite_pcduino_defconfig | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig
index 5a00e57281..b58f970493 100644
--- a/configs/linksprite_pcduino_defconfig
+++ b/configs/linksprite_pcduino_defconfig
@@ -17,13 +17,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh"
 # For kernel modules autoloading
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 
-# Linux headers same as kernel, a 5.3 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino"
@@ -38,11 +38,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
 BR2_TARGET_UBOOT_USE_DEFCONFIG=y
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
-- 
2.30.0

[Buildroot] [PATCH 2/3] configs/orangepi_zero_defconfig: bump BSP versions

[Sergey Matyukevich]

Bump Linux to 5.10.10 and U-Boot to 2020.10.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/orangepi_zero_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
index 37d3d8dc72..b008523c84 100644
--- a/configs/orangepi_zero_defconfig
+++ b/configs/orangepi_zero_defconfig
@@ -3,13 +3,13 @@ BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
 BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero"
 BR2_SYSTEM_DHCP="eth0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero"
@@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
-- 
2.30.0

[Buildroot] [PATCH 3/3] configs/orangepi_zero_plus2_defconfig: bump BSP versions

[Sergey Matyukevich]

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>
---
 ...-pi-zero-plus2-use-fixed-mmc-indexes.patch | 33 +++++++++++++++++++
 configs/orangepi_zero_plus2_defconfig         |  8 +++--
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 board/orangepi/orangepi-zero-plus2/patches/linux/0001-ARM-dts-orange-pi-zero-plus2-use-fixed-mmc-indexes.patch

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
+
diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig
index 222736423c..9273a8e3a8 100644
--- a/configs/orangepi_zero_plus2_defconfig
+++ b/configs/orangepi_zero_plus2_defconfig
@@ -2,9 +2,10 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay"
+BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero-plus2/patches"
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -18,9 +19,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
@@ -34,7 +36,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-pl
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2"
-- 
2.30.0

[Buildroot] [PATCH 1/3] configs/linksprite_pcduino: bump BSP versions

[Peter Korsgaard]

On 27/01/2021 07.05, Sergey Matyukevich wrote:
> Bump Linux to 5.10.10 and U-Boot to 2020.10.
> 
> Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>

Committed, thanks

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/3] configs/orangepi_zero_defconfig: bump BSP versions

[Peter Korsgaard]

On 27/01/2021 07.05, Sergey Matyukevich wrote:
> Bump Linux to 5.10.10 and U-Boot to 2020.10.
> 
> Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>

Committed, thanks

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/3] configs/orangepi_zero_plus2_defconfig: bump BSP versions

[Peter Korsgaard]

On 27/01/2021 07.05, Sergey Matyukevich wrote:
> 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>

Committed, thanks. Another option would be to move to finding the rootfs 
by label like I recently did for the orangepi r1:

https://git.buildroot.net/buildroot/commit/?id=34cce93adb06608992023c44fa3245d1f1a3deb4

https://git.buildroot.net/buildroot/commit/?id=38d04e6b13410f79ab18044737bdb078c637136a

-- 
Bye, Peter Korsgaard