diff options
author | Peter Tyser <ptyser@xes-inc.com> | 2010-04-12 22:28:04 -0500 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-04-13 09:13:03 +0200 |
commit | ea0364f1bbfed1e3ea711147420875cf338fe77a (patch) | |
tree | 15c051bc4d2e94c1661c73e1b87c22c7beda7c24 /lib_i386/bootm.c | |
parent | 89f39e177e7b0152aa1d3152baa25d986e36cdcf (diff) | |
download | u-boot-imx-ea0364f1bbfed1e3ea711147420875cf338fe77a.zip u-boot-imx-ea0364f1bbfed1e3ea711147420875cf338fe77a.tar.gz u-boot-imx-ea0364f1bbfed1e3ea711147420875cf338fe77a.tar.bz2 |
Move lib_$ARCH directories to arch/$ARCH/lib
Also move lib_$ARCH/config.mk to arch/$ARCH/config.mk
This change is intended to clean up the top-level directory structure
and more closely mimic Linux's directory organization.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'lib_i386/bootm.c')
-rw-r--r-- | lib_i386/bootm.c | 94 |
1 files changed, 0 insertions, 94 deletions
diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c deleted file mode 100644 index f96d7bd..0000000 --- a/lib_i386/bootm.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger@sysgo.de> - * - * Copyright (C) 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#include <common.h> -#include <command.h> -#include <image.h> -#include <u-boot/zlib.h> -#include <asm/byteorder.h> -#include <asm/zimage.h> - -/*cmd_boot.c*/ -int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) -{ - void *base_ptr; - ulong os_data, os_len; - image_header_t *hdr; - -#if defined(CONFIG_FIT) - const void *data; - 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)) { - /* if multi-part image, we need to get first subimage */ - image_multi_getimg (hdr, 0, &os_data, &os_len); - } else { - /* otherwise get image data */ - os_data = image_get_data (hdr); - os_len = image_get_data_size (hdr); - } -#if defined(CONFIG_FIT) - } else if (images->fit_uname_os) { - ret = fit_image_get_data (images->fit_hdr_os, - images->fit_noffset_os, &data, &len); - if (ret) { - puts ("Can't get image data/size!\n"); - goto error; - } - os_data = (ulong)data; - os_len = (ulong)len; -#endif - } else { - puts ("Could not find kernel image!\n"); - goto error; - } - - base_ptr = load_zimage ((void*)os_data, os_len, - images->rd_start, images->rd_end - images->rd_start, 0); - - if (NULL == base_ptr) { - printf ("## Kernel loading failed ...\n"); - goto error; - - } - -#ifdef DEBUG - printf ("## Transferring control to Linux (at address %08x) ...\n", - (u32)base_ptr); -#endif - - /* we assume that the kernel is in place */ - printf("\nStarting kernel ...\n\n"); - - boot_zimage(base_ptr); - /* does not return */ - -error: - return 1; -} |