mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-04 02:20:43 +09:00
mpc83xx: replace elaborate boottime verbosity with 'clocks' command
and fix CPU: to align with Board: display text. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
This commit is contained in:
parent
5c5d324293
commit
54b2d434ae
@ -52,7 +52,7 @@ int checkcpu(void)
|
|||||||
|
|
||||||
immr = (immap_t *)CFG_IMMR;
|
immr = (immap_t *)CFG_IMMR;
|
||||||
|
|
||||||
puts("CPU: ");
|
puts("CPU: ");
|
||||||
|
|
||||||
switch (pvr & 0xffff0000) {
|
switch (pvr & 0xffff0000) {
|
||||||
case PVR_E300C1:
|
case PVR_E300C1:
|
||||||
@ -158,10 +158,12 @@ int checkcpu(void)
|
|||||||
/* Multiple revisons of 834x processors may have the same SPRIDR value.
|
/* Multiple revisons of 834x processors may have the same SPRIDR value.
|
||||||
* So use PVR to identify the revision number.
|
* So use PVR to identify the revision number.
|
||||||
*/
|
*/
|
||||||
printf("Rev: %02x at %s MHz\n", PVR_MAJ(pvr)<<4 | PVR_MIN(pvr), strmhz(buf, clock));
|
printf("Rev: %02x at %s MHz", PVR_MAJ(pvr)<<4 | PVR_MIN(pvr), strmhz(buf, clock));
|
||||||
#else
|
#else
|
||||||
printf("Rev: %02x at %s MHz\n", spridr & 0x0000FFFF, strmhz(buf, clock));
|
printf("Rev: %02x at %s MHz", spridr & 0x0000FFFF, strmhz(buf, clock));
|
||||||
#endif
|
#endif
|
||||||
|
printf(", CSB: %4d MHz\n", gd->csb_clk / 1000000);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <mpc83xx.h>
|
#include <mpc83xx.h>
|
||||||
|
#include <command.h>
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
@ -365,11 +366,11 @@ ulong get_bus_freq(ulong dummy)
|
|||||||
return gd->csb_clk;
|
return gd->csb_clk;
|
||||||
}
|
}
|
||||||
|
|
||||||
int print_clock_conf(void)
|
int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||||
{
|
{
|
||||||
printf("Clock configuration:\n");
|
printf("Clock configuration:\n");
|
||||||
printf(" Coherent System Bus: %4d MHz\n", gd->csb_clk / 1000000);
|
|
||||||
printf(" Core: %4d MHz\n", gd->core_clk / 1000000);
|
printf(" Core: %4d MHz\n", gd->core_clk / 1000000);
|
||||||
|
printf(" Coherent System Bus: %4d MHz\n", gd->csb_clk / 1000000);
|
||||||
#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
|
#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
|
||||||
printf(" QE: %4d MHz\n", gd->qe_clk / 1000000);
|
printf(" QE: %4d MHz\n", gd->qe_clk / 1000000);
|
||||||
printf(" BRG: %4d MHz\n", gd->brg_clk / 1000000);
|
printf(" BRG: %4d MHz\n", gd->brg_clk / 1000000);
|
||||||
@ -395,3 +396,8 @@ int print_clock_conf(void)
|
|||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
U_BOOT_CMD(clocks, 1, 0, do_clocks,
|
||||||
|
"clocks - print clock configuration\n",
|
||||||
|
" clocks\n"
|
||||||
|
);
|
||||||
|
@ -440,8 +440,6 @@ int sdram_adjust_866 (void);
|
|||||||
int adjust_sdram_tbs_8xx (void);
|
int adjust_sdram_tbs_8xx (void);
|
||||||
#if defined(CONFIG_8260)
|
#if defined(CONFIG_8260)
|
||||||
int prt_8260_clks (void);
|
int prt_8260_clks (void);
|
||||||
#elif defined(CONFIG_MPC83XX)
|
|
||||||
int print_clock_conf(void);
|
|
||||||
#elif defined(CONFIG_MPC5xxx)
|
#elif defined(CONFIG_MPC5xxx)
|
||||||
int prt_mpc5xxx_clks (void);
|
int prt_mpc5xxx_clks (void);
|
||||||
#endif
|
#endif
|
||||||
|
@ -310,10 +310,6 @@ init_fnc_t *init_sequence[] = {
|
|||||||
prt_8260_clks,
|
prt_8260_clks,
|
||||||
#endif /* CONFIG_8260 */
|
#endif /* CONFIG_8260 */
|
||||||
|
|
||||||
#if defined(CONFIG_MPC83XX)
|
|
||||||
print_clock_conf,
|
|
||||||
#endif
|
|
||||||
|
|
||||||
checkcpu,
|
checkcpu,
|
||||||
#if defined(CONFIG_MPC5xxx)
|
#if defined(CONFIG_MPC5xxx)
|
||||||
prt_mpc5xxx_clks,
|
prt_mpc5xxx_clks,
|
||||||
|
Loading…
Reference in New Issue
Block a user