sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

bootm: Simplify initrd address handling 

data.initrd_address = UIMAGE_SOME_ADDRESS;
	...
	if (-L was given to bootm)
		data.initrd_address = address_provided_to_-L;
	...
	if (initrd is provided as uInitrd && data.initrd_address == UIMAGE_SOME_ADDRESS)
		data.initrd_address = load_address_from_uInitrd;
	...
	if (data.initrd_address == UIMAGE_SOME_ADDRESS)
		data.initrd_address = UIMAGE_INVALID_ADDRESS;

can be simplified to:

	data.initrd_address = UIMAGE_INVALID_ADDRESS;
	...
	if (-L was given to bootm)
		data.initrd_address = address_provided_to_-L;
	...
	if (initrd is provided as uInitrd && data.initrd_address == UIMAGE_INVALID_ADDRESS)
		data.initrd_address = load_address_from_uInitrd;
	...

The only change introduced by this simplification is for cases where the
user passes -L UIMAGE_SOME_ADDRESS or -L UIMAGE_INVALID_ADDRESS to
bootm. (-L UIMAGE_SOME_ADDRESS is now used literally instead of ignored
before. -L UIMAGE_INVALID_ADDRESS used to skip getting the
initrd-address from the uInitrd, now the uInitrd address is honored.)

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2013-05-02 11:07:11 +02:00 committed by Sascha Hauer
parent 7c15fd1b09
commit ce9163ae34
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commands/bootm.c
View File

@ -127,7 +127,7 @@ static int bootm_open_initrd_uimage(struct image_data *data)
data->initrd = data->os;
}
if (data->initrd_address == UIMAGE_SOME_ADDRESS)
if (data->initrd_address == UIMAGE_INVALID_ADDRESS)
data->initrd_address = data->initrd->header.ih_load;
return 0;
@ -256,7 +256,7 @@ static int do_bootm(int argc, char *argv[])
memset(&data, 0, sizeof(struct image_data));
data.initrd_address = UIMAGE_SOME_ADDRESS;
data.initrd_address = UIMAGE_INVALID_ADDRESS;
data.os_address = UIMAGE_SOME_ADDRESS;
data.verify = 0;
data.verbose = 0;
@ -408,8 +408,6 @@ static int do_bootm(int argc, char *argv[])
#endif
if (data.os_address == UIMAGE_SOME_ADDRESS)
data.os_address = UIMAGE_INVALID_ADDRESS;
if (data.initrd_address == UIMAGE_SOME_ADDRESS)
data.initrd_address = UIMAGE_INVALID_ADDRESS;
handler = bootm_find_handler(os_type, &data);
if (!handler) {