coreboot April 2009

coreboot@coreboot.org

69 participants
583 discussions

[v2] r4212 - in trunk/coreboot-v2: src/mainboard/emulation/qemu-x86 src/mainboard/kontron/986lcd-m targets/kontron/986lcd-m
by svn＠coreboot.org 26 Apr '09

26 Apr '09

Author: oxygene Date: 2009-04-26 00:15:29 +0200 (Sun, 26 Apr 2009) New Revision: 4212 Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb Log: Enable CBFS for qemu and kontron. Both are builds-and-runs tested, incl. optionrom-in-cbfs for kontron, and compressed payloads for both. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Myles Watson <mylesgw(a)gmail.com> Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb 2009-04-25 22:07:28 UTC (rev 4211) +++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb 2009-04-25 22:15:29 UTC (rev 4212) @@ -50,7 +50,7 @@ default CONFIG_CONSOLE_SERIAL8250=1 default DEFAULT_CONSOLE_LOGLEVEL=8 default MAXIMUM_CONSOLE_LOGLEVEL=8 -default CONFIG_CBFS=0 +default CONFIG_CBFS=1 ## ROM_SIZE is the size of boot ROM that this board will use. default ROM_SIZE = 256*1024 Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb 2009-04-25 22:07:28 UTC (rev 4211) +++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb 2009-04-25 22:15:29 UTC (rev 4212) @@ -327,7 +327,7 @@ # # CBFS # -default CONFIG_CBFS=0 +default CONFIG_CBFS=1 ### End Options.lb end Modified: trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb =================================================================== --- trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb 2009-04-25 22:07:28 UTC (rev 4211) +++ trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb 2009-04-25 22:15:29 UTC (rev 4212) @@ -10,19 +10,22 @@ __COMPRESSION__ __LOGLEVEL__ -option ROM_SIZE=1024*(1024-64) +option ROM_SIZE=1024*1024 option FALLBACK_SIZE=1024*512 +# add optionroms with: +# coreboot-builds/kontron_986lcd-m/cbfstool coreboot-builds/kontron_986lcd-m/coreboot.rom add $pathto/pci8086,27a2.rom pci8086,27a2.rom 0x30 + romimage "normal" option USE_FALLBACK_IMAGE=0 - option ROM_IMAGE_SIZE=0x19000 + option ROM_IMAGE_SIZE=0x1a000 option COREBOOT_EXTRA_VERSION=".0-normal" payload __PAYLOAD__ end romimage "fallback" option USE_FALLBACK_IMAGE=1 - option ROM_IMAGE_SIZE=0x19000 + option ROM_IMAGE_SIZE=0x1a000 option COREBOOT_EXTRA_VERSION=".0-fallback" payload __PAYLOAD__ end

1 0

Re: [coreboot] [flashrom][PATCH] typo in Makefile
by Carl-Daniel Hailfinger 26 Apr '09

26 Apr '09

On 24.04.2009 15:09, stephan.guilloux(a)free.fr wrote: > Selon Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>: > >> On 24.04.2009 14:16, Ward Vandewege wrote: >> >>> On Fri, Apr 24, 2009 at 11:15:07AM +0200, stephan.guilloux(a)free.fr wrote: >>> >>> >>>>>> Found some typo in Makefile which was producing some "strange >>>>>> >> behaviours" >> >> I originally insisted on >& because it worked on tcsh, but since make >> uses /bin/sh and /bin/sh has to be POSIX compliant, we can use the POSIX >> variant. >& is not POSIX compliant, but >> >/dev/null 2>&1 >> is POSIX compliant. This is specified in SuSv3, Shell command language, >> sections 2.7.2 and 2.7.6. >> >> >>>>>> Signed-off-by: Stephan Guilloux <stephan.guilloux(a)free.fr> >>>>>> >>>>>> >>> Acked-by: Ward Vandewege <ward(a)gnu.org> >>> >>> >> Stephan, would you mind resubmitting the 2>&1 variant? Thanks. >> > Here it is and in attachment. > > Stephan. > > Signed-off-by: Stephan Guilloux <stephan.guilloux(a)free.fr> > Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Thanks, committed in r4211. Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

[v2] r4211 - trunk/util/flashrom
by svn＠coreboot.org 26 Apr '09

26 Apr '09

