September 2022 - flashrom-gerrit

[M] Change in flashrom[master]: ft2232_spi.c: Add struct for programmer params
by Angel Pons (Code Review) 27 Sep '22

27 Sep '22

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67906 ) Change subject: ft2232_spi.c: Add struct for programmer params ...................................................................... ft2232_spi.c: Add struct for programmer params Introduce a struct to store ft2232_spi programmer parameters. This struct allows separating the parsing of programmer params from the code that uses the values, which should allow specifying parameter values directly into the struct. Change-Id: I36b9f5f8481907bd605e9310bef08592bb7d9827 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M ft2232_spi.c 1 file changed, 126 insertions(+), 94 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/06/67906/1 diff --git a/ft2232_spi.c b/ft2232_spi.c index 6d7aa6a..c8772a7 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -304,22 +304,13 @@ .probe_opcode = default_spi_probe_opcode, }; -/* Returns 0 upon success, a negative number upon errors. */ -static int ft2232_spi_init(const struct programmer_cfg *cfg) -{ - int ret = 0; - unsigned char buf[512]; - int ft2232_vid = FTDI_VID; - int ft2232_type = FTDI_FT4232H_PID; - int channel_count = 4; /* Stores the number of channels of the device. */ - enum ftdi_interface ft2232_interface = INTERFACE_A; +struct ft2232_parameters { + int ft2232_vid; + int ft2232_type; + enum ftdi_interface ft2232_interface; + /* - * The 'H' chips can run with an internal clock of either 12 MHz or 60 MHz, - * but the non-H chips can only run at 12 MHz. We disable the divide-by-5 - * prescaler on 'H' chips so they run at 60MHz. - */ - bool clock_5x = true; - /* In addition to the prescaler mentioned above there is also another + * In addition to the divide-by-5 prescaler there is also another * configurable one on all versions of the chips. Its divisor div can be * set by a 16 bit value x according to the following formula: * div = (1 + x) * 2 <-> x = div / 2 - 1 @@ -328,115 +319,141 @@ * 92 Hz for 12 MHz inputs and 30 MHz down to about 458 Hz for 60 MHz * inputs. */ - uint32_t divisor = DEFAULT_DIVISOR; + uint32_t divisor; + uint8_t cs_bits; + uint8_t aux_bits; + uint8_t pindir; + uint8_t aux_bits_high; + uint8_t pindir_high; +}; + +/* Returns 0 upon success, a negative number upon errors. */ +static int ft2232_spi_init(const struct programmer_cfg *cfg) +{ + int ret = 0; + unsigned char buf[512]; + int channel_count = 4; /* Stores the number of channels of the device. */ + /* + * The 'H' chips can run with an internal clock of either 12 MHz or 60 MHz, + * but the non-H chips can only run at 12 MHz. We disable the divide-by-5 + * prescaler on 'H' chips so they run at 60MHz. + */ + bool clock_5x = true; int f; char *arg, *arg2; double mpsse_clk; - uint8_t cs_bits = 0x08; - uint8_t aux_bits = 0x00; - uint8_t pindir = 0x0b; - uint8_t aux_bits_high = 0x00; - uint8_t pindir_high = 0x00; + struct ft2232_parameters parameters = { + .ft2232_vid = FTDI_VID, + .ft2232_type = FTDI_FT4232H_PID, + .ft2232_interface = INTERFACE_A, + .divisor = DEFAULT_DIVISOR, + .cs_bits = 0x08, + .aux_bits = 0x00, + .pindir = 0x0b, + .aux_bits_high = 0x00, + .pindir_high = 0x00, + }; + struct ftdi_context ftdic; struct ft2232_data *spi_data; arg = extract_programmer_param_str(cfg, "type"); if (arg) { if (!strcasecmp(arg, "2232H")) { - ft2232_type = FTDI_FT2232H_PID; + parameters.ft2232_type = FTDI_FT2232H_PID; channel_count = 2; } else if (!strcasecmp(arg, "4232H")) { - ft2232_type = FTDI_FT4232H_PID; + parameters.ft2232_type = FTDI_FT4232H_PID; channel_count = 4; } else if (!strcasecmp(arg, "232H")) { - ft2232_type = FTDI_FT232H_PID; + parameters.ft2232_type = FTDI_FT232H_PID; channel_count = 1; } else if (!strcasecmp(arg, "4233H")) { - ft2232_type = FTDI_FT4233H_PID; + parameters.ft2232_type = FTDI_FT4233H_PID; channel_count = 4; } else if (!strcasecmp(arg, "jtagkey")) { - ft2232_type = AMONTEC_JTAGKEY_PID; + parameters.ft2232_type = AMONTEC_JTAGKEY_PID; channel_count = 2; /* JTAGkey(2) needs to enable its output via Bit4 / GPIOL0 * value: 0x18 OE=high, CS=high, DI=low, DO=low, SK=low * dir: 0x1b OE=output, CS=output, DI=input, DO=output, SK=output */ - cs_bits = 0x18; - pindir = 0x1b; + parameters.cs_bits = 0x18; + parameters.pindir = 0x1b; } else if (!strcasecmp(arg, "picotap")) { - ft2232_vid = GOEPEL_VID; - ft2232_type = GOEPEL_PICOTAP_PID; + parameters.ft2232_vid = GOEPEL_VID; + parameters.ft2232_type = GOEPEL_PICOTAP_PID; channel_count = 2; } else if (!strcasecmp(arg, "tumpa")) { /* Interface A is SPI1, B is SPI2. */ - ft2232_type = TIAO_TUMPA_PID; + parameters.ft2232_type = TIAO_TUMPA_PID; channel_count = 2; } else if (!strcasecmp(arg, "tumpalite")) { /* Only one channel is used on lite edition */ - ft2232_type = TIAO_TUMPA_LITE_PID; + parameters.ft2232_type = TIAO_TUMPA_LITE_PID; channel_count = 1; } else if (!strcasecmp(arg, "busblaster")) { /* In its default configuration it is a jtagkey clone */ - ft2232_type = FTDI_FT2232H_PID; + parameters.ft2232_type = FTDI_FT2232H_PID; channel_count = 2; - cs_bits = 0x18; - pindir = 0x1b; + parameters.cs_bits = 0x18; + parameters.pindir = 0x1b; } else if (!strcasecmp(arg, "openmoko")) { - ft2232_vid = FIC_VID; - ft2232_type = OPENMOKO_DBGBOARD_PID; + parameters.ft2232_vid = FIC_VID; + parameters.ft2232_type = OPENMOKO_DBGBOARD_PID; channel_count = 2; } else if (!strcasecmp(arg, "arm-usb-ocd")) { - ft2232_vid = OLIMEX_VID; - ft2232_type = OLIMEX_ARM_OCD_PID; + parameters.ft2232_vid = OLIMEX_VID; + parameters.ft2232_type = OLIMEX_ARM_OCD_PID; channel_count = 2; /* arm-usb-ocd(-h) has an output buffer that needs to be enabled by pulling ADBUS4 low. * value: 0x08 #OE=low, CS=high, DI=low, DO=low, SK=low * dir: 0x1b #OE=output, CS=output, DI=input, DO=output, SK=output */ - cs_bits = 0x08; - pindir = 0x1b; + parameters.cs_bits = 0x08; + parameters.pindir = 0x1b; } else if (!strcasecmp(arg, "arm-usb-tiny")) { - ft2232_vid = OLIMEX_VID; - ft2232_type = OLIMEX_ARM_TINY_PID; + parameters.ft2232_vid = OLIMEX_VID; + parameters.ft2232_type = OLIMEX_ARM_TINY_PID; channel_count = 2; } else if (!strcasecmp(arg, "arm-usb-ocd-h")) { - ft2232_vid = OLIMEX_VID; - ft2232_type = OLIMEX_ARM_OCD_H_PID; + parameters.ft2232_vid = OLIMEX_VID; + parameters.ft2232_type = OLIMEX_ARM_OCD_H_PID; channel_count = 2; /* See arm-usb-ocd */ - cs_bits = 0x08; - pindir = 0x1b; + parameters.cs_bits = 0x08; + parameters.pindir = 0x1b; } else if (!strcasecmp(arg, "arm-usb-tiny-h")) { - ft2232_vid = OLIMEX_VID; - ft2232_type = OLIMEX_ARM_TINY_H_PID; + parameters.ft2232_vid = OLIMEX_VID; + parameters.ft2232_type = OLIMEX_ARM_TINY_H_PID; channel_count = 2; } else if (!strcasecmp(arg, "google-servo")) { - ft2232_vid = GOOGLE_VID; - ft2232_type = GOOGLE_SERVO_PID; + parameters.ft2232_vid = GOOGLE_VID; + parameters.ft2232_type = GOOGLE_SERVO_PID; } else if (!strcasecmp(arg, "google-servo-v2")) { - ft2232_vid = GOOGLE_VID; - ft2232_type = GOOGLE_SERVO_V2_PID1; + parameters.ft2232_vid = GOOGLE_VID; + parameters.ft2232_type = GOOGLE_SERVO_V2_PID1; /* Default divisor is too fast, and chip ID fails */ - divisor = 6; + parameters.divisor = 6; } else if (!strcasecmp(arg, "google-servo-v2-legacy")) { - ft2232_vid = GOOGLE_VID; - ft2232_type = GOOGLE_SERVO_V2_PID0; + parameters.ft2232_vid = GOOGLE_VID; + parameters.ft2232_type = GOOGLE_SERVO_V2_PID0; } else if (!strcasecmp(arg, "flyswatter")) { - ft2232_type = FTDI_FT2232H_PID; + parameters.ft2232_type = FTDI_FT2232H_PID; channel_count = 2; /* Flyswatter and Flyswatter-2 require GPIO bits 0x80 * and 0x40 to be driven low to enable output buffers */ - pindir = 0xcb; + parameters.pindir = 0xcb; } else if (!strcasecmp(arg, "kt-link")) { - ft2232_type = KT_LINK_PID; + parameters.ft2232_type = KT_LINK_PID; /* port B is used as uart */ channel_count = 1; /* Set GPIOL1 output high - route TMS and TDO through multiplexers */ - aux_bits = 0x20; - pindir = 0x2b; + parameters.aux_bits = 0x20; + parameters.pindir = 0x2b; /* Set GPIOH4 output low - enable TMS output buffer */ /* Set GPIOH5 output low - enable TDI output buffer */ /* Set GPIOH6 output low - enable TCK output buffer */ - pindir_high = 0x70; + parameters.pindir_high = 0x70; } else { msg_perr("Error: Invalid device type specified.\n"); free(arg); @@ -445,27 +462,27 @@ } free(arg); - /* Remember reserved pins before pindir gets modified. */ - const uint8_t rsv_bits = pindir & 0xf0; + /* Remember reserved pins before parameters.pindir gets modified. */ + const uint8_t rsv_bits = parameters.pindir & 0xf0; arg = extract_programmer_param_str(cfg, "port"); if (arg) { switch (toupper((unsigned char)*arg)) { case 'A': - ft2232_interface = INTERFACE_A; + parameters.ft2232_interface = INTERFACE_A; break; case 'B': - ft2232_interface = INTERFACE_B; + parameters.ft2232_interface = INTERFACE_B; if (channel_count < 2) channel_count = -1; break; case 'C': - ft2232_interface = INTERFACE_C; + parameters.ft2232_interface = INTERFACE_C; if (channel_count < 3) channel_count = -1; break; case 'D': - ft2232_interface = INTERFACE_D; + parameters.ft2232_interface = INTERFACE_D; if (channel_count < 4) channel_count = -1; break; @@ -492,7 +509,7 @@ free(arg); return -2; } - divisor = (uint32_t)temp; + parameters.divisor = (uint32_t)temp; } free(arg); @@ -521,8 +538,8 @@ return -2; } - cs_bits |= 1 << pin; - pindir |= 1 << pin; + parameters.cs_bits |= 1 << pin; + parameters.pindir |= 1 << pin; } free(arg); @@ -557,15 +574,15 @@ switch (toupper(arg[0])) { case 'H': - aux_bits |= bit; - pindir |= bit; + parameters.aux_bits |= bit; + parameters.pindir |= bit; break; case 'L': - pindir |= bit; + parameters.pindir |= bit; break; case 'C': - cs_bits |= bit; - pindir |= bit; + parameters.cs_bits |= bit; + parameters.pindir |= bit; break; default: goto format_error; @@ -587,26 +604,26 @@ } msg_pdbg("Using device type %s %s ", - get_ft2232_vendorname(ft2232_vid, ft2232_type), - get_ft2232_devicename(ft2232_vid, ft2232_type)); + get_ft2232_vendorname(parameters.ft2232_vid, parameters.ft2232_type), + get_ft2232_devicename(parameters.ft2232_vid, parameters.ft2232_type)); msg_pdbg("channel %s.\n", - (ft2232_interface == INTERFACE_A) ? "A" : - (ft2232_interface == INTERFACE_B) ? "B" : - (ft2232_interface == INTERFACE_C) ? "C" : "D"); + (parameters.ft2232_interface == INTERFACE_A) ? "A" : + (parameters.ft2232_interface == INTERFACE_B) ? "B" : + (parameters.ft2232_interface == INTERFACE_C) ? "C" : "D"); if (ftdi_init(&ftdic) < 0) { msg_perr("ftdi_init failed.\n"); return -3; } - if (ftdi_set_interface(&ftdic, ft2232_interface) < 0) { + if (ftdi_set_interface(&ftdic, parameters.ft2232_interface) < 0) { msg_perr("Unable to select channel (%s).\n", ftdi_get_error_string(&ftdic)); } arg = extract_programmer_param_str(cfg, "serial"); arg2 = extract_programmer_param_str(cfg, "description"); - f = ftdi_usb_open_desc(&ftdic, ft2232_vid, ft2232_type, arg2, arg); + f = ftdi_usb_open_desc(&ftdic, parameters.ft2232_vid, parameters.ft2232_type, arg2, arg); free(arg); free(arg2); @@ -648,15 +665,15 @@ msg_pdbg("Set clock divisor\n"); buf[0] = TCK_DIVISOR; - buf[1] = (divisor / 2 - 1) & 0xff; - buf[2] = ((divisor / 2 - 1) >> 8) & 0xff; + buf[1] = (parameters.divisor / 2 - 1) & 0xff; + buf[2] = ((parameters.divisor / 2 - 1) >> 8) & 0xff; if (send_buf(&ftdic, buf, 3)) { ret = -6; goto ftdi_err; } msg_pdbg("MPSSE clock: %f MHz, divisor: %u, SPI clock: %f MHz\n", - mpsse_clk, divisor, (double)(mpsse_clk / divisor)); + mpsse_clk, parameters.divisor, (double)(mpsse_clk / parameters.divisor)); /* Disconnect TDI/DO to TDO/DI for loopback. */ msg_pdbg("No loopback of TDI/DO TDO/DI\n"); @@ -668,18 +685,18 @@ msg_pdbg("Set data bits\n"); buf[0] = SET_BITS_LOW; - buf[1] = cs_bits | aux_bits; - buf[2] = pindir; + buf[1] = parameters.cs_bits | parameters.aux_bits; + buf[2] = parameters.pindir; if (send_buf(&ftdic, buf, 3)) { ret = -8; goto ftdi_err; } - if (pindir_high) { + if (parameters.pindir_high) { msg_pdbg("Set data bits HighByte\n"); buf[0] = SET_BITS_HIGH; - buf[1] = aux_bits_high; - buf[2] = pindir_high; + buf[1] = parameters.aux_bits_high; + buf[2] = parameters.pindir_high; if (send_buf(&ftdic, buf, 3)) { ret = -8; goto ftdi_err; @@ -691,9 +708,9 @@ msg_perr("Unable to allocate space for SPI master data\n"); return SPI_GENERIC_ERROR; } - spi_data->cs_bits = cs_bits; - spi_data->aux_bits = aux_bits; - spi_data->pindir = pindir; + spi_data->cs_bits = parameters.cs_bits; + spi_data->aux_bits = parameters.aux_bits; + spi_data->pindir = parameters.pindir; spi_data->ftdic_context = ftdic; return register_spi_master(&spi_master_ft2232, spi_data); -- To view, visit https://review.coreboot.org/c/flashrom/+/67906 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I36b9f5f8481907bd605e9310bef08592bb7d9827 Gerrit-Change-Number: 67906 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: [WIP] ft2232_spi.c: Reduce scope of programmer param variables
by Angel Pons (Code Review) 27 Sep '22

27 Sep '22

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67904 ) Change subject: [WIP] ft2232_spi.c: Reduce scope of programmer param variables ...................................................................... [WIP] ft2232_spi.c: Reduce scope of programmer param variables These variables have a very short lifetime, so enclose them in a scope and give them more meaningful names. Ideally, programmer params should all be extracted before any init steps are performed. Change-Id: I2c091d7098ea97141da90b9f8b7b60f94a1a2d3d Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M ft2232_spi.c 1 file changed, 22 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/04/67904/1 diff --git a/ft2232_spi.c b/ft2232_spi.c index 6d7aa6a..3391998 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -330,7 +330,7 @@ */ uint32_t divisor = DEFAULT_DIVISOR; int f; - char *arg, *arg2; + char *arg; double mpsse_clk; uint8_t cs_bits = 0x08; @@ -603,13 +603,15 @@ msg_perr("Unable to select channel (%s).\n", ftdi_get_error_string(&ftdic)); } - arg = extract_programmer_param_str(cfg, "serial"); - arg2 = extract_programmer_param_str(cfg, "description"); + { + char *serial = extract_programmer_param_str(cfg, "serial"); + char *description = extract_programmer_param_str(cfg, "description"); - f = ftdi_usb_open_desc(&ftdic, ft2232_vid, ft2232_type, arg2, arg); + f = ftdi_usb_open_desc(&ftdic, ft2232_vid, ft2232_type, description, serial); - free(arg); - free(arg2); + free(serial); + free(description); + } if (f < 0 && f != -5) { msg_perr("Unable to open FTDI device: %d (%s)\n", f, -- To view, visit https://review.coreboot.org/c/flashrom/+/67904 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2c091d7098ea97141da90b9f8b7b60f94a1a2d3d Gerrit-Change-Number: 67904 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: manibuilder: Add list of 1.2.x targets
by Nico Huber (Code Review) 27 Sep '22

27 Sep '22

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67903 ) Change subject: manibuilder: Add list of 1.2.x targets ...................................................................... manibuilder: Add list of 1.2.x targets We didn't maintain a list at the 1.2 release. Maybe didn't even run manibuilder. Let's start one with distributions available at the 1.2 release and those available today. Change-Id: Ia6266ecfba5e9acb37acc41cc305f2f713de7a24 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M util/manibuilder/Makefile.targets 1 file changed, 81 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/03/67903/1 diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets index dff3879..4456c1e 100644 --- a/util/manibuilder/Makefile.targets +++ b/util/manibuilder/Makefile.targets @@ -186,6 +186,70 @@ # can only run what is still maintained 11X_TAGS := $(filter $(11X_TAGS),$(ALL_TAGS)) +# 1.2.x tags -- list was crafted late at the 1.2.1 release +12X_TAGS := \ + djgpp\:6.1.0 \ + fedora\:30-aarch64 \ + fedora\:30-x86_64 \ + fedora\:31-x86_64 \ + fedora\:32-aarch64 \ + fedora\:32-x86_64 \ + fedora\:33-ppc64le \ + fedora\:33-x86_64 \ + fedora\:34-aarch64 \ + fedora\:34-ppc64le \ + fedora\:34-s390x \ + fedora\:34-x86_64 \ + centos\:7.6-amd64-clean \ + centos\:7.6-armhpf-clean \ + debian-debootstrap\:amd64-stretch \ + debian-debootstrap\:arm64-stretch \ + debian-debootstrap\:armhf-stretch \ + debian-debootstrap\:i386-stretch \ + debian-debootstrap\:mipsel-stretch \ + debian-debootstrap\:amd64-buster \ + debian-debootstrap\:arm64-buster \ + debian-debootstrap\:armhf-buster \ + debian-debootstrap\:i386-buster \ + debian-debootstrap\:mips-buster \ + debian-debootstrap\:mipsel-buster \ + debian-debootstrap\:ppc64el-buster \ + debian-debootstrap\:amd64-bullseye \ + debian-debootstrap\:armhf-bullseye \ + debian-debootstrap\:i386-bullseye \ + debian-debootstrap\:mipsel-bullseye \ + debian-debootstrap\:ppc64el-bullseye \ + ubuntu-debootstrap\:amd64-bionic \ + ubuntu-debootstrap\:arm64-bionic \ + ubuntu-debootstrap\:i386-bionic \ + ubuntu-debootstrap\:amd64-focal \ + ubuntu-debootstrap\:arm64-focal \ + ubuntu-debootstrap\:armhf-focal \ + ubuntu-debootstrap\:ppc64el-focal \ + ubuntu-debootstrap\:amd64-jammy \ + ubuntu-debootstrap\:arm64-jammy \ + ubuntu-debootstrap\:armhf-jammy \ + ubuntu-debootstrap\:ppc64el-jammy \ + alpine\:aarch64-v3.9 \ + alpine\:amd64-v3.9 \ + alpine\:i386-v3.9 \ + alpine\:aarch64-v3.10 \ + alpine\:amd64-v3.10 \ + alpine\:armhf-v3.10 \ + alpine\:i386-v3.10 \ + alpine\:aarch64-v3.10 \ + alpine\:amd64-v3.10 \ + alpine\:armhf-v3.10 \ + alpine\:i386-v3.10 \ + alpine\:aarch64-v3.12 \ + alpine\:amd64-v3.12 \ + alpine\:i386-v3.12 \ + alpine\:amd64-v3.14 \ + alpine\:i386-v3.14 \ + +# can only run what is still maintained +12X_TAGS := $(filter $(12X_TAGS),$(ALL_TAGS)) + default: $(DEFAULT_TAGS) native: $(NATIVE_TAGS) @@ -200,6 +264,9 @@ 1.1.x: export TEST_REVISION=refs/heads/1.1.x 1.1.x: $(11X_TAGS) +1.2.x: export TEST_REVISION=refs/heads/1.2.x +1.2.x: $(12X_TAGS) + show-default: @printf "%s\n" $(DEFAULT_TAGS) -- To view, visit https://review.coreboot.org/c/flashrom/+/67903 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia6266ecfba5e9acb37acc41cc305f2f713de7a24 Gerrit-Change-Number: 67903 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: jlink_spi.c: Move variable `speed` into parameter struct
by Angel Pons (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Felix Singer. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67886 ) Change subject: jlink_spi.c: Move variable `speed` into parameter struct ...................................................................... Patch Set 3: (1 comment) File jlink_spi.c: https://review.coreboot.org/c/flashrom/+/67886/comment/d4c04cf2_fafeb2d5 PS3, Line 196: struct jlink_spi_parameters { What's the point of this struct? Will it ever be used outside of the `jlink_spi_init()` function? -- To view, visit https://review.coreboot.org/c/flashrom/+/67886 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7af29e4bd107bfcda929155bbe603798d092fa79 Gerrit-Change-Number: 67886 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Comment-Date: Tue, 27 Sep 2022 14:03:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: manibuilder: Maintain list of broken images
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66996 ) Change subject: manibuilder: Maintain list of broken images ...................................................................... manibuilder: Maintain list of broken images Disable images that can't be built anymore by default. We keep them listed, so existing images can still be used. Also add commands to show and run all supposed-to-be working tags. Change-Id: I0f0ffb6c5e28348656aac2ce265f8b1dc0e93362 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/66996 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M util/manibuilder/Makefile.targets 1 file changed, 29 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets index ec4bdfa..dff3879 100644 --- a/util/manibuilder/Makefile.targets +++ b/util/manibuilder/Makefile.targets @@ -38,6 +38,12 @@ ALL_TAGS := $(ANITA_TAGS) $(MULTIARCH_TAGS) $(OTHER_TAGS) +BROKEN_TAGS := anita\:7.1-amd64 anita\:7.1-i386 \ + centos\:7.6-armhfp-clean \ + fedora\:30-s390x fedora\:28-armhfp \ + +WORKING_TAGS := $(filter-out $(BROKEN_TAGS),$(ALL_TAGS)) + arch_filter = $(sort \ $(foreach arch,$(1), \ $(filter-out $(subst $(arch),,$(MULTIARCH_TAGS)),$(MULTIARCH_TAGS)))) @@ -184,6 +190,8 @@ native: $(NATIVE_TAGS) +working: $(WORKING_TAGS) + all: $(ALL_TAGS) 1.0.x: export TEST_REVISION=refs/heads/1.0.x @@ -198,6 +206,9 @@ show-native: @printf "%s\n" $(NATIVE_TAGS) +show-working: + @printf "%s\n" $(WORKING_TAGS) + show-all: @printf "%s\n" $(ALL_TAGS) -- To view, visit https://review.coreboot.org/c/flashrom/+/66996 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0f0ffb6c5e28348656aac2ce265f8b1dc0e93362 Gerrit-Change-Number: 66996 Gerrit-PatchSet: 4 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: manibuilder/alpine: Disable https for Alpine 3.7 and 3.8
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67186 ) Change subject: manibuilder/alpine: Disable https for Alpine 3.7 and 3.8 ...................................................................... manibuilder/alpine: Disable https for Alpine 3.7 and 3.8 Alpine Linux 3.7 and 3.8 fell behind with their pre-installed cer- tificates. Plus, there seems to be no way to override certificate checks when downloading packages. Hence, disable https completely. Change-Id: I49dc3a2a2d44f948182e7571f6289b74e6fa6eb4 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/67186 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M util/manibuilder/Dockerfile.alpine M util/manibuilder/Makefile 2 files changed, 24 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/util/manibuilder/Dockerfile.alpine b/util/manibuilder/Dockerfile.alpine index 91b8806..674b545 100644 --- a/util/manibuilder/Dockerfile.alpine +++ b/util/manibuilder/Dockerfile.alpine @@ -1,7 +1,9 @@ FROM manibase +ARG PROTO=https RUN \ adduser -D mani mani && \ + sed -i "s/https/${PROTO}/" /etc/apk/repositories && \ apk update && \ apk add ca-certificates build-base linux-headers git ccache \ pciutils-dev libusb-compat-dev libusb-dev diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile index 5b58b05..98ed30c 100644 --- a/util/manibuilder/Makefile +++ b/util/manibuilder/Makefile @@ -21,12 +21,15 @@ .INTERMEDIATE: Dockerfile.$(call ident,$(1)) $(1)-build: Dockerfile.$(call ident,$(1)) - $(QUIET_SETUP)docker build . -f $$< -t mani/$(1) + $(QUIET_SETUP)docker build . -f $$< -t mani/$(1) $$(DOCKER_BUILD_ARGS) endef $(foreach tag,$(MULTIARCH_TAGS), \ $(eval $(call build_template,$(tag),multiarch))) +$(addsuffix -build,$(filter alpine%v3.7 alpine%v3.8,$(MULTIARCH_TAGS))): \ + DOCKER_BUILD_ARGS = --build-arg PROTO=http + djgpp\:6.1.0-build: %-build: Dockerfile.djgpp mani-wrapper.sh $(QUIET_SETUP)docker build . -f $< -t mani/$* -- To view, visit https://review.coreboot.org/c/flashrom/+/67186 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I49dc3a2a2d44f948182e7571f6289b74e6fa6eb4 Gerrit-Change-Number: 67186 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: mainbuilder/djgpp: Disable TLS verification for curl and Git
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67178 ) Change subject: mainbuilder/djgpp: Disable TLS verification for curl and Git ...................................................................... mainbuilder/djgpp: Disable TLS verification for curl and Git This image is based on an old unsupported SUSE version. The ca-certificates don't get updates anymore. Change-Id: Ie46e3772f030765d6abb092727e2fbed61d3d989 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/67178 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M util/manibuilder/Dockerfile.djgpp 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/util/manibuilder/Dockerfile.djgpp b/util/manibuilder/Dockerfile.djgpp index 970ceb4..7bd5c7b 100644 --- a/util/manibuilder/Dockerfile.djgpp +++ b/util/manibuilder/Dockerfile.djgpp @@ -6,6 +6,7 @@ useradd -p locked -m mani && \ zypper -q install -y tar make git ccache +ENV GIT_SSL_NO_VERIFY=1 USER mani RUN cd && \ mkdir .ccache && chown mani:users .ccache && \ @@ -13,14 +14,14 @@ git clone https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git && \ cd pciutils && \ git checkout v3.5.6 && \ - curl https://flashrom.org/images/6/6a/Pciutils-3.5.6.patch.gz | zcat | git apply && \ + curl --insecure https://flashrom.org/images/6/6a/Pciutils-3.5.6.patch.gz | zcat | git apply && \ make ZLIB=no DNS=no HOST=i386-djgpp-djgpp \ CROSS_COMPILE=i586-pc-msdosdjgpp- \ PREFIX=/ DESTDIR=$PWD/../ \ STRIP="--strip-program=i586-pc-msdosdjgpp-strip -s" \ install install-lib && \ cd ../ && \ - curl https://flashrom.org/images/3/3d/Libgetopt.tar.gz | zcat | tar x && \ + curl --insecure https://flashrom.org/images/3/3d/Libgetopt.tar.gz | zcat | tar x && \ cd libgetopt && \ make && cp libgetopt.a ../lib/ && cp getopt.h ../include/ -- To view, visit https://review.coreboot.org/c/flashrom/+/67178 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie46e3772f030765d6abb092727e2fbed61d3d989 Gerrit-Change-Number: 67178 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: manibuilder: Switch Dockerfile.anita to Bullseye and Python 3
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/65633 ) Change subject: manibuilder: Switch Dockerfile.anita to Bullseye and Python 3 ...................................................................... manibuilder: Switch Dockerfile.anita to Bullseye and Python 3 Basing the image on debian:stable turned out to be a bad idea once stable switched to Bullseye. Instead of falling back to Buster, we move forward to Bullseye and pin that version. Hopefully that works for some years again. With Bullseye it turned out to be easier to do things with Python 3, so we use that now. To ease future changes, we use tinier RUN and ARG steps which creates more intermediate images. Such intermediate images can be reused if some later step is changed in the Dockerfile. Change-Id: Ic064ddad807329a9bd81085775190615ad89273f Signed-off-by: Nico Huber <nico.h(a)gmx.de> Ticket: https://ticket.coreboot.org/issues/383 Reviewed-on: https://review.coreboot.org/c/flashrom/+/65633 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M util/manibuilder/Dockerfile.anita 1 file changed, 35 insertions(+), 9 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/util/manibuilder/Dockerfile.anita b/util/manibuilder/Dockerfile.anita index f4b1309..6ef41b9 100644 --- a/util/manibuilder/Dockerfile.anita +++ b/util/manibuilder/Dockerfile.anita @@ -1,22 +1,22 @@ -FROM debian:stable +FROM debian:bullseye ARG PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/7.1/All ARG INST_IMG=http://ftp.de.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/ -ARG DISK_SIZE=1G -ARG INSTALL_MEM=128M -ARG EXTRA_PKG="" RUN \ useradd -p locked -m mani && \ apt-get -qq update && \ apt-get -qq upgrade && \ apt-get -qq dist-upgrade && \ - apt-get -qqy install git python python-pexpect \ - genisoimage qemu-system && \ - apt-get clean && \ - git clone https://github.com/gson1703/anita.git && \ - cd anita && python setup.py install + apt-get -qqy install git python-is-python3 python3-pexpect \ + python3-distutils genisoimage qemu-system && \ + apt-get clean +RUN git clone https://github.com/gson1703/anita.git +RUN cd anita && python setup.py install + +ARG DISK_SIZE=1G +ARG INSTALL_MEM=128M USER mani RUN cd && mkdir .ccache && chown mani:mani .ccache && \ anita --sets kern-GENERIC,modules,base,etc,comp \ @@ -24,6 +24,7 @@ install ${INST_IMG} && \ rm -rf work-*/download +ARG EXTRA_PKG="" ARG RUNTIME_MEM=128M RUN cd && anita --persist --memory-size=${RUNTIME_MEM} --run \ "echo 'dhcpcd' >init && \ -- To view, visit https://review.coreboot.org/c/flashrom/+/65633 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic064ddad807329a9bd81085775190615ad89273f Gerrit-Change-Number: 65633 Gerrit-PatchSet: 6 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin L Roth <gaumless(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: manibuilder: Switch Dockerfile.anita to Bullseye and Python 3
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Nico Huber, Paul Menzel, Thomas Heijligen. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/65633 ) Change subject: manibuilder: Switch Dockerfile.anita to Bullseye and Python 3 ...................................................................... Patch Set 5: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/65633/comment/9ac38eb4_d0a7a3bb PS3, Line 16: steps which creates more intermediate images. Such intermediate images > Not the way I meant it ([the fact that] we use tinier [...] steps [...] creates), but […] Done -- To view, visit https://review.coreboot.org/c/flashrom/+/65633 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic064ddad807329a9bd81085775190615ad89273f Gerrit-Change-Number: 65633 Gerrit-PatchSet: 5 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin L Roth <gaumless(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 13:51:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: manibuilder/ubuntu: Add newer image tags
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67011 ) Change subject: manibuilder/ubuntu: Add newer image tags ...................................................................... manibuilder/ubuntu: Add newer image tags Add tags for the latest LTS releases Focal Fossa and Jammy Jellyfish. Only i386 is left behind because it lacks some packages. Change-Id: I81ab0401c8d69b594fa0db305b4f675f4f08a895 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/67011 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M util/manibuilder/Makefile.targets 1 file changed, 21 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets index 5bde7d5..ec4bdfa 100644 --- a/util/manibuilder/Makefile.targets +++ b/util/manibuilder/Makefile.targets @@ -23,7 +23,10 @@ $(foreach a,arm64 mips, \ $(foreach v,buster stretch, \ debian-debootstrap\:$(a)-$(v))) \ - $(foreach a,ppc64el arm64 armhf amd64 i386, \ + $(foreach a,ppc64el arm64 armhf amd64, \ + $(foreach v,jammy focal bionic xenial, \ + ubuntu-debootstrap\:$(a)-$(v))) \ + $(foreach a,i386, \ $(foreach v,bionic xenial, \ ubuntu-debootstrap\:$(a)-$(v))) \ ubuntu-debootstrap\:powerpc-xenial \ -- To view, visit https://review.coreboot.org/c/flashrom/+/67011 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I81ab0401c8d69b594fa0db305b4f675f4f08a895 Gerrit-Change-Number: 67011 Gerrit-PatchSet: 4 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2022