coreboot August 2011

coreboot@coreboot.org

47 participants
217 discussions

New patch to review: 8273028 Minor ma785gmt clean-up
by Alec Ari 22 Aug '11

22 Aug '11

Alec Ari (neotheuser(a)ymail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/167 -gerrit commit 82730285b1427ed6f95abbbaeecba8cffcde83f5 Author: Alec Ari <neotheuser(a)ymail.com> Date: Sun Aug 21 22:09:53 2011 -0500 Minor ma785gmt clean-up Change-Id: I9e889a6c475fb3283fa11f8b3de5baaf54235589 Signed-off-by: Alec Ari <neotheuser(a)ymail.com> --- src/mainboard/gigabyte/Kconfig | 2 +- src/mainboard/gigabyte/ma785gmt/Kconfig | 4 ++-- src/mainboard/gigabyte/ma785gmt/devicetree.cb | 2 +- src/mainboard/gigabyte/ma785gmt/mainboard.c | 7 ++----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/mainboard/gigabyte/Kconfig b/src/mainboard/gigabyte/Kconfig index 9de6574..813acef 100644 --- a/src/mainboard/gigabyte/Kconfig +++ b/src/mainboard/gigabyte/Kconfig @@ -29,7 +29,7 @@ config BOARD_GIGABYTE_GA_6BXE bool "GA-6BXE" config BOARD_GIGABYTE_M57SLI bool "GA-M57SLI-S4" -config BOARD_GIGABYTE_GA785GMT +config BOARD_GIGABYTE_MA785GMT bool "GA-MA785GMT-UD2H" config BOARD_GIGABYTE_MA78GM bool "GA-MA78GM-US2H" diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig index fd511a8..77bda90 100644 --- a/src/mainboard/gigabyte/ma785gmt/Kconfig +++ b/src/mainboard/gigabyte/ma785gmt/Kconfig @@ -1,4 +1,4 @@ -if BOARD_GIGABYTE_GA785GMT +if BOARD_GIGABYTE_MA785GMT config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -83,4 +83,4 @@ config RAMBASE hex default 0x200000 -endif # BOARD_GIGABYTE_GA785GMT +endif # BOARD_GIGABYTE_MA785GMT diff --git a/src/mainboard/gigabyte/ma785gmt/devicetree.cb b/src/mainboard/gigabyte/ma785gmt/devicetree.cb index 02e4bc8..124572f 100644 --- a/src/mainboard/gigabyte/ma785gmt/devicetree.cb +++ b/src/mainboard/gigabyte/ma785gmt/devicetree.cb @@ -1,4 +1,4 @@ -# sample config for gigabyte ga785gmt +# sample config for gigabyte/ma785gmt chip northbridge/amd/amdfam10/root_complex device lapic_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR3 diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c index 768c9e1..5747e62 100644 --- a/src/mainboard/gigabyte/ma785gmt/mainboard.c +++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c @@ -96,8 +96,6 @@ void set_pcie_reset() pci_write_config16(sm_dev, 0x7e, word); } - - /* * justify the dev3 is exist or not */ @@ -126,7 +124,6 @@ int is_dev3_present(void) } } - /* * set gpio40 gfx */ @@ -253,7 +250,7 @@ static void set_thermal_config(void) *************************************************/ static void ma785gmt_enable(device_t dev) { - printk(BIOS_INFO, "Mainboard Gigabyte ma785gmt Enable. dev=0x%p\n", dev); + printk(BIOS_INFO, "Mainboard MA785GMT-UD2H Enable. dev=0x%p\n", dev); #if (CONFIG_GFXUMA == 1) msr_t msr, msr2; @@ -315,6 +312,6 @@ int add_mainboard_resources(struct lb_memory *mem) } struct chip_operations mainboard_ops = { - CHIP_NAME("GIGABYTE MA785GMT Mainboard") + CHIP_NAME("GIGABYTE MA785GMT-UD2H Mainboard") .enable_dev = ma785gmt_enable, };

1 0

Re: [coreboot] Fwd: [PATCH v3 1/1] libpayload: add support for finding and parsing Coreboot BIOS tables
by Philip Prindeville 22 Aug '11

22 Aug '11

Since libpayload seems to be ownerless (but still active), I'm copying the 5 top committers of the last 100 commits. Plus Andres, who is knowledgeable about the Geode platforms (many of which use Coreboot). On 8/19/11 4:23 PM, Andrew Morton wrote: > On Thu, 18 Aug 2011 20:55:56 -0700 > Philip Prindeville <philipp(a)redfish-solutions.com> wrote: > >> Hi Andrew, >> >> Any chance this could make it in for 3.2? > > Perhaps. But I'm not on the linux-geode list (few people are!) and I > don't like to merge privately-sent patches. > > So please do a full resend, ccing myself and linux-kernel and then > we'll see what happens. > > > mini-review follows: > >> >> >> -------- Original Message -------- >> Subject: [PATCH v2 1/1] libpayload: add support for finding and parsing Coreboot BIOS tables >> Date: Wed, 17 Aug 2011 23:11:00 -0700 >> From: Philip Prindeville <philipp_subx(a)redfish-solutions.com> >> To: linux-geode(a)lists.infradead.org, Patrick Georgi <patrick.georgi(a)secunet.com> >> CC: Andres Salomon <dilinger(a)queued.net> >> >> Many experimental and small design house SBC's use Coreboot; here we add linux support for it. Platform drivers on generic processors such as Geode or C7 may interrogate Coreboot for the vendor and model. >> >> Removed the conditional compilation and non-kernel parts. >> >> Split into architecture indpendent and machine-specific parts as per Andres' comment. >> >> Signed-off-by: Philip Prindeville <philipp(a)redfish-solutions.com> >> Acked-by: Patrick Georgi <patrick.georgi(a)secunet.com> >> --- >> Taken from the coreboot project, largely unmodified. >> > > Given that it was taken from coreboot, are you sure that we have all > the signed-off-by:s? It seems that you're the primary/sole author so I > guess "yes". I'll add that when I post to linux-kernel after all review comments have been addressed. > The changelog is way too terse. I don't actually know what coreboot > *is*, and if you don't tell me, who will? I'll add that for the final review. > What does the code do? How does it work? What interfaces does it > offer and how does client code use them? etc. > > Should there be an associated documentation file? > > None of the exported interfaces are documented at all. This makes > review harder and less effective and makes the code harder and less > reliable to use. Yeah, unfortunately that's how it is at the source, too (the coreboot project). The upstream documentation is a little thin. http://www.coreboot.org/ http://www.coreboot.org/Libpayload but I can include a pointer to it. > diff --git a/include/linux/libpayload/coreboot_tables.h b/include/linux/libpayload/coreboot_tables.h > new file mode 100644 > index 0000000..ab1a652 > --- /dev/null > +++ b/include/linux/libpayload/coreboot_tables.h > @@ -0,0 +1,233 @@ > +/* > + * This file is part of the libpayload project. > + * > + * Copyright (C) 2008 Advanced Micro Devices, Inc. > + * Copyright (C) 2011 Philip Prindeville, Redfish Solutions, LLC. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. The name of the author may not be used to endorse or promote products > + * derived from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#ifndef _COREBOOT_TABLES_H > +#define _COREBOOT_TABLES_H > + > +#include <asm-generic/int-ll64.h> > + > +struct cbuint64 { > + u32 lo; > + u32 hi; > +}; > > I assume that all the structures in this file are based on some > coreboot spec? Without that spec, the implementation is unreviewable! > If such a spec is available, please prominently describe how the > reviewer can obtain it, within this file. It might be documented, but the Doxygen stuff seems to be faulting... I get a stack exception when I go to: http://qa.coreboot.org/docs/doxygen/ > > + u8 reserved_mask_pos; > + u8 reserved_mask_size; > +}; > + > +#define CB_TAG_CMOS_OPTION_TABLE 0x00c8 > +struct cb_cmos_option_table { > + u32 tag; > + u32 size; > + u32 header_length; > +}; > + > +#define CB_TAG_OPTION 0x00c9 > +#define CMOS_MAX_NAME_LENGTH 32 > +struct cb_cmos_entries { > + u32 tag; > + u32 size; > + u32 bit; > + u32 length; > + u32 config; > + u32 config_id; > + u8 name[CMOS_MAX_NAME_LENGTH]; > +}; > + > + > +#define CB_TAG_OPTION_ENUM 0x00ca > +#define CMOS_MAX_TEXT_LENGTH 32 > +struct cb_cmos_enums { > + u32 tag; > + u32 size; > + u32 config_id; > + u32 value; > + u8 text[CMOS_MAX_TEXT_LENGTH]; > +}; > + > +#define CB_TAG_OPTION_DEFAULTS 0x00cb > +#define CMOS_IMAGE_BUFFER_SIZE 128 > +struct cb_cmos_defaults { > + u32 tag; > + u32 size; > + u32 name_length; > + u8 name[CMOS_MAX_NAME_LENGTH]; > + u8 default_set[CMOS_IMAGE_BUFFER_SIZE]; > +}; > + > +#define CB_TAG_OPTION_CHECKSUM 0x00cc > +#define CHECKSUM_NONE 0 > +#define CHECKSUM_PCBIOS 1 > +struct cb_cmos_checksum { > + u32 tag; > + u32 size; > + u32 range_start; > + u32 range_end; > + u32 location; > + u32 type; > +}; > + > +/* Helpful macros */ > + > +#define MEM_RANGE_COUNT(_rec) \ > + (((_rec)->size - sizeof(*(_rec))) / sizeof((_rec)->map[0])) > + > +#define MEM_RANGE_PTR(_rec, _idx) \ > + (((u8 *) (_rec)) + sizeof(*(_rec)) \ > + + (sizeof((_rec)->map[0]) * (_idx))) > + > +#define MB_VENDOR_STRING(_mb) \ > + (((unsigned char *) ((_mb)->strings)) + (_mb)->vendor_idx) > + > +#define MB_PART_STRING(_mb) \ > + (((unsigned char *) ((_mb)->strings)) + (_mb)->part_number_idx) > + > +#define UNPACK_CB64(_in) \ > + ( (((u64) _in.hi) << 32) | _in.lo ) > > If at all possible, these should be implemented as (lower-cased) C > functions, not as macros. Because The first two can't be, since they are polymorphous (i.e. the "sizeof()" needs to work directly on the typeof() the argument it's getting). > - for some reason, people are more likely to document functions than > macros. > > - C functions provide argument typechecking > > - C functions are more readable > > - C functions can prevent unused-var warnings in obscure situations > > - C functions don't cause bugs when called using an expression with > side-effects. The above macros are in fact buggy if called with, for > example, UNPACK_CB64(*foo++). > > - C functions don't need vast amounts of parenthesis around argumetns > to prevent compilation errors. UNPACK_CB64() lacks these, for example. Done for the remainder. > +extern int get_coreboot_info(struct sysinfo_t *info); > +extern int cb_parse_header(void *addr, void *end, struct sysinfo_t *info); > + > +#endif > diff --git a/include/linux/libpayload/libpayload.h b/include/linux/libpayload/libpayload.h > new file mode 100644 > index 0000000..e2a4939 > --- /dev/null > +++ b/include/linux/libpayload/libpayload.h > @@ -0,0 +1,48 @@ > +/* > + * This file is part of the libpayload project. > + * > + * Copyright (C) 2008 Advanced Micro Devices, Inc. > + * Copyright (C) 2011 Philip Prindeville, Redfish Solutions, LLC. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. The name of the author may not be used to endorse or promote products > + * derived from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > +#ifndef _LIBPAYLOAD_H > +#define _LIBPAYLOAD_H > + > +#include <linux/types.h> > +#include <linux/unistd.h> > +#include <linux/string.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/printk.h> > +#include <linux/mm.h> > +#include <linux/highmem.h> > + > +#include <asm/io.h> > +#include <asm/page.h> > +#include <asm/checksum.h> > + > +#define ipchksum(start, len) ip_compute_csum(start, len) > + > +#endif > > I think this file needs to go away altogether. In the kernel we don't > like "#include <everything.h>" header files. Just explicitly list all > the needed includes directly, within each and every .c file. Nice and > simple. Done. > The ipchksum() macros hould be removed - jsut edit the code to call > ip_compute_csum(). I used a convenience function for this: cb_checksum(). > Is ip_compute_csum() available without CONFIG_NET? Seems to be "yes" > for x86, I don't know if that's true for other architectures, should > they developer coreboot support. For now, non-x86 platforms aren't supported. Worst case, we add a K-select or K-depends-on for it. >> >> ... >> +struct sysinfo_t { > > The _t should only be used in rare circumstances, for typedefs. This > should be "struct sysinfo". But we already have one of those. I'd > suggest a rename to "struct coreboot_sysinfo". Fixed. Called cb_sysinfo. > + unsigned int cpu_khz; > + unsigned short ser_ioport; > + unsigned long ser_base; // for mmapped serial > + > + int n_memranges; > + > + struct memrange { > + unsigned long long base; > + unsigned long long size; > + unsigned int type; > + } memrange[SYSINFO_MAX_MEM_RANGES]; > + > + struct cb_cmos_option_table *option_table; > + u32 cmos_range_start; > + u32 cmos_range_end; > + u32 cmos_checksum_location; > + > + struct cb_framebuffer *framebuffer; > + > + unsigned long *mbtable; /** Pointer to the multiboot table */ > + > + struct cb_header *header; > + struct cb_mainboard *mainboard; > +}; > + > +extern struct sysinfo_t lib_sysinfo; > +extern int lib_get_sysinfo(void); > > All globally exported symbols from code such as this should identify > what subsystem they belong to. So all these things should start with > "coreboot_", please. Done as "cb_". > Or "payload". This subsystem seems to have two main identifiers: > coreboot and payload. This is confusing. I prefer "coreboot", because > "payload" is terribly vague and could refer to anything at all. Looky: > > z:/usr/src/linux-3.1-rc2> grep -r payload . | wc -l > 5368 > > How do you distinguish this subsystem from all that? > > +#endif > + > diff --git a/lib/Kconfig b/lib/Kconfig > index 6c695ff..172c721 100644 > --- a/lib/Kconfig > +++ b/lib/Kconfig > @@ -91,6 +91,8 @@ config AUDIT_GENERIC > depends on AUDIT && !AUDIT_ARCH > default y > > +source "lib/libpayload/Kconfig" > + > # > # compression support is select'ed if needed > # > diff --git a/lib/Makefile b/lib/Makefile > index 15f7bb6..5af01ee 100644 > --- a/lib/Makefile > +++ b/lib/Makefile > @@ -72,6 +72,7 @@ obj-$(CONFIG_BCH) += bch.o > obj-$(CONFIG_LZO_COMPRESS) += lzo/ > obj-$(CONFIG_LZO_DECOMPRESS) += lzo/ > obj-$(CONFIG_XZ_DEC) += xz/ > +obj-$(CONFIG_LIBPAYLOAD) += libpayload/ > obj-$(CONFIG_RAID6_PQ) += raid6/ > > lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o > diff --git a/lib/libpayload/Kconfig b/lib/libpayload/Kconfig > new file mode 100644 > index 0000000..89c0fd8 > --- /dev/null > +++ b/lib/libpayload/Kconfig > @@ -0,0 +1,5 @@ > +config LIBPAYLOAD > + bool "Libpayload support" > + depends on X86 > + help > + Libpayload support for locating coreboot tables. > diff --git a/lib/libpayload/Makefile b/lib/libpayload/Makefile > new file mode 100644 > index 0000000..d65f5d4 > --- /dev/null > +++ b/lib/libpayload/Makefile > @@ -0,0 +1 @@ > +obj-$(CONFIG_LIBPAYLOAD) += coreboot.o sysinfo.o coreboot_x86.o > diff --git a/lib/libpayload/coreboot.c b/lib/libpayload/coreboot.c > new file mode 100644 > index 0000000..e1937e6 > --- /dev/null > +++ b/lib/libpayload/coreboot.c > @@ -0,0 +1,213 @@ > +/* > + * This file is part of the libpayload project. > + * > + * Copyright (C) 2008 Advanced Micro Devices, Inc. > + * Copyright (C) 2009 coresystems GmbH > + * Copyright (C) 2011 Philip Prindeville, Redfish Solutions, LLC. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. The name of the author may not be used to endorse or promote products > + * derived from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#include <linux/libpayload/libpayload.h> > +#include <linux/libpayload/sysinfo.h> > +#include <linux/libpayload/coreboot_tables.h> > + > +#include <linux/highmem.h> > +#include <asm/page.h> > + > +/* > + * Some of this is x86 specific, and the rest of it is generic. Right now, > + * since we only support x86, we'll avoid trying to make lots of infrastructure > + * we don't need. If in the future, we want to use coreboot on some other > + * architecture, then take out the generic parsing code and move it elsewhere. > + */ > + > +/* === Parsing code === */ > +/* This is the generic parsing code. */ > + > +#define page_base(addr) ((typeof(addr)) (((uintptr_t)(addr) & PAGE_MASK))) > > Remove, use PAGE_ALIGN Can't. PAGE_ALIGN() rounds *up* to the end of the page. I need the base page address. > +#define page_offset(addr) (((uintptr_t)(addr) & ~PAGE_MASK)) > > There might be an existing helper for this also. It should at least be > written in C so people can't do > > struct foo bar; > page_offset(bar); Done. > +static void cb_parse_memory(unsigned char *ptr, struct sysinfo_t *info) > > Documentation... I'll defer this to upstream. I'm trying to keep my code from becoming too divergent from what's upstream so it stays relatively simple to port bugfixes. Patrick: can we merge some of these changes back into coreboot/payloads/libpayload/arch/x86 ? > +{ > + struct cb_memory *mem = (struct cb_memory *)ptr; > + int count = MEM_RANGE_COUNT(mem); > + int i; > + > + if (count > SYSINFO_MAX_MEM_RANGES) > + count = SYSINFO_MAX_MEM_RANGES; > + > + info->n_memranges = 0; > + > + for (i = 0; i < count; i++) { > + struct cb_memory_range *range = > + (struct cb_memory_range *)MEM_RANGE_PTR(mem, i); > > Arrange for the MEM_RANGE_PTR() repalcement to return the correct type, > or void* then lose the typecast. Done. > + info->memrange[info->n_memranges].base = > + UNPACK_CB64(range->start); > + > + info->memrange[info->n_memranges].size = > + UNPACK_CB64(range->size); > + > + info->memrange[info->n_memranges].type = range->type; > + > + info->n_memranges++; > + } > +} > + > +static void cb_parse_serial(unsigned char *ptr, struct sysinfo_t *info) > +{ > + struct cb_serial *ser = (struct cb_serial *)ptr; > + info->ser_ioport = ser->ioport; > +} > > Make the arg void* and lose the typecast? Done. > +static void cb_parse_optiontable(unsigned char *ptr, struct sysinfo_t *info) > +{ > + info->option_table = (struct cb_cmos_option_table *)ptr; > +} > > Ditto. Done. > +static void cb_parse_checksum(unsigned char *ptr, struct sysinfo_t *info) > +{ > + struct cb_cmos_checksum *cmos_cksum = (struct cb_cmos_checksum *)ptr; > + info->cmos_range_start = cmos_cksum->range_start; > + info->cmos_range_end = cmos_cksum->range_end; > + info->cmos_checksum_location = cmos_cksum->location; > +} > + > +static void cb_parse_framebuffer(unsigned char *ptr, struct sysinfo_t *info) > +{ > + info->framebuffer = (struct cb_framebuffer *)ptr; > +} > > More. Done. > +int cb_parse_header(void *addr, void *end, struct sysinfo_t *info) > +{ > + struct cb_header *header; > + unsigned char *ptr = addr; > > make this void* then remove lots of typecasts. Done. > + void *forward; > + int i; > + > + for (i = 0; (void *)ptr < end; i += 16, ptr += 16) { > + header = (struct cb_header *)ptr; > + if (!strncmp((const char *)header->signature, "LBIO", 4)) > + break; > + } > + > + /* We walked the entire space and didn't find anything. */ > + if ((void *)ptr >= end) > + return -1; > + > + printk(KERN_DEBUG "coreboot: signature %.4s at %p\n", > + header->signature, header); > + > + if (!header->table_bytes) > + return 0; > + > + /* Make sure the checksums match. */ > + if (ipchksum(header, sizeof(*header)) != 0) > + return -1; > + > + printk(KERN_DEBUG "coreboot: header checksum verified\n"); > + > + if (ipchksum((char *)header + sizeof(*header), > + header->table_bytes) != header->table_checksum) > + return -1; > + > + printk(KERN_DEBUG "coreboot: table checksum verified\n"); > + > + info->header = header; > + > + /* Now, walk the tables. */ > + ptr += header->header_bytes; > + > + printk(KERN_DEBUG "coreboot: table start %p\n", ptr); > + > + for (i = 0; i < header->table_entries; i++) { > + struct cb_record *rec = (struct cb_record *)ptr; > + > + printk(KERN_DEBUG "coreboot: entry[%u] @ %p type %04x\n", > + i, rec, rec->tag); > + > + /* We only care about a few tags here (maybe more later). */ > + switch (rec->tag) { > + case CB_TAG_FORWARD: > + forward = (void *)(uintptr_t)((struct cb_forward *)rec)->forward; > > omigod. Your task is to get all the types sorted out and , make this > sort of thing vanish, please. Hard to do... "forward" is a 64-bit quantity, so it needs to be down-converted to the same width as your native pointer size, then cast back to a void *. Otherwise, we'll get compilation warnings which I hate to see... they're sloppy. > + printk(KERN_DEBUG "coreboot: forward to %p\n", > + forward); > + > + if (phys_to_virt((phys_addr_t) forward) >= high_memory) > + addr = ioremap((phys_addr_t) page_base(forward), 0x1000) > + + page_offset(forward); > + else > + addr = phys_to_virt((phys_addr_t) forward); > + /* we will leave the pages mapped */ > + return cb_parse_header(addr, addr + 0x1000, info); > + > + continue; > > All the playing with highmem internals is a bit obscure. I can't tell > what it's up to. Code comments, please. Done. > > + case CB_TAG_MEMORY: > + cb_parse_memory(ptr, info); > + break; > + case CB_TAG_SERIAL: > + cb_parse_serial(ptr, info); > + break; > + case CB_TAG_CMOS_OPTION_TABLE: > + cb_parse_optiontable(ptr, info); > + break; > + case CB_TAG_OPTION_CHECKSUM: > + cb_parse_checksum(ptr, info); > + break; > + // FIXME we should warn on serial if coreboot set up a > + // framebuffer buf the payload does not know about it. > > Please run the entire patch through scripts/checkpatch.pl. Done. > > + case CB_TAG_FRAMEBUFFER: > + cb_parse_framebuffer(ptr, info); > + break; > + case CB_TAG_MAINBOARD: > + info->mainboard = (struct cb_mainboard *)ptr; > + break; > + case CB_TAG_VERSION: > + case CB_TAG_EXTRA_VERSION: > + case CB_TAG_BUILD: > + case CB_TAG_COMPILE_TIME: > + case CB_TAG_COMPILE_BY: > + case CB_TAG_COMPILE_HOST: > + case CB_TAG_COMPILE_DOMAIN: > + case CB_TAG_COMPILER: > + case CB_TAG_LINKER: > + case CB_TAG_ASSEMBLER: > + printk(KERN_DEBUG "cb_parse_string: [%04x] %s\n", > + rec->tag, ((struct cb_string *)rec)->string); > + break; > + } > + > + ptr += rec->size; > + > + if ((void *)ptr >= end) > + return -1; > + } > + > + printk(KERN_DEBUG "coreboot: success (%u entries)!\n", > + header->table_entries); > + > + return 1; > +} > + > diff --git a/lib/libpayload/coreboot_x86.c b/lib/libpayload/coreboot_x86.c > new file mode 100644 > index 0000000..fa68041 > --- /dev/null > +++ b/lib/libpayload/coreboot_x86.c > @@ -0,0 +1,54 @@ > +/* > + * This file is part of the libpayload project. > + * > + * Copyright (C) 2008 Advanced Micro Devices, Inc. > + * Copyright (C) 2009 coresystems GmbH > + * Copyright (C) 2011 Philip Prindeville, Redfish Solutions, LLC. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. The name of the author may not be used to endorse or promote products > + * derived from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#include <linux/libpayload/libpayload.h> > +#include <linux/libpayload/sysinfo.h> > +#include <linux/libpayload/coreboot_tables.h> > + > +#include <linux/highmem.h> > +#include <asm/page.h> > + > +/* == Architecture specific == */ > +/* This is the x86 specific stuff. */ > + > +int get_coreboot_info(struct sysinfo_t *info) > > The globally-visible symbol should start with the subsystem identifier. > coreboot_get_info() would suit. Done. > > ALso, needs documentation. *What* info? > > +{ > + int ret; > + void *base = phys_to_virt(0x00000000); > + > + ret = cb_parse_header(base, base + 0x1000, info); > + if (ret != 1) { > + base = phys_to_virt(0x000f0000); > + ret = cb_parse_header(base, base + 0x1000, info); > + } > + > + return (ret == 1) ? 0 : -1; > +} > > > diff --git a/lib/libpayload/sysinfo.c b/lib/libpayload/sysinfo.c > new file mode 100644 > index 0000000..21c22f9 > --- /dev/null > +++ b/lib/libpayload/sysinfo.c > @@ -0,0 +1,68 @@ > +/* > + * This file is part of the libpayload project. > + * > + * Copyright (C) 2008 Advanced Micro Devices, Inc. > + * Copyright (C) 2011 Philip Prindeville, Redfish Solutions, LLC. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. The name of the author may not be used to endorse or promote products > + * derived from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#include <linux/libpayload/libpayload.h> > +#include <linux/libpayload/sysinfo.h> > +#include <linux/libpayload/coreboot_tables.h> > + > +/** > + * This is a global structure that is used through the library - we set it > + * up initially with some dummy values - hopefully they will be overridden. > + */ > +struct sysinfo_t lib_sysinfo = { > + .ser_ioport = 0x3f8, > +}; > +EXPORT_SYMBOL(lib_sysinfo); > > Again, poor naming choices. coreboot_sysinfo_lib, perhaps. Done. > > +int lib_get_sysinfo(void) > +{ > + int ret; > + > + /* Get information from the coreboot tables, > + * if they exist */ > + > + ret = get_coreboot_info(&lib_sysinfo); > + > + if (!lib_sysinfo.n_memranges) { > + /* If we can't get a good memory range, use the default. */ > + lib_sysinfo.n_memranges = 2; > + > + lib_sysinfo.memrange[0].base = 0; > + lib_sysinfo.memrange[0].size = 640 * 1024; > + lib_sysinfo.memrange[0].type = CB_MEM_RAM; > + > + lib_sysinfo.memrange[1].base = 1024 * 1024; > + lib_sysinfo.memrange[1].size = 31 * 1024 * 1024; > + lib_sysinfo.memrange[1].type = CB_MEM_RAM; > + } > + > + return ret; > +} > +EXPORT_SYMBOL(lib_get_sysinfo); > > coreboot_sysinfo_lib_get? > Done. Attached.

1 0

Successful boot on Gigabyte GA-MA78GM-S2HP motherboard
by Donovan Lavinder 21 Aug '11

21 Aug '11

I decided to evict the Award BIOS for Coreboot, for some advanced features, such as UEFI for example (upcoming BIOS won't support EFI, so I decided to give Coreboot a shot), however, I first tried a well-known working firmware snapshot in archived ZIP files of motherboard firmwares. For my Gigabyte GA-MA78GM-S2HP Rev. 2.0 - I picked firmware ROM from /GIGABYTE_MA78GM/ folder, and then burned that copy onto the main firmware ROM flash chip, and several power-downs hoping the backup BIOS won't think of silly idea of overwriting the main firmware flash with Award BIOS. The verdict: IT WORKED! However, I am getting rather strange behavior from WIndows XP - whenever it boots up, it crashed (from safe mode, it stopped dead after "giveio.sys" file was loaded - I think it could be AMD CPU driver that loads after giveio.sys) - otherwise, Linux live CD distro (that I used to burn the firmware) loaded fine on the computer. I am thinking it could be the bugs in SeaBIOS. System specification: Gigabyte GA-MA78GM-S2HP (AMD 780G / SB710 chipsets) - similar to GA-MA78GM-US2H Gigabyte brand (can't remember model) AMD Radeon HD 4670 PCIe 2.0 1GB video card (used as a main VGA controller) Crucial Ballistix 2GB DDR-II 800MHz Dual-Channel kit AMD Phenom II X4 Deneb 940 Black Series (for some reason, the firmware told it to run at 2.0GHz instead of 3.0GHz) Western Digital OEM Caivar 40GB SATA hard drive (WIndows XP Home Edition w/ SP3) Western Digital Caivar Blue 500GB SATA-II hard drive (secondary) ASUS DRW 2014-L1T SATA DVD-RAM burner PS/2 keyboard (PS/2 mouse won't work so I am using USB mouse. An excuse for getting all USB keyboard and mouse! :) ) -- "Mamma-mia, there's Koopa troopa in Mushroom Kingdom!"

1 0

Patch merged into master: bb6d2d5 buildgcc: Remove all bashisms, making the script run also on BSD
by gerrit＠coreboot.org 21 Aug '11

21 Aug '11

the following patch was just integrated into master: commit bb6d2d5693dfae9ff78eea624b38b40964905210 Author: Peter Stuge <peter(a)stuge.se> Date: Sun Aug 21 06:24:55 2011 +0200 buildgcc: Remove all bashisms, making the script run also on BSD Use sed instead of ${variable:start:length} and ${#variable} Use single = in string comparisons Use `eval echo '$'$variable` instead of ${!variable} Use > file 2>&1 instead of &> file Use readlink -f to expand the path of GCC configure Change-Id: Idc7dfcea3922f55630a6855acdb19e36582708bd Signed-off-by: Peter Stuge <peter(a)stuge.se> See http://review.coreboot.org/165 for details. -gerrit

1 0

Patch merged into master: ff9ee51 Use git describe to set KERNELVERSION
by gerrit＠coreboot.org 21 Aug '11

21 Aug '11

the following patch was just integrated into master: commit ff9ee51926225fe9e9e8accb95c8d7c6b7faaf02 Author: Peter Stuge <peter(a)stuge.se> Date: Sun Aug 21 06:17:05 2011 +0200 Use git describe to set KERNELVERSION Change-Id: Id579b19fc38c7ca2b98ad1e87aaec71c070a9178 Signed-off-by: Peter Stuge <peter(a)stuge.se> See http://review.coreboot.org/163 for details. -gerrit

1 0

Patch merged into master: a6efd27 buildgcc: Fix typo in check for failed iasl build
by gerrit＠coreboot.org 21 Aug '11

21 Aug '11

the following patch was just integrated into master: commit a6efd27ef8a4d0c1c2f89ad1ae07322348546eec Author: Peter Stuge <peter(a)stuge.se> Date: Sun Aug 21 06:21:39 2011 +0200 buildgcc: Fix typo in check for failed iasl build Change-Id: I3e90b90e807ae775ac66af160a0f8547dcb3597a Signed-off-by: Peter Stuge <peter(a)stuge.se> See http://review.coreboot.org/164 for details. -gerrit

1 0

Patch set updated: bb6d2d5 buildgcc: Remove all bashisms, making the script run also on BSD
by Peter Stuge 21 Aug '11

21 Aug '11

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/165 -gerrit commit bb6d2d5693dfae9ff78eea624b38b40964905210 Author: Peter Stuge <peter(a)stuge.se> Date: Sun Aug 21 06:24:55 2011 +0200 buildgcc: Remove all bashisms, making the script run also on BSD Use sed instead of ${variable:start:length} and ${#variable} Use single = in string comparisons Use `eval echo '$'$variable` instead of ${!variable} Use > file 2>&1 instead of &> file Use readlink -f to expand the path of GCC configure Change-Id: Idc7dfcea3922f55630a6855acdb19e36582708bd Signed-off-by: Peter Stuge <peter(a)stuge.se> --- util/crossgcc/buildgcc | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index b3329b0..5591810 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright (C) 2008-2010 by coresystems GmbH # written by Patrick Georgi <patrick.georgi(a)coresystems.de> and @@ -153,8 +153,8 @@ export PATH=$PATH:. getopt - > /dev/null 2>/dev/null || gcc -o getopt getopt.c # parse parameters.. try to find out whether we're running GNU getopt -getoptbrand="`getopt -V`" -if [ "${getoptbrand:0:6}" == "getopt" ]; then +getoptbrand="`getopt -V | sed -e '1!d' -e 's,^$......$.*,\1,'`" +if [ "${getoptbrand}" = "getopt" ]; then # Detected GNU getopt that supports long options. args=`getopt -l version,help,clean,directory:,platform:,jobs:,destdir:,savetemps,skip-gdb Vhcd:p:j:D:tG -- "$@"` eval set "$args" @@ -197,14 +197,14 @@ if [ "$TARGETARCH" = "i386-mingw32" ]; then MINGW_ARCHIVES="$W32API_ARCHIVE $MINGWRT_ARCHIVE" fi -if [ ${GCC_VERSION} == "4.5.0" -o ${GCC_VERSION} == "4.6.0" ]; then +if [ ${GCC_VERSION} = "4.5.0" -o ${GCC_VERSION} = "4.6.0" ]; then # coreboot does not like the GOLD linker # USE_GOLD="--enable-gold" USE_GOLD="" GCC_OPTIONS="--enable-lto" fi -if [ ${GCC_VERSION} == "4.6.0" ]; then +if [ ${GCC_VERSION} = "4.6.0" ]; then if [ ! -r tarballs/gcc-core-${GCC_VERSION}.tar.bz2 ]; then printf "Pre-Release GCC ${GCC_VERSION}, checking out subversion trunk\n" mkdir -p tarballs/.tmp @@ -246,16 +246,18 @@ fi printf "Unpacking and patching ... \n" for PACKAGE in GMP MPFR MPC LIBELF GCC BINUTILS $GDB_PACKAGE $MINGW_PACKAGES IASL; do archive=$PACKAGE"_ARCHIVE" - archive=${!archive} + archive="`eval echo '$'$archive`" dir=$PACKAGE"_DIR" - test -d ${!dir} || ( + dir="`eval echo '$'${dir}`" + test -d ${dir} || ( printf " * `basename $archive`\n" FLAGS=zxf - test ${archive:${#archive}-2:2} = "gz" && FLAGS=zxf - test ${archive:${#archive}-3:3} = "bz2" && FLAGS=jxf - test ${archive:${#archive}-4:4} = "lzma" && FLAGS="--lzma -xf" + suffix=`echo $archive | sed 's,.*\.,,'` + test "$suffix" = "gz" && FLAGS=zxf + test "$suffix" = "bz2" && FLAGS=jxf + test "$suffix" = "lzma" && FLAGS="--lzma -xf" $TAR $FLAGS tarballs/`basename $archive` - for patch in patches/${!dir}_*.patch; do + for patch in patches/${dir}_*.patch; do test -r $patch || continue printf " o `basename $patch`\n" $PATCH -s -N -p0 < `echo $patch` @@ -308,7 +310,7 @@ printf "Building GMP ${GMP_VERSION} ... " $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-gmp/crossgcc-build.log +) > build-gmp/crossgcc-build.log 2>&1 test -r build-gmp/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-gmp/.failed && exit 1 fi @@ -341,7 +343,7 @@ printf "Building MPFR ${MPFR_VERSION} ... " fi if [ ! -f .failed ]; then touch .success; fi -) &> build-mpfr/crossgcc-build.log +) > build-mpfr/crossgcc-build.log 2>&1 test -r build-mpfr/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-mpfr/.failed && exit 1 fi @@ -361,7 +363,7 @@ printf "Building MPC ${MPC_VERSION} ... " $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-mpc/crossgcc-build.log +) > build-mpc/crossgcc-build.log 2>&1 test -r build-mpc/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-mpc/.failed && exit 1 fi @@ -380,7 +382,7 @@ printf "Building libelf ${LIBELF_VERSION} ... " $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-libelf/crossgcc-build.log +) > build-libelf/crossgcc-build.log 2>&1 test -r build-libelf/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-libelf/.failed && exit 1 fi @@ -398,7 +400,7 @@ printf "Building binutils ${BINUTILS_VERSION} ... " $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-binutils/crossgcc-build.log +) > build-binutils/crossgcc-build.log 2>&1 test -r build-binutils/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-binutils/.failed && exit 1 fi @@ -416,7 +418,7 @@ printf "Building GCC ${GCC_VERSION} ... " # There's a work-around called CFLAGS_FOR_BUILD and CFLAGS_FOR_TARGET # but it does not seem to work properly. At least the host library # libiberty is not compiled with CFLAGS_FOR_BUILD. - CFLAGS_FOR_TARGET="-O2" CFLAGS="$HOSTCFLAGS" CFLAGS_FOR_BUILD="$HOSTCFLAGS" ../gcc-${GCC_VERSION}/configure \ + CFLAGS_FOR_TARGET="-O2" CFLAGS="$HOSTCFLAGS" CFLAGS_FOR_BUILD="$HOSTCFLAGS" `readlink -f ../gcc-${GCC_VERSION}/configure` \ --prefix=$TARGETDIR --libexecdir=$TARGETDIR/lib \ --target=${TARGETARCH} --disable-werror --disable-shared \ --disable-libssp --disable-bootstrap --disable-nls \ @@ -428,7 +430,7 @@ printf "Building GCC ${GCC_VERSION} ... " $MAKE $JOBS CFLAGS_FOR_BUILD="$HOSTCFLAGS" || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-gcc/crossgcc-build.log +) > build-gcc/crossgcc-build.log 2>&1 test -r build-gcc/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-gcc/.failed && exit 1 fi @@ -448,7 +450,7 @@ printf "Building GDB ${GDB_VERSION} ... " $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-gdb/crossgcc-build.log +) > build-gdb/crossgcc-build.log 2>&1 test -r build-gdb/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-gdb/.failed && exit 1 fi @@ -466,7 +468,7 @@ printf "Building IASL ${IASL_VERSION} ... " rm -f $DESTDIR$TARGETDIR/bin/iasl || touch .failed cp iasl $DESTDIR$TARGETDIR/bin || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> $IASL_DIR/compiler/crossgcc-build.log +) > $IASL_DIR/compiler/crossgcc-build.log 2>&1 test -r $IASL_DIR/compiler/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r $IASL_DIR/compiler/.failed && exit 1 fi

1 0

New patch to review: df7a440 buildgcc: Remove all bashisms, allowing the script to run also on BSD
by Peter Stuge 21 Aug '11

21 Aug '11

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/165 -gerrit commit df7a44079d7e0763a7e845b706ad3ca48e7e222d Author: Peter Stuge <peter(a)stuge.se> Date: Sun Aug 21 06:24:55 2011 +0200 buildgcc: Remove all bashisms, allowing the script to run also on BSD Use sed instead of ${variable:start:length} and ${#variable} Use single = in string comparisons Use `eval echo '$'$variable` instead of ${!variable} Use > file 2>&1 instead of &> file Use readlink -f to expand the path of GCC configure Change-Id: Idc7dfcea3922f55630a6855acdb19e36582708bd Signed-off-by: Peter Stuge <peter(a)stuge.se> --- util/crossgcc/buildgcc | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index b3329b0..5591810 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright (C) 2008-2010 by coresystems GmbH # written by Patrick Georgi <patrick.georgi(a)coresystems.de> and @@ -153,8 +153,8 @@ export PATH=$PATH:. getopt - > /dev/null 2>/dev/null || gcc -o getopt getopt.c # parse parameters.. try to find out whether we're running GNU getopt -getoptbrand="`getopt -V`" -if [ "${getoptbrand:0:6}" == "getopt" ]; then +getoptbrand="`getopt -V | sed -e '1!d' -e 's,^$......$.*,\1,'`" +if [ "${getoptbrand}" = "getopt" ]; then # Detected GNU getopt that supports long options. args=`getopt -l version,help,clean,directory:,platform:,jobs:,destdir:,savetemps,skip-gdb Vhcd:p:j:D:tG -- "$@"` eval set "$args" @@ -197,14 +197,14 @@ if [ "$TARGETARCH" = "i386-mingw32" ]; then MINGW_ARCHIVES="$W32API_ARCHIVE $MINGWRT_ARCHIVE" fi -if [ ${GCC_VERSION} == "4.5.0" -o ${GCC_VERSION} == "4.6.0" ]; then +if [ ${GCC_VERSION} = "4.5.0" -o ${GCC_VERSION} = "4.6.0" ]; then # coreboot does not like the GOLD linker # USE_GOLD="--enable-gold" USE_GOLD="" GCC_OPTIONS="--enable-lto" fi -if [ ${GCC_VERSION} == "4.6.0" ]; then +if [ ${GCC_VERSION} = "4.6.0" ]; then if [ ! -r tarballs/gcc-core-${GCC_VERSION}.tar.bz2 ]; then printf "Pre-Release GCC ${GCC_VERSION}, checking out subversion trunk\n" mkdir -p tarballs/.tmp @@ -246,16 +246,18 @@ fi printf "Unpacking and patching ... \n" for PACKAGE in GMP MPFR MPC LIBELF GCC BINUTILS $GDB_PACKAGE $MINGW_PACKAGES IASL; do archive=$PACKAGE"_ARCHIVE" - archive=${!archive} + archive="`eval echo '$'$archive`" dir=$PACKAGE"_DIR" - test -d ${!dir} || ( + dir="`eval echo '$'${dir}`" + test -d ${dir} || ( printf " * `basename $archive`\n" FLAGS=zxf - test ${archive:${#archive}-2:2} = "gz" && FLAGS=zxf - test ${archive:${#archive}-3:3} = "bz2" && FLAGS=jxf - test ${archive:${#archive}-4:4} = "lzma" && FLAGS="--lzma -xf" + suffix=`echo $archive | sed 's,.*\.,,'` + test "$suffix" = "gz" && FLAGS=zxf + test "$suffix" = "bz2" && FLAGS=jxf + test "$suffix" = "lzma" && FLAGS="--lzma -xf" $TAR $FLAGS tarballs/`basename $archive` - for patch in patches/${!dir}_*.patch; do + for patch in patches/${dir}_*.patch; do test -r $patch || continue printf " o `basename $patch`\n" $PATCH -s -N -p0 < `echo $patch` @@ -308,7 +310,7 @@ printf "Building GMP ${GMP_VERSION} ... " $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-gmp/crossgcc-build.log +) > build-gmp/crossgcc-build.log 2>&1 test -r build-gmp/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-gmp/.failed && exit 1 fi @@ -341,7 +343,7 @@ printf "Building MPFR ${MPFR_VERSION} ... " fi if [ ! -f .failed ]; then touch .success; fi -) &> build-mpfr/crossgcc-build.log +) > build-mpfr/crossgcc-build.log 2>&1 test -r build-mpfr/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-mpfr/.failed && exit 1 fi @@ -361,7 +363,7 @@ printf "Building MPC ${MPC_VERSION} ... " $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-mpc/crossgcc-build.log +) > build-mpc/crossgcc-build.log 2>&1 test -r build-mpc/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-mpc/.failed && exit 1 fi @@ -380,7 +382,7 @@ printf "Building libelf ${LIBELF_VERSION} ... " $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-libelf/crossgcc-build.log +) > build-libelf/crossgcc-build.log 2>&1 test -r build-libelf/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-libelf/.failed && exit 1 fi @@ -398,7 +400,7 @@ printf "Building binutils ${BINUTILS_VERSION} ... " $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-binutils/crossgcc-build.log +) > build-binutils/crossgcc-build.log 2>&1 test -r build-binutils/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-binutils/.failed && exit 1 fi @@ -416,7 +418,7 @@ printf "Building GCC ${GCC_VERSION} ... " # There's a work-around called CFLAGS_FOR_BUILD and CFLAGS_FOR_TARGET # but it does not seem to work properly. At least the host library # libiberty is not compiled with CFLAGS_FOR_BUILD. - CFLAGS_FOR_TARGET="-O2" CFLAGS="$HOSTCFLAGS" CFLAGS_FOR_BUILD="$HOSTCFLAGS" ../gcc-${GCC_VERSION}/configure \ + CFLAGS_FOR_TARGET="-O2" CFLAGS="$HOSTCFLAGS" CFLAGS_FOR_BUILD="$HOSTCFLAGS" `readlink -f ../gcc-${GCC_VERSION}/configure` \ --prefix=$TARGETDIR --libexecdir=$TARGETDIR/lib \ --target=${TARGETARCH} --disable-werror --disable-shared \ --disable-libssp --disable-bootstrap --disable-nls \ @@ -428,7 +430,7 @@ printf "Building GCC ${GCC_VERSION} ... " $MAKE $JOBS CFLAGS_FOR_BUILD="$HOSTCFLAGS" || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-gcc/crossgcc-build.log +) > build-gcc/crossgcc-build.log 2>&1 test -r build-gcc/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-gcc/.failed && exit 1 fi @@ -448,7 +450,7 @@ printf "Building GDB ${GDB_VERSION} ... " $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> build-gdb/crossgcc-build.log +) > build-gdb/crossgcc-build.log 2>&1 test -r build-gdb/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r build-gdb/.failed && exit 1 fi @@ -466,7 +468,7 @@ printf "Building IASL ${IASL_VERSION} ... " rm -f $DESTDIR$TARGETDIR/bin/iasl || touch .failed cp iasl $DESTDIR$TARGETDIR/bin || touch .failed if [ ! -f .failed ]; then touch .success; fi -) &> $IASL_DIR/compiler/crossgcc-build.log +) > $IASL_DIR/compiler/crossgcc-build.log 2>&1 test -r $IASL_DIR/compiler/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" test -r $IASL_DIR/compiler/.failed && exit 1 fi

1 0

New patch to review: a6efd27 buildgcc: Fix typo in check for failed iasl build
by Peter Stuge 21 Aug '11

21 Aug '11

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/164 -gerrit commit a6efd27ef8a4d0c1c2f89ad1ae07322348546eec Author: Peter Stuge <peter(a)stuge.se> Date: Sun Aug 21 06:21:39 2011 +0200 buildgcc: Fix typo in check for failed iasl build Change-Id: I3e90b90e807ae775ac66af160a0f8547dcb3597a Signed-off-by: Peter Stuge <peter(a)stuge.se> --- util/crossgcc/buildgcc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index e58b23e..b3329b0 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -468,7 +468,7 @@ printf "Building IASL ${IASL_VERSION} ... " if [ ! -f .failed ]; then touch .success; fi ) &> $IASL_DIR/compiler/crossgcc-build.log test -r $IASL_DIR/compiler/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n" -test -r $IASL_DIR/compiler.failed && exit 1 +test -r $IASL_DIR/compiler/.failed && exit 1 fi if [ $SAVETEMPS -eq 0 ]; then

1 0

New patch to review: ff9ee51 Use git describe to set KERNELVERSION
by Peter Stuge 21 Aug '11

21 Aug '11

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/163 -gerrit commit ff9ee51926225fe9e9e8accb95c8d7c6b7faaf02 Author: Peter Stuge <peter(a)stuge.se> Date: Sun Aug 21 06:17:05 2011 +0200 Use git describe to set KERNELVERSION Change-Id: Id579b19fc38c7ca2b98ad1e87aaec71c070a9178 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- Makefile.inc | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 89467db..6c51a84 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -19,8 +19,7 @@ ####################################################################### # misleadingly named, this is the coreboot version -REV=-r$(shell if [ -d $(top)/.git -a -f "`which git`" ]; then git --git-dir=/$(top)/.git show -s --pretty=format:%h; fi) -export KERNELVERSION := 4.0$(REV) +export KERNELVERSION := $(shell if [ -d "$(top)/.git" -a -f "`which git`" ]; then git describe; else echo unknown; fi) ####################################################################### # Basic component discovery

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
22
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 August 2011