diff --git a/common/console.c b/common/console.c
index 3a57716db3..cebfd573c9 100644
--- a/common/console.c
+++ b/common/console.c
@@ -227,36 +227,19 @@ void console_task(void)
 static int command_help(int argc, char **argv)
 {
 	const int ncmds = __cmds_end - __cmds;
-	int i, j, cols, rows;
-	unsigned char indices[ncmds];
-
-	/* Initialize the index. */
-	for (i = 0; i < ncmds; i++)
-		indices[i] = i;
-
-	/* Bubble sort commands by name. */
-	for (i = 0; i < (ncmds - 1); i++) {
-		for (j = i + 1; j < ncmds; j++) {
-			if (strcasecmp(__cmds[indices[i]].name,
-				       __cmds[indices[j]].name) > 0) {
-				int tmp = indices[j];
-				indices[j] = indices[i];
-				indices[i] = tmp;
-			}
-		}
-	}
+	const int cols = 5;  /* printing in five columns */
+	const int rows = (ncmds + cols - 1) / cols;
+	int i, j;
 
 	ccputs("Known commands:\n");
 
-	cols = 5;  /* printing in five columns */
-	rows = (ncmds + 1) / cols;
 	for (i = 0; i < rows; i++) {
 		ccputs("  ");
 		for (j = 0; j < cols; j++) {
 			int index = j * rows + i;
 			if (index >= ncmds)
 				break;
-			ccprintf("%-15s", __cmds[indices[index]].name);
+			ccprintf("%-15s", __cmds[index].name);
 		}
 		ccputs("\n");
 		cflush();
diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S
index 8bb4997dfc..75d056b1fd 100644
--- a/core/cortex-m/ec.lds.S
+++ b/core/cortex-m/ec.lds.S
@@ -38,7 +38,7 @@ SECTIONS
 
         . = ALIGN(4);
         __cmds = .;
-        *(.rodata.cmds)
+        *(SORT(.rodata.cmds*))
         __cmds_end = .;
 
         . = ALIGN(4);
diff --git a/include/console.h b/include/console.h
index c2785cc545..4a655387da 100644
--- a/include/console.h
+++ b/include/console.h
@@ -83,7 +83,7 @@ void console_has_input(void);
 #define DECLARE_CONSOLE_COMMAND(name, routine)			\
 	static const char __con_cmd_label_##name[] = #name;	\
 	const struct console_command __con_cmd_##name		\
-		__attribute__((section(".rodata.cmds")))	\
+		__attribute__((section(".rodata.cmds." #name)))	\
 		= {__con_cmd_label_##name, routine}
 
 #endif  /* __CROS_EC_CONSOLE_H */