Alan Green has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33833
Change subject: flashchips.c: Fix field order ......................................................................
flashchips.c: Fix field order
For consistency and in order to allow automated tools to work with flashchips.c, put fields in the same order as they are defined in struct flashchip, in flash.h
Signed-off-by: Alan Green avg@google.com Change-Id: I5e0d81cb71b2c50ffeb9bb70267f16e9ac7a263c --- M flashchips.c 1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/33833/1
diff --git a/flashchips.c b/flashchips.c index e73a4e3..8ea7043 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2539,8 +2539,8 @@ .model_id = ATMEL_AT26F004, .total_size = 512, .page_size = 256, - .tested = {.probe = NT, .read = NT, .erase = NT, .write = BAD }, .feature_bits = FEATURE_WRSR_WREN, + .tested = {.probe = NT, .read = NT, .erase = NT, .write = BAD }, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -2690,10 +2690,10 @@ } }, .printlock = spi_prettyprint_status_register_plain, - .gran = write_gran_1056bytes, .write = spi_write_at45db, .read = spi_read_at45db, .voltage = {2700, 3600}, + .gran = write_gran_1056bytes, },
{ @@ -2943,10 +2943,10 @@ } }, .printlock = spi_prettyprint_status_register_at45db, /* Bit 0 is undefined, no lockdown */ - .gran = write_gran_528bytes, .write = spi_write_at45db, .read = spi_read_at45db_e8, /* 3 address and 4 dummy bytes */ .voltage = {2700, 3600}, + .gran = write_gran_528bytes, },
{ @@ -2983,8 +2983,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -3025,8 +3025,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, /* has a 2nd status register */ + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -3067,8 +3067,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -3430,7 +3430,7 @@ .total_size = 64, .page_size = 0, /* unused */ .feature_bits = 0, - .tested = {.probe = OK, .read = OK, .erase = BAD, .write = BAD }, + .tested = { .probe = OK, .read = OK, .erase = BAD, .write = BAD }, .probe = probe_jedec, /* FIXME! */ .probe_timing = TIMING_ZERO, .block_erasers = @@ -3476,11 +3476,11 @@ .vendor = "ENE", .name = "KB9012 (EDI)", .bustype = BUS_SPI, - .spi_cmd_set = SPI_EDI, .total_size = 128, .page_size = 128, .feature_bits = FEATURE_ERASED_ZERO, .tested = TEST_OK_PREW, + .spi_cmd_set = SPI_EDI, .probe = edi_probe_kb9012, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3490,10 +3490,10 @@ .block_erase = edi_chip_block_erase, }, }, - .gran = write_gran_128bytes, .write = edi_chip_write, .read = edi_chip_read, .voltage = {2700, 3600}, + .gran = write_gran_128bytes, },
{ @@ -14930,8 +14930,8 @@ .block_erase = erase_block_82802ab, } }, - .write = write_82802ab, .unlock = unlock_regspace2_uniform_64k, + .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -14963,8 +14963,8 @@ .block_erase = erase_block_82802ab, } }, - .write = write_82802ab, .unlock = unlock_regspace2_uniform_64k, + .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ },
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/flashrom/+/33833
to look at the new patch set (#2).
Change subject: flashchips.c: Fix field order ......................................................................
flashchips.c: Fix field order
For consistency and in order to allow automated tools to work with flashchips.c, put fields in the same order as they are defined in struct flashchip, in flash.h
Signed-off-by: Alan Green avg@google.com Change-Id: I5e0d81cb71b2c50ffeb9bb70267f16e9ac7a263c --- M flashchips.c 1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/33833/2
Hello Edward O'Callaghan, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/flashrom/+/33833
to look at the new patch set (#5).
Change subject: flashchips.c: Fix field order ......................................................................
flashchips.c: Fix field order
For consistency and in order to allow automated tools to work with flashchips.c, put fields in the same order as they are defined in struct flashchip, in flash.h
Signed-off-by: Alan Green avg@google.com Change-Id: I5e0d81cb71b2c50ffeb9bb70267f16e9ac7a263c --- M flashchips.c 1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/33833/5
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33833 )
Change subject: flashchips.c: Fix field order ......................................................................
Patch Set 6: Code-Review+1
(2 comments)
There is an inconsistency.
https://review.coreboot.org/#/c/33833/6/flashchips.c File flashchips.c:
https://review.coreboot.org/#/c/33833/6/flashchips.c@2543 PS6, Line 2543: . Missing space?
https://review.coreboot.org/#/c/33833/6/flashchips.c@3433 PS6, Line 3433: Extra space?
Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33833 )
Change subject: flashchips.c: Fix field order ......................................................................
Patch Set 6: Code-Review+2
With the other reviewers comments fixed, then looks fine to me.
Hello Edward O'Callaghan, Angel Pons, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/flashrom/+/33833
to look at the new patch set (#7).
Change subject: flashchips.c: Fix field order ......................................................................
flashchips.c: Fix field order
For consistency and in order to allow automated tools to work with flashchips.c, put fields in the same order as they are defined in struct flashchip, in flash.h
Signed-off-by: Alan Green avg@google.com Change-Id: I5e0d81cb71b2c50ffeb9bb70267f16e9ac7a263c --- M flashchips.c 1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/33833/7
Hello Edward O'Callaghan, Angel Pons, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/flashrom/+/33833
to look at the new patch set (#8).
Change subject: flashchips.c: Fix field order ......................................................................
flashchips.c: Fix field order
For consistency and in order to allow automated tools to work with flashchips.c, put fields in the same order as they are defined in struct flashchip, in flash.h
Signed-off-by: Alan Green avg@google.com Change-Id: I5e0d81cb71b2c50ffeb9bb70267f16e9ac7a263c --- M flashchips.c 1 file changed, 16 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/33833/8
Alan Green has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33833 )
Change subject: flashchips.c: Fix field order ......................................................................
Patch Set 8:
(2 comments)
Patch Set 6: Code-Review+1
(2 comments)
There is an inconsistency.
I'll send a separate change that tidies up the .tested field.
https://review.coreboot.org/#/c/33833/6/flashchips.c File flashchips.c:
https://review.coreboot.org/#/c/33833/6/flashchips.c@2543 PS6, Line 2543: .
Missing space?
Well spotted. This wasn't one of the inconsistencies I was targeting with this change. I'll send a separate change.
https://review.coreboot.org/#/c/33833/6/flashchips.c@3433 PS6, Line 3433:
Extra space?
I'll push this into another change.
Hello Edward O'Callaghan, Angel Pons, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/flashrom/+/33833
to look at the new patch set (#9).
Change subject: flashchips.c: Fix field order ......................................................................
flashchips.c: Fix field order
For consistency and in order to allow automated tools to work with flashchips.c, put fields in the same order as they are defined in struct flashchip, in flash.h
Signed-off-by: Alan Green avg@google.com Change-Id: I5e0d81cb71b2c50ffeb9bb70267f16e9ac7a263c --- M flashchips.c 1 file changed, 15 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/33833/9
Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33833 )
Change subject: flashchips.c: Fix field order ......................................................................
Patch Set 9: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/33833 )
Change subject: flashchips.c: Fix field order ......................................................................
Patch Set 9: Code-Review+2
Edward O'Callaghan has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/33833 )
Change subject: flashchips.c: Fix field order ......................................................................
flashchips.c: Fix field order
For consistency and in order to allow automated tools to work with flashchips.c, put fields in the same order as they are defined in struct flashchip, in flash.h
Signed-off-by: Alan Green avg@google.com Change-Id: I5e0d81cb71b2c50ffeb9bb70267f16e9ac7a263c Reviewed-on: https://review.coreboot.org/c/flashrom/+/33833 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Edward O'Callaghan quasisec@chromium.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M flashchips.c 1 file changed, 15 insertions(+), 15 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved
diff --git a/flashchips.c b/flashchips.c index ad7ecd7..eaf04a8 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2519,8 +2519,8 @@ .model_id = ATMEL_AT26F004, .total_size = 512, .page_size = 256, - .tested = {.probe = NT, .read = NT, .erase = NT, .write = BAD }, .feature_bits = FEATURE_WRSR_WREN, + .tested = {.probe = NT, .read = NT, .erase = NT, .write = BAD }, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -2670,10 +2670,10 @@ } }, .printlock = spi_prettyprint_status_register_plain, - .gran = write_gran_1056bytes, .write = spi_write_at45db, .read = spi_read_at45db, .voltage = {2700, 3600}, + .gran = write_gran_1056bytes, },
{ @@ -2710,8 +2710,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -2752,8 +2752,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -2794,8 +2794,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -2836,8 +2836,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -2878,8 +2878,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -2923,10 +2923,10 @@ } }, .printlock = spi_prettyprint_status_register_at45db, /* Bit 0 is undefined, no lockdown */ - .gran = write_gran_528bytes, .write = spi_write_at45db, .read = spi_read_at45db_e8, /* 3 address and 4 dummy bytes */ .voltage = {2700, 3600}, + .gran = write_gran_528bytes, },
{ @@ -2963,8 +2963,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -3005,8 +3005,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, /* has a 2nd status register */ + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -3047,8 +3047,8 @@ .block_erase = spi_erase_at45db_chip, } }, - .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ .printlock = spi_prettyprint_status_register_at45db, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ /* granularity will be set by the probing function. */ .write = spi_write_at45db, .read = spi_read_at45db, /* Fast read (0x0B) supported */ @@ -3456,11 +3456,11 @@ .vendor = "ENE", .name = "KB9012 (EDI)", .bustype = BUS_SPI, - .spi_cmd_set = SPI_EDI, .total_size = 128, .page_size = 128, .feature_bits = FEATURE_ERASED_ZERO, .tested = TEST_OK_PREW, + .spi_cmd_set = SPI_EDI, .probe = edi_probe_kb9012, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3470,10 +3470,10 @@ .block_erase = edi_chip_block_erase, }, }, - .gran = write_gran_128bytes, .write = edi_chip_write, .read = edi_chip_read, .voltage = {2700, 3600}, + .gran = write_gran_128bytes, },
{ @@ -14959,8 +14959,8 @@ .block_erase = erase_block_82802ab, } }, - .write = write_82802ab, .unlock = unlock_regspace2_uniform_64k, + .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -14992,8 +14992,8 @@ .block_erase = erase_block_82802ab, } }, - .write = write_82802ab, .unlock = unlock_regspace2_uniform_64k, + .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ },
-
Alan Green (Code Review) -
Angel Pons (Code Review)
-
Edward O'Callaghan (Code Review)