coreboot June 2010

coreboot@coreboot.org

60 participants
222 discussions

[PATCH]libpayload: add defines to lpgcc
by Patrick Georgi 24 Jun '10

24 Jun '10

Hi, attached patch tells lpgcc to add two defines to the compiler it invokes: __LIBPAYLOAD__ and an architecture specific one (__i386__ or __powerpc__) Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

6 6

[commit] r5645 - in trunk/payloads/libpayload: . include/pci libpci
by repository service 24 Jun '10

24 Jun '10

Author: oxygene Date: Thu Jun 24 16:15:49 2010 New Revision: 5645 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5645 Log: Incomplete implementation of libpci's (of pciutils) interface. No pciutils code was harmed in its production - this code was written by looking at flashrom's expectations, so there's no license pollution. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Peter Stuge <peter(a)stuge.se> Added: trunk/payloads/libpayload/include/pci/ trunk/payloads/libpayload/include/pci/pci.h trunk/payloads/libpayload/libpci/ trunk/payloads/libpayload/libpci/Makefile.inc trunk/payloads/libpayload/libpci/libpci.c Modified: trunk/payloads/libpayload/Makefile Modified: trunk/payloads/libpayload/Makefile ============================================================================== --- trunk/payloads/libpayload/Makefile Thu Jun 24 15:37:59 2010 (r5644) +++ trunk/payloads/libpayload/Makefile Thu Jun 24 16:15:49 2010 (r5645) @@ -77,7 +77,7 @@ PLATFORM-y += arch/$(ARCHDIR-y)/Makefile.inc TARGETS-y := -BUILD-y := crypto/Makefile.inc libc/Makefile.inc drivers/Makefile.inc +BUILD-y := crypto/Makefile.inc libc/Makefile.inc drivers/Makefile.inc libpci/Makefile.inc BUILD-$(CONFIG_TINYCURSES) += curses/Makefile.inc # The primary target needs to be here before we include the @@ -145,7 +145,7 @@ $(Q)mkdir -p $(obj)/util/kconfig/lxdialog $(Q)mkdir -p $(obj)/crypto $(obj)/curses $(obj)/drivers/video $(Q)mkdir -p $(obj)/drivers/usb - $(Q)mkdir -p $(obj)/arch/$(ARCHDIR-y) $(obj)/lib/$(ARCHDIR-y) $(obj)/libc + $(Q)mkdir -p $(obj)/arch/$(ARCHDIR-y) $(obj)/lib/$(ARCHDIR-y) $(obj)/libc $(obj)/libpci $(Q)mkdir -p $(obj)/lib/$(ARCHDIR-y) $(Q)mkdir -p $(obj)/include Added: trunk/payloads/libpayload/include/pci/pci.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/pci/pci.h Thu Jun 24 16:15:49 2010 (r5645) @@ -0,0 +1,76 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2010 coresystems GmbH + * + * 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 _PCI_PCI_H +#define _PCI_PCI_H + +#include <pci.h> + +#define PCI_CLASS_DEVICE REG_CLASS_DEV +#define PCI_SUBSYSTEM_VENDOR_ID REG_SUBSYS_VENDOR_ID +#define PCI_SUBSYSTEM_ID REG_SUBSYS_ID + +struct pci_dev { + u16 domain; + u8 bus, dev, func; + u16 vendor_id, device_id; + struct pci_dev *next; +}; + +/* + * values to match devices against. + * "-1" means "don't care", everything else requires an exact match + */ +struct pci_filter { + int domain, bus, dev, func; + int vendor, device; + struct pci_dev *devices; +}; + +struct pci_access { + struct pci_dev *devices; +}; + +u8 pci_read_byte(struct pci_dev *dev, int pos); +u16 pci_read_word(struct pci_dev *dev, int pos); +u32 pci_read_long(struct pci_dev *dev, int pos); + +int pci_write_byte(struct pci_dev *dev, int pos, u8 data); +int pci_write_word(struct pci_dev *dev, int pos, u16 data); +int pci_write_long(struct pci_dev *dev, int pos, u32 data); + +struct pci_access *pci_alloc(void); +void pci_init(struct pci_access*); +char *pci_filter_parse_slot(struct pci_filter*, const char*); +int pci_filter_match(struct pci_filter*, struct pci_dev*); +void pci_filter_init(struct pci_access*, struct pci_filter*); +void pci_scan_bus(struct pci_access*); +struct pci_dev *pci_get_dev(struct pci_access*, u16, u8, u8, u8); + +#endif Added: trunk/payloads/libpayload/libpci/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/libpci/Makefile.inc Thu Jun 24 16:15:49 2010 (r5645) @@ -0,0 +1,30 @@ +## +## This file is part of the libpayload project. +## +## Copyright (C) 2010 coresystems GmbH +## +## 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. +## + +TARGETS-y += libpci/libpci.o Added: trunk/payloads/libpayload/libpci/libpci.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/libpci/libpci.c Thu Jun 24 16:15:49 2010 (r5645) @@ -0,0 +1,216 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2010 coresystems GmbH + * + * 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 <libpayload.h> +#include <pci.h> +#include <pci/pci.h> + +/* libpci shim */ +static pcidev_t libpci_to_lb(struct pci_dev *dev) +{ + return PCI_DEV(dev->bus, dev->dev, dev->func); +} + +/* libpci interface */ +u8 pci_read_byte(struct pci_dev *dev, int pos) +{ + return pci_read_config8(libpci_to_lb(dev), pos); +} + +u16 pci_read_word(struct pci_dev *dev, int pos) +{ + return pci_read_config16(libpci_to_lb(dev), pos); +} + +u32 pci_read_long(struct pci_dev *dev, int pos) +{ + return pci_read_config32(libpci_to_lb(dev), pos); +} + +int pci_write_byte(struct pci_dev *dev, int pos, u8 data) +{ + pci_write_config8(libpci_to_lb(dev), pos, data); + return 1; /* success */ +} + +int pci_write_word(struct pci_dev *dev, int pos, u16 data) +{ + pci_write_config16(libpci_to_lb(dev), pos, data); + return 1; /* success */ +} + +int pci_write_long(struct pci_dev *dev, int pos, u32 data) +{ + pci_write_config32(libpci_to_lb(dev), pos, data); + return 1; /* success */ +} + +struct pci_access *pci_alloc(void) +{ + struct pci_access *pacc = malloc(sizeof(*pacc)); + return pacc; +} + +void pci_init(struct pci_access* pacc) +{ + memset(pacc, 0, sizeof(*pacc)); +} + +void pci_filter_init(struct pci_access* pacc, struct pci_filter* pf) +{ + pf->domain = -1; + pf->bus = -1; + pf->dev = -1; + pf->func = -1; + pf->vendor = -1; + pf->device = -1; +} + +/* parse domain:bus:dev.func (with all components but "dev" optional) + * into filter. + * Returns NULL on success, a string pointer to the error message otherwise. + */ +char *pci_filter_parse_slot(struct pci_filter* filter, const char* id) +{ + char *endptr; + + filter->func = filter->dev = filter->bus = filter->domain = -1; + + char *funcp = strrchr(id, '.'); + if (funcp) { + filter->func = strtoul(funcp+1, &endptr, 0); + if (endptr[0] != '\0') return "invalid pci device string"; + } + + char *devp = strrchr(id, ':'); + if (!devp) { + filter->dev = strtoul(id, &endptr, 0); + } else { + filter->dev = strtoul(devp+1, &endptr, 0); + } + if (endptr != funcp) return "invalid pci device string"; + if (!devp) return NULL; + + char *busp = strchr(id, ':'); + if (busp == devp) { + filter->bus = strtoul(id, &endptr, 0); + } else { + filter->bus = strtoul(busp+1, &endptr, 0); + } + if (endptr != funcp) return "invalid pci device string"; + if (busp == devp) return NULL; + + filter->domain = strtoul(id, &endptr, 0); + if (endptr != busp) return "invalid pci device string"; + + return NULL; +} + +int pci_filter_match(struct pci_filter* pf, struct pci_dev* dev) +{ + if ((pf->domain > -1) && (pf->domain != dev->domain)) + return 0; + if ((pf->bus > -1) && (pf->bus != dev->bus)) + return 0; + if ((pf->dev > -1) && (pf->dev != dev->dev)) + return 0; + if ((pf->func > -1) && (pf->func != dev->func)) + return 0; + if ((pf->vendor > -1) && (pf->vendor != dev->vendor_id)) + return 0; + if ((pf->device > -1) && (pf->device != dev->device_id)) + return 0; + return 1; +} + +static struct pci_dev *pci_scan_single_bus(struct pci_dev *dev, int bus) +{ + int devfn; + u32 val; + unsigned char hdr; + + for (devfn = 0; devfn < 0x100; devfn++) { + int func = devfn & 0x7; + int slot = (devfn >> 3) & 0x1f; + + val = pci_read_config32(PCI_DEV(bus, slot, func), + REG_VENDOR_ID); + + if (val == 0xffffffff || val == 0x00000000 || + val == 0x0000ffff || val == 0xffff0000) + continue; + + dev->next = malloc(sizeof(struct pci_dev)); + dev = dev->next; + dev->domain = 0; + dev->bus = bus; + dev->dev = slot; + dev->func = func; + dev->vendor_id = val & 0xffff; + dev->device_id = val >> 16; + dev->next = 0; + + hdr = pci_read_config8(PCI_DEV(bus, slot, func), + REG_HEADER_TYPE); + hdr &= 0x7F; + + if (hdr == HEADER_TYPE_BRIDGE || hdr == HEADER_TYPE_CARDBUS) { + unsigned int busses; + busses = pci_read_config32(PCI_DEV(bus, slot, func), + REG_PRIMARY_BUS); + busses = (busses >> 8) & 0xFF; + + /* Avoid recursion if the new bus is the same as + * the old bus (insert lame The Who joke here) */ + + if (busses != bus) + dev = pci_scan_single_bus(dev, busses); + } + } + + return dev; +} + +void pci_scan_bus(struct pci_access* pacc) +{ + struct pci_dev rootdev; + pci_scan_single_bus(&rootdev, 0); + pacc->devices = rootdev.next; +} + +struct pci_dev *pci_get_dev(struct pci_access* pacc, u16 domain, u8 bus, u8 dev, u8 func) +{ + struct pci_dev *cur = malloc(sizeof(*cur)); + cur->domain = domain; + cur->bus = bus; + cur->dev = dev; + cur->func = func; + return cur; +} +

