diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-28 00:09:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-28 00:09:53 +0200 |
| commit | d03f4230a6cc08ac718c876309e4dc425e1a9854 (patch) | |
| tree | 380ef4c7afb80846f2dde5865b54d0bd4c2a5199 /arch/powerpc | |
| parent | 8e98f5f70b269a77416a990b90ad8d853c5a0d73 (diff) | |
| parent | 1a2e203b31d33fb720f2cf1033b241ad36ab405a (diff) | |
| download | u-boot-imx-d03f4230a6cc08ac718c876309e4dc425e1a9854.zip u-boot-imx-d03f4230a6cc08ac718c876309e4dc425e1a9854.tar.gz u-boot-imx-d03f4230a6cc08ac718c876309e4dc425e1a9854.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/cpu.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/speed.c | 10 | ||||
| -rw-r--r-- | arch/powerpc/lib/board.c | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 51180d6..8b98a57 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -106,7 +106,9 @@ int checkcpu(void) puts(cpu_type_list[i].name); if (IS_E_PROCESSOR(spridr)) puts("E"); - if (REVID_MAJOR(spridr) >= 2) + if ((SPR_FAMILY(spridr) == SPR_834X_FAMILY || + SPR_FAMILY(spridr) == SPR_836X_FAMILY) && + REVID_MAJOR(spridr) >= 2) puts("A"); printf(", Rev: %d.%d", REVID_MAJOR(spridr), REVID_MINOR(spridr)); diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c index bde7e92..500eef1 100644 --- a/arch/powerpc/cpu/mpc83xx/speed.c +++ b/arch/powerpc/cpu/mpc83xx/speed.c @@ -116,7 +116,7 @@ int get_clocks(void) #if defined(CONFIG_MPC8315) u32 tdm_clk; #endif -#if defined(CONFIG_MPC837x) +#if defined(CONFIG_FSL_ESDHC) u32 sdhc_clk; #endif u32 enc_clk; @@ -274,7 +274,7 @@ int get_clocks(void) return -7; } -#if defined(CONFIG_MPC837x) +#if defined(CONFIG_FSL_ESDHC) switch ((sccr & SCCR_SDHCCM) >> SCCR_SDHCCM_SHIFT) { case 0: sdhc_clk = 0; @@ -321,7 +321,7 @@ int get_clocks(void) i2c1_clk = enc_clk; #elif defined(CONFIG_MPC831x) i2c1_clk = enc_clk; -#elif defined(CONFIG_MPC837x) +#elif defined(CONFIG_FSL_ESDHC) i2c1_clk = sdhc_clk; #endif #if !defined(CONFIG_MPC832x) @@ -455,7 +455,7 @@ int get_clocks(void) #if defined(CONFIG_MPC8315) gd->tdm_clk = tdm_clk; #endif -#if defined(CONFIG_MPC837x) +#if defined(CONFIG_FSL_ESDHC) gd->sdhc_clk = sdhc_clk; #endif gd->core_clk = core_clk; @@ -522,7 +522,7 @@ int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) #if defined(CONFIG_MPC8315) printf(" TDM: %-4s MHz\n", strmhz(buf, gd->tdm_clk)); #endif -#if defined(CONFIG_MPC837x) +#if defined(CONFIG_FSL_ESDHC) printf(" SDHC: %-4s MHz\n", strmhz(buf, gd->sdhc_clk)); #endif #if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x) diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index a30acee..7b09fb5 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -686,7 +686,7 @@ void board_init_r (gd_t *id, ulong dest_addr) WATCHDOG_RESET(); -#if defined(CONFIG_SYS_DELAYED_ICACHE) || defined(CONFIG_MPC83xx) +#if defined(CONFIG_SYS_DELAYED_ICACHE) icache_enable (); /* it's time to enable the instruction cache */ #endif |