From: Duje Mihanović <duje.mihanovic@skole.hr>
Date: Tue, 24 Dec 2024 16:41:03 +0000 (+0100)
Subject: finally prompt
X-Git-Url: http://git.dujemihanovic.xyz/posts?a=commitdiff_plain;h=1421ee3fa50ce6b0e5bae9a6dd73bb538d0a1582;p=u-boot.git

finally prompt
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 71084d8aae..9ab2beb82c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -846,6 +846,7 @@ config ARCH_MMP
 	select ARM64
 	select DM
 	select DM_SERIAL
+	select SAVE_PREV_BL_FDT_ADDR
 
 config ARCH_LPC32XX
 	bool "NXP LPC32xx platform"
diff --git a/arch/arm/dts/pxa1908-samsung-coreprimevelte.dts b/arch/arm/dts/pxa1908-samsung-coreprimevelte.dts
index a7d3ce278f..8519b7dae2 100644
--- a/arch/arm/dts/pxa1908-samsung-coreprimevelte.dts
+++ b/arch/arm/dts/pxa1908-samsung-coreprimevelte.dts
@@ -35,8 +35,7 @@
 
 	memory {
 		device_type = "memory";
-		reg = <0 0x1000000 0 0x1f000000>,
-		      <0 0x20000000 0 0x20000000>;
+		reg = <0 0x1000000 0 0x3f000000>;
 	};
 
 	reserved-memory {
diff --git a/board/samsung/coreprimevelte/coreprimevelte.c b/board/samsung/coreprimevelte/coreprimevelte.c
index b095dd0986..8ee7007662 100644
--- a/board/samsung/coreprimevelte/coreprimevelte.c
+++ b/board/samsung/coreprimevelte/coreprimevelte.c
@@ -5,7 +5,6 @@
 void lowlevel_init(void)
 {
 #ifdef CONFIG_DEBUG_UART
-	debug_uart_init();
 	printascii("Reached lowlevel_init()\n");
 #endif /* CONFIG_DEBUG_UART */
 
@@ -19,7 +18,7 @@ void lowlevel_init(void)
 
 int board_init(void)
 {
-	puts("Reached board_init()\n");
+	return 0;
 }
 
 int dram_init(void)
diff --git a/common/board_f.c b/common/board_f.c
index 0fbb8c4f73..939697d13d 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -877,22 +877,6 @@ static int initf_upl(void)
 	return 0;
 }
 
-int green(void)
-{
-	for (int *i = (int *) 0x17200000; i < 0x17177000 + 0x177000; i++)
-		*i = 0xff00ff00;
-
-	return 0;
-}
-
-int blue(void)
-{
-	for (int *i = (int *) 0x17200000; i < 0x17177000 + 0x177000; i++)
-		*i = 0xff0000ff;
-
-	return 0;
-}
-
 static const init_fnc_t init_sequence_f[] = {
 	setup_mon_len,
 #ifdef CONFIG_OF_CONTROL
@@ -931,10 +915,8 @@ static const init_fnc_t init_sequence_f[] = {
 	env_init,		/* initialize environment */
 	init_baud_rate,		/* initialze baudrate settings */
 	serial_init,		/* serial communications setup */
-	green,
 	console_init_f,		/* stage 1 init of console */
 	display_options,	/* say that we are here */
-	blue,
 	display_text_info,	/* show debugging info if required */
 	checkcpu,
 #if defined(CONFIG_SYSRESET)
diff --git a/common/board_r.c b/common/board_r.c
index 864edbac4a..88dc756b2a 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -783,9 +783,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
 	 */
 	gd->flags &= ~(GD_FLG_SERIAL_READY | GD_FLG_LOG_READY);
 
-	for (int *i = (int *) 0x17200000; i < 0x171770000 + 0x177000; i++)
-		*i = 0xffffffff;
-
 	/*
 	 * Set up the new global data pointer. So far only x86 does this
 	 * here.
diff --git a/configs/coreprimevelte_defconfig b/configs/coreprimevelte_defconfig
index fc3e9264a7..90749d0f89 100644
--- a/configs/coreprimevelte_defconfig
+++ b/configs/coreprimevelte_defconfig
@@ -17,12 +17,11 @@ CONFIG_LOCALVERSION="pxa1908"
 CONFIG_FIT=y
 CONFIG_LOGLEVEL=8
 CONFIG_LOG=y
+# CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_NO_NET=y
 CONFIG_CLK=y
-CONFIG_CPU=y
-CONFIG_CPU_ARMV8=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 46f0931931..860b695e31 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -223,49 +223,6 @@ static void ns16550_setbrg(struct ns16550 *com_port, int baud_divisor)
 
 void ns16550_init(struct ns16550 *com_port, int baud_divisor)
 {
-#if defined(CONFIG_XPL_BUILD) && defined(CONFIG_OMAP34XX)
-	/*
-	 * On some OMAP3/OMAP4 devices when UART3 is configured for boot mode
-	 * before SPL starts only THRE bit is set. We have to empty the
-	 * transmitter before initialization starts.
-	 */
-	if ((serial_in(&com_port->lsr) & (UART_LSR_TEMT | UART_LSR_THRE))
-	     == UART_LSR_THRE) {
-		if (baud_divisor != -1)
-			ns16550_setbrg(com_port, baud_divisor);
-		else {
-			// Re-use old baud rate divisor to flush transmit reg.
-			const int dll = serial_in(&com_port->dll);
-			const int dlm = serial_in(&com_port->dlm);
-			const int divisor = dll | (dlm << 8);
-			ns16550_setbrg(com_port, divisor);
-		}
-		serial_out(0, &com_port->mdr1);
-	}
-#endif
-
-	while (!(serial_in(&com_port->lsr) & UART_LSR_TEMT))
-		;
-
-	serial_out(CFG_SYS_NS16550_IER, &com_port->ier);
-#if defined(CONFIG_ARCH_OMAP2PLUS) || defined(CONFIG_OMAP_SERIAL)
-	serial_out(0x7, &com_port->mdr1);	/* mode select reset TL16C750*/
-#endif
-
-	serial_out(UART_MCRVAL, &com_port->mcr);
-	serial_out(ns16550_getfcr(com_port), &com_port->fcr);
-	/* initialize serial config to 8N1 before writing baudrate */
-	serial_out(UART_LCRVAL, &com_port->lcr);
-	if (baud_divisor != -1)
-		ns16550_setbrg(com_port, baud_divisor);
-#if defined(CONFIG_ARCH_OMAP2PLUS) || defined(CONFIG_SOC_DA8XX) || \
-	defined(CONFIG_OMAP_SERIAL)
-	/* /16 is proper to hit 115200 with 48MHz */
-	serial_out(0, &com_port->mdr1);
-#endif
-#if defined(CONFIG_ARCH_KEYSTONE)
-	serial_out(UART_REG_VAL_PWREMU_MGMT_UART_ENABLE, &com_port->regC);
-#endif
 }
 
 #if !CONFIG_IS_ENABLED(NS16550_MIN_FUNCTIONS)
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 69b29dee84..a08678dde4 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -86,9 +86,6 @@ static void serial_find_console_or_panic(void)
 			return;
 		}
 	} else if (CONFIG_IS_ENABLED(OF_CONTROL) && blob) {
-		for (int *i = (int *) 0x17200000; i < 0x17177000 + 0x177000; i++)
-			*i = 0xff444444;
-
 		/* Live tree has support for stdout */
 		if (of_live_active()) {
 			struct device_node *np = of_get_stdout();
@@ -215,8 +212,6 @@ int serial_init(void)
 		}
 	}
 	serial_setbrg();
-
-	serial_puts("serial_init done\n");
 #endif
 
 	return 0;