1 0

[commit] r5644 - trunk/util/cbfstool
by repository service 24 Jun '10

24 Jun '10

Author: stepan Date: Thu Jun 24 15:37:59 2010 New Revision: 5644 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5644 Log: fix return value checks of cbfstool's writerom Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/util/cbfstool/cbfstool.c trunk/util/cbfstool/common.c trunk/util/cbfstool/common.h Modified: trunk/util/cbfstool/cbfstool.c ============================================================================== --- trunk/util/cbfstool/cbfstool.c Thu Jun 24 13:16:10 2010 (r5643) +++ trunk/util/cbfstool/cbfstool.c Thu Jun 24 15:37:59 2010 (r5644) @@ -83,7 +83,8 @@ cbfsfile = create_cbfs_file(cbfsname, filedata, &filesize, type, &base); if (add_file_to_cbfs(cbfsfile, filesize, base)) return 1; - writerom(romname, rom, romsize); + if (writerom(romname, rom, romsize)) + return 1; return 0; } @@ -131,7 +132,8 @@ CBFS_COMPONENT_PAYLOAD, &base); if (add_file_to_cbfs(cbfsfile, filesize, base)) return 1; - writerom(romname, rom, romsize); + if (writerom(romname, rom, romsize)) + return 1; return 0; } @@ -180,7 +182,8 @@ if (add_file_to_cbfs(cbfsfile, filesize, base)) return 1; - writerom(romname, rom, romsize); + if (writerom(romname, rom, romsize)) + return 1; return 0; } Modified: trunk/util/cbfstool/common.c ============================================================================== --- trunk/util/cbfstool/common.c Thu Jun 24 13:16:10 2010 (r5643) +++ trunk/util/cbfstool/common.c Thu Jun 24 15:37:59 2010 (r5644) @@ -90,11 +90,23 @@ return romarea; } -void writerom(const char *filename, void *start, uint32_t size) +int writerom(const char *filename, void *start, uint32_t size) { FILE *file = fopen(filename, "wb"); - fwrite(start, size, 1, file); + if (!file) { + fprintf(stderr, "Could not open '%s' for writing: ", filename); + perror(""); + return 1; + } + + if (fwrite(start, size, 1, file) != 1) { + fprintf(stderr, "Could not write to '%s': ", filename); + perror(""); + return 1; + } + fclose(file); + return 0; } int cbfs_file_header(uint32_t physaddr) Modified: trunk/util/cbfstool/common.h ============================================================================== --- trunk/util/cbfstool/common.h Thu Jun 24 13:16:10 2010 (r5643) +++ trunk/util/cbfstool/common.h Thu Jun 24 15:37:59 2010 (r5644) @@ -44,7 +44,7 @@ void *loadfile(const char *filename, uint32_t * romsize_p, void *content, int place); void *loadrom(const char *filename); -void writerom(const char *filename, void *start, uint32_t size); +int writerom(const char *filename, void *start, uint32_t size); int iself(unsigned char *input);

