[coreboot-gerrit] Change in em100[master]: Cosmetic output fixes for EM100Pro-G2

[Stefan Reinauer (Code Review)]

Stefan Reinauer has submitted this change. ( https://review.coreboot.org/c/em100/+/37082 )

Change subject: Cosmetic output fixes for EM100Pro-G2
......................................................................

Cosmetic output fixes for EM100Pro-G2

EM100Pro-G2 does not have different firmware for each voltage anymore.
Also, the FPGA version is specified as XX.YYY instead of XX.YY.

Signed-off-by: Stefan Reinauer 
Change-Id: I592acbf337f6550ee5ebcd3f85156407707fa42d
Reviewed-on: https://review.coreboot.org/c/em100/+/37082
Tested-by: build bot (Jenkins) 
Reviewed-by: Martin Roth 
---
M em100.c
M firmware.c
2 files changed, 12 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved

diff --git a/em100.c b/em100.c
index 5c56d2d..9570e25 100644
--- a/em100.c
+++ b/em100.c
@@ -809,9 +809,13 @@

printf("MCU version: %d.%02d\n", em100.mcu >> 8, em100.mcu & 0xff);
    if (em100.fpga > 0x0033) { /* 0.51 */
-		printf("FPGA version: %d.%02d (%s)\n",
+		if (em100.hwversion == HWVERSION_EM100PRO)
+			printf("FPGA version: %d.%02d (%s)\n",
    			em100.fpga >> 8 & 0x7f, em100.fpga & 0xff,
    			em100.fpga & 0x8000 ? "1.8V" : "3.3V");
+		else /* EM100Pro-G2 */
+			printf("FPGA version: %d.%03d\n",
+				em100.fpga >> 8 & 0x7f, em100.fpga & 0xff);
    } else {
    	/* While the Dediprog software for Windows will refuse to work
    	 * with 1.8V chips on older FPGA versions, it does not
diff --git a/firmware.c b/firmware.c
index b2a1775..329b543 100644
--- a/firmware.c
+++ b/firmware.c
@@ -284,10 +284,16 @@

printf("EM100Pro%s Update File: %s\n",
    		em100->hwversion == HWVERSION_EM100PRO_G2 ? "-G2" : "", filename);
-	printf("  Installed version:  MCU %d.%d, FPGA %d.%d (%s)\n",
+	if (em100->hwversion == HWVERSION_EM100PRO)
+		printf("  Installed version:  MCU %d.%d, FPGA %d.%d (%s)\n",
    		em100->mcu >> 8, em100->mcu & 0xff,
    		em100->fpga >> 8 & 0x7f, em100->fpga & 0xff,
    		em100->fpga & 0x8000 ? "1.8V" : "3.3V");
+	else
+		printf("  Installed version:  MCU %d.%d, FPGA %d.%03d\n",
+			em100->mcu >> 8, em100->mcu & 0xff,
+			em100->fpga >> 8 & 0x7f, em100->fpga & 0xff);
+
    printf("  New version:        MCU %s, FPGA %s\n",
    		mcu_version, fpga_version);