[PATCH v3] arm: redefine OPT_APPEND and OPT_RAMDISK

[Łukasz Stelmach <l.stelmach@xxxxxxxxxxx>]

Redefine OPT_APPEND to avoid clash with OPT_KEXEC_SYSCALL_AUTO.
Redefine OPT_RAMDISK to avoid such problems in the future

Minor cleanup in HPPA too.

Signed-off-by: Łukasz Stelmach <l.stelmach@xxxxxxxxxxx>
---
Sven,

I removed some arch specific short options which to me don't seem
be handled in the getopt_long() loop in kexec-elf-hppa.c. Please tell us,
if it doesn't break anything.

Kind regards,
ŁS

 kexec/arch/arm/include/arch/options.h  | 6 +++---
 kexec/arch/arm/kexec-zImage-arm.c      | 2 +-
 kexec/arch/hppa/include/arch/options.h | 2 +-
 kexec/arch/hppa/kexec-elf-hppa.c       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kexec/arch/arm/include/arch/options.h b/kexec/arch/arm/include/arch/options.h
index abbf349..6fabfb7 100644
--- a/kexec/arch/arm/include/arch/options.h
+++ b/kexec/arch/arm/include/arch/options.h
@@ -4,12 +4,12 @@
 #define OPT_DT_NO_OLD_ROOT	(OPT_MAX+0)
 #define OPT_ARCH_MAX		(OPT_MAX+1)
 
-#define OPT_APPEND	'a'
-#define OPT_RAMDISK	'r'
 #define OPT_DTB		(OPT_ARCH_MAX+0)
 #define OPT_ATAGS	(OPT_ARCH_MAX+1)
 #define OPT_IMAGE_SIZE	(OPT_ARCH_MAX+2)
 #define OPT_PAGE_OFFSET	(OPT_ARCH_MAX+3)
+#define OPT_APPEND	(OPT_ARCH_MAX+4)
+#define OPT_RAMDISK	(OPT_ARCH_MAX+5)
 
 /* Options relevant to the architecture (excluding loader-specific ones),
  * in this case none:
@@ -45,7 +45,7 @@
 	{ "image-size",		1, 0, OPT_IMAGE_SIZE }, \
 	{ "page-offset",	1, 0, OPT_PAGE_OFFSET },
 
-#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR "a:r:s:"
+#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR ""
 
 extern unsigned int kexec_arm_image_size;
 
diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c
index 9845925..ff609e2 100644
--- a/kexec/arch/arm/kexec-zImage-arm.c
+++ b/kexec/arch/arm/kexec-zImage-arm.c
@@ -409,7 +409,7 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
 		{ "page-offset",	1, 0, OPT_PAGE_OFFSET },
 		{ 0, 			0, 0, 0 },
 	};
-	static const char short_options[] = KEXEC_ARCH_OPT_STR "a:r:";
+	static const char short_options[] = KEXEC_ARCH_OPT_STR "";
 
 	/*
 	 * Parse the command line arguments
diff --git a/kexec/arch/hppa/include/arch/options.h b/kexec/arch/hppa/include/arch/options.h
index a936140..e9deb51 100644
--- a/kexec/arch/hppa/include/arch/options.h
+++ b/kexec/arch/hppa/include/arch/options.h
@@ -17,7 +17,7 @@
 	{ "ramdisk",		1, 0, OPT_RAMDISK },
 
 
-#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR "a:r:s:"
+#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR ""
 
 /* See the other architectures for details of these; HPPA has no
  * loader-specific options yet.
diff --git a/kexec/arch/hppa/kexec-elf-hppa.c b/kexec/arch/hppa/kexec-elf-hppa.c
index d3ef0e9..474a919 100644
--- a/kexec/arch/hppa/kexec-elf-hppa.c
+++ b/kexec/arch/hppa/kexec-elf-hppa.c
@@ -76,7 +76,7 @@ int elf_hppa_load(int argc, char **argv, const char *buf, off_t len,
 		{ 0,                    0, NULL, 0 },
 	};
 
-	static const char short_options[] = KEXEC_ALL_OPT_STR "d";
+	static const char short_options[] = KEXEC_ALL_OPT_STR;
 
 	while ((opt = getopt_long(argc, argv, short_options, options, 0)) !=
 		-1) {
-- 
2.25.0


_______________________________________________
kexec mailing list
kexec@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/kexec