diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-26 10:41:48 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-26 10:41:48 +0100 |
| commit | b951f8d31711f3f10ad119ddcf5a3d0afe14d561 (patch) | |
| tree | 950ca2e675ec92ea7b5610a3a2ea2b739f0aaab5 /cpu | |
| parent | 218ca724c08ca8a649f0917cf201cf23d4b33f39 (diff) | |
| parent | 27f33e9f45ef7f9685cbdc65066a1828e85dde4f (diff) | |
| download | u-boot-imx-b951f8d31711f3f10ad119ddcf5a3d0afe14d561.zip u-boot-imx-b951f8d31711f3f10ad119ddcf5a3d0afe14d561.tar.gz u-boot-imx-b951f8d31711f3f10ad119ddcf5a3d0afe14d561.tar.bz2 | |
Merge branch 'master_merge_new-image' of /home/tur/git/u-boot
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc5xxx/cpu.c | 2 | ||||
| -rw-r--r-- | cpu/mpc8260/cpu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c index dbfdd97..ace1653 100644 --- a/cpu/mpc5xxx/cpu.c +++ b/cpu/mpc5xxx/cpu.c @@ -114,7 +114,7 @@ unsigned long get_tbclk (void) /* ------------------------------------------------------------------------- */ -#ifdef CONFIG_OF_LIBFDT +#if defined(CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP) void ft_cpu_setup(void *blob, bd_t *bd) { int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4; diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index 55e61a1..414759e 100644 --- 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; |