1 0

PATCH: Fix CMOS Tables support for all boards.
by Edwin Beasant 24 Jun '10

24 Jun '10

Re-integrated the "USE_OPTION_TABLE" code so that it will compile for all boards that define it at configure time. Made USE_OPTION_TABLE dependant on HAVE_OPTION_TABLE Signed-off-by: Edwin Beasant edwin_beasant(a)virtensys.com<mailto:edwin_beasant@virtensys.com> --- Edwin Beasant

1 0

[commit] r5643 - in trunk/payloads/libpayload: arch/i386 arch/powerpc include include/sys libc
by repository service 24 Jun '10

24 Jun '10

Author: oxygene Date: Thu Jun 24 13:16:10 2010 New Revision: 5643 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5643 Log: Attached patch moves functions out of the huge libpayload.h into headers according to libc/posix traditions, to simplify porting applications to payloads. It also adds a couple of functions: strcasecmp, strncasecmp, strcat, strtol, strspn, strcspn, strtok_r, strtok, perror, exit, getpagesize Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Added: trunk/payloads/libpayload/include/ctype.h trunk/payloads/libpayload/include/errno.h trunk/payloads/libpayload/include/stdarg.h trunk/payloads/libpayload/include/stdint.h trunk/payloads/libpayload/include/stdio.h trunk/payloads/libpayload/include/stdlib.h trunk/payloads/libpayload/include/string.h trunk/payloads/libpayload/include/sys/ trunk/payloads/libpayload/include/sys/types.h trunk/payloads/libpayload/include/unistd.h Modified: trunk/payloads/libpayload/arch/i386/virtual.c trunk/payloads/libpayload/arch/powerpc/virtual.c trunk/payloads/libpayload/include/libpayload.h trunk/payloads/libpayload/include/pci.h trunk/payloads/libpayload/libc/lib.c trunk/payloads/libpayload/libc/printf.c trunk/payloads/libpayload/libc/string.c Modified: trunk/payloads/libpayload/arch/i386/virtual.c ============================================================================== --- trunk/payloads/libpayload/arch/i386/virtual.c Thu Jun 24 13:14:51 2010 (r5642) +++ trunk/payloads/libpayload/arch/i386/virtual.c Thu Jun 24 13:16:10 2010 (r5643) @@ -30,3 +30,8 @@ unsigned long virtual_offset = 0; + +int getpagesize(void) +{ + return 4096; +} Modified: trunk/payloads/libpayload/arch/powerpc/virtual.c ============================================================================== --- trunk/payloads/libpayload/arch/powerpc/virtual.c Thu Jun 24 13:14:51 2010 (r5642) +++ trunk/payloads/libpayload/arch/powerpc/virtual.c Thu Jun 24 13:16:10 2010 (r5643) @@ -30,3 +30,7 @@ unsigned long virtual_offset = 0; +int getpagesize(void) +{ + return 4096; +} Added: trunk/payloads/libpayload/include/ctype.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/ctype.h Thu Jun 24 13:16:10 2010 (r5643) @@ -0,0 +1,55 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * 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 _CTYPE_H +#define _CTYPE_H + +/** + * @defgroup ctype Character type functions + * @{ + */ +int isalnum(int c); +int isalpha(int c); +int isascii(int c); +int isblank(int c); +int iscntrl(int c); +int isdigit(int c); +int isgraph(int c); +int islower(int c); +int isprint(int c); +int ispunct(int c); +int isspace(int c); +int isupper(int c); +int isxdigit(int c); +int tolower(int c); +int toupper(int c); +/** @} */ + + +#endif Added: trunk/payloads/libpayload/include/errno.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/errno.h Thu Jun 24 13:16:10 2010 (r5643) @@ -0,0 +1,35 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2010 coresystems GmbH + * + * 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 _ERRNO_H +#define _ERRNO_H + +extern int errno; + +#endif Modified: trunk/payloads/libpayload/include/libpayload.h ============================================================================== --- trunk/payloads/libpayload/include/libpayload.h Thu Jun 24 13:14:51 2010 (r5642) +++ trunk/payloads/libpayload/include/libpayload.h Thu Jun 24 13:16:10 2010 (r5643) @@ -44,12 +44,16 @@ #define _LIBPAYLOAD_H #include <libpayload-config.h> +#include <ctype.h> #include <stddef.h> +#include <stdio.h> +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> #include <arch/types.h> #include <arch/io.h> #include <arch/virtual.h> #include <sysinfo.h> -#include <stdarg.h> #include <pci.h> #ifdef CONFIG_LAR #include <lar.h> @@ -225,114 +229,12 @@ /** @} */ /** - * @defgroup ctype Character type functions - * @{ - */ -int isalnum(int c); -int isalpha(int c); -int isascii(int c); -int isblank(int c); -int iscntrl(int c); -int isdigit(int c); -int isgraph(int c); -int islower(int c); -int isprint(int c); -int ispunct(int c); -int isspace(int c); -int isupper(int c); -int isxdigit(int c); -int tolower(int c); -int toupper(int c); -/** @} */ - -/** * @defgroup ipchecksum IP checksum functions * @{ */ unsigned short ipchksum(const void *ptr, unsigned long nbytes); /** @} */ -/** - * @defgroup malloc Memory allocation functions - * @{ - */ -#if defined(CONFIG_DEBUG_MALLOC) && !defined(IN_MALLOC_C) -#define free(p) \ - ({ \ - extern void print_malloc_map(void); \ - extern void free(void *); \ - printf("free(%p) called from %s:%s:%d...\n", p, __FILE__, __func__, \ - __LINE__);\ - printf("PRE free()\n"); \ - print_malloc_map(); \ - free(p); \ - printf("POST free()\n"); \ - print_malloc_map(); \ - }) -#define malloc(s) \ - ({ \ - extern void print_malloc_map(void); \ - extern void *malloc(size_t); \ - void *ptr; \ - printf("malloc(%u) called from %s:%s:%d...\n", s, __FILE__, __func__, \ - __LINE__);\ - printf("PRE malloc\n"); \ - print_malloc_map(); \ - ptr = malloc(s); \ - printf("POST malloc (ptr = %p)\n", ptr); \ - print_malloc_map(); \ - ptr; \ - }) -#define calloc(n,s) \ - ({ \ - extern void print_malloc_map(void); \ - extern void *calloc(size_t,size_t); \ - void *ptr; \ - printf("calloc(%u, %u) called from %s:%s:%d...\n", n, s, __FILE__, \ - __func__, __LINE__);\ - printf("PRE calloc\n"); \ - print_malloc_map(); \ - ptr = calloc(n,s); \ - printf("POST calloc (ptr = %p)\n", ptr); \ - print_malloc_map(); \ - ptr; \ - }) -#define realloc(p,s) \ - ({ \ - extern void print_malloc_map(void); \ - extern void *realloc(void*,size_t); \ - void *ptr; \ - printf("realloc(%p, %u) called from %s:%s:%d...\n", p, s, __FILE__, \ - __func__, __LINE__);\ - printf("PRE realloc\n"); \ - print_malloc_map(); \ - ptr = realloc(p,s); \ - printf("POST realloc (ptr = %p)\n", ptr); \ - print_malloc_map(); \ - ptr; \ - }) -#define memalign(a,s) \ - ({ \ - extern void print_malloc_map(void); \ - extern void *memalign(size_t, size_t); \ - void *ptr; \ - printf("memalign(%u, %u) called from %s:%s:%d...\n", a, s, __FILE__, \ - __func__, __LINE__);\ - printf("PRE memalign\n"); \ - print_malloc_map(); \ - ptr = memalign(a,s); \ - printf("POST realloc (ptr = %p)\n", ptr); \ - print_malloc_map(); \ - ptr; \ - }) -#else -void free(void *ptr); -void *malloc(size_t size); -void *calloc(size_t nmemb, size_t size); -void *realloc(void *ptr, size_t size); -void *memalign(size_t align, size_t size); -#endif -/** @} */ /** * @defgroup exec Execution functions @@ -355,36 +257,6 @@ void fatal(const char *msg) __attribute__ ((noreturn)); /** @} */ -/** - * @defgroup memory Memory manipulation functions - * @{ - */ -void *memset(void *s, int c, size_t n); -void *memcpy(void *dst, const void *src, size_t n); -void *memmove(void *dst, const void *src, size_t n); -int memcmp(const void *s1, const void *s2, size_t len); -/** @} */ - -/** - * @defgroup printf Print functions - * @{ - */ -int snprintf(char *str, size_t size, const char *fmt, ...); -int sprintf(char *str, const char *fmt, ...); -int vsnprintf(char *str, size_t size, const char *fmt, va_list ap); -int vsprintf(char *str, const char *fmt, va_list ap); -int printf(const char *fmt, ...); -int vprintf(const char *fmt, va_list ap); -/** @} */ - -/** - * @defgroup rand Random number generator functions - * @{ - */ -int rand_r(unsigned int *seed); -int rand(void); -void srand(unsigned int seed); -/** @} */ /** * @defgroup hash Hashing functions @@ -405,27 +277,6 @@ /** @} */ /** - * @defgroup string String functions - * @{ - */ -size_t strnlen(const char *str, size_t maxlen); -size_t strlen(const char *str); -int strcmp(const char *s1, const char *s2); -int strncmp(const char *s1, const char *s2, size_t maxlen); -char *strncpy(char *d, const char *s, size_t n); -char *strcpy(char *d, const char *s); -char *strncat(char *d, const char *s, size_t n); -size_t strlcat(char *d, const char *s, size_t n); -char *strchr(const char *s, int c); -char *strrchr(const char *s, int c); -char *strdup(const char *s); -char *strstr(const char *h, const char *n); -char *strsep(char **stringp, const char *delim); -unsigned int strtoul(const char *s, char **nptr, int base); - -/** @} */ - -/** * @defgroup time Time functions * @{ */ @@ -527,14 +378,6 @@ void mdelay(unsigned int n); void delay(unsigned int n); -#define abort() halt() /**< Alias for the halt() function */ - -/** - * Stop execution and halt the processor (this function does not return). - */ -void halt(void) __attribute__ ((noreturn)); -/** @} */ - /** * @defgroup readline Readline functions * This interface provides a simple implementation of the standard readline() Modified: trunk/payloads/libpayload/include/pci.h ============================================================================== --- trunk/payloads/libpayload/include/pci.h Thu Jun 24 13:14:51 2010 (r5642) +++ trunk/payloads/libpayload/include/pci.h Thu Jun 24 13:16:10 2010 (r5643) @@ -36,8 +36,11 @@ #define REG_VENDOR_ID 0x00 #define REG_COMMAND 0x04 +#define REG_CLASS_DEV 0x0A #define REG_HEADER_TYPE 0x0E #define REG_PRIMARY_BUS 0x18 +#define REG_SUBSYS_VENDOR_ID 0x2C +#define REG_SUBSYS_ID 0x2E #define REG_COMMAND_BM (1 << 2) Added: trunk/payloads/libpayload/include/stdarg.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/stdarg.h Thu Jun 24 13:16:10 2010 (r5643) @@ -0,0 +1,44 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * 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_STDARG_H +#define _LIBPAYLOAD_STDARG_H + +#include_next <stdarg.h> + +/** + * @defgroup vprintf Varargs print functions + * @{ + */ +int vsnprintf(char *str, size_t size, const char *fmt, va_list ap); +int vsprintf(char *str, const char *fmt, va_list ap); +int vprintf(const char *fmt, va_list ap); +/** @} */ + +#endif Added: trunk/payloads/libpayload/include/stdint.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/stdint.h Thu Jun 24 13:16:10 2010 (r5643) @@ -0,0 +1,30 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2010 coresystems GmbH + * + * 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 <arch/types.h> Added: trunk/payloads/libpayload/include/stdio.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/stdio.h Thu Jun 24 13:16:10 2010 (r5643) @@ -0,0 +1,46 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * 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 _STDIO_H +#define _STDIO_H + +#include <stddef.h> + +/** + * @defgroup printf Print functions + * @{ + */ +int snprintf(char *str, size_t size, const char *fmt, ...); +int sprintf(char *str, const char *fmt, ...); +int printf(const char *fmt, ...); +/** @} */ + +void perror(const char *s); + +#endif Added: trunk/payloads/libpayload/include/stdlib.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/stdlib.h Thu Jun 24 13:16:10 2010 (r5643) @@ -0,0 +1,144 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * 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 _STDLIB_H +#define _STDLIB_H + +#include <stddef.h> + +/** + * @defgroup malloc Memory allocation functions + * @{ + */ +#if defined(CONFIG_DEBUG_MALLOC) && !defined(IN_MALLOC_C) +#define free(p) \ + ({ \ + extern void print_malloc_map(void); \ + extern void free(void *); \ + printf("free(%p) called from %s:%s:%d...\n", p, __FILE__, __func__, \ + __LINE__);\ + printf("PRE free()\n"); \ + print_malloc_map(); \ + free(p); \ + printf("POST free()\n"); \ + print_malloc_map(); \ + }) +#define malloc(s) \ + ({ \ + extern void print_malloc_map(void); \ + extern void *malloc(size_t); \ + void *ptr; \ + printf("malloc(%u) called from %s:%s:%d...\n", s, __FILE__, __func__, \ + __LINE__);\ + printf("PRE malloc\n"); \ + print_malloc_map(); \ + ptr = malloc(s); \ + printf("POST malloc (ptr = %p)\n", ptr); \ + print_malloc_map(); \ + ptr; \ + }) +#define calloc(n,s) \ + ({ \ + extern void print_malloc_map(void); \ + extern void *calloc(size_t,size_t); \ + void *ptr; \ + printf("calloc(%u, %u) called from %s:%s:%d...\n", n, s, __FILE__, \ + __func__, __LINE__);\ + printf("PRE calloc\n"); \ + print_malloc_map(); \ + ptr = calloc(n,s); \ + printf("POST calloc (ptr = %p)\n", ptr); \ + print_malloc_map(); \ + ptr; \ + }) +#define realloc(p,s) \ + ({ \ + extern void print_malloc_map(void); \ + extern void *realloc(void*,size_t); \ + void *ptr; \ + printf("realloc(%p, %u) called from %s:%s:%d...\n", p, s, __FILE__, \ + __func__, __LINE__);\ + printf("PRE realloc\n"); \ + print_malloc_map(); \ + ptr = realloc(p,s); \ + printf("POST realloc (ptr = %p)\n", ptr); \ + print_malloc_map(); \ + ptr; \ + }) +#define memalign(a,s) \ + ({ \ + extern void print_malloc_map(void); \ + extern void *memalign(size_t, size_t); \ + void *ptr; \ + printf("memalign(%u, %u) called from %s:%s:%d...\n", a, s, __FILE__, \ + __func__, __LINE__);\ + printf("PRE memalign\n"); \ + print_malloc_map(); \ + ptr = memalign(a,s); \ + printf("POST realloc (ptr = %p)\n", ptr); \ + print_malloc_map(); \ + ptr; \ + }) +#else +void free(void *ptr); +void *malloc(size_t size); +void *calloc(size_t nmemb, size_t size); +void *realloc(void *ptr, size_t size); +void *memalign(size_t align, size_t size); +#endif +/** @} */ + +/** + * @defgroup stdlib String conversion functions + * @{ + */ +long int strtol(const char *s, char **nptr, int base); +unsigned long int strtoul(const char *s, char **nptr, int base); + +/** @} */ + +/** + * @defgroup rand Random number generator functions + * @{ + */ +int rand_r(unsigned int *seed); +int rand(void); +void srand(unsigned int seed); +/** @} */ + +/** + * Stop execution and halt the processor (this function does not return). + */ +void halt(void) __attribute__ ((noreturn)); +void exit(int status) __attribute__ ((noreturn)); +#define abort() halt() /**< Alias for the halt() function */ + +/** @} */ + +#endif Added: trunk/payloads/libpayload/include/string.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/string.h Thu Jun 24 13:16:10 2010 (r5643) @@ -0,0 +1,71 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * 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 _STRING_H +#define _STRING_H + +#include <stddef.h> + +/** + * @defgroup memory Memory manipulation functions + * @{ + */ +void *memset(void *s, int c, size_t n); +void *memcpy(void *dst, const void *src, size_t n); +void *memmove(void *dst, const void *src, size_t n); +int memcmp(const void *s1, const void *s2, size_t len); +/** @} */ + +/** + * @defgroup string String functions + * @{ + */ +size_t strnlen(const char *str, size_t maxlen); +size_t strlen(const char *str); +int strcmp(const char *s1, const char *s2); +int strncmp(const char *s1, const char *s2, size_t maxlen); +int strcasecmp(const char *s1, const char *s2); +int strncasecmp(const char *s1, const char *s2, size_t maxlen); +char *strncpy(char *d, const char *s, size_t n); +char *strcpy(char *d, const char *s); +char *strncat(char *d, const char *s, size_t n); +size_t strlcat(char *d, const char *s, size_t n); +char *strcat(char *d, const char *s); +char *strchr(const char *s, int c); +char *strrchr(const char *s, int c); +char *strdup(const char *s); +char *strstr(const char *h, const char *n); +char *strsep(char **stringp, const char *delim); +size_t strspn(const char *s, const char *a); +size_t strcspn(const char *s, const char *a); +char* strtok(char *str, const char *delim); +char* strtok_r(char *str, const char *delim, char **ptr); +/** @} */ + +#endif Added: trunk/payloads/libpayload/include/sys/types.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/sys/types.h Thu Jun 24 13:16:10 2010 (r5643) @@ -0,0 +1,30 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2010 coresystems GmbH + * + * 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 <arch/types.h> Added: trunk/payloads/libpayload/include/unistd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/include/unistd.h Thu Jun 24 13:16:10 2010 (r5643) @@ -0,0 +1,30 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2010 coresystems GmbH + * + * 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. + */ + +int getpagesize(void); Modified: trunk/payloads/libpayload/libc/lib.c ============================================================================== --- trunk/payloads/libpayload/libc/lib.c Thu Jun 24 13:14:51 2010 (r5642) +++ trunk/payloads/libpayload/libc/lib.c Thu Jun 24 13:16:10 2010 (r5643) @@ -113,3 +113,10 @@ halt(); } +void exit(int status) +{ + printf("exited with status %d\n", status); + halt(); +} + +int errno; Modified: trunk/payloads/libpayload/libc/printf.c ============================================================================== --- trunk/payloads/libpayload/libc/printf.c Thu Jun 24 13:14:51 2010 (r5642) +++ trunk/payloads/libpayload/libc/printf.c Thu Jun 24 13:16:10 2010 (r5643) @@ -34,6 +34,7 @@ */ #include <libpayload.h> +#include <ctype.h> /** Structure for specifying output methods for different printf clones. */ struct printf_spec { Modified: trunk/payloads/libpayload/libc/string.c ============================================================================== --- trunk/payloads/libpayload/libc/string.c Thu Jun 24 13:14:51 2010 (r5642) +++ trunk/payloads/libpayload/libc/string.c Thu Jun 24 13:16:10 2010 (r5643) @@ -3,6 +3,7 @@ * * Copyright (C) 2007 Uwe Hermann <uwe(a)hermann-uwe.de> * Copyright (C) 2008 Advanced Micro Devices, Inc. + * Copyright (C) 2010 coresystems GmbH * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,6 +30,9 @@ */ #include <libpayload.h> +#include <string.h> +#include <ctype.h> +#include <errno.h> /** * Calculate the length of a fixed-size string. @@ -83,29 +87,57 @@ * zero, if s1 equals s2. Returns a value greater than zero, if * s1 is longer than s2. */ +int strcasecmp(const char *s1, const char *s2) +{ + int i; + + for (i = 0; 1; i++) { + if (tolower(s1[i]) != tolower(s2[i])) + return s1[i] - s2[i]; + } + + return 0; +} + +/** + * Compare two strings with fixed length. + * + * @param s1 The first string. + * @param s2 The second string. + * @param maxlen Return at most maxlen characters as length of the string. + * @return A non-zero value if s1 and s2 differ, or zero if s1 equals s2. + */ +int strncasecmp(const char *s1, const char *s2, size_t maxlen) +{ + int i; + + for (i = 0; i < maxlen; i++) { + if (tolower(s1[i]) != tolower(s2[i])) + return s1[i] - s2[i]; + } + + return 0; +} + +/** + * Compare two strings. + * + * @param s1 The first string. + * @param s2 The second string. + * @return Returns a value less than zero, if s1 is shorter than s2. Returns + * zero, if s1 equals s2. Returns a value greater than zero, if + * s1 is longer than s2. + */ int strcmp(const char *s1, const char *s2) { - char c1, c2; + int i; - /* Set c1 == c2, so that we can enter the while loop. */ - c1 = 0; - c2 = 0; - - /* Compare characters until they differ, or one of the strings ends. */ - while (c1 == c2) { - /* Read the next character from each string. */ - c1 = *s1++; - c2 = *s2++; - - /* Return something negative (if s1 is shorter than s2), or - zero (if s1 equals s2). */ - if (c1 == '\0') - return c1 - c2; - } - - /* Return something positive (if s1 is longer than s2), or zero (if s1 - and s2 are equal). */ - return c1 - c2; + for (i = 0; 1; i++) { + if (s1[i] != s2[i]) + return s1[i] - s2[i]; + } + + return 0; } /** @@ -161,6 +193,26 @@ } /** + * Concatenates two strings + * + * @param d The destination string. + * @param s The source string. + * @return A pointer to the destination string. + */ +char *strcat(char *d, const char *s) +{ + char *p = d + strlen(d); + int sl = strlen(s); + int i; + + for (i = 0; i < sl; i++) + p[i] = s[i]; + + p[i] = '\0'; + return d; +} + +/** * Concatenates two strings with a maximum length. * * @param d The destination string. @@ -353,6 +405,69 @@ } /** + * Convert the initial portion of a string into a signed int + * @param ptr A pointer to the string to convert + * @param endptr A pointer to the unconverted part of the string + * @param base The base of the number to convert, or 0 for auto + * @return A signed integer representation of the string + */ + +long int strtol(const char *ptr, char **endptr, int base) +{ + int ret = 0; + int negative = 1; + + if (endptr != NULL) + *endptr = (char *) ptr; + + /* Purge whitespace */ + + for( ; *ptr && isspace(*ptr); ptr++); + + if (ptr[0] == '-') { + negative = -1; + ptr++; + } + + if (!*ptr) + return 0; + + /* Determine the base */ + + if (base == 0) { + if (ptr[0] == '0' && (ptr[1] == 'x' || ptr[1] == 'X')) + base = 16; + else if (ptr[0] == '0') { + base = 8; + ptr++; + } + else + base = 10; + } + + /* Base 16 allows the 0x on front - so skip over it */ + + if (base == 16) { + if (ptr[0] == '0' && (ptr[1] == 'x' || ptr[1] == 'X')) + ptr += 2; + } + + /* If the first character isn't valid, then don't + * bother */ + + if (!*ptr || !_valid(*ptr, base)) + return 0; + + for( ; *ptr && _valid(*ptr, base); ptr++) + ret = (ret * base) + _offset(*ptr, base); + + if (endptr != NULL) + *endptr = (char *) ptr; + + return ret * negative; +} + +/** * Convert the initial portion of a string into an unsigned int * @param ptr A pointer to the string to convert * @param endptr A pointer to the unconverted part of the string @@ -360,7 +475,7 @@ * @return An unsigned integer representation of the string */ -unsigned int strtoul(const char *ptr, char **endptr, int base) +unsigned long int strtoul(const char *ptr, char **endptr, int base) { int ret = 0; @@ -409,4 +524,102 @@ return ret; } +/** + * Determine the number of leading characters in s that match characters in a + * @param s A pointer to the string to analyse + * @param a A pointer to an array of characters that match the prefix + * @return The number of matching characters + */ + +size_t strspn(const char *s, const char *a) +{ + int i, j; + int al = strlen(a); + for (i = 0; s[i] != 0; i++) { + int found = 0; + for (j = 0; j < al; j++) { + if (s[i] == a[j]) { + found = 1; + break; + } + } + if (!found) + break; + } + return i; +} + +/** + * Determine the number of leading characters in s that do not match characters in a + * @param s A pointer to the string to analyse + * @param a A pointer to an array of characters that do not match the prefix + * @return The number of not matching characters + */ + +size_t strcspn(const char *s, const char *a) +{ + int i, j; + int al = strlen(a); + for (i = 0; s[i] != 0; i++) { + int found = 0; + for (j = 0; j < al; j++) { + if (s[i] == a[j]) { + found = 1; + break; + } + } + if (found) + break; + } + return i; +} + +/** + * Extract first token in string str that is delimited by a character in tokens. + * Destroys str and eliminates the token delimiter. + * @param str A pointer to the string to tokenize. + * @param delim A pointer to an array of characters that delimit the token + * @param ptr A pointer to a string pointer to keep state of the tokenizer + * @return Pointer to token + */ + +char* strtok_r(char *str, const char *delim, char **ptr) +{ + /* start new tokenizing job or continue existing one? */ + if (str == NULL) + str = *ptr; + + /* skip over prefix delimiters */ + char *start = str + strspn(str, delim); + + /* find first delimiter character */ + char *end = start + strcspn(start, delim); + end[0] = '\0'; + + *ptr = end+1; + return start; +} + +static char **strtok_global; + +/** + * Extract first token in string str that is delimited by a character in tokens. + * Destroys str, eliminates the token delimiter and uses global state. + * @param str A pointer to the string to tokenize. + * @param delim A pointer to an array of characters that delimit the token + * @return Pointer to token + */ + +char* strtok(char *str, const char *delim) +{ + return strtok_r(str, delim, strtok_global); +} +/** + * Print error message and error number + * @param s Error message to print + */ +void perror(const char *s) +{ + printf("%s: %d\n", s?s:"(none)", errno); +}

