finally prompt

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 71084d8aaecc40bcc134224ecac589e21458e755..9ab2beb82c041e0a67216e210e8c62025ace6598 100644 (file)
--- 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 a7d3ce278f549843f4a34c0ec811eff80fe53ced..8519b7dae2bbb5cf5007299f5bb9b7e9100c8af4 100644 (file)
--- 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 b095dd098609abfab230841cbf48a5466588e1f2..8ee7007662bc7797b728e53bfb33801e8f362fbd 100644 (file)
--- 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 0fbb8c4f73bee99e2fccff3b6c279fe3b40c3fb0..939697d13d83530a1d250e598c8a2e64bf93bc2f 100644 (file)
--- 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 864edbac4abbe6a30b326b3940af7c30ee0c2899..88dc756b2a5e5a44f55f9b0fd012adc798a8afdb 100644 (file)
--- 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 fc3e9264a7012f5f232c9ba3a5bfd939a3529ec3..90749d0f8960d515a2464fe4078225c7d2d75570 100644 (file)
--- 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 46f0931931565b77feb7b4b4c8227bb616317f6d..860b695e3127c05d2843e4f71f5939ce5bfc8b7d 100644 (file)
--- 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 69b29dee8447f1d0b0b7dcf528e942148101ef0f..a08678dde4e1935255c73ca3859cc274f3f620f5 100644 (file)
--- 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;