diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:16:49 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:16:49 -0600 |
| commit | b0a41a11845259ad88897cbcf7d0d7ceb2e70844 (patch) | |
| tree | 0e2f2244762b91e517a540b361cba7cc41c0b5a8 /cpu/mpc86xx/cpu.c | |
| parent | 59e7965922b683a5aca44ff294d95b206d5bc58a (diff) | |
| parent | 9f23ca334a6f5f021ef9e9d0fad9da80d63b2d56 (diff) | |
| download | u-boot-imx-b0a41a11845259ad88897cbcf7d0d7ceb2e70844.zip u-boot-imx-b0a41a11845259ad88897cbcf7d0d7ceb2e70844.tar.gz u-boot-imx-b0a41a11845259ad88897cbcf7d0d7ceb2e70844.tar.bz2 | |
Merge branch 'for-1.3.0'
Diffstat (limited to 'cpu/mpc86xx/cpu.c')
| -rw-r--r-- | cpu/mpc86xx/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index bbc0cd6..11354d3 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -131,7 +131,7 @@ checkcpu(void) static inline void soft_restart(unsigned long addr) { -#ifndef CONFIG_MPC8641HPCN +#if !defined(CONFIG_MPC8641HPCN) && !defined(CONFIG_MPC8610HPCD) /* * SRR0 has system reset vector, SRR1 has default MSR value @@ -159,7 +159,7 @@ soft_restart(unsigned long addr) void do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { -#ifndef CONFIG_MPC8641HPCN +#if !defined(CONFIG_MPC8641HPCN) && !defined(CONFIG_MPC8610HPCD) #ifdef CFG_RESET_ADDRESS ulong addr = CFG_RESET_ADDRESS; |