Skip to contentSkip to conversation

Boot from the bootable paritions

PATCH Superseded Sjoerd Simons 3 participants 10 messages Feb 25, 2015 – Mar 25, 2015

lore
Share & tools
lore
#0 lore raw

v2 cover Boot from the bootable paritions

In the discussion after the submission of the "Let the distro boot command scan all partitions" patchset it became clear the general consensus was that u-boot should not simply scan all partitions but instead only partitions with the bootable flag set, falling back to parition 1 as was previously done.

This set of patches implements that

Changes since v1:
* Make updated part list command more precise about what arguments ordering it accepts.

Sjoerd Simons (3):
part: Add support for list filtering on bootable partitions config_cmd_default.h: Add 'env exists' command config_distro_bootcmd.h: Prefer booting from bootable paritions

 common/cmd_part.c               | 53 +++++++++++++++++++++++++++++++----------
 include/config_cmd_default.h    |  1 +
 include/config_distro_bootcmd.h |  3 ++-
 3 files changed, 44 insertions(+), 13 deletions(-)
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/3 part: Add support for list filtering on bootable partitions

Add an optional -bootable parameter to the part list commands to only put the list of bootable partitions in the environment variable

---
 common/cmd_part.c | 53 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 12 deletions(-)

Changes since v1:
* Be more specific about the arguments ordering that is accepted

