coreboot October 2011

coreboot@coreboot.org

46 participants
501 discussions

Re: [coreboot] Getting serial output from w83627hf?
by Idwer Vollering 17 Oct '11

17 Oct '11

2011/10/17 Alp Eren Köse <alperenkose(a)buyutech.com.tr> > Hi all, > > I can't get serial output from the board I am trying to put coreboot on, so > I am not able to go any further to see whats going on.. > > The board has a Winbond W83627HF/F/HG/G (id=0x52, rev=0x41) at 0x2e. > It is likely that you need to set the serial port's speed in romstage.c: // omitting includes, license header #include "superio/winbond/w83627hf/early_serial.c" #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) Add this line to main(): w83627hf_set_clksel_48(SERIAL_DEV); > > I couldn't figure out where to put the "chip superio/winbond/w83627hf" > section in the "devicetree.cb" file layout? > SCH boards don't use the serial port but the EHCI debug port to show output on? See src/mainboard/iwave/iWRainbowG6/devicetree.cb, it doesn't have the superio included. What I would do is put it inside the LPC bridge section, note that I don't know how the superio is actually attached and therefore could be wrong. So: chip southbridge/intel/i82801ex device pci 1f.0 on # lpc bridge chip superio/winbond/w83627hf end # superio end # 1f.0 > Could someone please explain the devicetree.cb file structure? or point a > way? > > The "lspci -tvnn" output and my modified "devicetree.cb" file are at the > attachment. > > Thanks in advance, > Alp > > -- > coreboot mailing list: coreboot(a)coreboot.org > http://www.coreboot.org/mailman/listinfo/coreboot >

1 0

Getting serial output from w83627hf?
by Alp Eren Köse 17 Oct '11

17 Oct '11

Hi all, I can't get serial output from the board I am trying to put coreboot on, so I am not able to go any further to see whats going on.. The board has a Winbond W83627HF/F/HG/G (id=0x52, rev=0x41) at 0x2e. I couldn't figure out where to put the "chip superio/winbond/w83627hf" section in the "devicetree.cb" file layout? Could someone please explain the devicetree.cb file structure? or point a way? The "lspci -tvnn" output and my modified "devicetree.cb" file are at the attachment. Thanks in advance, Alp

1 0

Trac reminder: list of new ticket(s)
by coreboot tracker 17 Oct '11

17 Oct '11

1 0

FSF Capaign against computer firmware restricting user choice through UEFI "secure boot"
by Xavi Drudis Ferran 17 Oct '11

17 Oct '11

I doubt whether to flag this with [off-topic] because it's mostly about the contrary of what coreboot is, but since the issue has been commented here and awareness of it can raise appreciation of the main value in coreboot (freedom), I thought I'd drop two links here. Article with FSF position http://www.fsf.org/campaigns/secure-boot/ Sign to support it http://www.fsf.org/campaigns/secure-boot/statement

1 0

Patch set updated for coreboot: d634d85 cbfstool: Optionally specify offsets to commands
by Noé Rubinstein 17 Oct '11

17 Oct '11

