summaryrefslogtreecommitdiffstats
path: root/common/bootm.c
diff options
context:
space:
mode:
authorJan Remmet <j.remmet@phytec.de>2015-11-19 13:58:23 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-11-20 08:35:18 +0100
commit5ec644e7d8a3523d2890f3f93ad6c7b8d37b707a (patch)
treebac5b706c0eda66eb28a19c880a91dfbc7fd5fa8 /common/bootm.c
parent33060cc67543c2b1f1656cd9ec94ed43df0f3b84 (diff)
downloadbarebox-5ec644e7d8a3523d2890f3f93ad6c7b8d37b707a.tar.gz
bootm: cleanup bootm_open_oftree
Separate oftree file and uimage oftree handling. Make fie_type checks in bootm_boot Signed-off-by: Jan Remmet <j.remmet@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/bootm.c')
-rw-r--r--common/bootm.c82
1 files changed, 54 insertions, 28 deletions
diff --git a/common/bootm.c b/common/bootm.c
index 447c9b6..ec1758b 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -245,25 +245,19 @@ static int bootm_open_initrd_uimage(struct image_data *data)
return 0;
}
-static int bootm_open_oftree(struct image_data *data, const char *oftree, int num)
+static int bootm_open_oftree_uimage(struct image_data *data)
{
- enum filetype ft;
struct fdt_header *fdt;
+ enum filetype ft;
+ const char *oftree = data->oftree_file;
+ int num = data->oftree_num;
+ struct uimage_handle *of_handle;
+ int release = 0;
size_t size;
- printf("Loading devicetree from '%s'\n", oftree);
-
- ft = file_name_detect_type(oftree);
- if ((int)ft < 0) {
- printf("failed to open %s: %s\n", oftree, strerror(-(int)ft));
- return ft;
- }
-
- if (ft == filetype_uimage) {
-#ifdef CONFIG_CMD_BOOTM_OFTREE_UIMAGE
- struct uimage_handle *of_handle;
- int release = 0;
+ printf("Loading devicetree from '%s'@%d\n", oftree, num);
+ if (IS_ENABLED(CONFIG_CMD_BOOTM_OFTREE_UIMAGE)) {
if (!strcmp(data->os_file, oftree)) {
of_handle = data->os;
} else if (!strcmp(data->initrd_file, oftree)) {
@@ -280,23 +274,42 @@ static int bootm_open_oftree(struct image_data *data, const char *oftree, int nu
if (release)
uimage_close(of_handle);
-#else
- return -EINVAL;
-#endif
- } else {
- fdt = read_file(oftree, &size);
- if (!fdt) {
- perror("open");
- return -ENODEV;
+
+ ft = file_detect_type(fdt, size);
+ if (ft != filetype_oftree) {
+ printf("%s is not an oftree but %s\n",
+ data->oftree_file, file_type_to_string(ft));
+ return -EINVAL;
}
- }
- ft = file_detect_type(fdt, size);
- if (ft != filetype_oftree) {
- printf("%s is not an oftree but %s\n", oftree,
- file_type_to_string(ft));
+ data->of_root_node = of_unflatten_dtb(fdt);
+ if (!data->of_root_node) {
+ pr_err("unable to unflatten devicetree\n");
+ free(fdt);
+ return -EINVAL;
+ }
+
+ free(fdt);
+
+ return 0;
+ } else {
return -EINVAL;
}
+}
+
+static int bootm_open_oftree(struct image_data *data)
+{
+ struct fdt_header *fdt;
+ const char *oftree = data->oftree_file;
+ size_t size;
+
+ printf("Loading devicetree from '%s'\n", oftree);
+
+ fdt = read_file(oftree, &size);
+ if (!fdt) {
+ perror("open");
+ return -ENODEV;
+ }
data->of_root_node = of_unflatten_dtb(fdt);
if (!data->of_root_node) {
@@ -368,6 +381,7 @@ int bootm_boot(struct bootm_data *bootm_data)
struct image_handler *handler;
int ret;
enum filetype os_type, initrd_type = filetype_unknown;
+ enum filetype oftree_type = filetype_unknown;
if (!bootm_data->os_file) {
printf("no image given\n");
@@ -438,7 +452,19 @@ int bootm_boot(struct bootm_data *bootm_data)
if (IS_ENABLED(CONFIG_OFTREE)) {
if (data->oftree_file) {
- ret = bootm_open_oftree(data, data->oftree_file, data->oftree_num);
+ oftree_type = file_name_detect_type(data->oftree_file);
+
+ if (oftree_type == filetype_uimage)
+ ret = bootm_open_oftree_uimage(data);
+ if (oftree_type == filetype_oftree)
+ ret = bootm_open_oftree(data);
+ if ((int)oftree_type < 0) {
+ printf("could not open %s: %s\n",
+ data->oftree_file,
+ strerror(-oftree_type));
+ ret = (int) oftree_type;
+ }
+
if (ret)
goto err_out;
} else {