diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2006-12-01 12:09:33 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2006-12-01 12:09:33 +0800 |
| commit | e0b369e4f71b11dd5716903dd6258028cf07e6e8 (patch) | |
| tree | 615986f2b3088072c49d74e1086650e185087698 /cpu/74xx_7xx | |
| parent | ee311214e0d216f904feea269599d0934bf71f23 (diff) | |
| parent | dd520bf314c7add4183c5191692180f576f96b60 (diff) | |
| download | u-boot-imx-e0b369e4f71b11dd5716903dd6258028cf07e6e8.zip u-boot-imx-e0b369e4f71b11dd5716903dd6258028cf07e6e8.tar.gz u-boot-imx-e0b369e4f71b11dd5716903dd6258028cf07e6e8.tar.bz2 | |
Fix the confilcts when merging 'master' into hpc2.
The conflicts due to a new mpc7448 p3m7448 board is in the main tree.
Merge branch 'master' into hpc2
Conflicts:
MAKEALL
cpu/74xx_7xx/cpu.c
cpu/74xx_7xx/cpu_init.c
cpu/74xx_7xx/speed.c
Diffstat (limited to 'cpu/74xx_7xx')
| -rw-r--r-- | cpu/74xx_7xx/cpu.c | 6 | ||||
| -rw-r--r-- | cpu/74xx_7xx/start.S | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/cpu/74xx_7xx/cpu.c b/cpu/74xx_7xx/cpu.c index fc3b092..ca45ca0 100644 --- a/cpu/74xx_7xx/cpu.c +++ b/cpu/74xx_7xx/cpu.c @@ -164,6 +164,10 @@ int checkcpu (void) str = "MPC7410"; break; + case CPU_7448: + str = "MPC7448"; + break; + case CPU_7450: str = "MPC7450"; break; @@ -241,7 +245,7 @@ soft_restart(unsigned long addr) void do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - ulong addr; + ulong addr; /* flush and disable I/D cache */ __asm__ __volatile__ ("mfspr 3, 1008" ::: "r3"); __asm__ __volatile__ ("ori 5, 5, 0xcc00" ::: "r5"); 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 |