projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/wd/git/u-boot/custodians
[oweals/u-boot.git]
/
cpu
/
mpc8xx
/
cpu.c
diff --git
a/cpu/mpc8xx/cpu.c
b/cpu/mpc8xx/cpu.c
index 97112f03daf168b7a311d1af7a91a34a05c08ce4..ec6a3fd5d6921be5812172b6170c71f29ad3608d 100644
(file)
--- a/
cpu/mpc8xx/cpu.c
+++ b/
cpu/mpc8xx/cpu.c
@@
-39,6
+39,12
@@
#include <mpc8xx.h>
#include <asm/cache.h>
#include <mpc8xx.h>
#include <asm/cache.h>
+#if defined(CONFIG_OF_LIBFDT)
+#include <libfdt.h>
+#include <libfdt_env.h>
+#include <fdt_support.h>
+#endif
+
DECLARE_GLOBAL_DATA_PTR;
static char *cpu_warning = "\n " \
DECLARE_GLOBAL_DATA_PTR;
static char *cpu_warning = "\n " \
@@
-628,7
+634,4
@@
void reset_8xx_watchdog (volatile immap_t * immr)
immr->im_siu_conf.sc_swsr = 0xaa39; /* write magic2 */
# endif /* CONFIG_LWMON */
}
immr->im_siu_conf.sc_swsr = 0xaa39; /* write magic2 */
# endif /* CONFIG_LWMON */
}
-
#endif /* CONFIG_WATCHDOG */
#endif /* CONFIG_WATCHDOG */
-
-/* ------------------------------------------------------------------------- */