diff options
Diffstat (limited to 'lib_i386')
| -rw-r--r-- | lib_i386/board.c | 7 | ||||
| -rw-r--r-- | lib_i386/bootm.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib_i386/board.c b/lib_i386/board.c index f3da0a2..1734f86 100644 --- a/lib_i386/board.c +++ b/lib_i386/board.c @@ -32,6 +32,7 @@ #include <watchdog.h> #include <command.h> #include <devices.h> +#include <timestamp.h> #include <version.h> #include <malloc.h> #include <net.h> @@ -70,7 +71,7 @@ ulong i386boot_bios_size = (ulong)&_i386boot_bios_size; /* size of BIOS const char version_string[] = - U_BOOT_VERSION" (" __DATE__ " - " __TIME__ ")"; + U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")"; /* @@ -84,7 +85,7 @@ static int mem_malloc_init(void) { /* start malloc area right after the stack */ mem_malloc_start = i386boot_bss_start + - i386boot_bss_size + CFG_STACK_SIZE; + i386boot_bss_size + CONFIG_SYS_STACK_SIZE; mem_malloc_start = (mem_malloc_start+3)&~3; /* Use all available RAM for malloc() */ @@ -137,7 +138,7 @@ static int display_banner (void) i386boot_romdata_dest, i386boot_romdata_dest+i386boot_romdata_size-1, i386boot_bss_start, i386boot_bss_start+i386boot_bss_size-1, i386boot_bss_start+i386boot_bss_size, - i386boot_bss_start+i386boot_bss_size+CFG_STACK_SIZE-1); + i386boot_bss_start+i386boot_bss_size+CONFIG_SYS_STACK_SIZE-1); return (0); diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c index 613e339..ea19b3d 100644 --- a/lib_i386/bootm.c +++ b/lib_i386/bootm.c @@ -40,6 +40,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) size_t len; #endif + if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) + return 1; + if (images->legacy_hdr_valid) { hdr = images->legacy_hdr_os; if (image_check_type (hdr, IH_TYPE_MULTI)) { |