Author: hailfinger Date: 2009-04-26 00:07:28 +0200 (Sun, 26 Apr 2009) New Revision: 4211 Modified: trunk/util/flashrom/Makefile Log: The flashrom makefile wants to redirect both stdout and stderr to /dev/null for one compile test. The old variant of using &>/dev/null works on bash and zsh, but not on dash and tcsh. dash and tcsh interpret it as "background command and truncate /dev/null" which is not what we want. >& works on tcsh and bash, but it is not POSIX compliant. Since make uses /bin/sh and /bin/sh has to be POSIX compliant, we can use the POSIX variant of stderr and stdout redirection. >/dev/null 2>&1 is POSIX compliant. This is specified in SuSv3, Shell Command Language, sections 2.7.2 and 2.7.6. Signed-off-by: Stephan Guilloux <stephan.guilloux(a)free.fr> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Ward Vandewege <ward(a)gnu.org> Modified: trunk/util/flashrom/Makefile =================================================================== --- trunk/util/flashrom/Makefile 2009-04-25 14:39:12 UTC (rev 4210) +++ trunk/util/flashrom/Makefile 2009-04-25 22:07:28 UTC (rev 4211) @@ -65,7 +65,7 @@ echo "struct pci_access *pacc;"; \ echo "int main(int argc, char **argv)"; \ echo "{ pacc = pci_alloc(); return 0; }"; ) > .test.c ) - @$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) &>/dev/null && \ + @$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) >/dev/null 2>&1 && \ echo "found." || ( echo "not found."; echo; \ echo "Please install pciutils-devel and zlib-devel."; \ echo "See README for more information."; echo; \

1 0

[PATCH] more intelligent cbfs walker
by Patrick Georgi 25 Apr '09

25 Apr '09

Hi, attached patch makes the CBFS file lookup skip file data instead of brute- forcing its way through it, looking for magic numbers. For one, it should speed up file access, esp. with many entries, but it also helps against false positives (eg. seabios, which contains the magic number for its own CBFS support, which _might_ just be aligned properly) Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

3 12

AMD Rumba manuals
by ron minnich 25 Apr '09

25 Apr '09

Anyone have any idea where these might be? For the CBFS/V2 work I dragged one out of the closet ... it even has a bios savior. ron

1 0

EHCI Debug Port questions
by Gregg Levine 25 Apr '09

25 Apr '09

Hello! Besides the web pages discussing what works and what does not, sorry to state that my current Linux box doesn't wear an ECHCI style USB port, is there anything else to report here? For example I just visited the site that discusses the Debug device, and their favorite supplier (and builder of same) are still selling them. I might even actually buy one of them next month, or for the following one. ----- Gregg C Levine gregg.drwho8(a)gmail.com "This signature was once found posting rude messages in English in the Moscow subway."

2 2

[v2] r4210 - trunk/coreboot-v2/src/lib
by svn＠coreboot.org 25 Apr '09

25 Apr '09

Author: oxygene Date: 2009-04-25 16:39:12 +0200 (Sat, 25 Apr 2009) New Revision: 4210 Modified: trunk/coreboot-v2/src/lib/cbfs.c Log: Make the CBFS file lookup skip file data instead of brute-forcing its way through it, looking for magic numbers. For one, it should speed up file access, esp. with many entries, but it also helps against false positives (eg. seabios, which contains the magic number for its own CBFS support, which _might_ just be aligned properly) Also avoid infinite loops and give up searching for new files for invalid magic numbers. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/coreboot-v2/src/lib/cbfs.c =================================================================== --- trunk/coreboot-v2/src/lib/cbfs.c 2009-04-25 12:39:04 UTC (rev 4209) +++ trunk/coreboot-v2/src/lib/cbfs.c 2009-04-25 14:39:12 UTC (rev 4210) @@ -96,15 +96,24 @@ return NULL; offset = 0 - ntohl(header->romsize) + ntohl(header->offset); + int align= ntohl(header->align); + while(1) { struct cbfs_file *file = (struct cbfs_file *) offset; - if (cbfs_check_magic(file)) printk_info("Check %s\n", CBFS_NAME(file)); - if (cbfs_check_magic(file) && - !strcmp(CBFS_NAME(file), name)) + if (!cbfs_check_magic(file)) return NULL; + printk_info("Check %s\n", CBFS_NAME(file)); + if (!strcmp(CBFS_NAME(file), name)) return file; - offset += ntohl(header->align); + int flen = ntohl(file->len); + int foffset = ntohl(file->offset); + printk_spew("CBFS: follow chain: %p + %x + %x + align -> ", offset, foffset, flen); + unsigned long oldoffset = offset; + offset = ALIGN(offset + foffset + flen, align); + printk_spew("%p\n", offset); + if (offset <= oldoffset) return NULL; + if (offset < 0xFFFFFFFF - ntohl(header->romsize)) return NULL; }

1 0

[v2] r4209 - trunk/coreboot-v2/util/cbfstool
by svn＠coreboot.org 25 Apr '09

25 Apr '09

Author: myles Date: 2009-04-25 14:39:04 +0200 (Sat, 25 Apr 2009) New Revision: 4209 Modified: trunk/coreboot-v2/util/cbfstool/cbfstool.h trunk/coreboot-v2/util/cbfstool/create.c trunk/coreboot-v2/util/cbfstool/util.c Log: The master cbfs record was located at the end of the flash and overwrote anything that was there. For ck804 or mcp55-based machines that was the romstrap. The fix is simple: 1. Put the master cbfs record above the bootblock instead of on it. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Peter Stuge <peter(a)stuge.se> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: trunk/coreboot-v2/util/cbfstool/cbfstool.h =================================================================== --- trunk/coreboot-v2/util/cbfstool/cbfstool.h 2009-04-25 07:33:25 UTC (rev 4208) +++ trunk/coreboot-v2/util/cbfstool/cbfstool.h 2009-04-25 12:39:04 UTC (rev 4209) @@ -58,7 +58,8 @@ /* util.c */ int open_rom(struct rom *rom, const char *filename); int create_rom(struct rom *rom, const unsigned char *filename, int size, - int bootblocksize, int align); + const unsigned char *bootblockname, int bootblocksize, + int align); int size_and_open(const char *filename, unsigned int *size); int copy_from_fd(int fd, void *ptr, int size); int get_size(const char *size); Modified: trunk/coreboot-v2/util/cbfstool/create.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/create.c 2009-04-25 07:33:25 UTC (rev 4208) +++ trunk/coreboot-v2/util/cbfstool/create.c 2009-04-25 12:39:04 UTC (rev 4209) @@ -59,11 +59,8 @@ return -1; } - if (create_rom(rom, rom->name, size, bootblocksize, align)) + if (create_rom(rom, rom->name, size, bootblock, bootblocksize, align)) return -1; - if (bootblock != NULL) - return add_bootblock(rom, bootblock); - return 0; } Modified: trunk/coreboot-v2/util/cbfstool/util.c =================================================================== --- trunk/coreboot-v2/util/cbfstool/util.c 2009-04-25 07:33:25 UTC (rev 4208) +++ trunk/coreboot-v2/util/cbfstool/util.c 2009-04-25 12:39:04 UTC (rev 4209) @@ -168,7 +168,8 @@ } int create_rom(struct rom *rom, const unsigned char *filename, - int romsize, int bootblocksize, int align) + int romsize, const unsigned char *bootblockname, + int bootblocksize, int align) { unsigned char null = '\0'; @@ -180,8 +181,9 @@ /* Remember the size of the entire ROM */ rom->size = romsize; - /* The size of the archive section is everything but the bootblock */ - rom->fssize = romsize - bootblocksize; + /* The size of the archive section is everything but the bootblock and + * the cbfs master header. */ + rom->fssize = romsize - bootblocksize - sizeof(struct cbfs_header); /* Open the file descriptor */ @@ -201,29 +203,27 @@ return -1; } - /* Clear the reset vector */ - memset(rom->ptr + rom->size - 16, 0, 16); - - ROM_WRITEL(rom, rom->size - 4, - 0xFFFFFFF0 - sizeof(struct cbfs_header)); - /* This is a pointer to the header for easy access */ rom->header = (struct cbfs_header *) - ROM_PTR(rom, rom->size - 16 - sizeof(struct cbfs_header)); - + ROM_PTR(rom, rom->size - 16 - bootblocksize - sizeof(struct cbfs_header)); rom->header->magic = htonl(HEADER_MAGIC); rom->header->romsize = htonl(romsize); rom->header->bootblocksize = htonl(bootblocksize); rom->header->align = htonl(align); rom->header->offset = htonl(0); + add_bootblock(rom, bootblockname); + + /* Write the cbfs master header address at the end of the ROM. */ + + ROM_WRITEL(rom, rom->size - 4, + 0xFFFFFFF0 - bootblocksize - sizeof(struct cbfs_header)); return 0; } int add_bootblock(struct rom *rom, const char *filename) { unsigned int size; - //unsigned int offset; int fd = size_and_open(filename, &size); int ret; struct cbfs_header tmp; @@ -237,11 +237,7 @@ return -1; } - /* Copy the current header into a temporary buffer */ - memcpy(&tmp, rom->header, sizeof(struct cbfs_header)); - /* Copy the bootblock into place at the end of the file */ - ret = copy_from_fd(fd, ROM_PTR(rom, rom->size - ntohl(rom->header->bootblocksize)), size); close(fd); @@ -251,26 +247,6 @@ return -1; } - /* FIXME: This should point to a location defined by coreboot */ - - ROM_WRITEL(rom, rom->size - 4, - 0xFFFFFFF0 - sizeof(struct cbfs_header)); - - /* This is a pointer to the header for easy access */ - rom->header = (struct cbfs_header *) - ROM_PTR(rom, rom->size - 16 - sizeof(struct cbfs_header)); - -#if 0 - /* Figure out the new location for the header */ - offset = ROM_READL(rom, rom->size - 4); - - rom->header = (struct cbfs_header *) - ROM_PTR(rom, offset - (0xFFFFFFFF - rom->size)); -#endif - - /* Replace the LAR header */ - memcpy(rom->header, &tmp, sizeof(struct cbfs_header)); - return 0; }

1 0

[v2] r4208 - trunk/coreboot-v2/util/newconfig
by svn＠coreboot.org 25 Apr '09

25 Apr '09

Author: oxygene Date: 2009-04-25 09:33:25 +0200 (Sat, 25 Apr 2009) New Revision: 4208 Modified: trunk/coreboot-v2/util/newconfig/config.g Log: Enable cbfs payload compression (the "l" flag) if payloads are supposed to be compressed (with lzma only, as cbfstool lacks nrv2b compression support for now) Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: trunk/coreboot-v2/util/newconfig/config.g =================================================================== --- trunk/coreboot-v2/util/newconfig/config.g 2009-04-25 07:32:24 UTC (rev 4207) +++ trunk/coreboot-v2/util/newconfig/config.g 2009-04-25 07:33:25 UTC (rev 4208) @@ -2293,6 +2293,8 @@ file.write("\trm -f romcc*\n\n") file.write("ifeq \"$(CONFIG_CBFS)\" \"1\"\n\n") + file.write("CBFS_COMPRESS_FLAG:=\n") + file.write("ifeq \"$(CONFIG_COMPRESSED_PAYLOAD_LZMA)\" \"1\"\nCBFS_COMPRESS_FLAG:=l\nendif\n\n") for i in buildroms: file.write("%s: cbfstool" %(i.name)) @@ -2316,7 +2318,7 @@ for j in i.roms: #failover is a hack that will go away soon. if (j != "failover") and (rommapping[j] != "/dev/null"): - file.write("\t./cbfstool %s add-payload %s %s/payload\n" % (i.name, rommapping[j], j,)) + file.write("\t./cbfstool %s add-payload %s %s/payload $(CBFS_COMPRESS_FLAG)\n" % (i.name, rommapping[j], j,)) file.write("\t./cbfstool %s print\n" % i.name) file.write("\n") file.write("else\n\n")

1 0

[v2] r4207 - trunk/coreboot-v2/src/boot
by svn＠coreboot.org 25 Apr '09

25 Apr '09

Author: oxygene Date: 2009-04-25 09:32:24 +0200 (Sat, 25 Apr 2009) New Revision: 4207 Modified: trunk/coreboot-v2/src/boot/selfboot.c Log: Move decompression further down the code flow, so that - where possible - code is decompressed directly to the right place (instead of copying around, as before). The downside of this approach is that it's not possible (without API changes to the decompressors) to put partial segments into bounce buffers. So if a segment collides with coreboot _and_ is compressed, it's bounced entirely. But, as this only brings back the copy we already had before, the new worst case is better than the average before. It also fixes handling of compressed segments. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: trunk/coreboot-v2/src/boot/selfboot.c =================================================================== --- trunk/coreboot-v2/src/boot/selfboot.c 2009-04-24 16:44:34 UTC (rev 4206) +++ trunk/coreboot-v2/src/boot/selfboot.c 2009-04-25 07:32:24 UTC (rev 4207) @@ -55,6 +55,7 @@ unsigned long s_srcaddr; unsigned long s_memsz; unsigned long s_filesz; + int compression; }; struct verify_callback { @@ -70,54 +71,6 @@ unsigned short ip_checksum; }; -int cbfs_self_decompress(int algo, void *src,struct segment *new) -{ - u8 *dst; - - /* for uncompressed, it's easy: just point at the area in ROM */ - if (algo == CBFS_COMPRESS_NONE) { - new->s_srcaddr = (u32) src; - new->s_filesz = new->s_memsz; - return 0; - } - - /* for compression, let's keep it simple. We'll malloc the destination - * area and decompress to there. The compression overhead far outweighs - * any overhead for an extra copy. - */ - dst = malloc(new->s_memsz); - if (! dst) - return -1; - - switch(algo) { -#if CONFIG_COMPRESSED_PAYLOAD_LZMA==1 - case CBFS_COMPRESS_LZMA: { - unsigned long ulzma(unsigned char *src, unsigned char *dst); - ulzma(src, dst); - break; - } -#endif - -#if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1 - case CBFS_COMPRESS_NRV2B: { - unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p); - unsigned long tmp; - unrv2b(src, dst, &tmp); - break; - } -#endif - default: - printk_info( "CBFS: Unknown compression type %d\n", - algo); - return -1; - } - - new->s_srcaddr = (u32) dst; - new->s_filesz = new->s_memsz; - return 0; - -} - /* The problem: * Static executables all want to share the same addresses * in memory because only a few addresses are reliably present on @@ -249,82 +202,84 @@ printk_spew("segment: [0x%016lx, 0x%016lx, 0x%016lx)\n", start, middle, end); - /* Slice off a piece at the beginning - * that doesn't conflict with coreboot. - */ - if (start < lb_start) { - struct segment *new; - unsigned long len = lb_start - start; - new = malloc(sizeof(*new)); - *new = *seg; - new->s_memsz = len; - seg->s_memsz -= len; - seg->s_dstaddr += len; - seg->s_srcaddr += len; - if (seg->s_filesz > len) { - new->s_filesz = len; - seg->s_filesz -= len; - } else { - seg->s_filesz = 0; - } + if (seg->compression == CBFS_COMPRESS_NONE) { + /* Slice off a piece at the beginning + * that doesn't conflict with coreboot. + */ + if (start < lb_start) { + struct segment *new; + unsigned long len = lb_start - start; + new = malloc(sizeof(*new)); + *new = *seg; + new->s_memsz = len; + seg->s_memsz -= len; + seg->s_dstaddr += len; + seg->s_srcaddr += len; + if (seg->s_filesz > len) { + new->s_filesz = len; + seg->s_filesz -= len; + } else { + seg->s_filesz = 0; + } - /* Order by stream offset */ - new->next = seg; - new->prev = seg->prev; - seg->prev->next = new; - seg->prev = new; - /* Order by original program header order */ - new->phdr_next = seg; - new->phdr_prev = seg->phdr_prev; - seg->phdr_prev->phdr_next = new; - seg->phdr_prev = new; + /* Order by stream offset */ + new->next = seg; + new->prev = seg->prev; + seg->prev->next = new; + seg->prev = new; + /* Order by original program header order */ + new->phdr_next = seg; + new->phdr_prev = seg->phdr_prev; + seg->phdr_prev->phdr_next = new; + seg->phdr_prev = new; - /* compute the new value of start */ - start = seg->s_dstaddr; - - printk_spew(" early: [0x%016lx, 0x%016lx, 0x%016lx)\n", - new->s_dstaddr, - new->s_dstaddr + new->s_filesz, - new->s_dstaddr + new->s_memsz); - } - - /* Slice off a piece at the end - * that doesn't conflict with coreboot - */ - if (end > lb_end) { - unsigned long len = lb_end - start; - struct segment *new; - new = malloc(sizeof(*new)); - *new = *seg; - seg->s_memsz = len; - new->s_memsz -= len; - new->s_dstaddr += len; - new->s_srcaddr += len; - if (seg->s_filesz > len) { - seg->s_filesz = len; - new->s_filesz -= len; - } else { - new->s_filesz = 0; - } - /* Order by stream offset */ - new->next = seg->next; - new->prev = seg; - seg->next->prev = new; - seg->next = new; - /* Order by original program header order */ - new->phdr_next = seg->phdr_next; - new->phdr_prev = seg; - seg->phdr_next->phdr_prev = new; - seg->phdr_next = new; + /* compute the new value of start */ + start = seg->s_dstaddr; + + printk_spew(" early: [0x%016lx, 0x%016lx, 0x%016lx)\n", + new->s_dstaddr, + new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->s_memsz); + } + + /* Slice off a piece at the end + * that doesn't conflict with coreboot + */ + if (end > lb_end) { + unsigned long len = lb_end - start; + struct segment *new; + new = malloc(sizeof(*new)); + *new = *seg; + seg->s_memsz = len; + new->s_memsz -= len; + new->s_dstaddr += len; + new->s_srcaddr += len; + if (seg->s_filesz > len) { + seg->s_filesz = len; + new->s_filesz -= len; + } else { + new->s_filesz = 0; + } + /* Order by stream offset */ + new->next = seg->next; + new->prev = seg; + seg->next->prev = new; + seg->next = new; + /* Order by original program header order */ + new->phdr_next = seg->phdr_next; + new->phdr_prev = seg; + seg->phdr_next->phdr_prev = new; + seg->phdr_next = new; - /* compute the new value of end */ - end = start + len; - - printk_spew(" late: [0x%016lx, 0x%016lx, 0x%016lx)\n", - new->s_dstaddr, - new->s_dstaddr + new->s_filesz, - new->s_dstaddr + new->s_memsz); - + /* compute the new value of end */ + end = start + len; + + printk_spew(" late: [0x%016lx, 0x%016lx, 0x%016lx)\n", + new->s_dstaddr, + new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->s_memsz); + + } } /* Now retarget this segment onto the bounce buffer */ /* sort of explanation: the buffer is a 1:1 mapping to coreboot. @@ -371,15 +326,11 @@ new = malloc(sizeof(*new)); new->s_dstaddr = ntohl((u32) segment->load_addr); new->s_memsz = ntohl(segment->mem_len); + new->compression = ntohl(segment->compression); datasize = ntohl(segment->len); - /* figure out decompression, do it, get pointer to the area */ - if (cbfs_self_decompress(ntohl(segment->compression), - ((unsigned char *) first_segment) + - ntohl(segment->offset), new)) { - printk_emerg("cbfs_self_decompress failed\n"); - return; - } + new->s_srcaddr = (u32) ((unsigned char *) first_segment) + ntohl(segment->offset); + new->s_filesz = ntohl(segment->len); printk_debug("New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); /* Clean up the values */ @@ -449,23 +400,47 @@ /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - end = dest + ptr->s_memsz; - middle = dest + ptr->s_filesz; src = ptr->s_srcaddr; - printk_spew("[ 0x%016lx, %016lx, 0x%016lx) <- %016lx\n", - (unsigned long)dest, - (unsigned long)middle, - (unsigned long)end, - (unsigned long)src); /* Copy data from the initial buffer */ if (ptr->s_filesz) { size_t len; len = ptr->s_filesz; - memcpy(dest, src, len); - dest += len; + switch(ptr->compression) { +#if CONFIG_COMPRESSED_PAYLOAD_LZMA==1 + case CBFS_COMPRESS_LZMA: { + printk_debug("using LZMA\n"); + unsigned long ulzma(unsigned char *src, unsigned char *dst); + len = ulzma(src, dest); + break; + } +#endif +#if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1 + case CBFS_COMPRESS_NRV2B: { + printk_debug("using NRV2B\n"); + unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p); + unsigned long tmp; + len = unrv2b(src, dest, &tmp); + break; + } +#endif + case CBFS_COMPRESS_NONE: { + printk_debug("it's not compressed!\n"); + memcpy(dest, src, len); + break; + } + default: + printk_info( "CBFS: Unknown compression type %d\n", ptr->compression); + return -1; + } + end = dest + ptr->s_memsz; + middle = dest + len; + printk_spew("[ 0x%016lx, %016lx, 0x%016lx) <- %016lx\n", + (unsigned long)dest, + (unsigned long)middle, + (unsigned long)end, + (unsigned long)src); } - /* Zero the extra bytes between middle & end */ if (middle < end) { printk_debug("Clearing Segment: addr: 0x%016lx memsz: 0x%016lx\n",

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
59
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 April 2009