diff --git a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
index b0b785e202..648a2cfbbe 100644
--- a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
@@ -5,7 +5,7 @@
 
 / {
 	chosen {
-		stdout-path = "serial2:115200n8";
+		stdout-path = "serial1:115200n8";
 		tick-timer = &timer1;
 	};
 
@@ -108,6 +108,11 @@
 	u-boot,dm-spl;
 };
 
+
+&wkup_uart0 {
+	u-boot,dm-spl;
+};
+
 &main_sdhci0 {
 	u-boot,dm-spl;
 };
diff --git a/arch/arm/dts/k3-j7200-common-proc-board.dts b/arch/arm/dts/k3-j7200-common-proc-board.dts
index fecfce3c2e..46133ac923 100644
--- a/arch/arm/dts/k3-j7200-common-proc-board.dts
+++ b/arch/arm/dts/k3-j7200-common-proc-board.dts
@@ -13,8 +13,8 @@
 
 / {
 	chosen {
-		stdout-path = "serial2:115200n8";
-		bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
+		stdout-path = "serial1:115200n8";
+		bootargs = "console=ttyS1,115200n8 earlycon=ns16550a,mmio32,0x42300000";
 	};
 
 	aliases {
@@ -130,7 +130,7 @@
 
 &wkup_uart0 {
 	/* Wakeup UART is used by System firmware */
-	status = "reserved";
+	status = "okay";
 };
 
 &main_uart0 {
diff --git a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
index 537725702d..e9aca62d6b 100644
--- a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
@@ -16,7 +16,7 @@
 	};
 
 	chosen {
-		stdout-path = &main_uart0;
+		stdout-path = &wkup_uart0;
 		tick-timer = &timer1;
 		firmware-loader = &fs_loader0;
 	};
@@ -201,10 +201,14 @@
 };
 
 &wkup_uart0 {
+	/delete-property/ power-domains;
+	/delete-property/ clocks;
+	/delete-property/ clock-names;
 	u-boot,dm-spl;
 	pinctrl-names = "default";
 	pinctrl-0 = <&wkup_uart0_pins_default>;
 	status = "okay";
+	clock-frequency = <96000000>;
 };
 
 &mcu_uart0 {
diff --git a/arch/arm/dts/k3-j7200.dtsi b/arch/arm/dts/k3-j7200.dtsi
index feed52d9f0..2f1b4ffbd3 100644
--- a/arch/arm/dts/k3-j7200.dtsi
+++ b/arch/arm/dts/k3-j7200.dtsi
@@ -18,8 +18,8 @@
 	#size-cells = <2>;
 
 	aliases {
-		serial0 = &wkup_uart0;
-		serial1 = &mcu_uart0;
+		serial1 = &wkup_uart0;
+		serial0 = &mcu_uart0;
 		serial2 = &main_uart0;
 		serial3 = &main_uart1;
 		serial4 = &main_uart2;
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index f3c25d4216..9c52f6d20c 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -152,6 +152,7 @@ static void serial_find_console_or_panic(void)
 	}
 
 #ifdef CONFIG_REQUIRE_SERIAL_CONSOLE
+
 	panic_str("No serial driver found");
 #endif
 }
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 614d032538..9fbbc1a5ca 100644
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -85,8 +85,8 @@
 			"setenv name_fdt k3-j721e-sk.dtb; fi;"	\
 		"setenv fdtfile ${name_fdt}\0"				\
 	"name_kern=Image\0"						\
-	"console=ttyS2,115200n8\0"					\
-	"args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 "	\
+	"console=ttyS1,115200n8\0"					\
+	"args_all=setenv optargs earlycon=ns16550a,mmio32,0x42300000 "	\
 		"${mtdparts}\0"						\
 	"run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
 
diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h
index a4d22c56bd..2cb540d2f6 100644
--- a/include/environment/ti/boot.h
+++ b/include/environment/ti/boot.h
@@ -12,7 +12,7 @@
 #include <linux/stringify.h>
 
 #ifndef CONSOLEDEV
-#define CONSOLEDEV "ttyS2"
+#define CONSOLEDEV "ttyS1"
 #endif
 
 #ifndef PARTS_DEFAULT