Merge git://git.denx.de/u-boot-dm

diff --git a/arch/arm/mach-rockchip/board-spl.c b/arch/arm/mach-rockchip/board-spl.c
index a241d96..28c3949 100644 (file)
--- a/arch/arm/mach-rockchip/board-spl.c
+++ b/arch/arm/mach-rockchip/board-spl.c
@@ -217,6 +217,13 @@ void board_init_f(ulong dummy)
                debug("DRAM init failed: %d\n", ret);
                return;
        }
+
+       /*
+        * Now that DRAM is initialized setup base pointer for simple malloc
+        * into RAM.
+        */
+       gd->malloc_base = CONFIG_SPL_STACK_R_ADDR;
+       gd->malloc_ptr = 0;
 }
 
 static int setup_led(void)

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ccb80d2..ddb725d 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -111,7 +111,7 @@ config DEBUG_UART_SHIFT
 
 config ROCKCHIP_SERIAL
        bool "Rockchip on-chip UART support"
-       depends on ARCH_UNIPHIER && DM_SERIAL
+       depends on ARCH_ROCKCHIP && DM_SERIAL
        help
          Select this to enable a debug UART for Rockchip devices. This uses
          the ns16550 driver. You will need to #define CONFIG_SYS_NS16550 in