uboot-rockchip:fix r4se uboot sd card not bootable (#10117)

* uboot-rockchip:fix r4se uboot sd card not bootable

this will cause uboot to fail to load the sd card at startup, and uboot can recognize emmc

* rockchip:fix r4se system loading prompt led

* add the previous one

* fix
This commit is contained in:
骷髅头 2022-09-15 14:05:50 +08:00 committed by GitHub
parent 61d68ec9b2
commit b030e9103a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions

View File

@ -10,7 +10,7 @@
rk3399-puma-haikou.dtb \ rk3399-puma-haikou.dtb \
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/rk3399-nanopi-r4se.dts +++ b/arch/arm/dts/rk3399-nanopi-r4se.dts
@@ -0,0 +1,29 @@ @@ -0,0 +1,32 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/* +/*
+ * FriendlyElec NanoPC-T4 board device tree source + * FriendlyElec NanoPC-T4 board device tree source
@ -40,6 +40,9 @@
+ non-removable; + non-removable;
+ status = "okay"; + status = "okay";
+}; +};
+&sdmmc {
+ pinctrl-0 = <&sdmmc_cd>;
+};
--- /dev/null --- /dev/null
+++ b/configs/nanopi-r4se-rk3399_defconfig +++ b/configs/nanopi-r4se-rk3399_defconfig
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@

View File

@ -19,6 +19,13 @@
model = "FriendlyElec NanoPi R4SE"; model = "FriendlyElec NanoPi R4SE";
compatible = "friendlyarm,nanopi-r4se", "rockchip,rk3399"; compatible = "friendlyarm,nanopi-r4se", "rockchip,rk3399";
aliases {
led-boot = &sys_led;
led-failsafe = &sys_led;
led-running = &sys_led;
led-upgrade = &sys_led;
};
/delete-node/ display-subsystem; /delete-node/ display-subsystem;
gpio-leds { gpio-leds {
@ -33,7 +40,7 @@
sys_led: led-sys { sys_led: led-sys {
gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
label = "red:power"; label = "red:sys";
default-state = "on"; default-state = "on";
}; };