allwinner: arm32: misc BSP updates
cover allwinner: arm32: misc BSP updates
Hi all,
Here is a patch set with BSP updates for several boards with Allwinner 32-bit CPU. U-Boot version updated to 2021.04 and Linux version updated to 5.12.2. Besides, rtl8189fs out-of-tree wireless driver revision was updated to compile it with new kernel.
Regards,
Sergey
Sergey Matyukevich (6):
rtl8189fs: bump revision to 62c31d57
rtl8189fs: disable debug messages configs/orangepi_zero_defconfig: bump BSP versions configs/orangepi_one_defconfig: bump BSP versions configs/orangepi_pc_plus_defconfig: bump BSP versions board/orangepi-pc-plus: switch to GPT partitions for PARTLABEL support
board/orangepi/orangepi-pc-plus/boot.cmd | 2 +- board/orangepi/orangepi-pc-plus/genimage.cfg | 8 +++++- configs/orangepi_one_defconfig | 13 +++++---- configs/orangepi_pc_plus_defconfig | 11 ++++---- configs/orangepi_zero_defconfig | 10 +++---- .../0001-include-disable-debug-messages.patch | 28 +++++++++++++++++++ package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 8 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 package/rtl8189fs/0001-include-disable-debug-messages.patch
Signature · 1 line
2.32.0
PATCH 1/6 rtl8189fs: bump revision to 62c31d57
Update out-of-tree driver to make it work with Linux kernel v5.12.
--- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/rtl8189fs/rtl8189fs.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 f3f8bcc1e75f095350f12c36f7b8af88eebf3913d4bc921083489f1758cb5068 rtl8189fs-54bd6808e38f213126e7d6447ae9d80c656179f3.tar.gz +sha256 7d425e18ebc427b3df5ff31185b4dc29c6bfd54f8e167f57c2254cea341a26c6 rtl8189fs-62c31d577c385316bb99107f60e63169dacc37db.tar.gz
package/rtl8189fs/rtl8189fs.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = 54bd6808e38f213126e7d6447ae9d80c656179f3 +RTL8189FS_VERSION = 62c31d577c385316bb99107f60e63169dacc37db RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0
Signature · 1 line
2.32.0
PATCH 1/6 rtl8189fs: bump revision to 62c31d57
Quoted 13 lines · Sergey Matyukevich
Update out-of-tree driver to make it work with Linux kernel v5.12.
Signed-off-by Sergey Matyukevich <[email protected]>--- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)package/rtl8189fs/rtl8189fs.hash +0
-0
package/rtl8189fs/rtl8189fs.hash line 2
Quoted 3 lines
package/rtl8189fs/rtl8189fs.hash +1
-1@@ -1,2 +1,2 @@ # Locally calculated -sha256 f3f8bcc1e75f095350f12c36f7b8af88eebf3913d4bc921083489f1758cb5068 rtl8189fs-54bd6808e38f213126e7d6447ae9d80c656179f3.tar.gz +sha256 7d425e18ebc427b3df5ff31185b4dc29c6bfd54f8e167f57c2254cea341a26c6 rtl8189fs-62c31d577c385316bb99107f60e63169dacc37db.tar.gz
The different fields here should be separated by two spaces, not a mix of tabs
and spaces. I fixed that and applied to master, thanks.
Regards,
Arnout
Quoted 14 lines
package/rtl8189fs/rtl8189fs.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = 54bd6808e38f213126e7d6447ae9d80c656179f3 +RTL8189FS_VERSION = 62c31d577c385316bb99107f60e63169dacc37db RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0
PATCH 2/6 rtl8189fs: disable debug messages
In reply to Sergey MatyukevichDebug messages in rtl8189fs are enabled by default. Add patch that disables debug messages to make driver less noisy.
--- .../0001-include-disable-debug-messages.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/rtl8189fs/0001-include-disable-debug-messages.patch
package/rtl8189fs/0001-include-disable-debug-messages.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 5d3a44ff1aeb8ace6e08df3cad16102aaac1ef09 Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich <[email protected]> +Date: Sun, 13 Jun 2021 15:51:51 +0300 +Subject: [PATCH] include: disable debug messages + +Disable debug messages to make rtl8189fs driver less noisy. + +Signed-off-by: Sergey Matyukevich <[email protected]> +--- + include/autoconf.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/include/autoconf.h b/include/autoconf.h +index 44efe42..b5df57b 100644 +--- a/include/autoconf.h ++++ b/include/autoconf.h +@@ -224,8 +224,6 @@ + /* + * Debug Related Config + */ +-#define CONFIG_DEBUG /* DBG_871X, etc... */ +- + #ifdef CONFIG_DEBUG + #define DBG 1 // for ODM & BTCOEX debug + //#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */ +-- +2.32.0 +
Signature · 1 line
2.32.0
PATCH 3/6 configs/orangepi_zero_defconfig: bump BSP versions
In reply to Sergey MatyukevichBump Linux to 5.12.2 and U-Boot to 2021.04. Introduce minor cleanup:
use SPL options instead of custom image options for combined SPL image.
--- configs/orangepi_zero_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
configs/orangepi_zero_defconfig +5 -5
@@ -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_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=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.10.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero"
@@ -21,13 +21,13 @@ 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.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd"
Signature · 1 line
2.32.0
PATCH 4/6 configs/orangepi_one_defconfig: bump BSP versions
In reply to Sergey MatyukevichBump Linux to 5.12.2 and U-Boot to 2021.04. Introduce minor cleanup:
use SPL options instead of custom image options for combined SPL image.
--- configs/orangepi_one_defconfig | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
configs/orangepi_one_defconfig +7 -6
@@ -1,34 +1,35 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" BR2_SYSTEM_DHCP="eth0" 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.12.2" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set 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="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one/genimage.cfg"
Signature · 1 line
2.32.0
PATCH 5/6 configs/orangepi_pc_plus_defconfig: bump BSP versions
In reply to Sergey MatyukevichBump Linux to 5.12.2 and U-Boot to 2021.04. Introduce minor cleanup:
use SPL options instead of custom image options for combined SPL image.
--- configs/orangepi_pc_plus_defconfig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
configs/orangepi_pc_plus_defconfig +6 -5
@@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus" BR2_SYSTEM_DHCP="eth0" 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.12.2" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus"
@@ -20,12 +20,13 @@ 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="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y
Signature · 1 line
2.32.0
PATCH 6/6 board/orangepi-pc-plus: switch to GPT partitions for PARTLABEL support
In reply to Sergey MatyukevichIn new kernels sunxi-mmc driver has been switched to asynchronous probe. As a result, mmc (SD/eMMC) indexes can be shuffled breaking board boot. Switch to GPT partitions to use partition labels instead of explicit mmcblk device names. Note that the default GPT partition table location conflicts with the SPL location, so move GPT table after bootloaders.
--- board/orangepi/orangepi-pc-plus/boot.cmd | 2 +- board/orangepi/orangepi-pc-plus/genimage.cfg | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
board/orangepi/orangepi-pc-plus/boot.cmd +1 -1
@@ -1,6 +1,6 @@ setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb
board/orangepi/orangepi-pc-plus/genimage.cfg +7 -1
@@ -13,13 +13,17 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTLABEL support + gpt = true + # default GPT location conflicts with bootloaders, move it after + gpt-location = 1M } partition u-boot { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" offset = 8192 - size = 1040384 # 1MB - 8192 + size = 1056768 # 1MB - 8K + 16K(GPT) } partition boot {
@@ -28,6 +32,8 @@ image sdcard.img { image = "boot.vfat" } + # 'rootfs' will be used as the partition label, used + # with root=PARTLABEL=rootfs kernel command line partition rootfs { partition-type = 0x83 image = "rootfs.ext4"
Signature · 1 line
2.32.0
cover allwinner: arm32: misc BSP updates
In reply to Sergey MatyukevichQuoted 6 lines · Sergey Matyukevich
Hi all,
Here is a patch set with BSP updates for several boards with Allwinner 32-bit CPU. U-Boot version updated to 2021.04 and Linux version updated to 5.12.2. Besides, rtl8189fs out-of-tree wireless driver revision was updated to compile it with new kernel.
Series applied to master, thanks.
Quoted 5 lines
Regards,
Sergey
Quoted 7 lines
Sergey Matyukevich (6):
rtl8189fs: bump revision to62c31d57
rtl8189fs: disable debug messages configs/orangepi_zero_defconfig: bump BSP versions configs/orangepi_one_defconfig: bump BSP versions configs/orangepi_pc_plus_defconfig: bump BSP versions board/orangepi-pc-plus: switch to GPT partitions for PARTLABEL support
Next time you're messing with these defconfigs, you could also consider
switching them to extlinux.conf (like in orangepi-one-plus), so a single partition is sufficient.
And it would make sense to make that scenario a little easier in Buildroot,
since it's pretty much always supported in new boards, and is compatible with x86-based boards.
Regards,
Arnout
Quoted 12 lines
board/orangepi/orangepi-pc-plus/boot.cmd | 2 +- board/orangepi/orangepi-pc-plus/genimage.cfg | 8 +++++- configs/orangepi_one_defconfig | 13 +++++---- configs/orangepi_pc_plus_defconfig | 11 ++++---- configs/orangepi_zero_defconfig | 10 +++---- .../0001-include-disable-debug-messages.patch | 28 +++++++++++++++++++ package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 8 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 package/rtl8189fs/0001-include-disable-debug-messages.patch