Noé Rubinstein (noe.rubinstein(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/284 -gerrit commit d634d85badfe28f6a23e67d2811e66dd8695426f Author: Noe Rubinstein <nrubinstein(a)avencall.com> Date: Tue Sep 27 14:59:12 2011 +0200 cbfstool: Optionally specify offsets to commands This enables placing components in specific parts of the ROM while leaving the calculation of their precise location to CBFStool. This can be used, for example, with flashrom's layout feature. We plan to use it to provide a more robust fallback mechanism than the one already provided by Coreboot, restricting the fallback to a part of the ROM which is write-protected during runtime. Change-Id: I7403f37e2f20306ea113879d12a9fcec175063d8 Signed-off-by: Noe Rubinstein <nrubinstein(a)avencall.com> --- src/arch/x86/Kconfig | 6 +++ src/arch/x86/Makefile.bootblock.inc | 4 +- util/cbfstool/cbfstool.c | 53 ++++++++++++++++++----- util/cbfstool/common.c | 79 ++++++++++++++++++++++++++++++++--- util/cbfstool/common.h | 6 ++- 5 files changed, 128 insertions(+), 20 deletions(-) diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index f98cf5b..c4ece2a 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -55,6 +55,12 @@ config X86_BOOTBLOCK_NORMAL endchoice + +config ROMSTAGE_OFFSET + hex "Romstage offset in ROM: " + depends on TINY_BOOTBLOCK + default '0x0' + config BOOTBLOCK_SOURCE string default "bootblock_simple.c" if X86_BOOTBLOCK_SIMPLE diff --git a/src/arch/x86/Makefile.bootblock.inc b/src/arch/x86/Makefile.bootblock.inc index 806afea..dd0d76e 100644 --- a/src/arch/x86/Makefile.bootblock.inc +++ b/src/arch/x86/Makefile.bootblock.inc @@ -80,7 +80,9 @@ $(obj)/coreboot.romstage: $(obj)/coreboot.pre1 $$(romstage-objs) $(obj)/romstage $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(romstage-objs) $(OBJCOPY) -O binary $(obj)/romstage.elf $(obj)/romstage.bin printf "CONFIG_ROMBASE = 0x" > $(obj)/location.ld - $(CBFSTOOL) $(obj)/coreboot.pre1 locate $(obj)/romstage.bin $(CONFIG_CBFS_PREFIX)/romstage $(CONFIG_XIP_ROM_SIZE) > $(obj)/location.txt + $(CBFSTOOL) $(obj)/coreboot.pre1 locate $(obj)/romstage.bin \ + $(CONFIG_CBFS_PREFIX)/romstage $(CONFIG_XIP_ROM_SIZE) \ + $(CONFIG_ROMSTAGE_OFFSET) > $(obj)/location.txt cat $(obj)/location.txt >> $(obj)/location.ld printf ';\nAUTO_XIP_ROM_BASE = CONFIG_ROMBASE & ~(CONFIG_XIP_ROM_SIZE - 1);\n' >> $(obj)/location.ld $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(romstage-objs) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 4c28c29..bda8cf7 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -78,7 +78,11 @@ static int cbfs_add(int argc, char **argv) else type = strtoul(argv[5], NULL, 0); if (argc > 6) { - base = strtoul(argv[6], NULL, 0); + if (*argv[6] == '+') + base = cbfs_find_location(rom, filesize, filename, + strtoul(argv[6]+1, NULL, 0)); + else + base = strtoul(argv[6], NULL, 0); } cbfsfile = create_cbfs_file(cbfsname, filedata, &filesize, type, &base); if (add_file_to_cbfs(cbfsfile, filesize, base)) @@ -118,15 +122,20 @@ static int cbfs_add_payload(int argc, char **argv) void *cbfsfile = NULL; comp_algo algo = CBFS_COMPRESS_NONE; - if (argc > 5) { - if (argv[5][0] == 'l') + if (argc > 5 && argv[5][0] == 'l') algo = CBFS_COMPRESS_LZMA; - } - if (argc > 6) { - base = strtoul(argv[6], NULL, 0); - } + + unsigned char *payload; filesize = parse_elf_to_payload(filedata, &payload, algo); + + if (argc > 6) + if (*argv[6] == '+') + base = cbfs_find_location(rom, filesize, filename, + strtoul(argv[6]+1, NULL, 0)); + else + base = strtoul(argv[6], NULL, 0); + cbfsfile = create_cbfs_file(cbfsname, payload, &filesize, CBFS_COMPONENT_PAYLOAD, &base); @@ -171,11 +180,27 @@ static int cbfs_add_stage(int argc, char **argv) if (argv[5][0] == 'l') algo = CBFS_COMPRESS_LZMA; } - if (argc > 6) { - base = strtoul(argv[6], NULL, 0); - } unsigned char *stage; + + /* Careful here: + * + * - when the location is specified exactly, we want parse_elf_to_stage + * to use this information for the romstage to execute correctly. See + * src/arch/x86/Makefile.bootblock.inc + * + * - the +offset syntax can only be used when parse_elf_to_stage + * doesn't need this information + */ + + if (argc > 6 && *argv[6] != '+') + base = strtoul(argv[6], NULL, 0); + filesize = parse_elf_to_stage(filedata, &stage, algo, &base); + + if (argc > 6 && *argv[6] == '+') + base = cbfs_find_location(rom, filesize, filename, + strtoul(argv[6]+1, NULL, 0)); + cbfsfile = create_cbfs_file(cbfsname, stage, &filesize, CBFS_COMPONENT_STAGE, &base); @@ -225,8 +250,11 @@ static int cbfs_locate(int argc, char **argv) uint32_t filesize = getfilesize(file); const char *filename = argv[4]; int align = strtoul(argv[5], NULL, 0); + uint32_t offset = argc > 6 ? strtoul(argv[6], NULL, 0) : 0; + uint32_t loc = cbfs_find_stage_location(romname, filesize, filename, align, + offset); - printf("%x\n", cbfs_find_location(romname, filesize, filename, align)); + printf("%x\n", loc); return 0; } @@ -287,7 +315,8 @@ void usage(void) " add-payload FILE NAME [COMP] [base] Add a payload to the ROM\n" " add-stage FILE NAME [COMP] [base] Add a stage to the ROM\n" " create SIZE BOOTBLOCK [ALIGN] Create a ROM file\n" - " locate FILE NAME ALIGN Find a place for a file of that size\n" + " locate FILE NAME ALIGN OFFSET Find a place for a file of that size\n" + " OFFSET is relative to the ROM start.\n" " print Show the contents of the ROM\n" " extract NAME FILE Extracts a raw payload from ROM\n" "\n" diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index cbf0757..09fe5bb 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -436,8 +436,9 @@ static int in_segment(int addr, int size, int gran) return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1))); } -uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, - const char *filename, uint32_t alignment) +uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, + const char *filename, uint32_t alignment, + uint32_t offset) { void *rom = loadrom(romfile); int filename_size = strlen(filename); @@ -447,6 +448,13 @@ uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, 16) + sizeof(struct cbfs_stage); int totalsize = headersize + filesize; + if (offset > phys_end - phys_start) { + fprintf(stderr, "Offset outside of ROM boundaries\n"); + exit(1); + } + + if (offset) offset = ALIGN(phys_start + offset, align); + uint32_t current = phys_start; while (current < phys_end) { if (!cbfs_file_header(current)) { @@ -458,10 +466,19 @@ uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, uint32_t top = current + ntohl(thisfile->len) + ntohl(thisfile->offset); - if (((ntohl(thisfile->type) == 0x0) - || (ntohl(thisfile->type) == 0xffffffff)) - && (ntohl(thisfile->len) + ntohl(thisfile->offset) >= - totalsize)) { + + uint32_t off_rel = 0; + if (current < offset && offset <= top) { + off_rel = offset - current; + current = offset; + } + + if (current >= offset + && ((ntohl(thisfile->type) == 0x0) + || (ntohl(thisfile->type) == 0xffffffff)) + && (ntohl(thisfile->len) + ntohl(thisfile->offset) + - off_rel >= totalsize)) { + if (in_segment (current + headersize, filesize, alignment)) return current + headersize; @@ -485,3 +502,53 @@ uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, } return 0; } + +uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, + const char *filename, uint32_t offset) +{ + void *rom = loadrom(romfile); + int filename_size = strlen(filename); + + int headersize = + sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16); + + int totalsize = headersize + filesize; + + if (offset > phys_end - phys_start) { + fprintf(stderr, "Offset outside of ROM boundaries\n"); + exit(1); + } + + if (offset) offset = ALIGN(phys_start + offset, align); + + uint32_t current = phys_start; + while (current < phys_end) { + if (!cbfs_file_header(current)) { + current += align; + continue; + } + struct cbfs_file *thisfile = + (struct cbfs_file *)phys_to_virt(current); + + uint32_t top = + current + ntohl(thisfile->len) + ntohl(thisfile->offset); + + uint32_t off_rel = 0; + if (current < offset && offset <= top) { + off_rel = offset - current; + current = offset; + } + + if (current >= offset + && ((ntohl(thisfile->type) == 0x0) + || (ntohl(thisfile->type) == 0xffffffff)) + && (ntohl(thisfile->len) + ntohl(thisfile->offset) + - off_rel >= totalsize)) + return current + headersize; + + current = ALIGN(current + (ntohl(thisfile->len) + + ntohl(thisfile->offset) - off_rel), + align); + } + return 0; +} diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 8f397d8..b5aea46 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -70,8 +70,12 @@ int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location); void print_cbfs_directory(const char *filename); int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath); +uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, + const char *filename, uint32_t alignment, + uint32_t offset); + uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, - const char *filename, uint32_t align); + const char *filename, uint32_t offset); void print_supported_filetypes(void);

