From: Simon Glass <sjg@chromium.org>
Date: Tue, 23 Feb 2016 05:55:35 +0000 (-0700)
Subject: mkimage: Sort the option processing code by option
X-Git-Tag: v2016.05-rc1~487
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0745008145e0a30db06b21533512893ba0f706a2;p=oweals%2Fu-boot.git

mkimage: Sort the option processing code by option

Adjust the code so that option alphabetical order matches the order in the
switch() statement. This makes it easier to find options.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/mkimage.c b/tools/mkimage.c
index f0cc53d423..89d3c97ff7 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -75,8 +75,13 @@ static void process_args(int argc, char **argv)
 	while ((opt = getopt(argc, argv,
 			     "a:A:cC:d:D:e:f:Fk:K:ln:O:rR:sT:vVx")) != -1) {
 		switch (opt) {
-		case 'l':
-			params.lflag = 1;
+		case 'a':
+			params.addr = strtoull(optarg, &ptr, 16);
+			if (*ptr) {
+				fprintf(stderr, "%s: invalid load address %s\n",
+					params.cmdname, optarg);
+				exit(EXIT_FAILURE);
+			}
 			break;
 		case 'A':
 			params.arch = genimg_get_arch_id(optarg);
@@ -91,33 +96,13 @@ static void process_args(int argc, char **argv)
 			if (params.comp < 0)
 				usage();
 			break;
-		case 'D':
-			params.dtc = optarg;
-			break;
-		case 'O':
-			params.os = genimg_get_os_id(optarg);
-			if (params.os < 0)
-				usage();
-			break;
-		case 'T':
-			params.type = genimg_get_type_id(optarg);
-			if (params.type < 0) {
-				show_image_types();
-				usage();
-			}
-			break;
-		case 'a':
-			params.addr = strtoull(optarg, &ptr, 16);
-			if (*ptr) {
-				fprintf(stderr, "%s: invalid load address %s\n",
-					params.cmdname, optarg);
-				exit(EXIT_FAILURE);
-			}
-			break;
 		case 'd':
 			params.datafile = optarg;
 			params.dflag = 1;
 			break;
+		case 'D':
+			params.dtc = optarg;
+			break;
 		case 'e':
 			params.ep = strtoull(optarg, &ptr, 16);
 			if (*ptr) {
@@ -144,9 +129,17 @@ static void process_args(int argc, char **argv)
 		case 'K':
 			params.keydest = optarg;
 			break;
+		case 'l':
+			params.lflag = 1;
+			break;
 		case 'n':
 			params.imagename = optarg;
 			break;
+		case 'O':
+			params.os = genimg_get_os_id(optarg);
+			if (params.os < 0)
+				usage();
+			break;
 		case 'r':
 			params.require_keys = 1;
 			break;
@@ -160,6 +153,13 @@ static void process_args(int argc, char **argv)
 		case 's':
 			params.skipcpy = 1;
 			break;
+		case 'T':
+			params.type = genimg_get_type_id(optarg);
+			if (params.type < 0) {
+				show_image_types();
+				usage();
+			}
+			break;
 		case 'v':
 			params.vflag++;
 			break;