1 0

[commit] r5642 - trunk/payloads/libpayload/bin
by repository service 24 Jun '10

24 Jun '10

Author: oxygene Date: Thu Jun 24 13:14:51 2010 New Revision: 5642 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5642 Log: Add __LIBPAYLOAD__ and __i386__/__powerpc__ symbols to lpgcc's build context. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/payloads/libpayload/bin/lpgcc Modified: trunk/payloads/libpayload/bin/lpgcc ============================================================================== --- trunk/payloads/libpayload/bin/lpgcc Tue Jun 22 22:36:52 2010 (r5641) +++ trunk/payloads/libpayload/bin/lpgcc Thu Jun 24 13:14:51 2010 (r5642) @@ -103,14 +103,16 @@ if [ "$CONFIG_TARGET_I386" = "y" ]; then _ARCHINCDIR=$_INCDIR/i386 _ARCHLIBDIR=$_LIBDIR/i386 + _TARGETCFLAGS="-D__i386__=1" fi if [ "$CONFIG_TARGET_POWERPC" = "y" ]; then _ARCHINCDIR=$_INCDIR/powerpc _ARCHLIBDIR=$_LIBDIR/powerpc + _TARGETCFLAGS="-D__powerpc__=1" fi -_CFLAGS="-m32 -nostdinc -nostdlib -I$_INCDIR -I$_ARCHINCDIR" +_CFLAGS="-m32 -nostdinc -nostdlib -I$_INCDIR -I$_ARCHINCDIR -D__LIBPAYLOAD__=1 $_TARGETCFLAGS" # Check for the -fno-stack-protector silliness