1 0

Patch set updated for coreboot: c9e030a cbfstool: Unify cbfs_find_location
by Noé Rubinstein 17 Oct '11

17 Oct '11

Noé Rubinstein (noe.rubinstein(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/285 -gerrit commit c9e030abb67122a521cf959f6feff1cf4583675c Author: Noe Rubinstein <nrubinstein(a)avencall.com> Date: Tue Oct 11 19:13:49 2011 +0200 cbfstool: Unify cbfs_find_location Change-Id: I7db964d6211d9c6646eeed31bdeb9c204bd44b9a Signed-off-by: Noe Rubinstein <nrubinstein(a)avencall.com> --- util/cbfstool/common.c | 73 ++++++++++++++---------------------------------- 1 files changed, 21 insertions(+), 52 deletions(-) diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 09fe5bb..80b293a 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -436,16 +436,18 @@ static int in_segment(int addr, int size, int gran) return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1))); } -uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, - const char *filename, uint32_t alignment, - uint32_t offset) +static uint32_t cbfs_find_location_(const char *romfile, uint32_t filesize, + const char *filename, uint32_t offset, + int is_stage, uint32_t alignment) { void *rom = loadrom(romfile); int filename_size = strlen(filename); int headersize = - sizeof(struct cbfs_file) + ALIGN(filename_size + 1, - 16) + sizeof(struct cbfs_stage); + sizeof(struct cbfs_file) + + ALIGN(filename_size + 1, 16) + + (is_stage ? sizeof(struct cbfs_stage) : 0); + int totalsize = headersize + filesize; if (offset > phys_end - phys_start) { @@ -479,6 +481,8 @@ uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, && (ntohl(thisfile->len) + ntohl(thisfile->offset) - off_rel >= totalsize)) { + if (!is_stage) return current + headersize; + if (in_segment (current + headersize, filesize, alignment)) return current + headersize; @@ -496,9 +500,9 @@ uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, filesize, alignment)) return ALIGN(current, alignment) + alignment; } - current = - ALIGN(current + ntohl(thisfile->len) + - ntohl(thisfile->offset), align); + current = ALIGN(current + (ntohl(thisfile->len) + + ntohl(thisfile->offset) - off_rel), + align); } return 0; } @@ -506,49 +510,14 @@ uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, const char *filename, uint32_t offset) { - void *rom = loadrom(romfile); - int filename_size = strlen(filename); - - int headersize = - sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16); - - int totalsize = headersize + filesize; - - if (offset > phys_end - phys_start) { - fprintf(stderr, "Offset outside of ROM boundaries\n"); - exit(1); - } - - if (offset) offset = ALIGN(phys_start + offset, align); - - uint32_t current = phys_start; - while (current < phys_end) { - if (!cbfs_file_header(current)) { - current += align; - continue; - } - struct cbfs_file *thisfile = - (struct cbfs_file *)phys_to_virt(current); - - uint32_t top = - current + ntohl(thisfile->len) + ntohl(thisfile->offset); - - uint32_t off_rel = 0; - if (current < offset && offset <= top) { - off_rel = offset - current; - current = offset; - } - - if (current >= offset - && ((ntohl(thisfile->type) == 0x0) - || (ntohl(thisfile->type) == 0xffffffff)) - && (ntohl(thisfile->len) + ntohl(thisfile->offset) - - off_rel >= totalsize)) - return current + headersize; + return cbfs_find_location_(romfile, filesize, filename, offset, 0, + 0); +} - current = ALIGN(current + (ntohl(thisfile->len) + - ntohl(thisfile->offset) - off_rel), - align); - } - return 0; +uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, + const char *filename, uint32_t alignment, + uint32_t offset) +{ + return cbfs_find_location_(romfile, filesize, filename, offset, 1, + alignment); }

