Skip to contentSkip to conversation

Add --dtb option to ppc64

RFC Applied Geoff Levand 2 participants 2 messages Apr 15, 2013 – Apr 16, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

RFC 1/1 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.

---
Hi All,

This consistency in option names will make it easier for platform independent scripts and kexec front ends like petitboot.

I haven't yet tested this on ppc64, but if someone can do that before I find some time I certainly would be grateful.

-Geoff

 kexec/arch/ppc64/include/arch/options.h |    1 +
 kexec/arch/ppc64/kexec-elf-ppc64.c      |    2 ++
 2 files changed, 3 insertions(+)
kexec/arch/ppc64/include/arch/options.h +1 -0
index 8f11c83..4ad9b75 100644
@@ -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
kexec/arch/ppc64/kexec-elf-ppc64.c +2 -0
index f68f2bc..9a0e69a 100644
@@ -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");
 }

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec