aboutsummaryrefslogtreecommitdiff
path: root/board/orangepi
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2021-01-24 22:42:25 +0100
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2021-01-24 23:42:33 +0100
commit34cce93adb06608992023c44fa3245d1f1a3deb4 (patch)
tree4c3fe9fba468e1ff38deff5c3404a11e790f4bf3 /board/orangepi
parent6d9fdc0984c139872485a1d446c1518185af0ddf (diff)
downloadbuildroot-34cce93adb06608992023c44fa3245d1f1a3deb4.tar.gz
buildroot-34cce93adb06608992023c44fa3245d1f1a3deb4.tar.bz2
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. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> [yann.morin.1998@free.fr: use feedc0de as magic] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Diffstat (limited to 'board/orangepi')
-rw-r--r--board/orangepi/orangepi-r1/boot.cmd2
-rw-r--r--board/orangepi/orangepi-r1/genimage.cfg2
2 files changed, 3 insertions, 1 deletions
diff --git a/board/orangepi/orangepi-r1/boot.cmd b/board/orangepi/orangepi-r1/boot.cmd
index e927b01e82..e62e31a3e4 100644
--- a/board/orangepi/orangepi-r1/boot.cmd
+++ b/board/orangepi/orangepi-r1/boot.cmd
@@ -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=feedc0de-02 rootwait
fatload mmc 0 $kernel_addr_r zImage
fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtb
diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg
index 01e2c0adc4..3496383573 100644
--- a/board/orangepi/orangepi-r1/genimage.cfg
+++ b/board/orangepi/orangepi-r1/genimage.cfg
@@ -13,6 +13,8 @@ image boot.vfat {
image sdcard.img {
hdimage {
+ # for root=PARTUUID=feedc0de-02 support
+ disk-signature = 0xfeedc0de
}
partition u-boot {