Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/83942?usp=email )
Change subject: doc: Remove leftover reference to building_with_make
......................................................................
doc: Remove leftover reference to building_with_make
Change-Id: If6d3580972ea7d42503004b922b90829025bd62d
Signed-off-by: Anastasia Klimchuk <aklm(a)flashrom.org>
---
M doc/user_docs/example_partial_wp.rst
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/42/83942/1
diff --git a/doc/user_docs/example_partial_wp.rst b/doc/user_docs/example_partial_wp.rst
index 67a382a..811c772 100644
--- a/doc/user_docs/example_partial_wp.rst
+++ b/doc/user_docs/example_partial_wp.rst
@@ -14,8 +14,8 @@
Write-protect manipulation functionality is included in flashrom since release v1.3.0.
If for any reasons you need the latest code from head, you might need to build :code:`flashrom`
-from scratch. The following docs describe how to do this :doc:`/dev_guide/building_from_source` and
-:doc:`/dev_guide/building_with_make`. See also :doc:`/dev_guide/development_guide`.
+from scratch. The following doc describe how to do this: :doc:`/dev_guide/building_from_source`.
+See also :doc:`/dev_guide/development_guide`.
Alternatively, your operating system might provide development version of :code:`flashrom` as a package.
--
To view, visit https://review.coreboot.org/c/flashrom/+/83942?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: If6d3580972ea7d42503004b922b90829025bd62d
Gerrit-Change-Number: 83942
Gerrit-PatchSet: 1
Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org>
Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/83941?usp=email )
Change subject: tree: Remove print_wiki.c
......................................................................
tree: Remove print_wiki.c
Old wiki website is retired and so is print_wiki.c
Change-Id: I9990add27f7fdddc23ddd1f33306566ce7548417
Signed-off-by: Anastasia Klimchuk <aklm(a)flashrom.org>
---
M cli_classic.c
M doc/classic_cli_manpage.rst
M include/flash.h
M include/programmer.h
M known_boards.c
M meson.build
M meson_options.txt
D print_wiki.c
8 files changed, 2 insertions(+), 508 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/41/83941/1
diff --git a/cli_classic.c b/cli_classic.c
index ffded5f..3343438 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -51,9 +51,6 @@
bool read_it, extract_it, write_it, erase_it, verify_it;
bool dont_verify_it, dont_verify_all;
bool list_supported;
-#if CONFIG_PRINT_WIKI == 1
- bool list_supported_wiki;
-#endif
char *filename;
const struct programmer_entry *prog;
@@ -81,9 +78,6 @@
static void cli_classic_usage(const char *name)
{
printf("Usage: %s [-h|-R|-L|"
-#if CONFIG_PRINT_WIKI == 1
- "-z|"
-#endif
"\n\t-p <programmername>[:<parameters>] [-c <chipname>]\n"
"\t\t(--flash-name|--flash-size|\n"
"\t\t [-E|-x|(-r|-w|-v) <file>]\n"
@@ -124,16 +118,10 @@
" -o | --output <logfile> log output to <logfile>\n"
" --flash-contents <ref-file> assume flash contents to be <ref-file>\n"
" -L | --list-supported print supported devices\n"
-#if CONFIG_PRINT_WIKI == 1
- " -z | --list-supported-wiki print supported devices in wiki syntax\n"
-#endif
" --progress show progress percentage on the standard output\n"
" -p | --programmer <name>[:<param>] specify the programmer device. One of\n");
list_programmers_linebreak(4, 80, 0);
printf(".\n\nYou can specify one of -h, -R, -L, "
-#if CONFIG_PRINT_WIKI == 1
- "-z, "
-#endif
"-E, -r, -w, -v or no operation.\n"
"If no operation is specified, flashrom will only probe for flash chips.\n");
}
@@ -754,15 +742,6 @@
cli_classic_validate_singleop(&operation_specified);
options->list_supported = true;
break;
- case 'z':
-#if CONFIG_PRINT_WIKI == 1
- cli_classic_validate_singleop(&operation_specified);
- options->list_supported_wiki = true;
-#else
- cli_classic_abort_usage("Error: Wiki output was not "
- "compiled in. Aborting.\n");
-#endif
- break;
case 'p':
if (options->prog != NULL) {
cli_classic_abort_usage("Error: --programmer specified "
@@ -895,7 +874,6 @@
{"wp-enable", 0, NULL, OPTION_WP_ENABLE},
{"wp-disable", 0, NULL, OPTION_WP_DISABLE},
{"list-supported", 0, NULL, 'L'},
- {"list-supported-wiki", 0, NULL, 'z'},
{"programmer", 1, NULL, 'p'},
{"help", 0, NULL, 'h'},
{"version", 0, NULL, 'R'},
@@ -934,13 +912,6 @@
if (options.logfile && open_logfile(options.logfile))
cli_classic_abort_usage(NULL);
-#if CONFIG_PRINT_WIKI == 1
- if (options.list_supported_wiki) {
- print_supported_wiki();
- goto out;
- }
-#endif
-
if (options.list_supported) {
if (print_supported())
ret = 1;
diff --git a/doc/classic_cli_manpage.rst b/doc/classic_cli_manpage.rst
index d8380c7..932f4c9 100644
--- a/doc/classic_cli_manpage.rst
+++ b/doc/classic_cli_manpage.rst
@@ -11,7 +11,7 @@
SYNOPSIS
--------
-| **flashrom** [-h|-R|-L|-z|
+| **flashrom** [-h|-R|-L|
| -p <programmername>[:<parameters>] [-c <chipname>]
| (--flash-name|--flash-size|
| [-E|-x|-r <file>|-w <file>|-v <file>]
@@ -39,7 +39,7 @@
OPTIONS
-------
-You can specify one of ``-h``, ``-R``, ``-L``, ``-z``, ``-E``, ``-r``, ``-w``, ``-v`` or no operation.
+You can specify one of ``-h``, ``-R``, ``-L``, ``-E``, ``-r``, ``-w``, ``-v`` or no operation.
If no operation is specified, **flashrom** will only probe for flash chips. It is recommended that if you try **flashrom** the
first time on a system, you run it in probe-only mode and check the output.
Also you are advised to make a backup of your current ROM contents with ``-r`` before you try to write a new image.
@@ -256,12 +256,6 @@
For verification you have to test an ERASE and/or WRITE operation, so make sure you only do that if you have proper means to recover from failure!
-**-z, --list-supported-wiki**
- Same as ``--list-supported``, but outputs the supported hardware in MediaWiki syntax,
- so that it can be easily pasted into the `supported hardware wiki page <https://flashrom.org/Supported_hardware>`_.
- Please note that MediaWiki output is not compiled in by default.
-
-
**-p, --programmer <name>[:parameter[,parameter[,parameter]]]**
Specify the programmer device. This is mandatory for all operations involving any chip access (probe/read/write/...).
Currently supported are:
diff --git a/include/flash.h b/include/flash.h
index aa89409..d9a20ad 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -606,7 +606,6 @@
/* print.c */
int print_supported(void);
-void print_supported_wiki(void);
/* helpers.c */
uint32_t address_to_bits(uint32_t addr);
diff --git a/include/programmer.h b/include/programmer.h
index a90624b..77e79ae 100644
--- a/include/programmer.h
+++ b/include/programmer.h
@@ -208,10 +208,8 @@
const char *vendor;
const char *name;
const enum test_state working;
-#ifdef CONFIG_PRINT_WIKI
const char *url;
const char *note;
-#endif
};
extern const struct board_info boards_known[];
diff --git a/known_boards.c b/known_boards.c
index afc6992..c412b8f 100644
--- a/known_boards.c
+++ b/known_boards.c
@@ -18,12 +18,7 @@
#include "programmer.h"
-
-#ifdef CONFIG_PRINT_WIKI
#define B(vendor, name, status, url, note) { vendor, name, status, url, note }
-#else
-#define B(vendor, name, status, url, note) { vendor, name, status }
-#endif
/* Please keep this list alphabetically ordered by vendor/board. */
const struct board_info boards_known[] = {
diff --git a/meson.build b/meson.build
index ae56b26..85d69b8 100644
--- a/meson.build
+++ b/meson.build
@@ -61,7 +61,6 @@
add_project_arguments('-DFLASHROM_VERSION="' + flashrom_version + '"', language : 'c')
# get defaults from configure
-config_print_wiki= get_option('classic_cli_print_wiki')
config_default_programmer_name = get_option('default_programmer_name')
config_default_programmer_args = get_option('default_programmer_args')
@@ -623,15 +622,6 @@
endif
endforeach
-if config_print_wiki.enabled()
- if get_option('classic_cli').disabled()
- error('`classic_cli_print_wiki` can not be enabled without `classic_cli`')
- else
- srcs += files('print_wiki.c')
- cargs += '-DCONFIG_PRINT_WIKI=1'
- endif
-endif
-
if config_default_programmer_name != ''
cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=&programmer_' + config_default_programmer_name
else
diff --git a/meson_options.txt b/meson_options.txt
index 8a04114..0f56e26 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,4 @@
option('classic_cli', type : 'feature', value : 'enabled', description : 'classic flashrom cli binary')
-option('classic_cli_print_wiki', type : 'feature', value : 'disabled', description : 'Print Wiki')
option('default_programmer_name', type : 'string', description : 'default programmer')
option('default_programmer_args', type : 'string', description : 'default programmer arguments')
option('ich_descriptors_tool', type : 'feature', value : 'auto', description : 'Build ich_descriptors_tool')
diff --git a/print_wiki.c b/print_wiki.c
deleted file mode 100644
index a0cade9..0000000
--- a/print_wiki.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * This file is part of the flashrom project.
- *
- * Copyright (C) 2009 Uwe Hermann <uwe(a)hermann-uwe.de>
- * Copyright (C) 2009 Carl-Daniel Hailfinger
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include "flash.h"
-#include "flashchips.h"
-#include "programmer.h"
-
-static const char wiki_header[] = "= Supported devices =\n\n\
-<div style=\"margin-top:0.5em; padding:0.5em 0.5em 0.5em 0.5em; \
-background-color:#eeeeee; text-align:left; border:1px solid #aabbcc;\">\
-<small>\n\
-'''Last update:''' %s (generated by flashrom %s)<br />\n\
-The tables below are generated from flashrom's source by copying the output of '''flashrom -z'''.<br /><br />\n\
-A short explanation of the cells representing the support state follows:<br />\n\
-{| border=\"0\" valign=\"top\"\n\
-! style=\"text-align:left;\" |\n\
-! style=\"text-align:left;\" |\n\
-|-\n\
-|{{OK}}\n\
-| The feature was '''tested and should work''' in general unless there is a bug in flashrom or another component in \
-the system prohibits some functionality.\n\
-|-\n\
-|{{Dep}}\n\
-| '''Configuration-dependent'''. The feature was tested and should work in general but there are common \
-configurations that drastically limit flashrom's capabilities or make it completely stop working.\n\
-|-\n\
-|{{?3}}\n\
-| The feature is '''untested''' but believed to be working.\n\
-|-\n\
-|{{NA}}\n\
-| The feature is '''not applicable''' in this configuration (e.g. write operations on ROM chips).\n\
-|-\n\
-|{{No}}\n\
-| The feature is '''known to not work'''. Don't bother testing (nor reporting. Patches welcome! ;).\n\
-|}\n\
-</small></div>\n";
-
-static const char th_start[] = "| valign=\"top\"|\n\n\
-{| border=\"0\" style=\"font-size: smaller\" valign=\"top\"\n\
-|- bgcolor=\"#6699dd\"\n";
-
-#if CONFIG_INTERNAL == 1
-static const char chipset_th[] = "\
-! align=\"left\" | Vendor\n\
-! align=\"left\" | Southbridge\n\
-! align=\"center\" | PCI IDs\n\
-! align=\"center\" | Status\n\n";
-
-static const char board_th[] = "\
-! align=\"left\" | Vendor\n\
-! align=\"left\" | Mainboard\n\
-! align=\"left\" | Required option\n\
-! align=\"center\" | Status\n\n";
-
-static const char board_intro[] = "\
-\n== Supported mainboards ==\n\n\
-In general, it is very likely that flashrom works out of the box even if your \
-mainboard is not listed below.\n\nThis is a list of mainboards where we have \
-verified that they either do or do not need any special initialization to \
-make flashrom work (given flashrom supports the respective chipset and flash \
-chip), or that they do not yet work at all. If they do not work, support may \
-or may not be added later.\n\n\
-Mainboards (or individual revisions) which don't appear in the list may or may \
-not work (we don't know, someone has to give it a try). Please report any \
-further verified mainboards on the [[Contact#Mailing_List|mailing list]].\n";
-#endif
-
-static const char chip_th[] = "\
-! align=\"left\" | Vendor\n\
-! align=\"left\" | Device\n\
-! align=\"center\" | Size [kB]\n\
-! align=\"center\" | Type\n\
-! align=\"center\" colspan=\"4\" | Status\n\
-! align=\"center\" colspan=\"2\" | Voltage [V]\n\n\
-|- bgcolor=\"#6699ff\"\n| colspan=\"4\" | \n\
-| Probe\n| Read\n| Erase\n| Write\n\
-| align=\"center\" | Min\n| align=\"center\" | Max\n\n";
-
-static const char chip_intro[] = "\
-\n== Supported flash chips ==\n\n\
-The list below contains all chips that have some kind of explicit support added to flashrom and their last \
-known test status. Newer SPI flash chips might work even without explicit support if they implement SFDP ([\
-http://www.jedec.org/standards-documents/docs/jesd216 Serial Flash Discoverable Parameters - JESD216]). \
-Flashrom will detect this automatically and inform you about it.\n\n\
-The names used below are designed to be as concise as possible and hence contain only the characters \
-describing properties that are relevant to flashrom. Irrelevant characters specify attributes flashrom can not \
-use or even detect by itself (e.g. the physical package) and have no effect on flashrom's operation. They are \
-replaced by dots ('.') functioning as wildcards (like in Regular Expressions) or are completely omitted at the \
-end of a name.\n";
-
-static const char programmer_th[] = "\
-! align=\"left\" | Programmer\n\
-! align=\"left\" | Vendor\n\
-! align=\"left\" | Device\n\
-! align=\"center\" | IDs\n\
-! align=\"center\" | Status\n\n";
-
-/* The output of this module relies on MediaWiki templates to select special formatting styles for table cells
- * reflecting the test status of the respective hardware. This functions returns the correct template name for
- * the supplied enum test_state. */
-static const char *test_state_to_template(enum test_state test_state)
-{
- switch (test_state) {
- case OK: return "OK";
- case BAD: return "No";
- case NA: return "NA";
- case DEP: return "Dep";
- case NT:
- default: return "?3";
- }
-}
-
-#if CONFIG_INTERNAL == 1
-static const char laptop_intro[] = "\n== Supported mobile devices (laptops, tablets etc.) ==\n\n\
-In general, flashing mobile devices is more difficult because they\n\n\
-* often use the flash chip for stuff besides the BIOS,\n\
-* often have special protection stuff which has to be handled by flashrom,\n\
-* often use flash translation circuits which need drivers in flashrom.\n\n\
-<div style=\"margin-top:0.5em; padding:0.5em 0.5em 0.5em 0.5em; \
-background-color:#ff6666; align:right; border:1px solid #000000;\">\n\
-'''IMPORTANT:''' At this point we recommend to '''not''' use flashrom on \
-untested mobile devices unless you have a means to recover from a flashing that goes \
-wrong (a working backup flash chip and/or good soldering skills).\n</div>\n";
-
-static void print_supported_chipsets_wiki(int cols)
-{
- int i;
- unsigned int lines_per_col;
- const struct penable *e;
- int enablescount = 0, color = 1;
-
- for (e = chipset_enables; e->vendor_name != NULL; e++)
- enablescount++;
-
- /* +1 to force the resulting number of columns to be < cols */
- lines_per_col = enablescount / cols + ((enablescount%cols) > 0 ? 1 : 0);
-
- printf("\n== Supported chipsets ==\n\nTotal amount of supported chipsets: '''%d'''\n\n"
- "{| border=\"0\" valign=\"top\"\n", enablescount);
-
- e = chipset_enables;
- for (i = 0; e[i].vendor_name != NULL; i++) {
- if ((i % lines_per_col) == 0)
- printf("%s%s", th_start, chipset_th);
-
- /* Alternate colors if the vendor changes. */
- if (i > 0 && strcmp(e[i].vendor_name, e[i - 1].vendor_name))
- color = !color;
-
- printf("|- bgcolor=\"#%s\"\n| %s || %s "
- "|| %04x:%04x || {{%s}}\n", (color) ? "eeeeee" : "dddddd",
- e[i].vendor_name, e[i].device_name,
- e[i].vendor_id, e[i].device_id,
- test_state_to_template(e[i].status));
-
- if (((i % lines_per_col) + 1) == lines_per_col)
- printf("\n|}\n\n");
- }
-
- /* end inner table if it did not fill the last column fully */
- if (((i % lines_per_col)) > 0)
- printf("\n|}\n\n");
- printf("\n\n|}\n");
-}
-
-static void print_supported_boards_wiki_helper(const char *devicetype, int cols, const struct board_info boards[])
-{
- int i, k;
- unsigned int boardcount, lines_per_col;
- unsigned int boardcount_good = 0, boardcount_bad = 0, boardcount_nt = 0;
- int num_notes = 0, color = 1;
- char *notes = calloc(1, 1);
- char tmp[900 + 1];
- const struct board_match *b = board_matches;
-
- for (i = 0; boards[i].vendor != NULL; i++) {
- if (boards[i].working == OK)
- boardcount_good++;
- else if (boards[i].working == NT)
- boardcount_nt++;
- else
- boardcount_bad++;
- }
- boardcount = boardcount_good + boardcount_nt + boardcount_bad;
-
- /* +1 to force the resulting number of columns to be < cols */
- lines_per_col = boardcount / cols + ((boardcount%cols) > 0 ? 1 : 0);
-
- printf("\n\nTotal amount of known good %s: '''%d'''; "
- "Untested (e.g. user vanished before testing new code): '''%d'''; "
- "Not yet supported (i.e. known-bad): '''%d'''.\n\n"
- "{| border=\"0\" valign=\"top\"\n", devicetype, boardcount_good, boardcount_nt, boardcount_bad);
-
- for (i = 0; boards[i].vendor != NULL; i++) {
- if ((i % lines_per_col) == 0)
- printf("%s%s", th_start, board_th);
-
- /* Alternate colors if the vendor changes. */
- if (i > 0 && strcmp(boards[i].vendor, boards[i - 1].vendor))
- color = !color;
-
- k = 0;
- while ((b[k].vendor_name != NULL) &&
- (strcmp(b[k].vendor_name, boards[i].vendor) ||
- strcmp(b[k].board_name, boards[i].name))) {
- k++;
- }
-
- printf("|- bgcolor=\"#%s\"\n| %s || %s%s %s%s || %s%s%s%s "
- "|| {{%s}}", (color) ? "eeeeee" : "dddddd",
- boards[i].vendor,
- boards[i].url ? "[" : "",
- boards[i].url ? boards[i].url : "",
- boards[i].name,
- boards[i].url ? "]" : "",
- b[k].lb_vendor ? "-p internal:mainboard=" : "—",
- b[k].lb_vendor ? b[k].lb_vendor : "",
- b[k].lb_vendor ? ":" : "",
- b[k].lb_vendor ? b[k].lb_part : "",
- test_state_to_template(boards[i].working));
-
- if (boards[i].note) {
- num_notes++;
- printf(" <span id=\"%s_ref%d\"><sup>[[#%s_note%d|%d]]</sup></span>\n",
- devicetype, num_notes, devicetype, num_notes, num_notes);
- int ret = snprintf(tmp, sizeof(tmp),
- "<span id=\"%s_note%d\">%d. [[#%s_ref%d|↑]]</span>"
- " <nowiki>%s</nowiki><br />\n", devicetype, num_notes, num_notes,
- devicetype, num_notes, boards[i].note);
- if (ret < 0 || (unsigned int)ret >= sizeof(tmp)) {
- fprintf(stderr, "Footnote text #%d of %s truncated (ret=%d, sizeof(tmp)=%zu)\n",
- num_notes, devicetype, ret, sizeof(tmp));
- }
- notes = strcat_realloc(notes, tmp);
- } else {
- printf("\n");
- }
-
- if (((i % lines_per_col) + 1) == lines_per_col)
- printf("\n|}\n\n");
- }
-
- /* end inner table if it did not fill the last column fully */
- if (((i % lines_per_col)) > 0)
- printf("\n|}\n\n");
- printf("|}\n");
-
- if (num_notes > 0)
- printf("\n<small>\n%s</small>\n", notes);
- free(notes);
-}
-
-static void print_supported_boards_wiki(void)
-{
- printf("%s", board_intro);
- print_supported_boards_wiki_helper("mainboards", 2, boards_known);
-
- printf("%s", laptop_intro);
- print_supported_boards_wiki_helper("mobile devices", 1, laptops_known);
-}
-#endif
-
-static void print_supported_chips_wiki(int cols)
-{
- unsigned int lines_per_col;
- char *s;
- char vmax[6];
- char vmin[6];
- const struct flashchip *f, *old = NULL;
- int i = 0, c = 1, chipcount = 0;
-
- for (f = flashchips; f->name != NULL; f++) {
- /* Don't count generic entries. */
- if (!strncmp(f->vendor, "Unknown", 7) ||
- !strncmp(f->vendor, "Programmer", 10) ||
- !strncmp(f->name, "unknown", 7))
- continue;
- chipcount++;
- }
-
- /* +1 to force the resulting number of columns to be < cols */
- lines_per_col = chipcount / cols + ((chipcount%cols) > 0 ? 1 : 0);
-
- printf("%s", chip_intro);
- printf("\nTotal amount of supported chips: '''%d'''\n\n"
- "{| border=\"0\" valign=\"top\"\n", chipcount);
-
- for (f = flashchips; f->name != NULL; f++) {
- /* Don't print generic entries. */
- if (!strncmp(f->vendor, "Unknown", 7) ||
- !strncmp(f->vendor, "Programmer", 10) ||
- !strncmp(f->name, "unknown", 7))
- continue;
-
- if ((i % lines_per_col) == 0)
- printf("%s%s", th_start, chip_th);
-
- /* Alternate colors if the vendor changes. */
- if (old != NULL && strcmp(old->vendor, f->vendor))
- c = !c;
-
- old = f;
- s = flashbuses_to_text(f->bustype);
- sprintf(vmin, "%0.03f", f->voltage.min / (double)1000);
- sprintf(vmax, "%0.03f", f->voltage.max / (double)1000);
- printf("|- bgcolor=\"#%s\"\n| %s || %s || align=\"right\" | %d "
- "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}"
- "|| %s || %s\n",
- (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name,
- f->total_size, s ? s : "?",
- test_state_to_template(f->tested.probe),
- test_state_to_template(f->tested.read),
- test_state_to_template(f->tested.erase),
- test_state_to_template(f->tested.write),
- f->voltage.min ? vmin : "?",
- f->voltage.max ? vmax : "?");
- free(s);
-
- if (((i % lines_per_col) + 1) == lines_per_col)
- printf("\n|}\n\n");
- i++;
- }
- /* end inner table if it did not fill the last column fully */
- if (((i % lines_per_col)) > 0)
- printf("\n|}\n\n");
- printf("|}\n\n");
-}
-
-/* Following functions are not needed when no PCI/USB programmers are compiled in,
- * but since print_wiki code has no size constraints we include it unconditionally. */
-static int count_supported_devs_wiki(const struct dev_entry *devs)
-{
- unsigned int count = 0;
- unsigned int i = 0;
- for (i = 0; devs[i].vendor_id != 0; i++)
- count++;
- return count;
-}
-
-static void print_supported_devs_wiki_helper(const struct programmer_entry *const prog)
-{
- int i = 0;
- static int c = 0;
- const struct dev_entry *devs = prog->devs.dev;
- const unsigned int count = count_supported_devs_wiki(devs);
-
- /* Alternate colors if the vendor changes. */
- c = !c;
-
- for (i = 0; devs[i].vendor_id != 0; i++) {
- printf("|- bgcolor=\"#%s\"\n", (c) ? "eeeeee" : "dddddd");
- if (i == 0)
- printf("| rowspan=\"%u\" | %s |", count, prog->name);
- printf("| %s || %s || %04x:%04x || {{%s}}\n", devs[i].vendor_name, devs[i].device_name,
- devs[i].vendor_id, devs[i].device_id, test_state_to_template(devs[i].status));
- }
-}
-
-static void print_supported_devs_wiki()
-{
- unsigned int pci_count = 0;
- unsigned int usb_count = 0;
- unsigned int i;
-
- for (i = 0; i < programmer_table_size; i++) {
- const struct programmer_entry *const prog = programmer_table[i];
- switch (prog->type) {
- case USB:
- usb_count += count_supported_devs_wiki(prog->devs.dev);
- break;
- case PCI:
- pci_count += count_supported_devs_wiki(prog->devs.dev);
- break;
- case OTHER:
- default:
- break;
- }
- }
-
- printf("\n== PCI Devices ==\n\n"
- "Total amount of supported PCI devices flashrom can use as a programmer: '''%d'''\n\n"
- "{%s%s", pci_count, th_start, programmer_th);
-
- for (i = 0; i < programmer_table_size; i++) {
- const struct programmer_entry *const prog = programmer_table[i];
- if (prog->type == PCI) {
- print_supported_devs_wiki_helper(prog);
- }
- }
- printf("\n|}\n\n|}\n");
-
- printf("\n== USB Devices ==\n\n"
- "Total amount of supported USB devices flashrom can use as a programmer: '''%d'''\n\n"
- "{%s%s", usb_count, th_start, programmer_th);
-
- for (i = 0; i < programmer_table_size; i++) {
- const struct programmer_entry *const prog = programmer_table[i];
- if (prog->type == USB) {
- print_supported_devs_wiki_helper(prog);
- }
- }
- printf("\n|}\n\n|}\n");
-
- printf("\n== Other programmers ==\n\n"
- "{%s", th_start);
- printf("! align=\"left\" | Programmer\n"
- "! align=\"left\" | Note\n\n");
-
- for (i = 0; i < programmer_table_size; i++) {
- static int c = 0;
- const struct programmer_entry *const prog = programmer_table[i];
- if (prog->type == OTHER && prog->devs.note != NULL) {
- c = !c;
- printf("|- bgcolor=\"#%s\"\n", (c) ? "eeeeee" : "dddddd");
- printf("| %s || %s", prog->name, prog->devs.note);
- }
- }
- printf("\n|}\n\n|}\n");
-}
-
-void print_supported_wiki(void)
-{
- time_t t = time(NULL);
- char buf[sizeof("1986-02-28T12:37:42Z")];
- strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", gmtime(&t));
-
- printf(wiki_header, buf, flashrom_version);
- print_supported_chips_wiki(2);
-#if CONFIG_INTERNAL == 1
- print_supported_chipsets_wiki(3);
- print_supported_boards_wiki();
-#endif
- print_supported_devs_wiki();
-}
--
To view, visit https://review.coreboot.org/c/flashrom/+/83941?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: I9990add27f7fdddc23ddd1f33306566ce7548417
Gerrit-Change-Number: 83941
Gerrit-PatchSet: 1
Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org>
Attention is currently required from: Maciej Pijanowski, Michał Kopeć.
Anastasia Klimchuk has posted comments on this change by Maciej Pijanowski. ( https://review.coreboot.org/c/flashrom/+/83854?usp=email )
Change subject: ichspi: Add RaptorPoint PCH support
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
Could you please add this to document `/release_notes/devel.rst` ? We just introduced this doc as a place to gather ongoing new features (to make it easier to create release notes).
If you could add a new header "Chipset support" and then just one line "Raptor Point PCH" that would be enough.
Thanks!
--
To view, visit https://review.coreboot.org/c/flashrom/+/83854?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: I13ac52d5400c0e2260e12d605077fc2182c379ef
Gerrit-Change-Number: 83854
Gerrit-PatchSet: 3
Gerrit-Owner: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com>
Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Michał Kopeć <michal.kopec(a)3mdeb.com>
Gerrit-Attention: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com>
Gerrit-Attention: Michał Kopeć <michal.kopec(a)3mdeb.com>
Gerrit-Comment-Date: Fri, 16 Aug 2024 09:25:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: Nicholas Chin, ZhiYuanNJ.
Anastasia Klimchuk has posted comments on this change by ZhiYuanNJ. ( https://review.coreboot.org/c/flashrom/+/82776?usp=email )
Change subject: ch347_spi: Add spi clock frequency selection
......................................................................
Patch Set 10:
(1 comment)
File ch347_spi.c:
https://review.coreboot.org/c/flashrom/+/82776/comment/e772d905_4fb239e4?us… :
PS7, Line 365: 30MHz
> Sorry for the late reply. […]
I have a suggestion, but please tell me what you all think about it.
This thread is about changing/ or not changing default value, but no one argues about the feature itself. Maybe you can have first patch which adds the feature but keeps the default as is? And then later, in a separate patch, you can change the default value (if you both agree this is a good idea to change it). Or maybe you will keep the default.
My point is that we can go ahead with the feature, and then spend more time discussing just the question of what is the best default setting.
What do you think?
--
To view, visit https://review.coreboot.org/c/flashrom/+/82776?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: If2be48929db540a6598ac0b60b37e64597156db7
Gerrit-Change-Number: 82776
Gerrit-PatchSet: 10
Gerrit-Owner: ZhiYuanNJ
Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org>
Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: ZhiYuanNJ
Gerrit-Attention: Nicholas Chin <nic.c3.14(a)gmail.com>
Gerrit-Comment-Date: Fri, 16 Aug 2024 09:18:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org>
Comment-In-Reply-To: ZhiYuanNJ
Comment-In-Reply-To: Nicholas Chin <nic.c3.14(a)gmail.com>
Attention is currently required from: Maciej Pijanowski, Michał Kopeć.
Anastasia Klimchuk has posted comments on this change by Maciej Pijanowski. ( https://review.coreboot.org/c/flashrom/+/83854?usp=email )
Change subject: ichspi: Add RaptorPoint PCH support
......................................................................
Patch Set 3:
(2 comments)
Patchset:
PS3:
Thank you for adding support!
I have one comment (below), but also, a general question: is there any documentation that is available?
Also I see that original commit a year ago, so this mean you are using the chipset for a year? (I think it's good, if there were any bugs you would find them already and fix :)
File util/ich_descriptors_tool/ich_descriptors_tool.c:
https://review.coreboot.org/c/flashrom/+/83854/comment/925d26c9_710570df?us… :
PS3, Line 142: "\t- \"600\" or \"alder\" for Intel's 600 series chipsets.\n"
Could you please add raptor here? And then run the tool, select this new option, and add the result to testing info in commit message?
Thank you!
--
To view, visit https://review.coreboot.org/c/flashrom/+/83854?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: I13ac52d5400c0e2260e12d605077fc2182c379ef
Gerrit-Change-Number: 83854
Gerrit-PatchSet: 3
Gerrit-Owner: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com>
Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Michał Kopeć <michal.kopec(a)3mdeb.com>
Gerrit-Attention: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com>
Gerrit-Attention: Michał Kopeć <michal.kopec(a)3mdeb.com>
Gerrit-Comment-Date: Fri, 16 Aug 2024 08:49:45 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: Hsuan Ting Chen, Hsuan-ting Chen, Kane Chen, Peter Marheine, Subrata Banik.
Kane Chen has posted comments on this change by Kane Chen. ( https://review.coreboot.org/c/flashrom/+/83896?usp=email )
Change subject: chipset_enable.c: Use PCI_ACCESS_ECAM to access pci register
......................................................................
Patch Set 5:
(1 comment)
File meson_options.txt:
https://review.coreboot.org/c/flashrom/+/83896/comment/a7506b52_37fc115b?us… :
PS3, Line 9: option('use_libpci_ecam', type : 'boolean', value : false)
> Yeah, I feel pretty comfortable assuming any system using a 100-series PCH should support ECAM since […]
Thanks for the feedback.
i'm confused about adding "adding an item to the release notes for this change"
Did you mean release note like doc/user_docs/misc_intel.rst?
--
To view, visit https://review.coreboot.org/c/flashrom/+/83896?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: I4549f87c8b01da0a1d3d8ce0b3b75c1f5fa2cbab
Gerrit-Change-Number: 83896
Gerrit-PatchSet: 5
Gerrit-Owner: Kane Chen <kane.chen(a)intel.com>
Gerrit-Reviewer: Hsuan Ting Chen <roccochen(a)chromium.org>
Gerrit-Reviewer: Hsuan-ting Chen <roccochen(a)google.com>
Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Kane Chen <kane.chen(a)intel.corp-partner.google.com>
Gerrit-Attention: Hsuan Ting Chen <roccochen(a)chromium.org>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Hsuan-ting Chen <roccochen(a)google.com>
Gerrit-Attention: Kane Chen <kane.chen(a)intel.com>
Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org>
Gerrit-Comment-Date: Fri, 16 Aug 2024 06:57:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Kane Chen <kane.chen(a)intel.corp-partner.google.com>
Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org>
Attention is currently required from: Hsuan Ting Chen, Hsuan-ting Chen, Kane Chen, Kane Chen, Subrata Banik.
Hello Hsuan Ting Chen, Hsuan-ting Chen, Peter Marheine, Subrata Banik,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/flashrom/+/83896?usp=email
to look at the new patch set (#5).
Change subject: chipset_enable.c: Use PCI_ACCESS_ECAM to access pci register
......................................................................
chipset_enable.c: Use PCI_ACCESS_ECAM to access pci register
In the latest pciutils(v3.13.0), it supports accessing pci registers
by ecam. This patch uses libpci version check to decide whether
flashrom calls libpci and use 0xcf8/0xcfc or ecam to access pci
registers.
BUG=b:359813524
TEST=with libpci >= 3.13.0, flashrom is working with ECAM access
Change-Id: I4549f87c8b01da0a1d3d8ce0b3b75c1f5fa2cbab
Signed-off-by: Kane Chen <kane.chen(a)intel.com>
---
M chipset_enable.c
M meson.build
2 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/96/83896/5
--
To view, visit https://review.coreboot.org/c/flashrom/+/83896?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: I4549f87c8b01da0a1d3d8ce0b3b75c1f5fa2cbab
Gerrit-Change-Number: 83896
Gerrit-PatchSet: 5
Gerrit-Owner: Kane Chen <kane.chen(a)intel.com>
Gerrit-Reviewer: Hsuan Ting Chen <roccochen(a)chromium.org>
Gerrit-Reviewer: Hsuan-ting Chen <roccochen(a)google.com>
Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-CC: Kane Chen <kane.chen(a)intel.corp-partner.google.com>
Gerrit-Attention: Hsuan Ting Chen <roccochen(a)chromium.org>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Kane Chen <kane.chen(a)intel.corp-partner.google.com>
Gerrit-Attention: Hsuan-ting Chen <roccochen(a)google.com>
Gerrit-Attention: Kane Chen <kane.chen(a)intel.com>
Attention is currently required from: Hsuan Ting Chen, Hsuan-ting Chen, Kane Chen, Kane Chen, Subrata Banik.
Peter Marheine has posted comments on this change by Kane Chen. ( https://review.coreboot.org/c/flashrom/+/83896?usp=email )
Change subject: Provide an option to use PCI_ACCESS_ECAM to access pci register
......................................................................
Patch Set 3:
(1 comment)
File meson_options.txt:
https://review.coreboot.org/c/flashrom/+/83896/comment/7e857aad_d4091df4?us… :
PS3, Line 9: option('use_libpci_ecam', type : 'boolean', value : false)
> My original thought is to avoid any potential impact since i only have chromebooks to verify. […]
Yeah, I feel pretty comfortable assuming any system using a 100-series PCH should support ECAM since they're documented to not support legacy PCI and it seems likely that any system equipped with that hardware should have the appropriate firmware support for ECAM.
It might be worth adding an item to the release notes for this change, and note that it might break badly-configured systems but is not expected to actually affect any systems.
--
To view, visit https://review.coreboot.org/c/flashrom/+/83896?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: I4549f87c8b01da0a1d3d8ce0b3b75c1f5fa2cbab
Gerrit-Change-Number: 83896
Gerrit-PatchSet: 3
Gerrit-Owner: Kane Chen <kane.chen(a)intel.com>
Gerrit-Reviewer: Hsuan Ting Chen <roccochen(a)chromium.org>
Gerrit-Reviewer: Hsuan-ting Chen <roccochen(a)google.com>
Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-CC: Kane Chen <kane.chen(a)intel.corp-partner.google.com>
Gerrit-Attention: Hsuan Ting Chen <roccochen(a)chromium.org>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Kane Chen <kane.chen(a)intel.corp-partner.google.com>
Gerrit-Attention: Hsuan-ting Chen <roccochen(a)google.com>
Gerrit-Attention: Kane Chen <kane.chen(a)intel.com>
Gerrit-Comment-Date: Fri, 16 Aug 2024 06:19:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Kane Chen <kane.chen(a)intel.corp-partner.google.com>
Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org>