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 30a0a358dd4f10f1ff358ba0018777989336aa66..b37c4a5208bdc7820bcbf40befc2e70369d86a4b 100644 (file)
--- 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 7273c3faca7b2e9a5c7a10571b76c54866309d1c..9067d1e277b9438ecb23563165de681377759490 100644 (file)
--- 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 e5d112dd1edfba20f8f56a505df8142a0a47b467..99c0b5ac78107f16ed203fb5a0a4b05217ca26be 100644 (file)
--- 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