Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 10:39:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing

Browse source 
Conflicts:

	common/cmd_bootm.c
	cpu/mpc8xx/cpu.c

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
This commit is contained in:
Bartlomiej Sieka 2008-03-26 09:38:06 +01:00
commit 27f33e9f45
82 changed files with 8302 additions and 3279 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/common.h
View file

@ -222,10 +222,7 @@ int mac_read_from_eeprom(void);
void flash_perror (int);
/* common/cmd_autoscript.c */
int autoscript (ulong addr);
/* common/cmd_bootm.c */
void print_image_hdr (image_header_t *hdr);
int autoscript (ulong addr, const char *fit_uname);
extern ulong load_addr; /* Default Load Address */