diff options
author | wdenk <wdenk> | 2005-03-15 22:56:53 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2005-03-15 22:56:53 +0000 |
commit | 6c9e789e9e47de6146efefa48224b085501bc094 (patch) | |
tree | 00649fee2880baba1c18f926c1dc8e3c085ee126 /cpu | |
parent | 911d08f6ae244c6407fff268585e5b9544ce8adb (diff) | |
download | u-boot-6c9e789e9e47de6146efefa48224b085501bc094.zip u-boot-6c9e789e9e47de6146efefa48224b085501bc094.tar.gz u-boot-6c9e789e9e47de6146efefa48224b085501bc094.tar.bz2 |
Update code for TQM8540 board (and 85xx in general):
- Change the name of the Ethernet driver: MOTO ENET -> ENET
- Reformat boot messages
- Enable redundant environment
- Replace the -O2 optimization flag with -mno-string
Diffstat (limited to 'cpu')
-rw-r--r-- | cpu/mpc85xx/config.mk | 2 | ||||
-rw-r--r-- | cpu/mpc85xx/cpu.c | 50 | ||||
-rw-r--r-- | cpu/mpc85xx/cpu_init.c | 4 | ||||
-rw-r--r-- | cpu/mpc85xx/tsec.c | 2 |
4 files changed, 28 insertions, 30 deletions
diff --git a/cpu/mpc85xx/config.mk b/cpu/mpc85xx/config.mk index a51527a..1d0b192 100644 --- a/cpu/mpc85xx/config.mk +++ b/cpu/mpc85xx/config.mk @@ -23,4 +23,4 @@ PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx -DCONFIG_E500 -ffixed-r2 -ffixed-r29 -Wa,-me500 -msoft-float -O2 +PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx -DCONFIG_E500 -ffixed-r2 -ffixed-r29 -Wa,-me500 -msoft-float -mno-string diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c index 8eb9317..fe678df 100644 --- a/cpu/mpc85xx/cpu.c +++ b/cpu/mpc85xx/cpu.c @@ -41,30 +41,12 @@ int checkcpu (void) uint ver; uint major, minor; - puts("Freescale PowerPC\n"); - - pvr = get_pvr(); - ver = PVR_VER(pvr); - major = PVR_MAJ(pvr); - minor = PVR_MIN(pvr); - - printf(" Core: "); - switch (ver) { - case PVR_VER(PVR_85xx): - puts("E500"); - break; - default: - puts("Unknown"); - break; - } - printf(", Version: %d.%d, (0x%08x)\n", major, minor, pvr); - svr = get_svr(); ver = SVR_VER(svr); major = SVR_MAJ(svr); minor = SVR_MIN(svr); - puts(" System: "); + puts("CPU: "); switch (ver) { case SVR_8540: puts("8540"); @@ -84,12 +66,28 @@ int checkcpu (void) } printf(", Version: %d.%d, (0x%08x)\n", major, minor, svr); + pvr = get_pvr(); + ver = PVR_VER(pvr); + major = PVR_MAJ(pvr); + minor = PVR_MIN(pvr); + + printf("Core: "); + switch (ver) { + case PVR_VER(PVR_85xx): + puts("E500"); + break; + default: + puts("Unknown"); + break; + } + printf(", Version: %d.%d, (0x%08x)\n", major, minor, pvr); + get_sys_info(&sysinfo); - puts(" Clocks: "); - printf("CPU:%4lu MHz, ", sysinfo.freqProcessor / 1000000); - printf("CCB:%4lu MHz, ", sysinfo.freqSystemBus / 1000000); - printf("DDR:%4lu MHz, ", sysinfo.freqSystemBus / 2000000); + puts("Clocks Configuration:\n"); + printf(" CPU:%4lu MHz, ", sysinfo.freqProcessor / 1000000); + printf("CCB:%4lu MHz,\n", sysinfo.freqSystemBus / 1000000); + printf(" DDR:%4lu MHz, ", sysinfo.freqSystemBus / 2000000); #if defined(CFG_LBC_LCRR) lcrr = CFG_LBC_LCRR; @@ -106,15 +104,15 @@ int checkcpu (void) printf("LBC:%4lu MHz\n", sysinfo.freqSystemBus / 1000000 / clkdiv); } else { - printf(" LBC: unknown (lcrr: 0x%08x)\n", lcrr); + printf("LBC: unknown (lcrr: 0x%08x)\n", lcrr); } if (ver == SVR_8560) { - printf(" CPM: %lu Mhz\n", + printf("CPM: %lu Mhz\n", sysinfo.freqSystemBus / 1000000); } - puts(" L1 D-cache 32KB, L1 I-cache 32KB enabled.\n"); + puts("L1: D-cache 32 kB enabled\n I-cache 32 kB enabled\n"); return 0; } diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c index 3ffd558..ee2f79f 100644 --- a/cpu/mpc85xx/cpu_init.c +++ b/cpu/mpc85xx/cpu_init.c @@ -196,9 +196,9 @@ int cpu_init_r (void) temp = l2cache->l2ctl; asm("msync;isync"); - printf("L2 cache enabled: 256KB\n"); + printf("L2: 256 kB enabled\n"); #else - printf("L2 cache disabled.\n"); + printf("L2: disabled.\n"); #endif return 0; diff --git a/cpu/mpc85xx/tsec.c b/cpu/mpc85xx/tsec.c index de056d9..992475c 100644 --- a/cpu/mpc85xx/tsec.c +++ b/cpu/mpc85xx/tsec.c @@ -141,7 +141,7 @@ int tsec_initialize(bd_t *bis, int index) priv->phyaddr = tsec_info[index].phyaddr; priv->gigabit = tsec_info[index].gigabit; - sprintf(dev->name, "MOTO ENET%d", index); + sprintf(dev->name, "ENET%d", index); dev->iobase = 0; dev->priv = priv; dev->init = tsec_init; |