1 0

Patch set updated for coreboot: 08bf28b Document CBFStool's behaviour
by Noé Rubinstein 17 Oct '11

17 Oct '11

Noé Rubinstein (noe.rubinstein(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/286 -gerrit commit 08bf28b8cd1179161edcedd3aedf8ce8c817d690 Author: Noe Rubinstein <nrubinstein(a)avencall.com> Date: Tue Oct 11 18:27:58 2011 +0200 Document CBFStool's behaviour Change-Id: I8cd905db0297f2b8194de433f79d483964313e4f Signed-off-by: Noe Rubinstein <nrubinstein(a)avencall.com> --- util/cbfstool/cbfstool.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index bda8cf7..cc9c8e7 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -315,11 +315,18 @@ void usage(void) " add-payload FILE NAME [COMP] [base] Add a payload to the ROM\n" " add-stage FILE NAME [COMP] [base] Add a stage to the ROM\n" " create SIZE BOOTBLOCK [ALIGN] Create a ROM file\n" - " locate FILE NAME ALIGN OFFSET Find a place for a file of that size\n" - " OFFSET is relative to the ROM start.\n" + " locate FILE NAME ALIGN [offset] Find a place for a file of that size\n" " print Show the contents of the ROM\n" " extract NAME FILE Extracts a raw payload from ROM\n" "\n" + "If COMP is l, the component is LZMA-compressed.\n" + "\n" + "If base is prefixed with a +, it is interpreted as a minimum\n" + "offset relative to the start of the ROM for the CBFS file,\n" + "including header. If it does not start with a +, it is\n" + "interpreted as the exact absolute physical address of the\n" + "content of the file when CBFS will be loaded in memory.\n" + "\n" "TYPEs:\n" ); print_supported_filetypes();

1 0

New patch to review for coreboot: 4d0b82f Document CBFStool's behaviour
by Noé Rubinstein 17 Oct '11

17 Oct '11

Noé Rubinstein (noe.rubinstein(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/286 -gerrit commit 4d0b82fc39cf7f88be0d7a7de2e29f2377b77611 Author: Noe Rubinstein <nrubinstein(a)avencall.com> Date: Tue Oct 11 18:27:58 2011 +0200 Document CBFStool's behaviour Change-Id: I8cd905db0297f2b8194de433f79d483964313e4f Signed-off-by: Noe Rubinstein <nrubinstein(a)avencall.com> --- util/cbfstool/cbfstool.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 75edcda..b298660 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -315,11 +315,18 @@ void usage(void) " add-payload FILE NAME [COMP] [base] Add a payload to the ROM\n" " add-stage FILE NAME [COMP] [base] Add a stage to the ROM\n" " create SIZE BOOTBLOCK [ALIGN] Create a ROM file\n" - " locate FILE NAME ALIGN OFFSET Find a place for a file of that size\n" - " OFFSET is relative to the ROM start.\n" + " locate FILE NAME ALIGN [offset] Find a place for a file of that size\n" " print Show the contents of the ROM\n" " extract NAME FILE Extracts a raw payload from ROM\n" "\n" + "If COMP is l, the component is LZMA-compressed.\n" + "\n" + "If base is prefixed with a +, it is interpreted as a minimum\n" + "offset relative to the start of the ROM for the CBFS file,\n" + "including header. If it does not start with a +, it is\n" + "interpreted as the exact absolute physical address of the\n" + "content of the file when CBFS will be loaded in memory.\n" + "\n" "TYPEs:\n" ); print_supported_filetypes();

1 0

New patch to review for coreboot: 04c13d9 cbfstool: Unify cbfs_find_location
by Noé Rubinstein 17 Oct '11

17 Oct '11

Noé Rubinstein (noe.rubinstein(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/285 -gerrit commit 04c13d9b86c0b2bd50f45d328cb5f914e7e13c85 Author: Noe Rubinstein <nrubinstein(a)avencall.com> Date: Tue Oct 11 19:13:49 2011 +0200 cbfstool: Unify cbfs_find_location Change-Id: I7db964d6211d9c6646eeed31bdeb9c204bd44b9a Signed-off-by: Noe Rubinstein <nrubinstein(a)avencall.com> --- util/cbfstool/cbfstool.c | 5 +-- util/cbfstool/common.c | 73 +++++++++++++-------------------------------- 2 files changed, 23 insertions(+), 55 deletions(-) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 530712b..75edcda 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -251,11 +251,10 @@ static int cbfs_locate(int argc, char **argv) const char *filename = argv[4]; int align = strtoul(argv[5], NULL, 0); uint32_t offset = argc > 6 ? strtoul(argv[6], NULL, 0) : 0; - uint32_t loc = cbfs_find_stage_location(romname, filesize, filename, align, - offset); + uint32_t loc = cbfs_find_stage_location(romname, filesize, filename, + align, offset); printf("%x\n", loc); - fprintf(stderr, "%x\n", loc); return 0; } diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 09fe5bb..80b293a 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -436,16 +436,18 @@ static int in_segment(int addr, int size, int gran) return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1))); } -uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, - const char *filename, uint32_t alignment, - uint32_t offset) +static uint32_t cbfs_find_location_(const char *romfile, uint32_t filesize, + const char *filename, uint32_t offset, + int is_stage, uint32_t alignment) { void *rom = loadrom(romfile); int filename_size = strlen(filename); int headersize = - sizeof(struct cbfs_file) + ALIGN(filename_size + 1, - 16) + sizeof(struct cbfs_stage); + sizeof(struct cbfs_file) + + ALIGN(filename_size + 1, 16) + + (is_stage ? sizeof(struct cbfs_stage) : 0); + int totalsize = headersize + filesize; if (offset > phys_end - phys_start) { @@ -479,6 +481,8 @@ uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, && (ntohl(thisfile->len) + ntohl(thisfile->offset) - off_rel >= totalsize)) { + if (!is_stage) return current + headersize; + if (in_segment (current + headersize, filesize, alignment)) return current + headersize; @@ -496,9 +500,9 @@ uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, filesize, alignment)) return ALIGN(current, alignment) + alignment; } - current = - ALIGN(current + ntohl(thisfile->len) + - ntohl(thisfile->offset), align); + current = ALIGN(current + (ntohl(thisfile->len) + + ntohl(thisfile->offset) - off_rel), + align); } return 0; } @@ -506,49 +510,14 @@ uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, const char *filename, uint32_t offset) { - void *rom = loadrom(romfile); - int filename_size = strlen(filename); - - int headersize = - sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16); - - int totalsize = headersize + filesize; - - if (offset > phys_end - phys_start) { - fprintf(stderr, "Offset outside of ROM boundaries\n"); - exit(1); - } - - if (offset) offset = ALIGN(phys_start + offset, align); - - uint32_t current = phys_start; - while (current < phys_end) { - if (!cbfs_file_header(current)) { - current += align; - continue; - } - struct cbfs_file *thisfile = - (struct cbfs_file *)phys_to_virt(current); - - uint32_t top = - current + ntohl(thisfile->len) + ntohl(thisfile->offset); - - uint32_t off_rel = 0; - if (current < offset && offset <= top) { - off_rel = offset - current; - current = offset; - } - - if (current >= offset - && ((ntohl(thisfile->type) == 0x0) - || (ntohl(thisfile->type) == 0xffffffff)) - && (ntohl(thisfile->len) + ntohl(thisfile->offset) - - off_rel >= totalsize)) - return current + headersize; + return cbfs_find_location_(romfile, filesize, filename, offset, 0, + 0); +} - current = ALIGN(current + (ntohl(thisfile->len) + - ntohl(thisfile->offset) - off_rel), - align); - } - return 0; +uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, + const char *filename, uint32_t alignment, + uint32_t offset) +{ + return cbfs_find_location_(romfile, filesize, filename, offset, 1, + alignment); }

