mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
cd4de3251c
Probing of the fitblk driver in some situations happens after the kernel attempts to mount rootfs, which then fails. Always use 'rootwait' when using fitblk for rootfs. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
56 lines
1.1 KiB
Diff
56 lines
1.1 KiB
Diff
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
|
|
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
|
|
@@ -26,7 +26,9 @@
|
|
|
|
chosen {
|
|
stdout-path = "serial2:115200n8";
|
|
- bootargs = "earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200n8 console=tty1";
|
|
+ bootargs = "root=/dev/fit0 rootwait earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200n8 console=tty1";
|
|
+ rootdisk-emmc = <&emmc_rootdisk>;
|
|
+ rootdisk-sd = <&sd_rootdisk>;
|
|
};
|
|
|
|
connector {
|
|
@@ -315,6 +317,20 @@
|
|
vmmc-supply = <®_3p3v>;
|
|
vqmmc-supply = <®_1p8v>;
|
|
non-removable;
|
|
+
|
|
+ card@0 {
|
|
+ compatible = "mmc-card";
|
|
+ reg = <0>;
|
|
+
|
|
+ block {
|
|
+ compatible = "block-device";
|
|
+ partitions {
|
|
+ emmc_rootdisk: block-partition-fit {
|
|
+ partno = <3>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&mmc1 {
|
|
@@ -328,6 +344,20 @@
|
|
cd-gpios = <&pio 261 GPIO_ACTIVE_LOW>;
|
|
vmmc-supply = <®_3p3v>;
|
|
vqmmc-supply = <®_3p3v>;
|
|
+
|
|
+ card@0 {
|
|
+ compatible = "mmc-card";
|
|
+ reg = <0>;
|
|
+
|
|
+ block {
|
|
+ compatible = "block-device";
|
|
+ partitions {
|
|
+ sd_rootdisk: block-partition-fit {
|
|
+ partno = <3>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&mt6323_leds {
|