1 0

Why my kernel 2.6.34 failed?
by Bao, Zheng 24 Jun '10

24 Jun '10

I recently build a new kernel, 2.6.34. But it failed to boot on my coreboot with ACPI support. If I remove the ACPI, it can boot. So I believe there is a bug hidden in the ASL script. And 2.6.33 works well. The .config(s) are the same. Do you guys have any suggestion? Zheng

3 3

[PATCH]libpayload: more libc support
by Patrick Georgi 23 Jun '10

23 Jun '10

Hi, I updated last week's patch to take Carl-Daniel's review into account. Attached patch moves functions out of the huge libpayload.h into headers according to libc/posix traditions, to simplify porting applications to payloads. It also adds a couple of functions: strcasecmp, strncasecmp, strcat, strtol, strspn, strcspn, strtok_r, strtok, perror, exit, getpagesize Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

2 1

[commit] r5641 - in trunk/src: drivers/i2c/adt7463 mainboard/tyan/s2881
by repository service 23 Jun '10

23 Jun '10

Author: myles Date: Tue Jun 22 22:36:52 2010 New Revision: 5641 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5641 Log: Finish fixing Tyan s2881. Simplify ADT7463 initialization code. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Ward Vandewege <ward(a)gnu.org> Modified: trunk/src/drivers/i2c/adt7463/adt7463.c trunk/src/mainboard/tyan/s2881/Makefile.inc trunk/src/mainboard/tyan/s2881/devicetree.cb Modified: trunk/src/drivers/i2c/adt7463/adt7463.c ============================================================================== --- trunk/src/drivers/i2c/adt7463/adt7463.c Tue Jun 22 21:12:58 2010 (r5640) +++ trunk/src/drivers/i2c/adt7463/adt7463.c Tue Jun 22 22:36:52 2010 (r5641) @@ -33,25 +33,11 @@ * See Analog Devices ADT7463 datasheet, Rev C (2004): * http://www.analog.com/en/prod/0,,766_825_ADT7463,00.html */ -static void adt7463_init(device_t dev) +static void adt7463_init(device_t adt7463) { - device_t smbus_dev, adt7463; - struct device_path path; int result; - /* Find the SMBus controller (AMD-8111). */ - smbus_dev = dev_find_device(0x1022, 0x746b, 0); - if (!smbus_dev) - die("SMBus controller not found\n"); - printk(BIOS_DEBUG, "SMBus controller found\n"); - - /* Find the ADT7463 device. */ - path.type = DEVICE_PATH_I2C; - path.i2c.device = 0x2d; - adt7463 = find_dev_path(smbus_dev->link_list, &path); - if (!adt7463) - die("ADT7463 not found\n"); - printk(BIOS_DEBUG, "ADT7463 found\n"); + printk(BIOS_DEBUG, "ADT7463 is %s\n", dev_path(adt7463)); /* Set all fans to 'Fastest Speed Calculated by All 3 Temperature * Channels Controls PWMx'. @@ -116,7 +102,7 @@ dev->ops = &adt7463_operations; } -struct chip_operations mainboard_ops = { +struct chip_operations drivers_i2c_adt7463_ops = { CHIP_NAME("adt7463") .enable_dev = enable_dev, }; Modified: trunk/src/mainboard/tyan/s2881/Makefile.inc ============================================================================== --- trunk/src/mainboard/tyan/s2881/Makefile.inc Tue Jun 22 21:12:58 2010 (r5640) +++ trunk/src/mainboard/tyan/s2881/Makefile.inc Tue Jun 22 22:36:52 2010 (r5641) @@ -1 +1 @@ -obj-y += ../../../drivers/i2c/adm1027/adm1027.o +obj-y += ../../../drivers/i2c/adt7463/adt7463.o Modified: trunk/src/mainboard/tyan/s2881/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2881/devicetree.cb Tue Jun 22 21:12:58 2010 (r5640) +++ trunk/src/mainboard/tyan/s2881/devicetree.cb Tue Jun 22 22:36:52 2010 (r5641) @@ -102,7 +102,7 @@ chip drivers/generic/generic #dimm 1-1-1 device i2c 57 on end end - chip drivers/i2c/adm1027 # ADT7463A CPU0/1 temp, CPU1 vid, SYS FAN 1/2/3 + chip drivers/i2c/adt7463 # CPU0/1 temp, CPU1 vid, SYS FAN 1/2/3 device i2c 2d on end end chip drivers/generic/generic # Winbond HWM 0x54 CPU0/1 VRM temp, SYSFAN 4,CPU0 vid, CPU0/1 FAN

2 1

[PATCH]libpayload: implement libpci interface
by Patrick Georgi 23 Jun '10

23 Jun '10

Hi, attached patch provides a libpci implementation sufficient to get flashrom to compile. It should work but is untested beyond what flashrom does. It's also incomplete: libpci has many more capabilities than exposed in this variant. No pciutils code was harmed in its production - this code was written by looking at flashrom's expectations, so licensing is clean. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

2 1

← Newer
1
...
4
5
6
7
8
9
10
...
23
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 June 2010