diff options
| author | Geoff Levand <geoff@infradead.org> | 2013-04-15 12:40:36 -0700 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2013-04-16 11:44:33 +0900 |
| commit | 7330fdfff8cf9122df6904b529d0870a49d56deb (patch) | |
| tree | c5e9154360fe6f1e9dd916ea9eb30b7021c9be6a /kexec | |
| parent | b6e1a672bb69420bb0af61bcfa862f4af485ff88 (diff) | |
Add --dtb option to ppc64
All other architectures use the command line option --dtb to pass
a dtb file name. For consistency add that option to ppc64.
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec')
| -rw-r--r-- | kexec/arch/ppc64/include/arch/options.h | 1 | ||||
| -rw-r--r-- | kexec/arch/ppc64/kexec-elf-ppc64.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/kexec/arch/ppc64/include/arch/options.h b/kexec/arch/ppc64/include/arch/options.h index 8f11c83..4ad9b75 100644 --- a/kexec/arch/ppc64/include/arch/options.h +++ b/kexec/arch/ppc64/include/arch/options.h @@ -38,6 +38,7 @@ { "ramdisk", 1, NULL, OPT_RAMDISK }, \ { "initrd", 1, NULL, OPT_RAMDISK }, \ { "devicetreeblob", 1, NULL, OPT_DEVICETREEBLOB }, \ + { "dtb", 1, NULL, OPT_DEVICETREEBLOB }, \ { "args-linux", 0, NULL, OPT_ARGS_IGNORE }, #define KEXEC_ALL_OPT_STR KEXEC_OPT_STR diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c index f68f2bc..9a0e69a 100644 --- a/kexec/arch/ppc64/kexec-elf-ppc64.c +++ b/kexec/arch/ppc64/kexec-elf-ppc64.c @@ -101,6 +101,7 @@ int elf_ppc64_load(int argc, char **argv, const char *buf, off_t len, { "ramdisk", 1, NULL, OPT_RAMDISK }, { "initrd", 1, NULL, OPT_RAMDISK }, { "devicetreeblob", 1, NULL, OPT_DEVICETREEBLOB }, + { "dtb", 1, NULL, OPT_DEVICETREEBLOB }, { "args-linux", 0, NULL, OPT_ARGS_IGNORE }, { 0, 0, NULL, 0 }, }; @@ -345,6 +346,7 @@ void elf_ppc64_usage(void) fprintf(stderr, " --ramdisk=<filename> Initial RAM disk.\n"); fprintf(stderr, " --initrd=<filename> same as --ramdisk.\n"); fprintf(stderr, " --devicetreeblob=<filename> Specify device tree blob file.\n"); + fprintf(stderr, " --dtb=<filename> same as --devicetreeblob.\n"); fprintf(stderr, "elf support is still broken\n"); } |