diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-02-21 17:20:18 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-02-21 17:20:18 +0100 |
| commit | 75d3e8fbd93c14d9929d024c75af2d742c76db70 (patch) | |
| tree | 0e6aeeaae765e634fd2be4b23ae0d60f9f3a1535 | |
| parent | 20c93959330aba8b5bbdbfde1ef319e99eba235d (diff) | |
| download | u-boot-imx-75d3e8fbd93c14d9929d024c75af2d742c76db70.zip u-boot-imx-75d3e8fbd93c14d9929d024c75af2d742c76db70.tar.gz u-boot-imx-75d3e8fbd93c14d9929d024c75af2d742c76db70.tar.bz2 | |
[new uImage] Pull in libfdt if CONFIG_FIT is enabled
New uImage format (Flattened Image Tree) requires libfdt
functionality, print out error message if CONFIG_OF_LIBFDT
is not defined.
New uImage support is enabled by defining CONFIG_FIT (and CONFIG_OF_LIBFDT).
This commit turns it on by default.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| -rw-r--r-- | cpu/mpc5xxx/cpu.c | 2 | ||||
| -rw-r--r-- | cpu/mpc8260/cpu.c | 2 | ||||
| -rw-r--r-- | cpu/mpc8xx/cpu.c | 2 | ||||
| -rw-r--r-- | include/image.h | 9 |
4 files changed, 12 insertions, 3 deletions
diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c index e4d6168..7522afe 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; diff --git a/cpu/mpc8xx/cpu.c b/cpu/mpc8xx/cpu.c index c878352..5d4ab82 100644 --- a/cpu/mpc8xx/cpu.c +++ b/cpu/mpc8xx/cpu.c @@ -638,7 +638,7 @@ void reset_8xx_watchdog (volatile immap_t * immr) #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; diff --git a/include/image.h b/include/image.h index dbbbee9..ecfce72 100644 --- a/include/image.h +++ b/include/image.h @@ -35,10 +35,19 @@ #include <asm/byteorder.h> #include <command.h> + #ifndef USE_HOSTCC #include <linux/string.h> #include <asm/u-boot.h> + +/* new uImage format support enabled by default */ +#define CONFIG_FIT 1 +#define CONFIG_OF_LIBFDT 1 + +#if defined(CONFIG_FIT) && !defined(CONFIG_OF_LIBFDT) +#error "CONFIG_OF_LIBFDT not enabled, required by CONFIG_FIT!" #endif +#endif /* USE_HOSTCC */ /* * Operating System Codes |