projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
cpu.c
diff --git
a/arch/powerpc/cpu/mpc85xx/cpu.c
b/arch/powerpc/cpu/mpc85xx/cpu.c
index 1a0196c7c421db4924c9531c55574b4b467696af..3e99b079c74a5f613409fd70491d7882ae9e17c4 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/
arch/powerpc/cpu/mpc85xx/cpu.c
@@
-17,12
+17,12
@@
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/mmu.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/mmu.h>
-#include <
asm/
fsl_ifc.h>
+#include <fsl_ifc.h>
#include <asm/fsl_law.h>
#include <asm/fsl_lbc.h>
#include <post.h>
#include <asm/processor.h>
#include <asm/fsl_law.h>
#include <asm/fsl_lbc.h>
#include <post.h>
#include <asm/processor.h>
-#include <
asm/
fsl_ddr_sdram.h>
+#include <fsl_ddr_sdram.h>
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
@@
-416,7
+416,7
@@
static void dump_spd_ddr_reg(void)
int i, j, k, m;
u8 *p_8;
u32 *p_32;
int i, j, k, m;
u8 *p_8;
u32 *p_32;
-
ccsr_ddr_t
*ddr[CONFIG_NUM_DDR_CONTROLLERS];
+
struct ccsr_ddr __iomem
*ddr[CONFIG_NUM_DDR_CONTROLLERS];
generic_spd_eeprom_t
spd[CONFIG_NUM_DDR_CONTROLLERS][CONFIG_DIMM_SLOTS_PER_CTLR];
generic_spd_eeprom_t
spd[CONFIG_NUM_DDR_CONTROLLERS][CONFIG_DIMM_SLOTS_PER_CTLR];
@@
-453,21
+453,21
@@
static void dump_spd_ddr_reg(void)
for (i = 0; i < CONFIG_NUM_DDR_CONTROLLERS; i++) {
switch (i) {
case 0:
for (i = 0; i < CONFIG_NUM_DDR_CONTROLLERS; i++) {
switch (i) {
case 0:
- ddr[i] = (void *)CONFIG_SYS_
MPC8xxx
_DDR_ADDR;
+ ddr[i] = (void *)CONFIG_SYS_
FSL
_DDR_ADDR;
break;
break;
-#if defined(CONFIG_SYS_
MPC8xxx
_DDR2_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 1)
+#if defined(CONFIG_SYS_
FSL
_DDR2_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 1)
case 1:
case 1:
- ddr[i] = (void *)CONFIG_SYS_
MPC8xxx
_DDR2_ADDR;
+ ddr[i] = (void *)CONFIG_SYS_
FSL
_DDR2_ADDR;
break;
#endif
break;
#endif
-#if defined(CONFIG_SYS_
MPC8xxx
_DDR3_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 2)
+#if defined(CONFIG_SYS_
FSL
_DDR3_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 2)
case 2:
case 2:
- ddr[i] = (void *)CONFIG_SYS_
MPC8xxx
_DDR3_ADDR;
+ ddr[i] = (void *)CONFIG_SYS_
FSL
_DDR3_ADDR;
break;
#endif
break;
#endif
-#if defined(CONFIG_SYS_
MPC8xxx
_DDR4_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 3)
+#if defined(CONFIG_SYS_
FSL
_DDR4_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 3)
case 3:
case 3:
- ddr[i] = (void *)CONFIG_SYS_
MPC8xxx
_DDR4_ADDR;
+ ddr[i] = (void *)CONFIG_SYS_
FSL
_DDR4_ADDR;
break;
#endif
default:
break;
#endif
default:
@@
-482,7
+482,7
@@
static void dump_spd_ddr_reg(void)
for (i = 0; i < CONFIG_NUM_DDR_CONTROLLERS; i++)
printf(" Base + 0x%04x", (u32)ddr[i] & 0xFFFF);
puts("\n");
for (i = 0; i < CONFIG_NUM_DDR_CONTROLLERS; i++)
printf(" Base + 0x%04x", (u32)ddr[i] & 0xFFFF);
puts("\n");
- for (k = 0; k < sizeof(
ccsr_ddr_t
)/4; k++) {
+ for (k = 0; k < sizeof(
struct ccsr_ddr
)/4; k++) {
m = 0;
printf("%6d (0x%04x)", k * 4, k * 4);
for (i = 0; i < CONFIG_NUM_DDR_CONTROLLERS; i++) {
m = 0;
printf("%6d (0x%04x)", k * 4, k * 4);
for (i = 0; i < CONFIG_NUM_DDR_CONTROLLERS; i++) {