projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'wd/master'
[platform/kernel/u-boot.git]
/
cpu
/
mpc86xx
/
cpu.c
diff --git
a/cpu/mpc86xx/cpu.c
b/cpu/mpc86xx/cpu.c
index
bbc0cd6
..
11354d3
100644
(file)
--- a/
cpu/mpc86xx/cpu.c
+++ b/
cpu/mpc86xx/cpu.c
@@
-131,7
+131,7
@@
checkcpu(void)
static inline void
soft_restart(unsigned long addr)
{
static inline void
soft_restart(unsigned long addr)
{
-#if
ndef CONFIG_MPC8641HPCN
+#if
!defined(CONFIG_MPC8641HPCN) && !defined(CONFIG_MPC8610HPCD)
/*
* SRR0 has system reset vector, SRR1 has default MSR value
/*
* 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[])
{
void
do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
-#if
ndef CONFIG_MPC8641HPCN
+#if
!defined(CONFIG_MPC8641HPCN) && !defined(CONFIG_MPC8610HPCD)
#ifdef CFG_RESET_ADDRESS
ulong addr = CFG_RESET_ADDRESS;
#ifdef CFG_RESET_ADDRESS
ulong addr = CFG_RESET_ADDRESS;