summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/uniphier
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2015-02-05 14:42:56 +0900
committerMasahiro Yamada <yamada.m@jp.panasonic.com>2015-02-07 00:15:03 +0900
commit08fda258ee127db50f76d6600cc6bf2268e0a178 (patch)
tree1fcba214208310a766d0dc1e9e6a4241155a9091 /arch/arm/cpu/armv7/uniphier
parent35adfc4d259e7985abaffa32cb9578640d09225c (diff)
downloadblackbird-obmc-uboot-08fda258ee127db50f76d6600cc6bf2268e0a178.tar.gz
blackbird-obmc-uboot-08fda258ee127db50f76d6600cc6bf2268e0a178.zip
ARM: UniPhier: revive support card info
Since commit 0365ffcc0bd6 (generic-board: show model name in board_init_f() too), the support card information has not been displayed because check_support_card() is invoked only when show_board_info() fails to get the model name from Device Tree. This commit adds misc_init_f() function to call check_support_card() from there. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/cpu/armv7/uniphier')
-rw-r--r--arch/arm/cpu/armv7/uniphier/Makefile1
-rw-r--r--arch/arm/cpu/armv7/uniphier/print_misc_info.c13
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/Makefile b/arch/arm/cpu/armv7/uniphier/Makefile
index 86be181cfe..713a0d74ed 100644
--- a/arch/arm/cpu/armv7/uniphier/Makefile
+++ b/arch/arm/cpu/armv7/uniphier/Makefile
@@ -12,6 +12,7 @@ obj-y += dram_init.o
obj-$(CONFIG_DRAM_INIT) += ddrphy_training.o
obj-$(CONFIG_BOARD_EARLY_INIT_F) += board_early_init_f.o
obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o
+obj-$(CONFIG_MISC_INIT_F) += print_misc_info.o
obj-$(CONFIG_BOARD_EARLY_INIT_R) += board_early_init_r.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
obj-$(CONFIG_UNIPHIER_SMP) += smp.o
diff --git a/arch/arm/cpu/armv7/uniphier/print_misc_info.c b/arch/arm/cpu/armv7/uniphier/print_misc_info.c
new file mode 100644
index 0000000000..69cfab519f
--- /dev/null
+++ b/arch/arm/cpu/armv7/uniphier/print_misc_info.c
@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2015 Panasonic Corporation
+ * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <asm/arch/board.h>
+
+int misc_init_f(void)
+{
+ return check_support_card();
+}
OpenPOWER on IntegriCloud