[efiwrapper] generate same emmc serialno with abl

This patch change generation algorithm of emmc serialno to generate
same serialno with abl

Change-Id: I28b78e82a1124ff26cc154ab1c1270610089e7eb
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-70029
Signed-off-by: zhouji3x <[email protected]>
Reviewed-on: https://android.intel.com:443/648213

Author: zhouji3x

drivers/mmc_serial/mmc_serial.c

@@ -60,21 +60,24 @@ extern int mmc_cid(uint8_t cid[16]);
 static char *build_serial(void)
 {
 	static char serial[15];
-	struct cid cid;
-	size_t i;
-	uint32_t *tmp = (uint32_t *)&cid;
+	struct cid m_cid;
+	uint8_t *cid = (uint8_t *) &m_cid;
+	uint32_t sn;
 	int ret;
 
-	ret = mmc_cid((uint8_t *)&cid);
+	ret = mmc_cid((uint8_t *)&m_cid);
 	if (ret)
 		return NULL;
 
-	for (i = 0; i < sizeof(cid) / sizeof(*tmp); i++)
-		tmp[i] = __builtin_bswap32(tmp[i]);
-
-	memcpy(&serial[0], cid.pnm, sizeof(cid.pnm));
-	snprintf(&serial[6], 9, "%08x", cid.psn);
+	sn = (cid[9]<<24) | (cid[8]<<16) | (cid[15]<<8) | (cid[14]);
+	serial[0] = cid[0];
+	serial[1] = cid[7];
+	serial[2] = cid[6];
+	serial[3] = cid[5];
+	serial[4] = cid[4];
+	serial[5] = cid[11];
 
+	snprintf(&serial[6], 9, "%08x", sn);
 	return serial;
 }