GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[new uImage] Pull in libfdt if CONFIG_FIT is enabled

Browse source 
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>
This commit is contained in:
Marian Balakowicz 2008-02-21 17:20:18 +01:00
parent 20c9395933
commit 75d3e8fbd9
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/mpc5xxx/cpu.c
View file

@ -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) void ft_cpu_setup(void *blob, bd_t *bd)
{ {
int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4; int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4;

2
cpu/mpc8260/cpu.c
View file

@ -300,7 +300,7 @@ void watchdog_reset (void)
#endif /* CONFIG_WATCHDOG */ #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) void ft_cpu_setup (void *blob, bd_t *bd)
{ {
char * cpu_path = "/cpus/" OF_CPU; char * cpu_path = "/cpus/" OF_CPU;

2
cpu/mpc8xx/cpu.c
View file

@ -638,7 +638,7 @@ void reset_8xx_watchdog (volatile immap_t * immr)
#endif /* CONFIG_WATCHDOG */ #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) void ft_cpu_setup (void *blob, bd_t *bd)
{ {
char * cpu_path = "/cpus/" OF_CPU; char * cpu_path = "/cpus/" OF_CPU;

9
include/image.h
View file

@ -35,10 +35,19 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <command.h> #include <command.h>
#ifndef USE_HOSTCC #ifndef USE_HOSTCC
#include <linux/string.h> #include <linux/string.h>
#include <asm/u-boot.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
#endif /* USE_HOSTCC */
/* /*
* Operating System Codes * Operating System Codes