Commit 5cafc338 authored by Peter Stuge's avatar Peter Stuge
Browse files

Beautify flash chip ID verbose printout a little, always use %02x


Corresponding to flashrom svn r390 and coreboot v2 svn r3895.
Signed-off-by: default avatarPeter Stuge <peter@stuge.se>
Acked-by: default avatarPeter Stuge <peter@stuge.se>
parent 9371dc3c
......@@ -69,7 +69,7 @@ int probe_82802ab(struct flashchip *flash)
myusec_delay(10);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
if (id1 != flash->manufacture_id || id2 != flash->model_id)
return 0;
......
......@@ -83,7 +83,7 @@ int probe_29f040b(struct flashchip *flash)
myusec_delay(10);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
......
......@@ -49,7 +49,7 @@ int probe_en29f512(struct flashchip *flash)
*(volatile uint8_t *)(bios + 0x2AA) = 0x55;
*(volatile uint8_t *)(bios + 0x555) = 0xF0;
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
......
......@@ -130,7 +130,7 @@ int probe_jedec(struct flashchip *flash)
*(volatile uint8_t *)(bios + 0x5555) = 0xF0;
myusec_delay(40);
printf_debug("%s: id1 0x%x, id2 0x%x", __FUNCTION__, largeid1, largeid2);
printf_debug("%s: id1 0x%02x, id2 0x%02x", __FUNCTION__, largeid1, largeid2);
if (!oddparity(id1))
printf_debug(", id1 parity violation");
printf_debug("\n");
......
......@@ -75,7 +75,7 @@ int probe_m29f400bt(struct flashchip *flash)
myusec_delay(10);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
......
......@@ -38,7 +38,7 @@ int probe_29f002(struct flashchip *flash)
myusec_delay(10);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
......
......@@ -61,7 +61,7 @@ int probe_lhf00l04(struct flashchip *flash)
myusec_delay(10);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
if (id1 != flash->manufacture_id || id2 != flash->model_id)
return 0;
......
......@@ -126,7 +126,7 @@ static int probe_spi_rdid_generic(struct flashchip *flash, int bytes)
model_id = (readarr[1] << 8) | readarr[2];
}
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, manuf_id,
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, manuf_id,
model_id);
if (manuf_id == flash->manufacture_id && model_id == flash->model_id) {
......
......@@ -112,7 +112,7 @@ int probe_28sf040(struct flashchip *flash)
*bios = RESET;
myusec_delay(10);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
......
......@@ -135,7 +135,7 @@ int probe_49lfxxxc(struct flashchip *flash)
*bios = RESET;
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
if (!(id1 == flash->manufacture_id && id2 == flash->model_id))
return 0;
......
......@@ -80,7 +80,7 @@ int probe_stm50flw0x0x(struct flashchip *flash)
*(volatile uint8_t *)(bios + 0x5555) = 0xF0;
myusec_delay(40);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, largeid1,
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, largeid1,
largeid2);
if (largeid1 != flash->manufacture_id || largeid2 != flash->model_id)
......
......@@ -62,7 +62,7 @@ int probe_w29ee011(struct flashchip *flash)
*(volatile uint8_t *)(bios + 0x5555) = 0xF0;
myusec_delay(10);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
......
......@@ -44,7 +44,7 @@ int probe_w39v040c(struct flashchip *flash)
*(volatile uint8_t *)(bios + 0x5555) = 0xF0;
myusec_delay(40);
printf_debug("%s: id1 0x%x, id2 0x%x", __func__, id1, id2);
printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, id1, id2);
if (!oddparity(id1))
printf_debug(", id1 parity violation");
printf_debug("\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment