configs/orangepi_r1_defconfig: bump kernel to 5.10.10, u-boot to 2020.10
PATCH 1/1 configs/orangepi_r1_defconfig: bump kernel to 5.10.10, u-boot to 2020.10
The probing order of the two mmc controllers (sdcard and sdio wifi) has changed in kernel 5.10 since commit 21b2cec61c04bd1 (mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4), so change to root=PARTUUID=.. instead of hardcoding /dev/mmcblkXp2.
--- board/orangepi/orangepi-r1/boot.cmd | 2 +- board/orangepi/orangepi-r1/genimage.cfg | 2 ++ configs/orangepi_r1_defconfig | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-)
board/orangepi/orangepi-r1/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=PARTUUID=deadbeef-02 rootwait fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtb
board/orangepi/orangepi-r1/genimage.cfg +2 -0
@@ -13,6 +13,8 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTUUID=deadbeef-02 support + disk-signature = 0xdeadbeef } partition u-boot {
configs/orangepi_r1_defconfig +4 -3
@@ -1,13 +1,13 @@ 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_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.12" +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-r1"
@@ -19,9 +19,10 @@ 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_BOARD_DEFCONFIG="orangepi_r1" 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"
Signature · 1 line
2.20.1
Yann E. MORIN
AppliedPATCH 1/1 configs/orangepi_r1_defconfig: bump kernel to 5.10.10, u-boot to 2020.10
Peter, All,
On 2021-01-24 22:42 +0100, Peter Korsgaard spake thusly:
Quoted 17 lines
The probing order of the two mmc controllers (sdcard and sdio wifi) has changed in kernel 5.10 since commit
21b2cec61c04bd1(mmc: SetPROBE_PREFER_ASYNCHRONOUSfor drivers that existed in v4.4), so change to root=PARTUUID=.. instead of hardcoding/dev/mmcblkXp2.Signed-off-by Peter Korsgaard <[email protected]>--- board/orangepi/orangepi-r1/boot.cmd | 2 +- board/orangepi/orangepi-r1/genimage.cfg | 2 ++ configs/orangepi_r1_defconfig | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-)board/orangepi/orangepi-r1/boot.cmd +0
-0
board/orangepi/orangepi-r1/boot.cmd line 3
Quoted 4 lines
board/orangepi/orangepi-r1/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=PARTUUID=deadbeef-02 rootwait
I found deadbeef to be too depressive... I switched it to a better suited magic: feedc0de (after all, the rootfs will feed code to run).
board/orangepi/orangepi-r1/genimage.cfg image boot.vfat { · line 17
Quoted 12 lines
board/orangepi/orangepi-r1/boot.cmd +0
-0fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtbboard/orangepi/orangepi-r1/genimage.cfg +2
-0@@ -13,6 +13,8 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTUUID=deadbeef-02 support + disk-signature = 0xdeadbeef
And switched here too, of course.
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 42 lines
board/orangepi/orangepi-r1/genimage.cfg +0
-0} partition u-boot {configs/orangepi_r1_defconfig +4
-3@@ -1,13 +1,13 @@ 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_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.12" +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-r1"@@ -19,9 +19,10 @@ 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_BOARD_DEFCONFIG="orangepi_r1" 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"Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 configs/orangepi_r1_defconfig: bump kernel to 5.10.10, u-boot to 2020.10
Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Peter, All,
On 2021-01-24 22:42 +0100, Peter Korsgaard spake thusly:Quoted 19 lines
The probing order of the two mmc controllers (sdcard and sdio wifi) has changed in kernel 5.10 since commit
21b2cec61c04bd1(mmc: SetPROBE_PREFER_ASYNCHRONOUSfor drivers that existed in v4.4), so change to root=PARTUUID=.. instead of hardcoding/dev/mmcblkXp2.Signed-off-by Peter Korsgaard <[email protected]>---
board/orangepi/orangepi-r1/boot.cmd | 2 +- board/orangepi/orangepi-r1/genimage.cfg | 2 ++ configs/orangepi_r1_defconfig | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-)board/orangepi/orangepi-r1/boot.cmd +0
-0@@ -1,6 +1,6 @@setenv
fdt_highffffffff
Quoted 5 lines
board/orangepi/orangepi-r1/boot.cmd line 3
Quoted 2 lines
board/orangepi/orangepi-r1/boot.cmd +1
-1-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=PARTUUID=deadbeef-02 rootwaitI found deadbeef to be too depressive... I switched it to a better suited magic:
feedc0de(after all, the rootfs will feed code to run).
Fine my me. Thinking about it a bit more, a nicer solution would be to move to GPT partitions and use root=PARTLABEL=rootfs instead of this somewhat obscure disk signature. I'll send a patch.
Signature · 1 line
Bye, Peter Korsgaard