coreboot-gerrit November 2019

coreboot-gerrit@coreboot.org

1 participants
2418 discussions

Change in coreboot[master]: util/release: Try reusing the local checkout for cloning
by Patrick Georgi (Code Review) 22 Nov '19

22 Nov '19

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36954 ) Change subject: util/release: Try reusing the local checkout for cloning ...................................................................... util/release: Try reusing the local checkout for cloning git clone allows using a local repo as reference which reduces the required network traffic. Change-Id: I64722cd5dbdfc0c2bcd935715cffdb99b773711c Signed-off-by: Patrick Georgi <pgeorgi(a)… [View More]

2 2

Change in coreboot[master]: util/release: Make signing with GPG 2 easier
by Patrick Georgi (Code Review) 22 Nov '19

22 Nov '19

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36953 ) Change subject: util/release: Make signing with GPG 2 easier ...................................................................... util/release: Make signing with GPG 2 easier GPG 2 expects the GPG_TTY variable to be configured so that it can properly ask for the passphrase. If it's not already set, do so. Change-Id: I7e145a492c9eceda40cc1a1e04452a78852042d1 Signed-off-by: Patrick Georgi … [View More]

2 2

Change in coreboot[master]: src: Remove asterisks from variable name annotation
by Peter Lemenkov (Code Review) 22 Nov '19

22 Nov '19

Peter Lemenkov has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/29235 ) Change subject: src: Remove asterisks from variable name annotation ...................................................................... Abandoned Not really a big deal. -- To view, visit https://review.coreboot.org/c/coreboot/+/29235 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: … [View More]

1 0

Change in em100[master]: Refactor chips configuration
by Stefan Reinauer (Code Review) 22 Nov '19

22 Nov '19

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/37125 ) Change subject: Refactor chips configuration ...................................................................... Refactor chips configuration - Doesn't need to happen before USB device detection. In fact, available chips might depend on hardware version. - Move to separate function Change-Id: I22aefc2c2d415dc47e6a0eae42349b280543df15 Signed-off-by: Stefan Reinauer <stefan.reinauer(… [View More]a)coreboot.org> --- M em100.c 1 file changed, 31 insertions(+), 22 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/25/37125/1 diff --git a/em100.c b/em100.c index d682991..b8d5969 100644 --- a/em100.c +++ b/em100.c @@ -680,6 +680,33 @@ return strdup(file); } +static chipdesc *setup_chips(const char *desiredchip) +{ + const chipdesc *chip = chips; + if (desiredchip) { + do { + if (strcasecmp(desiredchip, chip->name) == 0) { + printf("will emulate '%s'\n", chip->name); + break; + } + } while ((++chip)->name); + + if (chip->name == NULL) { + printf("Supported chips:\n"); + chip = chips; + do { + printf("%s ", chip->name); + } while ((++chip)->name); + printf("\n\nCould not find emulation for '%s'.\n", + desiredchip); + + return NULL; + } + + } + return chip; +} + static const struct option longopts[] = { {"set", 1, 0, 'c'}, {"download", 1, 0, 'd'}, @@ -832,33 +859,15 @@ } } - const chipdesc *chip = chips; - if (desiredchip) { - do { - if (strcasecmp(desiredchip, chip->name) == 0) { - printf("will emulate '%s'\n", chip->name); - break; - } - } while ((++chip)->name); - - if (chip->name == NULL) { - printf("Supported chips:\n"); - chip = chips; - do { - printf("%s ", chip->name); - } while ((++chip)->name); - printf("\n\nCould not find emulation for '%s'.\n", - desiredchip); - - return 1; - } - } - struct em100 em100; if (!em100_attach(&em100, bus, device, serial_number)) { return 1; } + const chipdesc *chip = setup_chips(desiredchip); + if (!chip) + return 1; + printf("MCU version: %d.%02d\n", em100.mcu >> 8, em100.mcu & 0xff); if (em100.fpga > 0x0033) { /* 0.51 */ if (em100.hwversion == HWVERSION_EM100PRO) -- To view, visit https://review.coreboot.org/c/em100/+/37125 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: I22aefc2c2d415dc47e6a0eae42349b280543df15 Gerrit-Change-Number: 37125 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newchange [View Less]

