summaryrefslogtreecommitdiffstats
path: root/commands/bootm.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-05-02 11:07:12 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-05-04 11:06:30 +0200
commit88a012b9e14680149c0c970193e082fb5cf90157 (patch)
tree9ee881d5e400e09264d4c8e30ea66241148675e8 /commands/bootm.c
parentce9163ae34cfec84206d3ae0bbd4b263323cc80c (diff)
downloadbarebox-88a012b9e14680149c0c970193e082fb5cf90157.tar.gz
barebox-88a012b9e14680149c0c970193e082fb5cf90157.tar.xz
Don't honor initrd load address
U-Boot doesn't honor the load address specified in an initrd. Barebox shouldn't be more strict here. This unbreaks booting an uInitrd generated by Debian's flash-kernel that uses 0 as entry address where there is nothing on the i.MX53 that was used. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/bootm.c')
-rw-r--r--commands/bootm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/commands/bootm.c b/commands/bootm.c
index bb44776afd..5dd1703538 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -127,9 +127,6 @@ static int bootm_open_initrd_uimage(struct image_data *data)
data->initrd = data->os;
}
- if (data->initrd_address == UIMAGE_INVALID_ADDRESS)
- data->initrd_address = data->initrd->header.ih_load;
-
return 0;
}