From: Simon Glass <sjg@chromium.org>
Date: Mon, 23 Jan 2017 20:31:26 +0000 (-0700)
Subject: Drop prt_mpc5xxx_clks() in favour of print_cpuinfo()
X-Git-Tag: v2017.03-rc1~45
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a009f36cfef6c4f60ce7f8d70e3ae8dd98537e30;p=u-boot

Drop prt_mpc5xxx_clks() in favour of print_cpuinfo()

Rather than having an arch-specific function, use the existing generic
one.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/powerpc/cpu/mpc5xxx/speed.c b/arch/powerpc/cpu/mpc5xxx/speed.c
index 30a0a358dd..b37c4a5208 100644
--- a/arch/powerpc/cpu/mpc5xxx/speed.c
+++ b/arch/powerpc/cpu/mpc5xxx/speed.c
@@ -69,7 +69,7 @@ int get_clocks (void)
 	return (0);
 }
 
-int prt_mpc5xxx_clks (void)
+int print_cpuinfo(void)
 {
 	char buf1[32], buf2[32], buf3[32];
 
diff --git a/common/Kconfig b/common/Kconfig
index 7273c3faca..9067d1e277 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -385,7 +385,7 @@ config BOARD_LATE_INIT
 
 config DISPLAY_CPUINFO
 	bool "Display information about the CPU during start up"
-	default y if ARM || BLACKFIN || NIOS2 || X86 || XTENSA
+	default y if ARM || BLACKFIN || NIOS2 || X86 || XTENSA || MPC5xxx
 	help
 	  Display information about the CPU that U-Boot is running on
 	  when U-Boot starts up. The function print_cpuinfo() is called
diff --git a/common/board_f.c b/common/board_f.c
index e5d112dd1e..99c0b5ac78 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -919,9 +919,6 @@ static init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_DISPLAY_CPUINFO)
 	print_cpuinfo,		/* display cpu info (and speed) */
 #endif
-#if defined(CONFIG_MPC5xxx)
-	prt_mpc5xxx_clks,
-#endif /* CONFIG_MPC5xxx */
 #if defined(CONFIG_DISPLAY_BOARDINFO)
 	show_board_info,
 #endif