diff options
| author | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
|---|---|---|
| committer | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
| commit | 27f33e9f45ef7f9685cbdc65066a1828e85dde4f (patch) | |
| tree | 5828044d71e5caa3bec4d05c6c48793df0cd17a3 /include/common.h | |
| parent | 18e69a35efbb078403db0c0063986470dad7d082 (diff) | |
| parent | 388b82fddc7c05596f3f615f190da0448227dc82 (diff) | |
| download | olio-uboot-2014.01-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.xz olio-uboot-2014.01-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.zip | |
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/common.h b/include/common.h index 673afdd15..e03ead10b 100644 --- a/include/common.h +++ b/include/common.h @@ -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 */ |