Fix -v PID\VID miss algined at IMXRT106X

correct rominfo Signed-off-by: Frank Li <[email protected]>
nxp-imx · Aug 2, 2018 · da4deb2 · da4deb2
1 parent e43069b
commit da4deb2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/libuuu/config.cpp b/libuuu/config.cpp
@@ -52,7 +52,7 @@ Config::Config()
 	push_back(ConfigItem("SDP:", "MX6ULL",  "MX7D", FSL_VID, 0x0080));
 	push_back(ConfigItem("SDP:", "MX6SLL",  "MX7D", NXP_VID, 0x0128));
 	push_back(ConfigItem("SDP:", "MX7ULP",   NULL,  NXP_VID, 0x0126));
-	push_back(ConfigItem("SDP:", "MXRT106X", NULL,  NXP_VID, 0x0135));
+	push_back(ConfigItem("SDP:", "MXRT106X",  NULL,  NXP_VID, 0x0135));
 	push_back(ConfigItem("SDP:", "MX8MM",   "MX8MQ", NXP_VID, 0x0134));
 	push_back(ConfigItem("SDP:", "MX8MQ",   "MX8MQ", NXP_VID, 0x012B));
 	push_back(ConfigItem("SDPU:", "SPL",    "SPL",  0x0525, 0xB4A4));

diff --git a/libuuu/rominfo.cpp b/libuuu/rominfo.cpp
@@ -49,9 +49,9 @@ ROM_INFO g_RomInfo[] =
 	{ "MX6SLL",	 0x00910000, ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_HID_SKIP_DCD },
 	{ "MX8MQ",	 0x00910000, ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_HID_SKIP_DCD },
 	{ "MX7ULP",	 0x2f018000, ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_HID_SKIP_DCD },
-	{ "MXRT106X",0x1000,     ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_HID_SKIP_DCD },
-	{ "MX8QXPB0",0x0,		 ROM_INFO_HID | ROM_INFO_HID_NO_CMD | ROM_INFO_HID_UID_STRING },
-	{ "SPL",	 0x0,		 ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_SPL_JUMP }
+	{ "MXRT106X",	 0x1000,     ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_HID_SKIP_DCD },
+	{ "MX8QXP",      0x0,        ROM_INFO_HID | ROM_INFO_HID_NO_CMD | ROM_INFO_HID_UID_STRING },
+	{ "SPL",	 0x0,	     ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_SPL_JUMP }
 };
 
 ROM_INFO * search_rom_info(const char *s)

diff --git a/uuu/uuu.cpp b/uuu/uuu.cpp
@@ -145,10 +145,16 @@ void print_version()
 
 int print_cfg(const char *pro, const char * chip, const char * /*compatible*/, uint16_t pid, uint16_t vid, uint16_t bcdVersion, void * /*p*/)
 {
+	const char *ext;
+	if (strlen(chip) >= 7)
+		ext = "";
+	else
+		ext = "\t";
+
 	if (bcdVersion == 0xFFFF)
-		printf("\t%s\t %s\t 0x%04x\t 0x%04x\n", pro, chip, pid, vid);
+		printf("\t%s\t %s\t%s 0x%04x\t 0x%04x\n", pro, chip, ext, pid, vid);
 	else
-		printf("\t%s\t %s\t 0x%04x\t 0x%04x\t 0x%04x\n", pro, chip, pid, vid, bcdVersion);
+		printf("\t%s\t %s\t%s 0x%04x\t 0x%04x\t 0x%04x\n", pro, chip, ext, pid, vid, bcdVersion);
 	return 0;
 }
 
@@ -636,8 +642,8 @@ int main(int argc, char **argv)
 	if (g_verbose)
 	{
 		printf("Build in config:\n");
-		printf("\tPctl\tChip\tVid\tPid\tBcdVersion\n");
-		printf("\t==========================================\n");
+		printf("\tPctl\t Chip\t\t Vid\t Pid\t BcdVersion\n");
+		printf("\t==================================================\n");
 		uuu_for_each_cfg(print_cfg, NULL);
 		if (!shell)
 			cout << "Wait for Known USB Device Appear";