summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-23 00:07:25 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-24 00:15:35 +0900
commit499785b970a36a0c8de9bf4e5edf07455dc5b9bc (patch)
tree2f76977362eb65614ac58f97731b3d10ced42fa4 /arch/arm/mach-uniphier
parenta286039b13d5bbcee0a0525e44f564f82aa0e636 (diff)
downloadtalos-obmc-uboot-499785b970a36a0c8de9bf4e5edf07455dc5b9bc.tar.gz
talos-obmc-uboot-499785b970a36a0c8de9bf4e5edf07455dc5b9bc.zip
ARM: UniPhier: enable Driver Model and UART on SPL
Enable CONFIG_SPL_DM and CONFIG_SPL_SERIAL_SUPPORT, which provide Driver Model UART support on SPL. CONFIG_SYS_SPL_MALLOC_{START,SIZE} should be dropped because simple malloc is preferred on SPL. Dlmalloc requires some static variables on .data section that is not available yet for NOR boot mode etc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier')
-rw-r--r--arch/arm/mach-uniphier/spl.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-uniphier/spl.c b/arch/arm/mach-uniphier/spl.c
index a0d0f040a8..a34d3a167c 100644
--- a/arch/arm/mach-uniphier/spl.c
+++ b/arch/arm/mach-uniphier/spl.c
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2013-2015 Panasonic Corporation
- * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2015 Socionext Inc.
+ * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -52,6 +53,12 @@ void spl_board_init(void)
led_write(L, 3, , );
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
+ preloader_console_init();
+#endif
+
+ led_write(L, 4, , );
+
{
int res;
@@ -61,9 +68,9 @@ void spl_board_init(void)
;
}
}
- led_write(L, 4, , );
+ led_write(L, 5, , );
enable_dpll_ssc();
- led_write(L, 5, , );
+ led_write(L, 6, , );
}
OpenPOWER on IntegriCloud