X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=3723ebf824df6fcee31c4571d900f5159f410165;hp=b5ad682eae3b9e7136de412602648a8ee72b8510;hb=722e64564e436a0491563c9f57a49dfee5c50dd9;hpb=d0602ed25e3bff8298c19bece8cd8b3f80d86624

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index b5ad682..3723ebf 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -1033,7 +1033,6 @@ static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
 	struct platform_powerpc *platform = p->platform_data;
 	uint16_t resp_len = 16;
 	uint8_t resp[16], bcd;
-	uint32_t aux_version;
 	int i, rc;
 
 	/* Retrieve info from current side */
@@ -1061,10 +1060,11 @@ static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
 						resp[2]);
 		bcd = resp[4] & 0x0f;
 		bcd += 10 * (resp[4] >> 4);
-		memcpy(&aux_version, &resp[12], sizeof(aux_version));
+		/* rev1.rev2.aux_revision */
 		info->bmc_current[2] = talloc_asprintf(info,
-						"Firmware version: %u.%02u.%05u",
-						resp[3], bcd, aux_version);
+						"Firmware version: %u.%02u.%02x%02x%02x%02x",
+						resp[3], bcd, resp[12],
+						resp[13], resp[14], resp[15]);
 		bcd = resp[5] & 0x0f;
 		bcd += 10 * (resp[5] >> 4);
 		info->bmc_current[3] = talloc_asprintf(info, "IPMI version: %u",
@@ -1099,10 +1099,11 @@ static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
 						resp[2]);
 		bcd = resp[4] & 0x0f;
 		bcd += 10 * (resp[4] >> 4);
-		memcpy(&aux_version, &resp[12], sizeof(aux_version));
+		/* rev1.rev2.aux_revision */
 		info->bmc_golden[2] = talloc_asprintf(info,
-						"Firmware version: %u.%02u.%u",
-						resp[3], bcd, aux_version);
+						"Firmware version: %u.%02u.%02x%02x%02x%02x",
+						resp[3], bcd, resp[12],
+						resp[13], resp[14], resp[15]);
 		bcd = resp[5] & 0x0f;
 		bcd += 10 * (resp[5] >> 4);
 		info->bmc_golden[3] = talloc_asprintf(info, "IPMI version: %u",
@@ -1254,7 +1255,7 @@ static int load_config(struct platform *p, struct config *config)
 
 	rc = parse_nvram(platform);
 	if (rc)
-		return rc;
+		pb_log("%s: Failed to parse nvram\n", __func__);
 
 	populate_config(platform, config);