projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
microblaze: Enable hardware exception by default
[oweals/u-boot.git]
/
common
/
image-fdt.c
diff --git
a/common/image-fdt.c
b/common/image-fdt.c
index 8db3ccb4e7404b5b1f4f0bfca22998414157e0bc..e3f06cdd1a28406e8a1a2613d543b71c27d44942 100644
(file)
--- a/
common/image-fdt.c
+++ b/
common/image-fdt.c
@@
-237,6
+237,7
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
int fdt_noffset;
#endif
const char *select = NULL;
int fdt_noffset;
#endif
const char *select = NULL;
+ int ok_no_fdt = 0;
*of_flat_tree = NULL;
*of_size = 0;
*of_flat_tree = NULL;
*of_size = 0;
@@
-309,7
+310,7
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
fdt_addr);
fdt_hdr = image_get_fdt(fdt_addr);
if (!fdt_hdr)
fdt_addr);
fdt_hdr = image_get_fdt(fdt_addr);
if (!fdt_hdr)
- goto
error
;
+ goto
no_fdt
;
/*
* move image data to the load address,
/*
* move image data to the load address,
@@
-379,7
+380,7
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
break;
default:
puts("ERROR: Did not find a cmdline Flattened Device Tree\n");
break;
default:
puts("ERROR: Did not find a cmdline Flattened Device Tree\n");
- goto
error
;
+ goto
no_fdt
;
}
printf(" Booting using the fdt blob at %#08lx\n", fdt_addr);
}
printf(" Booting using the fdt blob at %#08lx\n", fdt_addr);
@@
-413,11
+414,11
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
}
} else {
debug("## No Flattened Device Tree\n");
}
} else {
debug("## No Flattened Device Tree\n");
-
return 0
;
+
goto no_fdt
;
}
} else {
debug("## No Flattened Device Tree\n");
}
} else {
debug("## No Flattened Device Tree\n");
-
return 0
;
+
goto no_fdt
;
}
*of_flat_tree = fdt_blob;
}
*of_flat_tree = fdt_blob;
@@
-427,9
+428,15
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
return 0;
return 0;
+no_fdt:
+ ok_no_fdt = 1;
error:
*of_flat_tree = NULL;
*of_size = 0;
error:
*of_flat_tree = NULL;
*of_size = 0;
+ if (!select && ok_no_fdt) {
+ debug("Continuing to boot without FDT\n");
+ return 0;
+ }
return 1;
}
return 1;
}