mirror of
https://github.com/u-boot/u-boot.git
synced 2025-01-16 07:43:48 +08:00
86xx: Add CPU_TYPE_ENTRY support
Unify with 83xx and 85xx and use CPU_TYPE_ENTRY. We are going to use this to convey the # of cores and DDR width in the near future so its good to keep in sync. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
3e88337b22
commit
480f617905
@ -31,6 +31,21 @@
|
||||
#include <tsec.h>
|
||||
#include <asm/fsl_law.h>
|
||||
|
||||
struct cpu_type cpu_type_list [] = {
|
||||
CPU_TYPE_ENTRY(8610, 8610),
|
||||
CPU_TYPE_ENTRY(8641, 8641),
|
||||
CPU_TYPE_ENTRY(8641D, 8641D),
|
||||
};
|
||||
|
||||
struct cpu_type *identify_cpu(u32 ver)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < ARRAY_SIZE(cpu_type_list); i++)
|
||||
if (cpu_type_list[i].soc_ver == ver)
|
||||
return &cpu_type_list[i];
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Default board reset function
|
||||
@ -53,6 +68,7 @@ checkcpu(void)
|
||||
char buf1[32], buf2[32];
|
||||
volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
|
||||
volatile ccsr_gur_t *gur = &immap->im_gur;
|
||||
struct cpu_type *cpu;
|
||||
uint msscr0 = mfspr(MSSCR0);
|
||||
|
||||
svr = get_svr();
|
||||
@ -62,20 +78,13 @@ checkcpu(void)
|
||||
|
||||
puts("CPU: ");
|
||||
|
||||
switch (ver) {
|
||||
case SVR_8641:
|
||||
puts("8641");
|
||||
break;
|
||||
case SVR_8641D:
|
||||
puts("8641D");
|
||||
break;
|
||||
case SVR_8610:
|
||||
puts("8610");
|
||||
break;
|
||||
default:
|
||||
cpu = identify_cpu(ver);
|
||||
if (cpu) {
|
||||
puts(cpu->name);
|
||||
} else {
|
||||
puts("Unknown");
|
||||
break;
|
||||
}
|
||||
|
||||
printf(", Version: %d.%d, (0x%08x)\n", major, minor, svr);
|
||||
puts("Core: ");
|
||||
|
||||
|
@ -1021,7 +1021,7 @@ struct cpu_type {
|
||||
|
||||
struct cpu_type *identify_cpu(u32 ver);
|
||||
|
||||
#if defined(CONFIG_MPC85xx)
|
||||
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
|
||||
#define CPU_TYPE_ENTRY(n, v) \
|
||||
{ .name = #n, .soc_ver = SVR_##v, }
|
||||
#else
|
||||
|
Loading…
Reference in New Issue
Block a user