40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
diff --git a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi
|
|
index 40bb917b..973c9b27 100644
|
|
--- a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi
|
|
@@ -10,7 +10,7 @@
|
|
};
|
|
};
|
|
|
|
-&uart2 {
|
|
+&uart0 {
|
|
u-boot,dm-pre-reloc;
|
|
clock-frequency = <24000000>;
|
|
status = "okay";
|
|
diff --git a/arch/arm/dts/rk3308-rock-pi-s.dts b/arch/arm/dts/rk3308-rock-pi-s.dts
|
|
index 678e7d70..581892bd 100644
|
|
--- a/arch/arm/dts/rk3308-rock-pi-s.dts
|
|
+++ b/arch/arm/dts/rk3308-rock-pi-s.dts
|
|
@@ -12,7 +12,7 @@
|
|
compatible = "radxa,rockpis", "rockchip,rk3308";
|
|
|
|
chosen {
|
|
- stdout-path = "serial2:1500000n8";
|
|
+ stdout-path = "serial0:1500000n8";
|
|
};
|
|
|
|
leds {
|
|
diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
|
|
index 2b4ab51d..15a7e49a 100644
|
|
--- a/configs/rock-pi-s-rk3308_defconfig
|
|
+++ b/configs/rock-pi-s-rk3308_defconfig
|
|
@@ -12,7 +12,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
|
|
CONFIG_TARGET_EVB_RK3308=y
|
|
CONFIG_SPL_STACK_R_ADDR=0xc00000
|
|
CONFIG_PRE_CON_BUF_ADDR=0x0f200000
|
|
-CONFIG_DEBUG_UART_BASE=0xFF0C0000
|
|
+CONFIG_DEBUG_UART_BASE=0xFF0A0000
|
|
CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_SPL_LIBDISK_SUPPORT=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="rk3308-rock-pi-s"
|