diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-06 08:50:44 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-15 08:33:20 +0200 |
commit | ed13dd918d597afd5bcce30d4dce66174435af55 (patch) | |
tree | 85de2dad476be26e8f705b2284675defa05456cf | |
parent | 720072d0ef6dca3415d3dd445d461dcad0e111cd (diff) | |
download | barebox-ed13dd918d597afd5bcce30d4dce66174435af55.tar.gz barebox-ed13dd918d597afd5bcce30d4dce66174435af55.tar.xz |
bootm: Drop data->oftree
It's no longer necessary to store the devicetree pointer in struct
image_data, it can be replaced with a local variable.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | common/bootm.c | 6 | ||||
-rw-r--r-- | include/bootm.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/common/bootm.c b/common/bootm.c index 5ff6683fe7..8167c3a603 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -337,9 +337,6 @@ int bootm_load_devicetree(struct image_data *data, unsigned long load_address) struct fdt_header *oftree; int ret; - if (data->oftree) - return 0; - if (!IS_ENABLED(CONFIG_OFTREE)) return 0; @@ -431,8 +428,6 @@ int bootm_load_devicetree(struct image_data *data, unsigned long load_address) if (bootm_verbose(data) > 1) of_print_nodes(data->of_root_node, 0); - data->oftree = oftree; - return 0; } @@ -576,7 +571,6 @@ int bootm_boot(struct bootm_data *bootm_data) * When we only allow booting signed images make sure everything * we boot is in the OS image and not given separately. */ - data->oftree = NULL; data->oftree_file = NULL; data->initrd_file = NULL; if (os_type != filetype_oftree) { diff --git a/include/bootm.h b/include/bootm.h index 62951d6058..03779772c4 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -78,7 +78,6 @@ struct image_data { void *fit_config; struct device_node *of_root_node; - struct fdt_header *oftree; struct resource *oftree_res; /* |