brcm_fw_tool: support for reading pending boot flash bank.

brcm_fw_tool/image-ubi.c

@@ -75,6 +75,7 @@ struct metaInfo_t {
 	char *nodePath;												// UBI node character device path.
 	char *volPath;												// UBI volume character device path.
 	int seqNo;													// Broadcom sequence number.
+	int flashBank;												// Iopsys flash bank it belongs to.
 	int committed;												// True when volume is "committed".
 	struct ubi_vol_info volInfo;
 };
@@ -594,6 +595,21 @@ static int meta_find_all(void)
 				metaInfos[medaIdx].volInfo = volInfo;
 				metaInfos[medaIdx].nodePath = ubi_path_by_id(devInfo.dev_num, METAINVALID);
 				metaInfos[medaIdx].volPath = ubi_path_by_id(devInfo.dev_num, volInfo.vol_id);
+
+				switch(META2ROOTFS(metaInfos[medaIdx].volInfo.vol_id)) {
+					case ROOTFS0:
+						metaInfos[medaIdx].flashBank = 0;
+						break;
+
+					case ROOTFS1:
+						metaInfos[medaIdx].flashBank = 1;
+						break;
+
+					default:
+						metaInfos[medaIdx].flashBank = -1;
+						break;
+				}
+
 				if(meta_find_seqno(metaInfos + medaIdx)) {
 					if (verbose) {
 						printf("Found %s in %s but it's corrupt.\n",
@@ -601,10 +617,11 @@ static int meta_find_all(void)
 					}
 				}
 				else if (verbose) {
-					printf("Found %s in %s, committed %d, seq %d\n",
+					printf("Found %s in %s, committed %d, seq %d, bank %d\n",
 						volInfo.name, metaInfos[medaIdx].volPath,
 							metaInfos[medaIdx].committed,
-							metaInfos[medaIdx].seqNo);
+							metaInfos[medaIdx].seqNo,
+							metaInfos[medaIdx].flashBank);
 				}
 				
 				if(medaIdx < MAX_METAS) medaIdx++;
@@ -785,6 +802,10 @@ static int meta_manage_vols(int readonly, int forcedBank)
 	}
 
 	if(readonly) {
+		if(metaInfos[highMeta].flashBank >= 0) {
+			printf("Active flash bank %d\n", metaInfos[highMeta].flashBank);	// Keep the string! It is parsed by others.
+		}
+
 		printf("%d\n", highSeqNo);
 		return 0;
 	}