coreboot-gerrit July 2015

coreboot-gerrit@coreboot.org

1 participants
1048 discussions

New patch to review for coreboot: cbfs: add a parser for boot media params to coreboot table
by Patrick Georgi 09 Jul '15

09 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10869 -gerrit commit 3ae1b8ac9b586a806dbe826cb919077e8a8d54d1 Author: Daisuke Nojiri <dnojiri(a)chromium.org> Date: Wed Jul 1 10:49:37 2015 -0700 cbfs: add a parser for boot media params to coreboot table This change allows a payload to read a cbfs header offset from coreboot table. [pg: adapted to match new structure layout and to use fmap] BUG=none BRANCH=tot TEST=dumped cbfs offset through a test-printf in depthcharge Change-Id: I75a8ee6b93f349b9f2fab1e82826aba675949c0a Signed-off-by: Daisuke Nojiri <dnojiri(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/include/coreboot_tables.h | 9 +++++++++ payloads/libpayload/include/sysinfo.h | 1 + payloads/libpayload/libc/coreboot.c | 13 +++++++++++++ 3 files changed, 23 insertions(+) diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index 0c516b1..b19d2fb 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -257,6 +257,15 @@ struct cb_spi_flash { uint32_t erase_cmd; }; +#define CB_TAG_BOOT_MEDIA_PARAMS 0x0030 +struct cb_boot_media_params { + uint32_t tag; + uint32_t size; + /* offset from the start of the media */ + uint32_t fmap_offset; + char fmap_name[32]; +}; + #define CB_TAG_SERIALNO 0x002a #define CB_MAX_SERIALNO_LENGTH 32 diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index c407c3d..0c5ea59 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -124,6 +124,7 @@ struct sysinfo_t { uint32_t sector_size; uint32_t erase_cmd; } spi_flash; + uint32_t cbfs_header_offset; uint64_t mtc_start; uint32_t mtc_size; }; diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c index 8a5d3ae..b8c29d4 100644 --- a/payloads/libpayload/libc/coreboot.c +++ b/payloads/libpayload/libc/coreboot.c @@ -220,6 +220,16 @@ static void cb_parse_spi_flash(void *ptr, struct sysinfo_t *info) info->spi_flash.erase_cmd = flash->erase_cmd; } +static void cb_parse_boot_media_params(unsigned char *ptr, + struct sysinfo_t *info) +{ + struct cb_boot_media_params *const bmp = + (struct cb_boot_media_params *)ptr; + fmap_region_by_name( + bmp->fmap_offset, bmp->fmap_name, + &info->cbfs_header_offset, NULL); +} + int cb_parse_header(void *addr, int len, struct sysinfo_t *info) { struct cb_header *header; @@ -372,6 +382,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_MTC: cb_parse_mtc(ptr, info); break; + case CB_TAG_BOOT_MEDIA_PARAMS: + cb_parse_boot_media_params(ptr, info); + break; default: cb_parse_arch_specific(rec, info); break;

1 0

New patch to review for coreboot: libpayload: Add support for handling fmaps
by Patrick Georgi 09 Jul '15

09 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10868 -gerrit commit d43393368da2c94a63e0eb4f13a7ddb759eb4fd6 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Thu Jul 9 13:57:00 2015 +0200 libpayload: Add support for handling fmaps They will become more common soon, so better support them now. Change-Id: I2b16e1bb7707fe8410365877524ff359aeefc161 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/include/fmap_serialized.h | 73 ++++++++++++++++++++++++ payloads/libpayload/include/libpayload.h | 5 ++ payloads/libpayload/libc/Makefile.inc | 1 + payloads/libpayload/libc/fmap.c | 81 +++++++++++++++++++++++++++ 4 files changed, 160 insertions(+) diff --git a/payloads/libpayload/include/fmap_serialized.h b/payloads/libpayload/include/fmap_serialized.h new file mode 100644 index 0000000..3585f0b --- /dev/null +++ b/payloads/libpayload/include/fmap_serialized.h @@ -0,0 +1,73 @@ +/* + * Copyright 2010, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + */ + +#ifndef FLASHMAP_SERIALIZED_H__ +#define FLASHMAP_SERIALIZED_H__ + +#include <stdint.h> + +#define FMAP_SIGNATURE "__FMAP__" +#define FMAP_VER_MAJOR 1 /* this header's FMAP minor version */ +#define FMAP_VER_MINOR 1 /* this header's FMAP minor version */ +#define FMAP_STRLEN 32 /* maximum length for strings, */ + /* including null-terminator */ + +enum fmap_flags { + FMAP_AREA_STATIC = 1 << 0, + FMAP_AREA_COMPRESSED = 1 << 1, + FMAP_AREA_RO = 1 << 2, +}; + +/* Mapping of volatile and static regions in firmware binary */ +struct fmap_area { + uint32_t offset; /* offset relative to base */ + uint32_t size; /* size in bytes */ + uint8_t name[FMAP_STRLEN]; /* descriptive name */ + uint16_t flags; /* flags for this area */ +} __attribute__((packed)); + +struct fmap { + uint8_t signature[8]; /* "__FMAP__" (0x5F5F464D41505F5F) */ + uint8_t ver_major; /* major version */ + uint8_t ver_minor; /* minor version */ + uint64_t base; /* address of the firmware binary */ + uint32_t size; /* size of firmware binary in bytes */ + uint8_t name[FMAP_STRLEN]; /* name of this firmware binary */ + uint16_t nareas; /* number of areas described by + fmap_areas[] below */ + struct fmap_area areas[]; +} __attribute__((packed)); + +#endif /* FLASHMAP_SERIALIZED_H__ */ diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index c09fc17..b92567c 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -47,6 +47,7 @@ #include <ctype.h> #include <die.h> #include <endian.h> +#include <fmap_serialized.h> #include <ipchksum.h> #include <kconfig.h> #include <stddef.h> @@ -405,4 +406,8 @@ void gdb_enter(void); /* Disconnect existing GDB connection if one exists. */ void gdb_exit(s8 exit_status); +/* look for area "name" in "fmap", setting offset and size to describe it. + Returns 0 on success, < 0 on error. */ +int fmap_region_by_name(const uint32_t fmap_offset, const char * const name, + uint32_t * const offset, uint32_t * const size); #endif diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.inc index b3c0f76..edef62c 100644 --- a/payloads/libpayload/libc/Makefile.inc +++ b/payloads/libpayload/libc/Makefile.inc @@ -38,6 +38,7 @@ libc-$(CONFIG_LP_LIBC) += qsort.c libc-$(CONFIG_LP_LIBC) += hexdump.c libc-$(CONFIG_LP_LIBC) += die.c libc-$(CONFIG_LP_LIBC) += coreboot.c +libc-$(CONFIG_LP_LIBC) += fmap.c ifeq ($(CONFIG_LP_ARCH_MIPS),y) libc-$(CONFIG_LP_LIBC) += 64bit_div.c diff --git a/payloads/libpayload/libc/fmap.c b/payloads/libpayload/libc/fmap.c new file mode 100644 index 0000000..72238e2 --- /dev/null +++ b/payloads/libpayload/libc/fmap.c @@ -0,0 +1,81 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2015 Google 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. + */ + +#include <libpayload-config.h> +#include <libpayload.h> +#include <coreboot_tables.h> +#include <cbfs.h> +#include <fmap_serialized.h> +#include <stdint.h> + +int fmap_region_by_name(const uint32_t fmap_offset, const char * const name, + uint32_t * const offset, uint32_t * const size) +{ + int i; + + struct fmap *fmap; + struct fmap fmap_head; + struct cbfs_media default_media; + struct cbfs_media *media = &default_media; + + if (init_default_cbfs_media(media) != 0) + return -1; + + media->open(media); + + if (!media->read(media, &fmap_head, fmap_offset, sizeof(fmap_head))) + return -1; + + if (memcmp(fmap_head.signature, FMAP_SIGNATURE, sizeof(fmap_head.signature))) { + return -1; + } + + int fmap_size = sizeof(*fmap) + + fmap_head.nareas * sizeof(struct fmap_area); + + fmap = malloc(fmap_size); + if (!fmap) + return -1; + + if (!media->read(media, fmap, fmap_offset, fmap_size)) + return -1; + + media->close(media); + + for (i = 0; i < fmap->nareas; i++) { + if (strcmp((const char *)fmap->areas[i].name, name) != 0) + continue; + if (offset) + *offset = fmap->areas[i].offset; + if (size) + *size = fmap->areas[i].size; + return 0; + } + return -1; +}

1 0

New patch to review for coreboot: fmap: store boot params to coreboot table
by Patrick Georgi 09 Jul '15

09 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10867 -gerrit commit a2f2904dd2a7be070977264af937e30c1d8eb396 Author: Daisuke Nojiri <dnojiri(a)chromium.org> Date: Wed Jul 1 11:08:22 2015 -0700 fmap: store boot params to coreboot table This allows payloads on ARM platforms to use cbfs on spi flash by passing along information to look it up from fmap. [pg: adapted to use fmap instead of CBFS_HEADER_OFFSET] Change-Id: I4b00159610077761c501507e136407e9ae08c73e Signed-off-by: Daisuke Nojiri <dnojiri(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/include/boot/coreboot_tables.h | 12 +++++ src/lib/coreboot_table.c | 6 +++ src/vendorcode/google/chromeos/vboot2/Makefile.inc | 1 + src/vendorcode/google/chromeos/vboot2/cbtable.c | 55 ++++++++++++++++++++++ 4 files changed, 74 insertions(+) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index c8d5251..99eb3c6 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -297,6 +297,15 @@ struct lb_spi_flash { uint32_t erase_cmd; }; +#define LB_TAG_BOOT_MEDIA_PARAMS 0x0030 +struct lb_boot_media_params { + uint32_t tag; + uint32_t size; + /* offset from the start of the media */ + uint32_t fmap_offset; + char fmap_name[32]; +}; + #define LB_TAG_SERIALNO 0x002a #define MAX_SERIALNO_LENGTH 32 @@ -390,6 +399,9 @@ void lb_add_console(uint16_t consoletype, void *data); /* Define this in mainboard.c to add board-specific table entries. */ void lb_board(struct lb_header *header); +/* Define this to add information which sub-CBFS to use. */ +void lb_boot_media_params(struct lb_header *header); + /* * Function to retrieve MAC address(es) from the VPD and store them in the * coreboot table. diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index f7fb2bb..9fa5da6 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -228,6 +228,10 @@ static void lb_board_id(struct lb_header *header) #endif } + +void __attribute__((weak)) lb_boot_media_params(struct lb_header *header) +{ /* NOOP */ } + static void lb_ram_code(struct lb_header *header) { #if IS_ENABLED(CONFIG_RAM_CODE_SUPPORT) @@ -483,6 +487,8 @@ unsigned long write_coreboot_table( lb_ramoops(head); #endif + lb_boot_media_params(head); + /* Remember where my valid memory ranges are */ return lb_table_fini(head); } diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc index 9026df6..08993cb 100644 --- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc +++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc @@ -41,6 +41,7 @@ endif romstage-y += vboot_handoff.c common.c ramstage-y += common.c +ramstage-y += cbtable.c verstage-y += verstage.ld diff --git a/src/vendorcode/google/chromeos/vboot2/cbtable.c b/src/vendorcode/google/chromeos/vboot2/cbtable.c new file mode 100644 index 0000000..988cb13 --- /dev/null +++ b/src/vendorcode/google/chromeos/vboot2/cbtable.c @@ -0,0 +1,55 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2015 Google Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc. + */ + +#include <boot/coreboot_tables.h> +#include <fmap.h> +#include <fmap_serialized.h> +#include <region.h> +#include <string.h> + +#include "misc.h" + +void lb_boot_media_params(struct lb_header *header) +{ + struct lb_boot_media_params *bmp; + struct vb2_working_data *wd = vboot_get_working_data(); + struct region_device boot_media, fmrd; + char name[FMAP_STRLEN]; + + if (!wd) + return; /* no vboot2 data to work with */ + + if (find_fmap_directory(&fmrd)) + return; /* couldn't find fmap */ + + if (vb2_get_selected_region(wd, &boot_media)) + return; /* no boot media defined */ + + if (fmap_find_region_name(&boot_media.region, name)) + return; /* couldn't find region */ + + bmp = (struct lb_boot_media_params *)lb_new_record(header); + + bmp->tag = LB_TAG_BOOT_MEDIA_PARAMS; + bmp->size = sizeof(*bmp); + bmp->fmap_offset = region_device_offset(&fmrd); + memcpy(bmp->fmap_name, name, FMAP_STRLEN); +} +

1 0

New patch to review for coreboot: fmap: publish find_fmap_directory()
by Patrick Georgi 09 Jul '15

09 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10866 -gerrit commit f44af94236ebcf5bf8d41bb4f6f1c2b38bc3863f Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Thu Jul 9 13:34:40 2015 +0200 fmap: publish find_fmap_directory() The fmap directory can be useful to pass to the payload. For that, we need to be able to get it. Change-Id: Ibe0be73bb4fe28afb16d4d215b979eb0be369645 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/include/fmap.h | 3 +++ src/lib/fmap.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/include/fmap.h b/src/include/fmap.h index bf98e4c..6903139 100644 --- a/src/include/fmap.h +++ b/src/include/fmap.h @@ -22,6 +22,9 @@ #include <region.h> +/* Locate the fmap directory. Return 0 on success, < 0 on error. */ +int find_fmap_directory(struct region_device *fmrd); + /* Locate the named area in the fmap and fill in a region device representing * that area. The region is a sub-region of the readonly boot media. Return * 0 on success, < 0 on error. */ diff --git a/src/lib/fmap.c b/src/lib/fmap.c index 4d3f1ca..6bf0760 100644 --- a/src/lib/fmap.c +++ b/src/lib/fmap.c @@ -28,7 +28,7 @@ * See http://code.google.com/p/flashmap/ for more information on FMAP. */ -static int find_fmap_directory(struct region_device *fmrd) +int find_fmap_directory(struct region_device *fmrd) { const struct region_device *boot; struct fmap *fmap;

1 0

New patch to review for coreboot: fmap: Introduce new function to derive fmap name from offset/size
by Patrick Georgi 09 Jul '15

09 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10865 -gerrit commit b533897b6ea47427082d9008737f179277269cd0 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Thu Jul 9 11:27:44 2015 +0200 fmap: Introduce new function to derive fmap name from offset/size vboot passes around the offset and size of the region to use in later stages. To assign more meaning to this pair, provide a function that returns the fmap area name if there's a precise match (and an error otherwise). Change-Id: I5724b860271025c8cb8b390ecbd33352ea779660 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/include/fmap.h | 3 +++ src/lib/fmap.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/src/include/fmap.h b/src/include/fmap.h index e575bbf..bf98e4c 100644 --- a/src/include/fmap.h +++ b/src/include/fmap.h @@ -32,4 +32,7 @@ int fmap_locate_area_as_rdev(const char *name, struct region_device *area); * < 0 on error. */ int fmap_locate_area(const char *name, struct region *r); +/* Find fmap area name by offset and size. + * Return 0 on success, < 0 on error. */ +int fmap_find_region_name(const struct region * const ar, char * const name); #endif diff --git a/src/lib/fmap.c b/src/lib/fmap.c index 0f48cdc..4d3f1ca 100644 --- a/src/lib/fmap.c +++ b/src/lib/fmap.c @@ -117,3 +117,45 @@ int fmap_locate_area(const char *name, struct region *ar) return -1; } + +int fmap_find_region_name(const struct region * const ar, char * const name) +{ + struct region_device fmrd; + size_t offset; + + if (find_fmap_directory(&fmrd)) + return -1; + + /* Start reading the areas just after fmap header. */ + offset = sizeof(struct fmap); + + while (1) { + struct fmap_area *area; + + area = rdev_mmap(&fmrd, offset, sizeof(*area)); + + if (area == NULL) + return -1; + + if ((ar->offset != area->offset) || + (ar->size != area->size)) { + rdev_munmap(&fmrd, area); + offset += sizeof(struct fmap_area); + continue; + } + + printk(BIOS_DEBUG, "FMAP: area (%zx, %zx) found, named %s\n", + ar->offset, ar->size, area->name); + + memcpy(name, area->name, FMAP_STRLEN); + + rdev_munmap(&fmrd, area); + + return 0; + } + + printk(BIOS_DEBUG, "FMAP: area (%zx, %zx) not found\n", + ar->offset, ar->size); + + return -1; +}

1 0

Patch merged into coreboot/master: libpayload: Have make install save .xcompile file
by gerrit＠coreboot.org 09 Jul '15

09 Jul '15

the following patch was just integrated into master: commit 5d866213f42fd22aed80abb5a91d74f6d485ac3f Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Wed Jul 8 17:09:49 2015 -0700 libpayload: Have make install save .xcompile file Useful information, record it in the destination directory, together with .config. Change-Id: Icf3282f61f502b37f9f06d7d5a0a630f49c96ed2 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-on: http://review.coreboot.org/10864 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> See http://review.coreboot.org/10864 for details. -gerrit

1 0

Patch merged into coreboot/master: libpayload: Use top level xcompile
by gerrit＠coreboot.org 09 Jul '15

09 Jul '15

the following patch was just integrated into master: commit f53dbfaa8c20cd789afc7e54ff004d068095223c Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Thu Jul 9 00:26:49 2015 +0200 libpayload: Use top level xcompile Instead of having a second copy that already within 2-3 days becamer quite outdated, use the same xcompile copy for coreboot and libpayload, as we do with Kconfig already. This requires a simple change to the top level xcompile to understand both CONFIG_COMPILER_GCC and CONFIG_LP_COMPILER_GCC (only one of them will occur at the same time) libpayload's .xcompile target was moved later so that it can make use of $(top) Change-Id: I44001067f551cd0776dd303cbaeaa40eb3d5c1db Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-on: http://review.coreboot.org/10863 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> See http://review.coreboot.org/10863 for details. -gerrit

1 0

Patch set updated for coreboot: libpayload: Have make install save .xcompile file
by Patrick Georgi 09 Jul '15

09 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10864 -gerrit commit 87a9f0d5cb856e22c5720fcbb607d04b70668782 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Wed Jul 8 17:09:49 2015 -0700 libpayload: Have make install save .xcompile file Useful information, record it in the destination directory, together with .config. Change-Id: Icf3282f61f502b37f9f06d7d5a0a630f49c96ed2 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index b84e322..873673c 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -118,6 +118,7 @@ install: real-target install -m 755 bin/lpas $(DESTDIR)/libpayload/bin install -m 644 bin/lp.functions $(DESTDIR)/libpayload/bin install -m 644 $(DOTCONFIG) $(DESTDIR)/libpayload/libpayload.config + install -m 755 .xcompile $(DESTDIR)/libpayload/libpayload.xcompile clean-for-update-target: rm -f $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a

1 0

New patch to review for coreboot: libpayload: Have make install save .xconfig file
by Stefan Reinauer 09 Jul '15

09 Jul '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10864 -gerrit commit 537db7c6fda13903b044d6099a20470ecf428d42 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Wed Jul 8 17:09:49 2015 -0700 libpayload: Have make install save .xconfig file Useful information, record it in the destination directory, together with .config. Change-Id: Icf3282f61f502b37f9f06d7d5a0a630f49c96ed2 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index b84e322..873673c 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -118,6 +118,7 @@ install: real-target install -m 755 bin/lpas $(DESTDIR)/libpayload/bin install -m 644 bin/lp.functions $(DESTDIR)/libpayload/bin install -m 644 $(DOTCONFIG) $(DESTDIR)/libpayload/libpayload.config + install -m 755 .xcompile $(DESTDIR)/libpayload/libpayload.xcompile clean-for-update-target: rm -f $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a

1 0

Patch set updated for coreboot: libpayload: Use top level xcompile
by Stefan Reinauer 09 Jul '15

09 Jul '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10863 -gerrit commit cbfd1f67c503e643b56b4734e7120f2faa278b52 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Thu Jul 9 00:26:49 2015 +0200 libpayload: Use top level xcompile Instead of having a second copy that already within 2-3 days becamer quite outdated, use the same xcompile copy for coreboot and libpayload, as we do with Kconfig already. This requires a simple change to the top level xcompile to understand both CONFIG_COMPILER_GCC and CONFIG_LP_COMPILER_GCC (only one of them will occur at the same time) libpayload's .xcompile target was moved later so that it can make use of $(top) Change-Id: I44001067f551cd0776dd303cbaeaa40eb3d5c1db Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- payloads/libpayload/Makefile | 28 +-- payloads/libpayload/util/xcompile/xcompile | 337 ----------------------------- util/xcompile/xcompile | 2 +- 3 files changed, 15 insertions(+), 352 deletions(-) diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 2b9bbcb..f3544d4 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -34,20 +34,6 @@ ifeq ($(INNER_SCANBUILD),y) CC_real:=$(CC) endif -# in addition to the dependency below, create the file if it doesn't exist -# to silence stupid warnings about a file that would be generated anyway. -$(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile))) - -.xcompile: util/xcompile/xcompile - $< $(XGCCPATH) > $@.tmp - \mv -f $@.tmp $@ 2> /dev/null - -ifeq ($(INNER_SCANBUILD),y) -CC:=$(CC_real) -HOSTCC:=$(CC_real) --hostcc -HOSTCXX:=$(CC_real) --hostcxx -endif - export top := $(CURDIR) export src := src export srck := $(abspath $(top)/../../util/kconfig) @@ -95,6 +81,20 @@ DOXYGEN_OUTPUT_DIR := doxygen all: real-all +# in addition to the dependency below, create the file if it doesn't exist +# to silence stupid warnings about a file that would be generated anyway. +$(if $(wildcard .xcompile),,$(eval $(shell $(top)/../../util/xcompile/xcompile $(XGCCPATH) > .xcompile))) + +.xcompile: $(top)/../../util/xcompile/xcompile + $< $(XGCCPATH) > $@.tmp + \mv -f $@.tmp $@ 2> /dev/null + +ifeq ($(INNER_SCANBUILD),y) +CC:=$(CC_real) +HOSTCC:=$(CC_real) --hostcc +HOSTCXX:=$(CC_real) --hostcxx +endif + # This include must come _before_ the pattern rules below! # Order _does_ matter for pattern rules. include $(srck)/Makefile diff --git a/payloads/libpayload/util/xcompile/xcompile b/payloads/libpayload/util/xcompile/xcompile deleted file mode 100755 index b6759a9..0000000 --- a/payloads/libpayload/util/xcompile/xcompile +++ /dev/null @@ -1,337 +0,0 @@ -#!/bin/bash -# -# This file is part of the coreboot project. -# -# Copyright (C) 2007-2010 coresystems GmbH -# Copyright (C) 2012 Google Inc -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc. -# - -TMPFILE="" -XGCCPATH=${1:-"`pwd`/util/crossgcc/xgcc/bin/"} - -die() { - echo "ERROR: $*" >&2 - exit 1 -} - -clean_up() { - if [ -n "$TMPFILE" ]; then - rm -f "$TMPFILE" "$TMPFILE.c" "$TMPFILE.o" - fi -} - -# Create temporary file(s). -TMPFILE="$(mktemp /tmp/temp.XXXX 2>/dev/null || echo /tmp/temp.78gOIUGz)" -touch "$TMPFILE" -trap clean_up EXIT - - -program_exists() { - type "$1" >/dev/null 2>&1 -} - - -if [ "$(${XGCCPATH}/iasl 2>/dev/null | grep -c ACPI)" -gt 0 ]; then - IASL=${XGCCPATH}iasl -elif [ "$(iasl 2>/dev/null | grep -c ACPI)" -gt 0 ]; then - IASL=iasl -else - die "no iasl found" -fi - -if program_exists gcc; then - HOSTCC=gcc -elif program_exists cc; then - HOSTCC=cc -else - die "no host compiler found" -fi - -cat <<EOF -# platform agnostic and host tools -IASL:=${IASL} -HOSTCC?=${HOSTCC} - -EOF - -testcc() { - local tmp_c="$TMPFILE.c" - local tmp_o="$TMPFILE.o" - rm -f "$tmp_c" "$tmp_o" - echo "void _start(void) {}" >"$tmp_c" - "$1" -nostdlib -Werror $2 "$tmp_c" -o "$tmp_o" >/dev/null 2>&1 -} - -testas() { - local gccprefix="$1" - local twidth="$2" - local arch="$3" - local use_dash_twidth="$4" - local endian="$5" - local obj_file="$TMPFILE.o" - local full_arch="elf$twidth-$arch" - - rm -f "$obj_file" - [ -n "$use_dash_twidth" ] && use_dash_twidth="--$twidth" - [ -n "$endian" ] && endian="-$endian" - ${gccprefix}as $use_dash_twidth $endian -o "$obj_file" $TMPFILE \ - 2>/dev/null || return 1 - - # Check output content type. - local obj_type="$(${gccprefix}objdump -p $obj_file)" - local obj_arch="$(expr "$obj_type" : '.*format $.[a-z0-9-]*$')" - [ "$obj_arch" = "$full_arch" ] || return 1 - - # Architecture matched. - GCCPREFIX="$gccprefix" - - unset ASFLAGS LDFLAGS - unset CFLAGS_GCC CFLAGS_CLANG - - if [ -n "$use_dash_twidth" ]; then - ASFLAGS="--$twidth" - CFLAGS_GCC="-m$twidth" - CFLAGS_CLANG="-m$twidth" - LDFLAGS="-b $full_arch" - - fi - - # Special parameters only available in dash_twidth mode. - [ -n "$use_dash_twidth" ] && case "$full_arch" in - "elf32-i386" ) - LDFLAGS="$LDFLAGS -melf_i386" - CFLAGS_GCC="$CFLAGS_GCC -Wl,-b,elf32-i386 -Wl,-melf_i386" - CFLAGS_CLANG="$CFLAGS_GCC -Wl,-b,elf32-i386 -Wl,-melf_i386" - ;; - esac - - return 0 -} - -detect_special_flags() { - local architecture="$1" - # GCC 4.6 is much more picky about unused variables. - # Turn off it's warnings for now: - testcc "$GCC" "$CFLAGS_GCC -Wno-unused-but-set-variable " && - CFLAGS_GCC="$CFLAGS_GCC -Wno-unused-but-set-variable " - - # Check for an operational -m32/-m64 - testcc "$GCC" "$CFLAGS_GCC -m$TWIDTH " && - CFLAGS_GCC="$CFLAGS_GCC -m$TWIDTH " - - # Use bfd linker instead of gold if available: - testcc "$GCC" "$CFLAGS_GCC -fuse-ld=bfd" && - CFLAGS_GCC="$CFLAGS_GCC -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' - - testcc "$GCC" "$CFLAGS_GCC -fno-stack-protector"&& - CFLAGS_GCC="$CFLAGS_GCC -fno-stack-protector" - testcc "$GCC" "$CFLAGS_GCC -Wl,--build-id=none" && - CFLAGS_GCC="$CFLAGS_GCC -Wl,--build-id=none" - - case "$architecture" in - x86) - testcc "$GCC" "$CFLAGS_GCC -Wa,--divide" && - CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide" - testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" && - CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide" - # Always build for i686 -- no sse/mmx instructions since SMM - # modules are compiled using these flags. Note that this - # doesn't prevent a project using xcompile to explicitly - # specify -mmsse, etc flags. - CFLAGS_GCC="$CFLAGS_GCC -march=i686" - ;; - x64) - testcc "$GCC" "$CFLAGS_GCC -Wa,--divide" && - CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide" - testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" && - CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide" - ;; - mipsel) - testcc "$GCC" "$CFLAGS_GCC -mno-abicalls -fno-pic" && \ - CFLAGS_GCC+=" -mno-abicalls -fno-pic" - - # Enforce little endian mode. - testcc "$GCC" "$CFLAGS_GCC -EL" && \ - CFLAGS_GCC+=" -EL" - ;; - esac -} - -detect_compiler_runtime() { - test -z "$CLANG" || \ - CC_RT_CLANG="`${CLANG} ${CFLAGS} -print-librt-file-name 2>/dev/null`" - test -z "$GCC" || \ - CC_RT_GCC="`${GCC} ${CFLAGS} -print-libgcc-file-name`" -} - -report_arch_toolchain() { - cat <<EOF -# elf${TWIDTH}-${TBFDARCH} toolchain (${GCC}) -ARCH_SUPPORTED+=${TARCH} -SUBARCH_SUPPORTED+=${TSUPP-${TARCH}} -ifeq (\$(CONFIG_LP_COMPILER_GCC),y) -CC_${TARCH}:=${GCC} -CFLAGS_${TARCH}:=${CFLAGS_GCC} -COMPILER_RT_${TARCH}:=${CC_RT_GCC} -COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC} -else -CC_${TARCH}:=${CLANG} -CFLAGS_${TARCH}:=${CFLAGS_CLANG} -CFLAGS_${TARCH}+=-no-integrated-as -Qunused-arguments -m${TWIDTH} -# tone down compiler warnings -CFLAGS_${TARCH}+=-Wno-unused-variable -Wno-unused-function -Wno-tautological-compare -Wno-shift-overflow -COMPILER_RT_${TARCH}:=${CC_RT_CLANG} -COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_CLANG} -endif -CPP_${TARCH}:=${GCCPREFIX}cpp -AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS} -LD_${TARCH}:=${GCCPREFIX}ld${LINKER_SUFFIX} ${LDFLAGS} -NM_${TARCH}:=${GCCPREFIX}nm -OBJCOPY_${TARCH}:=${GCCPREFIX}objcopy -OBJDUMP_${TARCH}:=${GCCPREFIX}objdump -READELF_${TARCH}:=${GCCPREFIX}readelf -STRIP_${TARCH}:=${GCCPREFIX}strip -AR_${TARCH}:=${GCCPREFIX}ar -CROSS_COMPILE_${TARCH}:=${GCCPREFIX} - -EOF -} - -# Architecture definitions -SUPPORTED_ARCHITECTURES="arm arm64 mipsel riscv x64 x86" - -arch_config_arm() { - TARCH="arm" - TBFDARCHS="littlearm" - TCLIST="armv7a armv7-a" - TWIDTH="32" - TSUPP="arm armv4 armv7 armv7_m" - TABI="eabi" -} - -arch_config_arm64() { - TARCH="arm64" - TBFDARCHS="littleaarch64" - TCLIST="aarch64" - TWIDTH="64" - TSUPP="arm64 armv8_64" - TABI="elf" -} - -arch_config_riscv() { - TARCH="riscv" - TBFDARCHS="littleriscv" - TCLIST="riscv" - TWIDTH="64" - TABI="elf" -} - -arch_config_x64() { - TARCH="x86_64" - TBFDARCHS="x86-64" - TCLIST="x86_64" - TWIDTH="64" - TABI="elf" -} - -arch_config_x86() { - TARCH="x86_32" - TBFDARCHS="i386" - TCLIST="i386 x86_64" - TWIDTH="32" - TABI="elf" - CC_RT_EXTRA_GCC="--wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3" -} - -arch_config_mipsel() { - TARCH="mips" - TBFDARCHS="tradlittlemips littlemips" - TCLIST="mipsel" - TWIDTH="32" - TSUPP="mips mipsel" - TABI="elf" - TENDIAN="EL" -} - -test_architecture() { - local architecture=$1 - local endian gccprefix search - - GCCPREFIX="invalid" - unset TABI TARCH TBFDARCH TCLIST TENDIAN TSUPP TWIDTH - unset CC_RT_EXTRA_GCC CC_RT_EXTRA_CLANG - unset GCC CLANG - if type arch_config_$architecture > /dev/null; then - arch_config_$architecture - else - die "no architecture definition for $architecture" - fi - - # To override toolchain, define CROSS_COMPILE_$arch or CROSS_COMPILE as - # environment variable. - # Ex: CROSS_COMPILE_arm="armv7a-cros-linux-gnueabi-" - # CROSS_COMPILE_x86="i686-pc-linux-gnu-" - search="$(eval echo \$CROSS_COMPILE_$architecture 2>/dev/null)" - search="$search $CROSS_COMPILE" - for toolchain in $TCLIST; do - search="$search $XGCCPATH$toolchain-$TABI-" - search="$search $toolchain-$TABI-" - search="$search $toolchain-linux-gnu-" - search="$search $toolchain-" - done - echo "# $architecture TARCH_SEARCH=$search" - - # Search toolchain by checking assembler capability. - for TBFDARCH in $TBFDARCHS; do - for gccprefix in $search ""; do - program_exists "${gccprefix}as" || continue - for endian in $TENDIAN ""; do - testas "$gccprefix" "$TWIDTH" "$TBFDARCH" \ - "" "$endian" && break 3 - testas "$gccprefix" "$TWIDTH" "$TBFDARCH" \ - "TRUE" "$endian" && break 3 - done - done - done - if [ "invalid" != "$GCCPREFIX" ]; then - GCC="${GCCPREFIX}gcc" - fi - - for clang_arch in $TCLIST invalid; do - testcc "clang" "-target ${clang_arch}-$TABI -c" && break - done - - if [ "invalid" != "$clang_arch" ]; then - # FIXME: this may break in a clang && !gcc configuration, - # but that's more of a clang limitation. Let's be optimistic - # that this will change in the future. - CLANG="clang -target ${clang_arch}-${TABI} -ccc-gcc-name ${GCC}" - fi - - if [ -z "$GCC" -a -z "$CLANG" ]; then - echo "Warning: no suitable compiler for $architecture." >&2 - return 1 - fi -} - -# This loops over all supported architectures. -for architecture in $SUPPORTED_ARCHITECTURES; do - if test_architecture $architecture; then - detect_special_flags "$architecture" - detect_compiler_runtime "$architecture" - report_arch_toolchain - fi -done diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index b11f7dd..c1c42af 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -174,7 +174,7 @@ report_arch_toolchain() { # elf${TWIDTH}-${TBFDARCH} toolchain (${GCC}) ARCH_SUPPORTED+=${TARCH} SUBARCH_SUPPORTED+=${TSUPP-${TARCH}} -ifeq (\$(CONFIG_COMPILER_GCC),y) +ifeq (\$(CONFIG_COMPILER_GCC)\$(CONFIG_LP_COMPILER_GCC),y) CC_${TARCH}:=${GCC} CFLAGS_${TARCH}:=${CFLAGS_GCC} COMPILER_RT_${TARCH}:=${CC_RT_GCC}

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2015