summaryrefslogtreecommitdiffstats
path: root/common/bootm.c
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2016-02-12 17:58:23 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-02-15 07:32:35 +0100
commit1a180cd3b6e5c067c68f3e09f7e15e5b18af9761 (patch)
treefe1ef4fb1e6d5e9858f218e820249fafd90cd4a1 /common/bootm.c
parentb80ff0f03554510826e4dd2954fbc21e9ab89fbc (diff)
downloadbarebox-1a180cd3b6e5c067c68f3e09f7e15e5b18af9761.tar.gz
bootm: parse initrd and oftree into correct struct members
The code parsing the oftree and initrd file names is clearly wrong, leading to bootm not loading oftree or initrd files any more. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/bootm.c')
-rw-r--r--common/bootm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/bootm.c b/common/bootm.c
index c046c7e..052cffa 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -505,8 +505,8 @@ int bootm_boot(struct bootm_data *bootm_data)
data = xzalloc(sizeof(*data));
bootm_image_name_and_part(bootm_data->os_file, &data->os_file, &data->os_part);
- bootm_image_name_and_part(bootm_data->oftree_file, &data->oftree_part, &data->os_part);
- bootm_image_name_and_part(bootm_data->initrd_file, &data->initrd_part, &data->os_part);
+ bootm_image_name_and_part(bootm_data->oftree_file, &data->oftree_file, &data->oftree_part);
+ bootm_image_name_and_part(bootm_data->initrd_file, &data->initrd_file, &data->initrd_part);
data->verbose = bootm_data->verbose;
data->verify = bootm_data->verify;
data->force = bootm_data->force;