Merge branch 'master_merge_new-image' of /home/tur/git/u-boot

[u-boot] / cpu / mpc8260 / cpu.c

diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c
index 55e61a1887586ab0e76048e3d749d32a5078c85d..414759e74c6749a1432a430fdb151bd5fbd3e333 100644 (file)
--- a/cpu/mpc8260/cpu.c
+++ b/cpu/mpc8260/cpu.c
@@ -300,7 +300,7 @@ void watchdog_reset (void)
 #endif /* CONFIG_WATCHDOG */
 
 /* ------------------------------------------------------------------------- */
-#if defined(CONFIG_OF_LIBFDT)
+#if defined(CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP)
 void ft_cpu_setup (void *blob, bd_t *bd)
 {
        char * cpu_path = "/cpus/" OF_CPU;