diff options
| author | Stefan Roese <sr@denx.de> | 2006-11-30 13:08:32 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-11-30 13:08:32 +0100 |
| commit | 5c97aeb8d8b780b10a1cb0beaca196c009f5a62a (patch) | |
| tree | 07b2f5b8692461d84048ddd3c31e88c7d2e1d6f3 /cpu | |
| parent | b690b7da0fdaa6055e94a82fdb468a1aa8771246 (diff) | |
| parent | 8d9a8610b8256331132227e9e6585c6bd5742787 (diff) | |
| download | u-boot-imx-5c97aeb8d8b780b10a1cb0beaca196c009f5a62a.zip u-boot-imx-5c97aeb8d8b780b10a1cb0beaca196c009f5a62a.tar.gz u-boot-imx-5c97aeb8d8b780b10a1cb0beaca196c009f5a62a.tar.bz2 | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/74xx_7xx/cpu.c | 8 | ||||
| -rw-r--r-- | cpu/74xx_7xx/cpu_init.c | 1 | ||||
| -rw-r--r-- | cpu/74xx_7xx/speed.c | 1 | ||||
| -rw-r--r-- | cpu/74xx_7xx/start.S | 8 | ||||
| -rw-r--r-- | cpu/mpc5xxx/cpu.c | 9 |
5 files changed, 19 insertions, 8 deletions
diff --git a/cpu/74xx_7xx/cpu.c b/cpu/74xx_7xx/cpu.c index ca45e17..d98831c 100644 --- a/cpu/74xx_7xx/cpu.c +++ b/cpu/74xx_7xx/cpu.c @@ -101,6 +101,10 @@ get_cpu_type(void) type = CPU_7457; break; + case 0x8004: + type = CPU_7448; + break; + default: break; } @@ -152,6 +156,10 @@ int checkcpu (void) str = "MPC7410"; break; + case CPU_7448: + str = "MPC7448"; + break; + case CPU_7450: str = "MPC7450"; break; diff --git a/cpu/74xx_7xx/cpu_init.c b/cpu/74xx_7xx/cpu_init.c index 93f180f..e02a4cc 100644 --- a/cpu/74xx_7xx/cpu_init.c +++ b/cpu/74xx_7xx/cpu_init.c @@ -43,6 +43,7 @@ cpu_init_f (void) case CPU_7450: case CPU_7455: case CPU_7457: + case CPU_7448: /* enable the timebase bit in HID0 */ set_hid0(get_hid0() | 0x4000000); break; diff --git a/cpu/74xx_7xx/speed.c b/cpu/74xx_7xx/speed.c index 2dc5107..d1800ed 100644 --- a/cpu/74xx_7xx/speed.c +++ b/cpu/74xx_7xx/speed.c @@ -91,6 +91,7 @@ int get_clocks (void) /* calculate the clock frequency based upon the CPU type */ switch (get_cpu_type()) { + case CPU_7448: case CPU_7455: case CPU_7457: /* diff --git a/cpu/74xx_7xx/start.S b/cpu/74xx_7xx/start.S index 1fc0fe6..1143038 100644 --- a/cpu/74xx_7xx/start.S +++ b/cpu/74xx_7xx/start.S @@ -44,7 +44,8 @@ #if !defined(CONFIG_DB64360) && \ !defined(CONFIG_DB64460) && \ - !defined(CONFIG_CPCI750) + !defined(CONFIG_CPCI750) && \ + !defined(CONFIG_P3Mx) #include <galileo/gt64260R.h> #endif @@ -270,7 +271,7 @@ in_flash: * gt-regs BAT can be reused after board_init_f calls * board_early_init_f (EVB only). */ -#if !defined(CONFIG_BAB7xx) && !defined(CONFIG_ELPPC) +#if !defined(CONFIG_BAB7xx) && !defined(CONFIG_ELPPC) && !defined(CONFIG_P3Mx) /* enable address translation */ bl enable_addr_trans sync @@ -757,7 +758,8 @@ in_ram: defined(CONFIG_DB64360) || \ defined(CONFIG_DB64460) || \ defined(CONFIG_CPCI750) || \ - defined(CONFIG_PPMC7XX) + defined(CONFIG_PPMC7XX) || \ + defined(CONFIG_P3Mx) mr r4, r9 /* Use RAM copy of the global data */ #endif bl after_reloc diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c index 20e6735..813aa79 100644 --- a/cpu/mpc5xxx/cpu.c +++ b/cpu/mpc5xxx/cpu.c @@ -112,21 +112,20 @@ void ft_cpu_setup(void *blob, bd_t *bd) { u32 *p; - ulong clock; int len; - clock = bd->bi_busfreq; + /* Core XLB bus frequency */ p = ft_get_prop(blob, "/cpus/" OF_CPU "/bus-frequency", &len); if (p != NULL) - *p = cpu_to_be32(clock); + *p = cpu_to_be32(bd->bi_busfreq); + /* SOC peripherals use the IPB bus frequency */ p = ft_get_prop(blob, "/" OF_SOC "/bus-frequency", &len); if (p != NULL) - *p = cpu_to_be32(clock); + *p = cpu_to_be32(bd->bi_ipbfreq); p = ft_get_prop(blob, "/" OF_SOC "/ethernet@3000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enetaddr, 6); - } #endif |