minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-11 21:18:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

bootm: move lmb into the bootm_headers_t structure

Browse Source 
To allow for persistent state between future bootm subcommands we
need the lmb to exist in a global state.
Moving it into the bootm_headers_t allows us to do that.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2008-08-15 08:24:40 -05:00 committed by Wolfgang Denk
parent 54f9c86691
commit e906cfae08
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/cmd_bootm.c
View File

@ -168,20 +168,17 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
phys_size_t mem_size; phys_size_t mem_size;
int ret; int ret;
struct lmb lmb;
memset ((void *)&images, 0, sizeof (images)); memset ((void *)&images, 0, sizeof (images));
images.verify = getenv_yesno ("verify"); images.verify = getenv_yesno ("verify");
images.lmb = &lmb;
lmb_init(&lmb); lmb_init(&images.lmb);
mem_start = getenv_bootm_low(); mem_start = getenv_bootm_low();
mem_size = getenv_bootm_size(); mem_size = getenv_bootm_size();
lmb_add(&lmb, (phys_addr_t)mem_start, mem_size); lmb_add(&images.lmb, (phys_addr_t)mem_start, mem_size);
board_lmb_reserve(&lmb); board_lmb_reserve(&images.lmb);
/* get kernel image header, start address and length */ /* get kernel image header, start address and length */
os_hdr = boot_get_kernel (cmdtp, flag, argc, argv, os_hdr = boot_get_kernel (cmdtp, flag, argc, argv,
@ -387,7 +384,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
show_boot_progress (8); show_boot_progress (8);
lmb_reserve(&lmb, load_start, (load_end - load_start)); lmb_reserve(&images.lmb, load_start, (load_end - load_start));
switch (os) { switch (os) {
default: /* handled by (original) Linux case */ default: /* handled by (original) Linux case */

4
include/image.h
View File

@ -229,7 +229,9 @@ typedef struct bootm_headers {
ulong ft_len; /* length of flat device tree */ ulong ft_len; /* length of flat device tree */
int verify; /* getenv("verify")[0] != 'n' */ int verify; /* getenv("verify")[0] != 'n' */
struct lmb *lmb; /* for memory mgmt */ #ifndef USE_HOSTCC
struct lmb lmb; /* for memory mgmt */
#endif
} bootm_headers_t; } bootm_headers_t;
/* /*

2
lib_m68k/bootm.c
View File

@ -58,7 +58,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
ulong bootmap_base; ulong bootmap_base;
bd_t *kbd; bd_t *kbd;
void (*kernel) (bd_t *, ulong, ulong, ulong, ulong); void (*kernel) (bd_t *, ulong, ulong, ulong, ulong);
struct lmb *lmb = images->lmb; struct lmb *lmb = &images->lmb;
bootmap_base = getenv_bootm_low(); bootmap_base = getenv_bootm_low();

2
lib_ppc/bootm.c
View File

@ -73,7 +73,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
ulong r7, ulong r8, ulong r9); ulong r7, ulong r8, ulong r9);
int ret; int ret;
ulong of_size = images->ft_len; ulong of_size = images->ft_len;
struct lmb *lmb = images->lmb; struct lmb *lmb = &images->lmb;
#if defined(CONFIG_OF_LIBFDT) #if defined(CONFIG_OF_LIBFDT)
char *of_flat_tree = images->ft_addr; char *of_flat_tree = images->ft_addr;

2
lib_sparc/bootm.c
View File

@ -93,7 +93,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
unsigned int data, len, checksum; unsigned int data, len, checksum;
unsigned int initrd_addr, kernend; unsigned int initrd_addr, kernend;
void (*kernel) (struct linux_romvec *, void *); void (*kernel) (struct linux_romvec *, void *);
struct lmb *lmb = images->lmb; struct lmb *lmb = &images->lmb;
int ret; int ret;
if (images->legacy_hdr_valid) { if (images->legacy_hdr_valid) {