2 3

Change in em100[master]: makechips.sh: protect version number
by Stefan Reinauer (Code Review) 22 Nov '19

22 Nov '19

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/37126 ) Change subject: makechips.sh: protect version number ...................................................................... makechips.sh: protect version number Things go wrong if the version number has a space in it right now. Change-Id: I584c60a6c6c957f775981a900b701455d0742502 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- M makechips.sh 1 file changed, 2 … [View More]

2 2

Change in em100[master]: write_dfifo: Actually send data to FIFO
by Stefan Reinauer (Code Review) 22 Nov '19

22 Nov '19

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/37122 ) Change subject: write_dfifo: Actually send data to FIFO ...................................................................... write_dfifo: Actually send data to FIFO The function is not currently used, so this was never discovered. Change-Id: If2210938fa31604bc81f5599dce8384ff9936b2a Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- M spi.c 1 file changed, 2 … [View More]

2 3

Change in em100[master]: Update Firmware Update Format
by Stefan Reinauer (Code Review) 22 Nov '19

22 Nov '19

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/37104 ) Change subject: Update Firmware Update Format ...................................................................... Update Firmware Update Format Update documentation on the firmware update format and the in-flash layout. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Change-Id: Icfa5dd6f9cfed4a9353ffa512560247d5e5b8677 --- M firmware.c 1 file changed, 22 insertions(+… [View More]), 13 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/04/37104/1 diff --git a/firmware.c b/firmware.c index 329b543..b6190d1 100644 --- a/firmware.c +++ b/firmware.c @@ -21,27 +21,36 @@ #include "em100.h" -/* file format: +/* Firmware Update File Format + * =========================== * - * 0x0000000: 65 6d 31 30 30 70 72 6f - magic 8 bytes - * 0x0000014: 32 2e 32 36 - version MCU - * 0x000001e: 30 2e 37 35 - version FPGA - * 0x0000028: 57 46 50 44 - WFPD (??) - * 0x0000038: 00 01 00 00 - file offset FPGA - * 0x000003c: 44 15 07 00 - file length FPGA - * 0x0000040: 00 17 07 00 - file offset MCU - * 0x0000044: 00 bf 00 00 - file length MCU + * 0x0000000: 65 6d 31 30 30 70 72 6f - magic (20 bytes) + * 0x0000014: 32 2e 32 36 - version MCU (10 bytes) + * 0x000001e: 30 2e 37 35 - version FPGA (10 bytes) + * 0x0000028: 57 46 50 44 - Rev / WFPD (16 bytes) + * 0x0000038: 00 01 00 00 - file offset FPGA (4 bytes) + * 0x000003c: 44 15 07 00 - file length FPGA (4 bytes) + * 0x0000040: 00 17 07 00 - file offset MCU (4 bytes) + * 0x0000044: 00 bf 00 00 - file length MCU (4 bytes) * - * flash layout + * EM100Pro / EM100Pro-G2 Flash Layout + * =================================== + * * 0x0000000: fpga firmware * 0x0100000: 256 bytes of 0x00 filled space * 0x0100100: mcu firmware * 0x01f0000: 4 bytes secret key, 00 padded * 0x01fff00: ff ff 4 bytes serial number ff padded * - * - empty pages remain 0xff filled - * - partially used pages are typically filled up with 00 bytes - * except the page containing the serial number + * Notes + * ===== + * + * - Empty pages remain 0xff filled. + * - Partially used pages are typically filled up with 00 bytes + * except the page containing the serial number. + * - After a FPGA firmware update, the page at 0x0100000 needs to + * be written with 0xaa 0x55 BOOT 0x55 0xaa to make the FPGA + * slurp in the new firmware. */ #undef DEBUG -- To view, visit https://review.coreboot.org/c/em100/+/37104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: Icfa5dd6f9cfed4a9353ffa512560247d5e5b8677 Gerrit-Change-Number: 37104 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newchange [View Less]

