Change in ...em100[master]: em100: Add ability to update spi flash with given start address.
Peter Tsung Ho Wu has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/30938
Change subject: em100: Add ability to update spi flash with given start address. ......................................................................
em100: Add ability to update spi flash with given start address.
Add an option to load file to a given start address in the spi flash and keep the rest of content unchanged.
Change-Id: I645db8155d32a3832d99840886d68e4522b66bdb --- M em100.c 1 file changed, 36 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/em100 refs/changes/38/30938/1
diff --git a/em100.c b/em100.c index 4673266..64a4ab2 100644 --- a/em100.c +++ b/em100.c @@ -515,6 +515,7 @@ static const struct option longopts[] = { {"set", 1, 0, 'c'}, {"download", 1, 0, 'd'}, + {"start-address", 1, 0, 'a'}, {"start", 0, 0, 'r'}, {"stop", 0, 0, 's'}, {"verify", 0, 0, 'v'}, @@ -540,7 +541,8 @@ "\nUsage:\n" " -c|--set CHIP: select chip emulation\n" " -d|--download FILE: download FILE into EM100pro\n" - " -u|--upload FILE: upload from EM100pro into FILE\n" + " -a|--start address: only works with -d (E.g. -d file.bin -a 0x300000)\n" + " -u|--upload FILE: upload from EM100pro into FILE\n" " -r|--start: em100 shall run\n" " -s|--stop: em100 shall stop\n" " -v|--verify: verify EM100 content matches the file\n" @@ -576,8 +578,9 @@ int firmware_is_dpfw = 0; unsigned int serial_number = 0; unsigned long address_offset = 0; + unsigned long spi_start_address = 0;
- while ((opt = getopt_long(argc, argv, "c:d:u:rsvtO:F:f:g:S:p:Dx:lhT", + while ((opt = getopt_long(argc, argv, "c:d:a:u:rsvtO:F:f:g:S:p:Dx:lhT", longopts, &idx)) != -1) { switch (opt) { case 'c': @@ -587,6 +590,10 @@ filename = optarg; /* TODO: check that file exists */ break; + case 'a': + sscanf(optarg, "%lx", &spi_start_address); + printf("Spi address: 0x%08lx\n", spi_start_address); + break; case 'u': read_filename = optarg; break; @@ -775,8 +782,11 @@ }
if (filename) { - int maxlen = 0x4000000; /* largest size - 64MB */ + int maxlen = desiredchip ? chip->size : 0x4000000; /* largest size - 64MB */ void *data = malloc(maxlen); + int done; + void *readback = NULL; + if (data == NULL) { printf("FATAL: couldn't allocate memory\n"); return 1; @@ -808,15 +818,34 @@ return 1; }
- write_sdram(&em100, (unsigned char *)data, 0x00000000, length); + if (desiredchip && (length != (chip->size - spi_start_address)) ) + { + printf("FATAL: file size does not match to chip size.\n"); + free(data); + return 1; + } + + if (spi_start_address) { + readback = malloc(maxlen); + if (data == NULL) { + printf("FATAL: couldn't allocate memory(size: %x)\n", maxlen); + return 1; + } + done = read_sdram(&em100, readback, 0, maxlen); + memcpy((unsigned char*)readback + spi_start_address, data, length); + write_sdram(&em100, (unsigned char*)readback, 0x00000000, maxlen); + free(readback); + } else { + write_sdram(&em100, (unsigned char*)data, 0x00000000, length); + } + if (verify) { - int done; - void *readback = malloc(length); + readback = malloc(length); if (data == NULL) { printf("FATAL: couldn't allocate memory\n"); return 1; } - done = read_sdram(&em100, readback, 0x00000000, length); + done = read_sdram(&em100, readback, spi_start_address, length); if (done && (memcmp(data, readback, length) == 0)) printf("Verify: PASS\n"); else
Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/em100/+/30938 )
Change subject: em100: Add ability to update spi flash with given start address. ......................................................................
Patch Set 1: Code-Review+2
Hello Stefan Reinauer, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/em100/+/30938
to look at the new patch set (#2).
Change subject: em100: Add ability to update spi flash with given start address. ......................................................................
em100: Add ability to update spi flash with given start address.
Add an option to load file to a given start address in the spi flash and keep the rest of content unchanged.
Change-Id: I645db8155d32a3832d99840886d68e4522b66bdb Signed-off-by: Tsung Ho Wu tsung@amazon.com --- M em100.c 1 file changed, 36 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/em100 refs/changes/38/30938/2
Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/c/em100/+/30938 )
Change subject: em100: Add ability to update spi flash with given start address. ......................................................................
Patch Set 2: Code-Review+2
Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/em100/+/30938 )
Change subject: em100: Add ability to update spi flash with given start address. ......................................................................
em100: Add ability to update spi flash with given start address.
Add an option to load file to a given start address in the spi flash and keep the rest of content unchanged.
Change-Id: I645db8155d32a3832d99840886d68e4522b66bdb Signed-off-by: Tsung Ho Wu tsung@amazon.com Reviewed-on: https://review.coreboot.org/c/30938 Reviewed-by: Philipp Deppenwiese zaolin.daisuki@gmail.com Reviewed-by: Stefan Reinauer stefan.reinauer@coreboot.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M em100.c 1 file changed, 36 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved Philipp Deppenwiese: Looks good to me, approved
diff --git a/em100.c b/em100.c index 4673266..64a4ab2 100644 --- a/em100.c +++ b/em100.c @@ -515,6 +515,7 @@ static const struct option longopts[] = { {"set", 1, 0, 'c'}, {"download", 1, 0, 'd'}, + {"start-address", 1, 0, 'a'}, {"start", 0, 0, 'r'}, {"stop", 0, 0, 's'}, {"verify", 0, 0, 'v'}, @@ -540,7 +541,8 @@ "\nUsage:\n" " -c|--set CHIP: select chip emulation\n" " -d|--download FILE: download FILE into EM100pro\n" - " -u|--upload FILE: upload from EM100pro into FILE\n" + " -a|--start address: only works with -d (E.g. -d file.bin -a 0x300000)\n" + " -u|--upload FILE: upload from EM100pro into FILE\n" " -r|--start: em100 shall run\n" " -s|--stop: em100 shall stop\n" " -v|--verify: verify EM100 content matches the file\n" @@ -576,8 +578,9 @@ int firmware_is_dpfw = 0; unsigned int serial_number = 0; unsigned long address_offset = 0; + unsigned long spi_start_address = 0;
- while ((opt = getopt_long(argc, argv, "c:d:u:rsvtO:F:f:g:S:p:Dx:lhT", + while ((opt = getopt_long(argc, argv, "c:d:a:u:rsvtO:F:f:g:S:p:Dx:lhT", longopts, &idx)) != -1) { switch (opt) { case 'c': @@ -587,6 +590,10 @@ filename = optarg; /* TODO: check that file exists */ break; + case 'a': + sscanf(optarg, "%lx", &spi_start_address); + printf("Spi address: 0x%08lx\n", spi_start_address); + break; case 'u': read_filename = optarg; break; @@ -775,8 +782,11 @@ }
if (filename) { - int maxlen = 0x4000000; /* largest size - 64MB */ + int maxlen = desiredchip ? chip->size : 0x4000000; /* largest size - 64MB */ void *data = malloc(maxlen); + int done; + void *readback = NULL; + if (data == NULL) { printf("FATAL: couldn't allocate memory\n"); return 1; @@ -808,15 +818,34 @@ return 1; }
- write_sdram(&em100, (unsigned char *)data, 0x00000000, length); + if (desiredchip && (length != (chip->size - spi_start_address)) ) + { + printf("FATAL: file size does not match to chip size.\n"); + free(data); + return 1; + } + + if (spi_start_address) { + readback = malloc(maxlen); + if (data == NULL) { + printf("FATAL: couldn't allocate memory(size: %x)\n", maxlen); + return 1; + } + done = read_sdram(&em100, readback, 0, maxlen); + memcpy((unsigned char*)readback + spi_start_address, data, length); + write_sdram(&em100, (unsigned char*)readback, 0x00000000, maxlen); + free(readback); + } else { + write_sdram(&em100, (unsigned char*)data, 0x00000000, length); + } + if (verify) { - int done; - void *readback = malloc(length); + readback = malloc(length); if (data == NULL) { printf("FATAL: couldn't allocate memory\n"); return 1; } - done = read_sdram(&em100, readback, 0x00000000, length); + done = read_sdram(&em100, readback, spi_start_address, length); if (done && (memcmp(data, readback, length) == 0)) printf("Verify: PASS\n"); else
-
Peter Tsung Ho Wu (Code Review) -
Philipp Deppenwiese (Code Review)
-
Stefan Reinauer (Code Review)