summaryrefslogtreecommitdiff
path: root/kexec/arch/arm/kexec-zImage-arm.c
diff options
context:
space:
mode:
authorDave Young <dyoung@redhat.com>2015-11-23 15:04:23 +0800
committerSimon Horman <horms@verge.net.au>2015-11-24 16:04:10 +0900
commit4bad06c3cd2a989459458eadd78c703ac5a3b8b6 (patch)
tree751d05ca599529d1c4eb1174777e5d5725812b3d /kexec/arch/arm/kexec-zImage-arm.c
parent4580c372000b469c4292e548c806dfe5922e97d1 (diff)
arm: use /sys/firmware/fdt in case without --atags and --dtb
Latest linux kernel will create /sys/firmware/fdt file. It will be convenient to use it in case one does not specify --atags and --dtb options. Signed-off-by: Dave Young <dyoung@redhat.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/arch/arm/kexec-zImage-arm.c')
-rw-r--r--kexec/arch/arm/kexec-zImage-arm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c
index d5b8ab4..d85ab9b 100644
--- a/kexec/arch/arm/kexec-zImage-arm.c
+++ b/kexec/arch/arm/kexec-zImage-arm.c
@@ -396,6 +396,14 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
return -1;
}
+ if (!use_atags && !dtb_file) {
+ int f;
+
+ f = have_sysfs_fdt();
+ if (f)
+ dtb_file = SYSFS_FDT;
+ }
+
if (command_line) {
command_line_len = strlen(command_line) + 1;
if (command_line_len > COMMAND_LINE_SIZE)