common/cmd_part.c +41 -12
index c99f527..d04588e 100644
@@ -53,29 +53,57 @@ static int do_part_list(int argc, char * const argv[])
 {
 	int ret;
 	block_dev_desc_t *desc;
+	char *var = NULL;
+	bool bootable = false;
+	int i;
 
-	if (argc < 2 || argc > 3)
+	if (argc < 2)
 		return CMD_RET_USAGE;
 
+	if (argc > 2) {
+		for (i = 2; i < argc ; i++) {
+			if (argv[i][0] == '-') {
+				if (!strcmp(argv[i], "-bootable")) {
+					bootable = true;
+				} else {
+					printf("Unknown option %s\n", argv[i]);
+					return CMD_RET_USAGE;
+				}
+			} else {
+				var = argv[i];
+				break;
+			}
+		}
+
+		/* Loops should have been exited@the last argument, which
+		 * as it contained the variable */
+		if (argc != i + 1)
+			return CMD_RET_USAGE;
+	}
+
 	ret = get_device(argv[0], argv[1], &desc);
 	if (ret < 0)
 		return 1;
 
-	if (argc == 3) {
+	if (var != NULL) {
 		int p;
-		char str[512] = { 0, };
+		char str[512] = { '\0', };
 	  disk_partition_t info;
 
 		for (p = 1; p < 128; p++) {
+			char t[5];
 			int r = get_partition_info(desc, p, &info);
 
-			if (r == 0) {
-				char t[5];
-				sprintf(t, "%s%d", str[0] ? " " : "", p);
-				strcat(str, t);
-			}
+			if (r != 0)
+				continue;
+
+			if (bootable && !info.bootable)
+				continue;
+
+			sprintf(t, "%s%d", str[0] ? " " : "", p);
+			strcat(str, t);
 		}
-		setenv(argv[2], str);
+		setenv(var, str);
 		return 0;
 	}
 
@@ -98,7 +126,7 @@ static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 }
 
 U_BOOT_CMD(
-	part,	5,	1,	do_part,
+	part,	CONFIG_SYS_MAXARGS,	1,	do_part,
 	"disk partition related commands",
 	"part uuid <interface> <dev>:<part>\n"
 	"    - print partition UUID\n"
@@ -106,6 +134,7 @@ U_BOOT_CMD(
 	"    - set environment variable to partition UUID\n"
 	"part list <interface> <dev>\n"
 	"    - print a device's partition table\n"
-	"part list <interface> <dev> <varname>\n"
-	"    - set environment variable to the list of partitions"
+	"part list <interface> <dev> [flags] <varname>\n"
+	"    - set environment variable to the list of partitions\n"
+	"      flags can be -bootable (list only bootable partitions)"
 );
Signature · 1 line
2.1.4
#2 lore raw

PATCH v2 1/3 part: Add support for list filtering on bootable partitions

Quoted 4 lines · Sjoerd Simons

Add an optional -bootable parameter to the part list commands to only put the list of bootable partitions in the environment variable

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150325/836f6d53/attachment.sig>
#3 lore raw

PATCH v2 2/3 config_cmd_default.h: Add 'env exists' command

In reply to Sjoerd Simons

env exists allows scripts to query whether an environment variable exists. Enable by default as it adds only a trivial amount of code and can be useful in scripts.

---
 include/config_cmd_default.h | 1 +
 1 file changed, 1 insertion(+)

Changes since v1:
* no changes

include/config_cmd_default.h +1 -0
index 73c9544..e79a13b 100644
@@ -21,6 +21,7 @@
 #define CONFIG_CMD_CONSOLE	/* coninfo			*/
 #define CONFIG_CMD_ECHO		/* echo arguments		*/
 #define CONFIG_CMD_EDITENV	/* editenv			*/
+#define CONFIG_CMD_ENV_EXISTS	/* query whether env variables exists */
 #define CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #define CONFIG_CMD_IMI		/* iminfo			*/
 #define CONFIG_CMD_ITEST	/* Integer (and string) test	*/
Signature · 1 line
2.1.4
#4 lore raw

PATCH v2 2/3 config_cmd_default.h: Add 'env exists' command

Quoted 6 lines · Sjoerd Simons

env exists allows scripts to query whether an environment variable exists. Enable by default as it adds only a trivial amount of code and can be useful in scripts.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150325/a688a2aa/attachment.sig>
#5 lore raw

PATCH v2 3/3 config_distro_bootcmd.h: Prefer booting from bootable paritions

In reply to Sjoerd Simons

List bootable partitions and only scan those for bootable files, falling back to partition 1 if there are no bootable partitions

---
 include/config_distro_bootcmd.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Changes since v1:
* No changes

include/config_distro_bootcmd.h +2 -1
index 07a0b3b..ad2dda1 100644
@@ -197,7 +197,8 @@
 		"done\0"                                                  \
 	\
 	"scan_dev_for_boot_part="                                         \
-		"part list ${devtype} ${devnum} devplist; "               \
+		"part list ${devtype} ${devnum} -bootable devplist; "     \
+		"env exists devplist || setenv devplist 1; "              \
 		"for bootpart in ${devplist}; do "                        \
 			"if fstype ${devtype} ${devnum}:${bootpart} "     \
 					"bootfstype; then "               \
Signature · 1 line
2.1.4
#6 lore raw

PATCH v2 3/3 config_distro_bootcmd.h: Prefer booting from bootable paritions

Quoted 5 lines · Sjoerd Simons

List bootable partitions and only scan those for bootable files, falling back to partition 1 if there are no bootable partitions

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150325/97c06fce/attachment.sig>
#7 lore raw

v2 cover Boot from the bootable paritions

In reply to Sjoerd Simons
Quoted 6 lines · Sjoerd Simons

In the discussion after the submission of the "Let the distro boot command scan all partitions" patchset it became clear the general consensus was that u-boot should not simply scan all partitions but instead only partitions with the bootable flag set, falling back to parition 1 as was previously done.

This set of patches implements that

The series,

#8 lore raw

v2 cover Boot from the bootable paritions

In reply to Sjoerd Simons

The release of -rc4 reminded me that i never got around to pinging about this set:

Quoted 4 lines · Sjoerd Simons

In the discussion after the submission of the "Let the distro boot command scan all partitions" patchset it became clear the general consensus was that u-boot should not simply scan all partitions but instead only partitions with the bootable flag set, falling back to parition 1 as was previously done.

As Hans de Goede already remarked for the first revision of this set, this patchset should probably be included in final v2015.04 to prevent the boot behaviour of the distro boot commands changing again post release.

For reference, v2015.1 just tried from the first partition on the various devices, current master tries to boot from all partitions (due to one of my earlier patchsets) and with this patchset we again change to just booting from partitions with the boot flag set, falling back to the first partition (as was the consensus from the mailinglist discussion).

Quoted 16 lines

This set of patches implements that

Changes since v1:
* Make updated part list command more precise about what arguments ordering it accepts.

Sjoerd Simons (3):
part: Add support for list filtering on bootable partitions config_cmd_default.h: Add 'env exists' command config_distro_bootcmd.h: Prefer booting from bootable paritions

 common/cmd_part.c               | 53 +++++++++++++++++++++++++++++++----------
 include/config_cmd_default.h    |  1 +
 include/config_distro_bootcmd.h |  3 ++-
 3 files changed, 44 insertions(+), 13 deletions(-)
#9 lore raw

v2 cover Boot from the bootable paritions

+ Corrected Tom Rini's e-mail address

Quoted 39 lines · Sjoerd Simons

The release of -rc4 reminded me that i never got around to pinging about this set:

Quoted 4 lines · Sjoerd Simons

In the discussion after the submission of the "Let the distro boot command scan all partitions" patchset it became clear the general consensus was that u-boot should not simply scan all partitions but instead only partitions with the bootable flag set, falling back to parition 1 as was previously done.

As Hans de Goede already remarked for the first revision of this set, this patchset should probably be included in final v2015.04 to prevent the boot behaviour of the distro boot commands changing again post release.

For reference, v2015.1 just tried from the first partition on the various devices, current master tries to boot from all partitions (due to one of my earlier patchsets) and with this patchset we again change to just booting from partitions with the boot flag set, falling back to the first partition (as was the consensus from the mailinglist discussion).

Quoted 16 lines

This set of patches implements that

Changes since v1:
* Make updated part list command more precise about what arguments ordering it accepts.

Sjoerd Simons (3):
part: Add support for list filtering on bootable partitions config_cmd_default.h: Add 'env exists' command config_distro_bootcmd.h: Prefer booting from bootable paritions

 common/cmd_part.c               | 53 +++++++++++++++++++++++++++++++----------
 include/config_cmd_default.h    |  1 +
 include/config_distro_bootcmd.h |  3 ++-
 3 files changed, 44 insertions(+), 13 deletions(-)