diff options
| author | Graeme Russ <graeme.russ@gmail.com> | 2011-11-08 02:33:20 +0000 |
|---|---|---|
| committer | Graeme Russ <graeme.russ@gmail.com> | 2011-11-29 21:09:52 +1100 |
| commit | a76fc70ee190416e0c161efebdb955a5fac904d3 (patch) | |
| tree | da8e5f0fcf2cdcfd938db82d5a35008772a8ab03 /arch/x86/lib/bootm.c | |
| parent | a206cc23431474a9890f0301f02f50ad3dc9b062 (diff) | |
| download | talos-obmc-uboot-a76fc70ee190416e0c161efebdb955a5fac904d3.tar.gz talos-obmc-uboot-a76fc70ee190416e0c161efebdb955a5fac904d3.zip | |
x86: Provide more configuration granularity
Planned future ports requires more granularity for some options
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'arch/x86/lib/bootm.c')
| -rw-r--r-- | arch/x86/lib/bootm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 836803cbea..bac7b4f0cf 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -35,7 +35,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) { - void *base_ptr; + void *base_ptr = NULL; ulong os_data, os_len; image_header_t *hdr; @@ -73,8 +73,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[], goto error; } +#ifdef CONFIG_CMD_ZBOOT base_ptr = load_zimage((void *)os_data, os_len, images->rd_start, images->rd_end - images->rd_start, 0); +#endif if (NULL == base_ptr) { printf("## Kernel loading failed ...\n"); |