1 0

New patch to review for coreboot: 23e7b95 cbfstool: Optionally specify offsets to commands
by Noé Rubinstein 17 Oct '11

17 Oct '11

Noé Rubinstein (noe.rubinstein(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/284 -gerrit commit 23e7b952e792935986aade22e8d84692e3714329 Author: Noe Rubinstein <nrubinstein(a)avencall.com> Date: Tue Sep 27 14:59:12 2011 +0200 cbfstool: Optionally specify offsets to commands This enables placing components in specific parts of the ROM while leaving the calculation of their precise location to CBFStool. This can be used, for example, with flashrom's layout feature. We plan to use it to provide a more robust fallback mechanism than the one already provided by Coreboot, restricting the fallback to a part of the ROM which is write-protected during runtime. Change-Id: I7403f37e2f20306ea113879d12a9fcec175063d8 Signed-off-by: Noe Rubinstein <nrubinstein(a)avencall.com> --- src/arch/x86/Kconfig | 6 +++ src/arch/x86/Makefile.bootblock.inc | 4 +- util/cbfstool/cbfstool.c | 54 ++++++++++++++++++----- util/cbfstool/common.c | 79 ++++++++++++++++++++++++++++++++--- util/cbfstool/common.h | 6 ++- 5 files changed, 129 insertions(+), 20 deletions(-) diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index f98cf5b..c4ece2a 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -55,6 +55,12 @@ config X86_BOOTBLOCK_NORMAL endchoice + +config ROMSTAGE_OFFSET + hex "Romstage offset in ROM: " + depends on TINY_BOOTBLOCK + default '0x0' + config BOOTBLOCK_SOURCE string default "bootblock_simple.c" if X86_BOOTBLOCK_SIMPLE diff --git a/src/arch/x86/Makefile.bootblock.inc b/src/arch/x86/Makefile.bootblock.inc index 806afea..dd0d76e 100644 --- a/src/arch/x86/Makefile.bootblock.inc +++ b/src/arch/x86/Makefile.bootblock.inc @@ -80,7 +80,9 @@ $(obj)/coreboot.romstage: $(obj)/coreboot.pre1 $$(romstage-objs) $(obj)/romstage $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(romstage-objs) $(OBJCOPY) -O binary $(obj)/romstage.elf $(obj)/romstage.bin printf "CONFIG_ROMBASE = 0x" > $(obj)/location.ld - $(CBFSTOOL) $(obj)/coreboot.pre1 locate $(obj)/romstage.bin $(CONFIG_CBFS_PREFIX)/romstage $(CONFIG_XIP_ROM_SIZE) > $(obj)/location.txt + $(CBFSTOOL) $(obj)/coreboot.pre1 locate $(obj)/romstage.bin \ + $(CONFIG_CBFS_PREFIX)/romstage $(CONFIG_XIP_ROM_SIZE) \ + $(CONFIG_ROMSTAGE_OFFSET) > $(obj)/location.txt cat $(obj)/location.txt >> $(obj)/location.ld printf ';\nAUTO_XIP_ROM_BASE = CONFIG_ROMBASE & ~(CONFIG_XIP_ROM_SIZE - 1);\n' >> $(obj)/location.ld $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(romstage-objs) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 4c28c29..530712b 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -78,7 +78,11 @@ static int cbfs_add(int argc, char **argv) else type = strtoul(argv[5], NULL, 0); if (argc > 6) { - base = strtoul(argv[6], NULL, 0); + if (*argv[6] == '+') + base = cbfs_find_location(rom, filesize, filename, + strtoul(argv[6]+1, NULL, 0)); + else + base = strtoul(argv[6], NULL, 0); } cbfsfile = create_cbfs_file(cbfsname, filedata, &filesize, type, &base); if (add_file_to_cbfs(cbfsfile, filesize, base)) @@ -118,15 +122,20 @@ static int cbfs_add_payload(int argc, char **argv) void *cbfsfile = NULL; comp_algo algo = CBFS_COMPRESS_NONE; - if (argc > 5) { - if (argv[5][0] == 'l') + if (argc > 5 && argv[5][0] == 'l') algo = CBFS_COMPRESS_LZMA; - } - if (argc > 6) { - base = strtoul(argv[6], NULL, 0); - } + + unsigned char *payload; filesize = parse_elf_to_payload(filedata, &payload, algo); + + if (argc > 6) + if (*argv[6] == '+') + base = cbfs_find_location(rom, filesize, filename, + strtoul(argv[6]+1, NULL, 0)); + else + base = strtoul(argv[6], NULL, 0); + cbfsfile = create_cbfs_file(cbfsname, payload, &filesize, CBFS_COMPONENT_PAYLOAD, &base); @@ -171,11 +180,27 @@ static int cbfs_add_stage(int argc, char **argv) if (argv[5][0] == 'l') algo = CBFS_COMPRESS_LZMA; } - if (argc > 6) { - base = strtoul(argv[6], NULL, 0); - } unsigned char *stage; + + /* Careful here: + * + * - when the location is specified exactly, we want parse_elf_to_stage + * to use this information for the romstage to execute correctly. See + * src/arch/x86/Makefile.bootblock.inc + * + * - the +offset syntax can only be used when parse_elf_to_stage + * doesn't need this information + */ + + if (argc > 6 && *argv[6] != '+') + base = strtoul(argv[6], NULL, 0); + filesize = parse_elf_to_stage(filedata, &stage, algo, &base); + + if (argc > 6 && *argv[6] == '+') + base = cbfs_find_location(rom, filesize, filename, + strtoul(argv[6]+1, NULL, 0)); + cbfsfile = create_cbfs_file(cbfsname, stage, &filesize, CBFS_COMPONENT_STAGE, &base); @@ -225,8 +250,12 @@ static int cbfs_locate(int argc, char **argv) uint32_t filesize = getfilesize(file); const char *filename = argv[4]; int align = strtoul(argv[5], NULL, 0); + uint32_t offset = argc > 6 ? strtoul(argv[6], NULL, 0) : 0; + uint32_t loc = cbfs_find_stage_location(romname, filesize, filename, align, + offset); - printf("%x\n", cbfs_find_location(romname, filesize, filename, align)); + printf("%x\n", loc); + fprintf(stderr, "%x\n", loc); return 0; } @@ -287,7 +316,8 @@ void usage(void) " add-payload FILE NAME [COMP] [base] Add a payload to the ROM\n" " add-stage FILE NAME [COMP] [base] Add a stage to the ROM\n" " create SIZE BOOTBLOCK [ALIGN] Create a ROM file\n" - " locate FILE NAME ALIGN Find a place for a file of that size\n" + " locate FILE NAME ALIGN OFFSET Find a place for a file of that size\n" + " OFFSET is relative to the ROM start.\n" " print Show the contents of the ROM\n" " extract NAME FILE Extracts a raw payload from ROM\n" "\n" diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index cbf0757..09fe5bb 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -436,8 +436,9 @@ static int in_segment(int addr, int size, int gran) return ((addr & ~(gran - 1)) == ((addr + size) & ~(gran - 1))); } -uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, - const char *filename, uint32_t alignment) +uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, + const char *filename, uint32_t alignment, + uint32_t offset) { void *rom = loadrom(romfile); int filename_size = strlen(filename); @@ -447,6 +448,13 @@ uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, 16) + sizeof(struct cbfs_stage); int totalsize = headersize + filesize; + if (offset > phys_end - phys_start) { + fprintf(stderr, "Offset outside of ROM boundaries\n"); + exit(1); + } + + if (offset) offset = ALIGN(phys_start + offset, align); + uint32_t current = phys_start; while (current < phys_end) { if (!cbfs_file_header(current)) { @@ -458,10 +466,19 @@ uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, uint32_t top = current + ntohl(thisfile->len) + ntohl(thisfile->offset); - if (((ntohl(thisfile->type) == 0x0) - || (ntohl(thisfile->type) == 0xffffffff)) - && (ntohl(thisfile->len) + ntohl(thisfile->offset) >= - totalsize)) { + + uint32_t off_rel = 0; + if (current < offset && offset <= top) { + off_rel = offset - current; + current = offset; + } + + if (current >= offset + && ((ntohl(thisfile->type) == 0x0) + || (ntohl(thisfile->type) == 0xffffffff)) + && (ntohl(thisfile->len) + ntohl(thisfile->offset) + - off_rel >= totalsize)) { + if (in_segment (current + headersize, filesize, alignment)) return current + headersize; @@ -485,3 +502,53 @@ uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, } return 0; } + +uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, + const char *filename, uint32_t offset) +{ + void *rom = loadrom(romfile); + int filename_size = strlen(filename); + + int headersize = + sizeof(struct cbfs_file) + ALIGN(filename_size + 1, 16); + + int totalsize = headersize + filesize; + + if (offset > phys_end - phys_start) { + fprintf(stderr, "Offset outside of ROM boundaries\n"); + exit(1); + } + + if (offset) offset = ALIGN(phys_start + offset, align); + + uint32_t current = phys_start; + while (current < phys_end) { + if (!cbfs_file_header(current)) { + current += align; + continue; + } + struct cbfs_file *thisfile = + (struct cbfs_file *)phys_to_virt(current); + + uint32_t top = + current + ntohl(thisfile->len) + ntohl(thisfile->offset); + + uint32_t off_rel = 0; + if (current < offset && offset <= top) { + off_rel = offset - current; + current = offset; + } + + if (current >= offset + && ((ntohl(thisfile->type) == 0x0) + || (ntohl(thisfile->type) == 0xffffffff)) + && (ntohl(thisfile->len) + ntohl(thisfile->offset) + - off_rel >= totalsize)) + return current + headersize; + + current = ALIGN(current + (ntohl(thisfile->len) + + ntohl(thisfile->offset) - off_rel), + align); + } + return 0; +} diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 8f397d8..b5aea46 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -70,8 +70,12 @@ int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location); void print_cbfs_directory(const char *filename); int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath); +uint32_t cbfs_find_stage_location(const char *romfile, uint32_t filesize, + const char *filename, uint32_t alignment, + uint32_t offset); + uint32_t cbfs_find_location(const char *romfile, uint32_t filesize, - const char *filename, uint32_t align); + const char *filename, uint32_t offset); void print_supported_filetypes(void);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
51
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot October 2011