2 4

Change in em100[master]: Fix serial number printing and parsing
by Stefan Reinauer (Code Review) 22 Nov '19

22 Nov '19

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/37083 ) Change subject: Fix serial number printing and parsing ...................................................................... Fix serial number printing and parsing Dediprog has switched the format of serial numbers on newer EM100Pro and all EM100Pro-G2 from DPxxxxxx to EMxxxxxx. Switch to that format, but still allow the format DPxxxxxx when a serial number is entered. Signed-off-by: … [View More]Stefan Reinauer <stefan.reinauer(a)coreboot.org> Change-Id: Idf44d1a468a7c62b0c5d2d66c37f261eb3c1950c --- M em100.c 1 file changed, 9 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/83/37083/1 diff --git a/em100.c b/em100.c index 4950fa8..5949ec8 100644 --- a/em100.c +++ b/em100.c @@ -255,7 +255,7 @@ /* Re-read serial number */ get_device_info(em100); if (em100->serialno != 0xffffffff) - printf("New serial number: DP%06d\n", em100->serialno); + printf("New serial number: EM%06d\n", em100->serialno); else printf("New serial number: N.A.\n"); @@ -433,7 +433,7 @@ if (bus && device) printf("Could not find EM100pro at %03d:%03d.\n", bus, device); else if (serial_number) - printf("Could not find EM100pro with serial number DP%06d.\n", + printf("Could not find EM100pro with serial number EM%06d.\n", serial_number); else printf("Could not find EM100pro device.\n"); @@ -493,7 +493,7 @@ libusb_get_device_address(dev)); continue; } - printf(" Bus %03d Device %03d: EM100pro DP%06d\n", + printf(" Bus %03d Device %03d: EM100pro EM%06d\n", libusb_get_bus_number(dev), libusb_get_device_address(dev), em100.serialno); @@ -679,7 +679,7 @@ " -V|--set-voltage [1.8|3.3] switch FPGA voltage\n" " -p|--holdpin [LOW|FLOAT|INPUT]: set the hold pin state\n" " -x|--device BUS:DEV use EM100pro on USB bus/device\n" - " -x|--device DPxxxxxx use EM100pro with serial no DPxxxxxx\n" + " -x|--device EMxxxxxx use EM100pro with serial no EMxxxxxx\n" " -l|--list-devices list all connected EM100pro devices\n" " -D|--debug: print debug information.\n" " -h|--help: this help text\n\n", @@ -830,7 +830,7 @@ printf("Hardware version: %u\n", em100.hwversion); if (em100.serialno != 0xffffffff) - printf("Serial number: DP%06d\n", em100.serialno); + printf("Serial number: EM%06d\n", em100.serialno); else printf("Serial number: N.A.\n"); printf("SPI flash database: %s\n", VERSION); @@ -858,6 +858,10 @@ if ((serialno[0] == 'D' || serialno[0] == 'd') && (serialno[1] == 'P' || serialno[1] == 'p')) offset = 2; + /* if the user specified a serial containing EM, skip that */ + if ((serialno[0] == 'E' || serialno[0] == 'e') && + (serialno[1] == 'M' || serialno[1] == 'm')) + offset = 2; if (sscanf(serialno + offset, "%d", &serial_number) != 1) printf("Error: Can't parse serial number '%s'\n", -- To view, visit https://review.coreboot.org/c/em100/+/37083 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: Idf44d1a468a7c62b0c5d2d66c37f261eb3c1950c Gerrit-Change-Number: 37083 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newchange [View Less]

2 3

Change in em100[master]: Cosmetic output fixes for EM100Pro-G2
by Stefan Reinauer (Code Review) 22 Nov '19

22 Nov '19

Stefan Reinauer has uploaded this change for review. ( 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 <stefan.reinauer(a)coreboot.org> Change-Id: … [View More]I592acbf337f6550ee5ebcd3f85156407707fa42d --- M em100.c M firmware.c 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/82/37082/1 diff --git a/em100.c b/em100.c index 2c4f4ea..4950fa8 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); -- To view, visit https://review.coreboot.org/c/em100/+/37082 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: I592acbf337f6550ee5ebcd3f85156407707fa42d Gerrit-Change-Number: 37082 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newchange [View Less]

2 3

Change in em100[master]: Firmware update support for EM100Pro-G2
by Stefan Reinauer (Code Review) 22 Nov '19

22 Nov '19

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/36938 ) Change subject: Firmware update support for EM100Pro-G2 ...................................................................... Firmware update support for EM100Pro-G2 Teach em100 tool about EM100Pro-G2 firmware and check that the firmware is for the correct device. Change-Id: I04c60f8fbe9a93048740549aa57d6d85a5db8107 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- … [View More]M firmware.c 1 file changed, 24 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/38/36938/1 diff --git a/firmware.c b/firmware.c index 6e2ff36..94cd8b1 100644 --- a/firmware.c +++ b/firmware.c @@ -129,6 +129,9 @@ case HWVERSION_EM100PRO: hdrversion=1; break; + case HWVERSION_EM100PRO_G2: + hdrversion=2; + break; default: printf("Dumping DPFW firmware on hardware version %u is " "not yet supported.\n", em100->hwversion); @@ -166,8 +169,14 @@ em100->fpga >> 8 & 0x7f, em100->fpga & 0xff); memset(header, 0, 0x100); - if (hdrversion == 1) + switch (hdrversion) { + case 1: memcpy(header, "em100pro", 8); + break; + case 2: + memcpy(header, "EM100Pro-G2", 11); + break; + } memcpy(header + 0x28, "WFPD", 4); memcpy(header + 0x14, mcu_version, 4); memcpy(header + 0x1e, fpga_version, 4); @@ -205,7 +214,10 @@ switch (em100->hwversion) { case HWVERSION_EM100PRO: - printf("Detected EM100Pro-G1.\n"); + printf("Detected EM100Pro (original).\n"); + break; + case HWVERSION_EM100PRO_G2: + printf("Detected EM100Pro-G2.\n"); break; default: printf("Updating EM100Pro firmware on hardware version %u is " @@ -251,6 +263,13 @@ return 0; } + if (em100->hwversion == HWVERSION_EM100PRO_G2 && (memcmp(fw, "EM100Pro-G2", 11) != 0 || + memcmp(fw + 0x28, "WFPD", 4) != 0)) { + printf("ERROR: Not an EM100Pro firmware file.\n"); + free(fw); + return 0; + } + /* Find firmwares in the update file */ fpga_offset = get_le32(fw+0x38); fpga_len = get_le32(fw+0x3c); @@ -263,7 +282,8 @@ strncpy(fpga_version, (char *)fw + 0x1e, MAX_VERSION_LENGTH); fpga_version[MAX_VERSION_LENGTH] = '\0'; - printf("EM100Pro Update File: %s\n", filename); + 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", em100->mcu >> 8, em100->mcu & 0xff, em100->fpga >> 8 & 0x7f, em100->fpga & 0xff, @@ -348,7 +368,7 @@ free(fw); - /* Write magic update page */ + /* Write magic update tag '.UBOOTU.' */ memset(page, 0x00, 256); page[0] = 0xaa; page[1] = 0x55; -- To view, visit https://review.coreboot.org/c/em100/+/36938 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: I04c60f8fbe9a93048740549aa57d6d85a5db8107 Gerrit-Change-Number: 36938 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newchange [View Less]

2 5

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2019