coreboot January 2011

coreboot@coreboot.org

65 participants
299 discussions

build service results for r6284
by repository service 21 Jan '11

21 Jan '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "oxygene" checked in revision 6284 to the coreboot repository. This caused the following changes: Change Log: Add support for working on in-memory CMOS data (eg. as loaded from a file). Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Build Log: Compilation of technologic:ts5300 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6284&device=ts5300&vendor=… If something broke during this checkin please be a pain in oxygene's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

build service results for r6283
by repository service 21 Jan '11

21 Jan '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "oxygene" checked in revision 6283 to the coreboot repository. This caused the following changes: Change Log: Abstract CMOS accesses a bit more in preparation of using files for CMOS data. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Build Log: Compilation of technologic:ts5300 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6283&device=ts5300&vendor=… If something broke during this checkin please be a pain in oxygene's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r6287 - trunk/src/mainboard/technologic/ts5300
by repository service 21 Jan '11

21 Jan '11

Author: stepan Date: Fri Jan 21 08:46:32 2011 New Revision: 6287 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6287 Log: push ts5300 rom size to 1MB. In fact the flash part on that board is 2MB and the entry point is somewhere in the middle. quite weird setup http://www.embeddedarm.com/products/board-detail.php?product=TS-5300 We should probably wipe the board from the tree. It will not work anyways with current coreboot and the architecture is kind of obscure. Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/src/mainboard/technologic/ts5300/Kconfig Modified: trunk/src/mainboard/technologic/ts5300/Kconfig ============================================================================== --- trunk/src/mainboard/technologic/ts5300/Kconfig Fri Jan 21 08:29:40 2011 (r6286) +++ trunk/src/mainboard/technologic/ts5300/Kconfig Fri Jan 21 08:46:32 2011 (r6287) @@ -7,7 +7,7 @@ select ROMCC select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE - select BOARD_ROMSIZE_KB_128 + select BOARD_ROMSIZE_KB_1024 config MAINBOARD_DIR string

1 0

[commit] r6286 - trunk/util/nvramtool
by repository service 21 Jan '11

21 Jan '11

Author: oxygene Date: Fri Jan 21 08:29:40 2011 New Revision: 6286 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6286 Log: Add nvramtool -D option that allows taking cmos data from a plain binary file. Overrides using cmos.default in CBFS if both -C and -D are given. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/util/nvramtool/common.c trunk/util/nvramtool/nvramtool.c trunk/util/nvramtool/opts.c trunk/util/nvramtool/opts.h Modified: trunk/util/nvramtool/common.c ============================================================================== --- trunk/util/nvramtool/common.c Fri Jan 21 08:24:08 2011 (r6285) +++ trunk/util/nvramtool/common.c Fri Jan 21 08:29:40 2011 (r6286) @@ -82,7 +82,8 @@ "LAYOUT_FILE.\n" " -t: Use CMOS layout specified by CMOS option " "table.\n" - " -C CBFS_FILE: Use CBFS file for layout and CMOS defaults.\n" + " -C CBFS_FILE: Use CBFS file for layout and CMOS data.\n" + " -D CMOS_FILE: Use CMOS file for CMOS data (overrides CMOS of -C).\n" " [-n] -r NAME: Show parameter NAME. If -n is given, " "show value only.\n" " -e NAME: Show all possible values for parameter " Modified: trunk/util/nvramtool/nvramtool.c ============================================================================== --- trunk/util/nvramtool/nvramtool.c Fri Jan 21 08:24:08 2011 (r6285) +++ trunk/util/nvramtool/nvramtool.c Fri Jan 21 08:29:40 2011 (r6286) @@ -28,6 +28,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. \*****************************************************************************/ +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/mman.h> #include "common.h" #include "opts.h" #include "lbtable.h" @@ -93,6 +97,7 @@ ****************************************************************************/ int main(int argc, char *argv[]) { + void *cmos_default = NULL; cmos_layout_get_fn_t fn = get_layout_from_cmos_table; parse_nvramtool_args(argc, argv); @@ -105,12 +110,38 @@ fn = get_layout_from_cmos_table; } else if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CBFS_FILE].found) { open_cbfs(nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CBFS_FILE].param); - void *cmosdefault = cbfs_find_file("cmos.default", CBFS_COMPONENT_CMOS_DEFAULT, NULL); - if (cmosdefault == NULL) { - printf("Need a cmos.default in the CBFS image for now.\n"); + if (!nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_FILE].found) { + cmos_default = cbfs_find_file("cmos.default", CBFS_COMPONENT_CMOS_DEFAULT, NULL); + if (cmos_default == NULL) { + fprintf(stderr, "Need a cmos.default in the CBFS image or separate cmos file (-D).\n"); + exit(1); + } + } + } + if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_FILE].found) { + int fd; + struct stat fd_stat; + if ((fd = open(nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_FILE].param, O_RDWR | O_CREAT, 0666)) < 0) { + fprintf(stderr, "Couldn't open '%s'\n", nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_FILE].param); + exit(1); + } + if (fstat(fd, &fd_stat) == -1) { + fprintf(stderr, "Couldn't stat '%s'\n", nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_FILE].param); exit(1); } - select_hal(HAL_MEMORY, cmosdefault); + if (fd_stat.st_size < 128) { + lseek(fd, 127, SEEK_SET); + write(fd, "\0", 1); + fsync(fd); + } + cmos_default = mmap(NULL, 128, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (cmos_default == MAP_FAILED) { + fprintf(stderr, "Couldn't map '%s'\n", nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_FILE].param); + exit(1); + } + } + if (cmos_default) { + select_hal(HAL_MEMORY, cmos_default); fn = get_layout_from_cbfs_file; } Modified: trunk/util/nvramtool/opts.c ============================================================================== --- trunk/util/nvramtool/opts.c Fri Jan 21 08:24:08 2011 (r6285) +++ trunk/util/nvramtool/opts.c Fri Jan 21 08:29:40 2011 (r6286) @@ -41,7 +41,7 @@ static void resolve_op_modifiers(void); static void sanity_check_args(void); -static const char getopt_string[] = "-ab:B:c::C:de:hil::np:r:tvw:xX:y:Y"; +static const char getopt_string[] = "-ab:B:c::C:dD:e:hil::np:r:tvw:xX:y:Y"; /**************************************************************************** * parse_nvramtool_args @@ -89,6 +89,10 @@ case 'd': register_op(&op_found, NVRAMTOOL_OP_LBTABLE_DUMP, NULL); break; + case 'D': + register_op_modifier(NVRAMTOOL_MOD_USE_CMOS_FILE, + optarg); + break; case 'e': register_op(&op_found, NVRAMTOOL_OP_SHOW_PARAM_VALUES, optarg); Modified: trunk/util/nvramtool/opts.h ============================================================================== --- trunk/util/nvramtool/opts.h Fri Jan 21 08:24:08 2011 (r6285) +++ trunk/util/nvramtool/opts.h Fri Jan 21 08:29:40 2011 (r6286) @@ -59,6 +59,7 @@ typedef enum { NVRAMTOOL_MOD_SHOW_VALUE_ONLY = 0, NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE, NVRAMTOOL_MOD_USE_CBFS_FILE, + NVRAMTOOL_MOD_USE_CMOS_FILE, NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE, NVRAMTOOL_NUM_OP_MODIFIERS /* must always be last */ } nvramtool_op_modifier_t;

1 0

build service results for r6282
by repository service 21 Jan '11

21 Jan '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "oxygene" checked in revision 6282 to the coreboot repository. This caused the following changes: Change Log: There's another place where nvramtool can look for the CMOS checksum specification. When using nvramtool on files (instead of CMOS and runtime firmware) it's the only place. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Build Log: Compilation of technologic:ts5300 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6282&device=ts5300&vendor=… If something broke during this checkin please be a pain in oxygene's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r6285 - trunk/util/nvramtool
by repository service 21 Jan '11

21 Jan '11

Author: oxygene Date: Fri Jan 21 08:24:08 2011 New Revision: 6285 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6285 Log: Add nvramtool -C option that takes a CBFS file as argument. When using this option, nvramtool looks for a cmos_layout.bin and cmos.default in the image and uses these for layout information and CMOS data. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Added: trunk/util/nvramtool/cbfs.c trunk/util/nvramtool/cbfs.h Modified: trunk/util/nvramtool/Makefile trunk/util/nvramtool/common.c trunk/util/nvramtool/lbtable.c trunk/util/nvramtool/lbtable.h trunk/util/nvramtool/nvramtool.c trunk/util/nvramtool/opts.c trunk/util/nvramtool/opts.h Modified: trunk/util/nvramtool/Makefile ============================================================================== --- trunk/util/nvramtool/Makefile Fri Jan 21 08:19:59 2011 (r6284) +++ trunk/util/nvramtool/Makefile Fri Jan 21 08:24:08 2011 (r6285) @@ -24,12 +24,12 @@ STRIP = strip INSTALL = /usr/bin/install PREFIX = /usr/local -CFLAGS = -O2 -g -Wall -W +CFLAGS = -O2 -g -Wall -W -m32 #CFLAGS = -Os -Wall OBJS = cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \ hexdump.o input_file.o layout.o layout_file.o lbtable.o \ - nvramtool.o opts.o reg_expr.o + nvramtool.o opts.o reg_expr.o cbfs.o OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Darwin) Added: trunk/util/nvramtool/cbfs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/nvramtool/cbfs.c Fri Jan 21 08:24:08 2011 (r6285) @@ -0,0 +1,146 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> + * Copyright (C) 2011 secunet Security Networks AG + * (Written by Patrick Georgi <patrick.georgi(a)secunet.com>) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include <arpa/inet.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/mman.h> +#include <stdlib.h> +#include <fcntl.h> +#include <string.h> +#include <stdio.h> +#include "cbfs.h" + +#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) +#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) + +static void *cbfs_mapped; +static u32 cbfs_offset; +static void* virt_to_phys(u32 virt) +{ + return (void*)(virt+cbfs_offset); +} + +#ifdef DEBUG +#define debug(x...) printf(x) +#else +#define debug(x...) while(0) {} +#endif + +static int cbfs_check_magic(struct cbfs_file *file) +{ + return !strcmp(file->magic, CBFS_FILE_MAGIC) ? 1 : 0; +} + +static struct cbfs_header *cbfs_master_header(void) +{ + struct cbfs_header *header; + + void *ptr = virt_to_phys(*((u32*)virt_to_phys(CBFS_HEADPTR_ADDR))); + debug("Check CBFS header at %p\n", ptr); + header = (struct cbfs_header *) ptr; + + debug("magic is %08x\n", ntohl(header->magic)); + if (ntohl(header->magic) != CBFS_HEADER_MAGIC) { + printf("ERROR: No valid CBFS header found!\n"); + return NULL; + } + + debug("Found CBFS header at %p\n", ptr); + return header; +} + +struct cbfs_file *cbfs_find(const char *name) +{ + struct cbfs_header *header = cbfs_master_header(); + unsigned long offset; + + if (header == NULL) + return NULL; + offset = (u32)virt_to_phys(0 - ntohl(header->romsize) + ntohl(header->offset)); + + int align= ntohl(header->align); + + while(1) { + struct cbfs_file *file = (struct cbfs_file *) offset; + if (!cbfs_check_magic(file)) return NULL; + debug("Check %s\n", CBFS_NAME(file)); + if (!strcmp(CBFS_NAME(file), name)) + return file; + + int flen = ntohl(file->len); + int foffset = ntohl(file->offset); + debug("CBFS: follow chain: %p + %x + %x + align -> ", (void *)offset, foffset, flen); + + unsigned long oldoffset = offset; + offset = ALIGN(offset + foffset + flen, align); + debug("%p\n", (void *)offset); + if (offset <= oldoffset) return NULL; + + if (offset < (u32)virt_to_phys(0xFFFFFFFF - ntohl(header->romsize))) + return NULL; + } +} + +void *cbfs_find_file(const char *name, unsigned int type, unsigned int *len) +{ + struct cbfs_file *file = cbfs_find(name); + + if (file == NULL) { + printf("CBFS: Could not find file %s\n", + name); + return NULL; + } + + if (ntohl(file->type) != type) { + printf("CBFS: File %s is of type %x instead of" + "type %x\n", name, file->type, type); + + return NULL; + } + if (len != NULL) *len = file->len; + + return (void *) CBFS_SUBHEADER(file); +} + +void open_cbfs(const char *filename) +{ + struct stat cbfs_stat; + int cbfs_fd; + + cbfs_fd = open(filename, O_RDWR); + if (cbfs_fd == -1) { + printf("Couldn't open '%s'\n", filename); + exit(-1); + } + if (fstat(cbfs_fd, &cbfs_stat) == -1) { + printf("Couldn't stat '%s'\n", filename); + exit(-1); + } + cbfs_mapped = mmap(NULL, cbfs_stat.st_size, PROT_READ | PROT_WRITE, + MAP_SHARED, cbfs_fd, 0); + if (cbfs_mapped == MAP_FAILED) { + printf("Couldn't map '%s'\n", filename); + exit(-1); + } + cbfs_offset = (uint32_t)cbfs_mapped-(0xffffffff-cbfs_stat.st_size+1); +} + Added: trunk/util/nvramtool/cbfs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/nvramtool/cbfs.h Fri Jan 21 08:24:08 2011 (r6285) @@ -0,0 +1,181 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> + * + * This file is dual-licensed. You can choose between: + * - The GNU GPL, version 2, as published by the Free Software Foundation + * - The revised BSD license (without advertising clause) + * + * --------------------------------------------------------------------------- + * 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., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + * --------------------------------------------------------------------------- + * 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 _CBFS_H_ +#define _CBFS_H_ + +#include "coreboot_tables.h" + +typedef uint64_t u64; +typedef uint32_t u32; +typedef uint16_t u16; +typedef uint8_t u8; + +/** These are standard values for the known compression + alogrithms that coreboot knows about for stages and + payloads. Of course, other CBFS users can use whatever + values they want, as long as they understand them. */ + +#define CBFS_COMPRESS_NONE 0 +#define CBFS_COMPRESS_LZMA 1 + +/** These are standard component types for well known + components (i.e - those that coreboot needs to consume. + Users are welcome to use any other value for their + components */ + +#define CBFS_TYPE_STAGE 0x10 +#define CBFS_TYPE_PAYLOAD 0x20 +#define CBFS_TYPE_OPTIONROM 0x30 +#define CBFS_TYPE_BOOTSPLASH 0x40 +#define CBFS_TYPE_RAW 0x50 +#define CBFS_TYPE_VSA 0x51 +#define CBFS_TYPE_MBI 0x52 +#define CBFS_TYPE_MICROCODE 0x53 +#define CBFS_COMPONENT_CMOS_DEFAULT 0xaa +#define CBFS_COMPONENT_CMOS_LAYOUT 0x01aa + + +/** this is the master cbfs header - it need to be + located somewhere in the bootblock. Where it + actually lives is up to coreboot. A pointer to + this header will live at 0xFFFFFFFc, so we can + easily find it. */ + +#define CBFS_HEADER_MAGIC 0x4F524243 +#define CBFS_HEADPTR_ADDR 0xFFFFFFFc +#define VERSION1 0x31313131 + +struct cbfs_header { + u32 magic; + u32 version; + u32 romsize; + u32 bootblocksize; + u32 align; + u32 offset; + u32 pad[2]; +} __attribute__((packed)); + +/** This is a component header - every entry in the CBFS + will have this header. + + This is how the component is arranged in the ROM: + + -------------- <- 0 + component header + -------------- <- sizeof(struct component) + component name + -------------- <- offset + data + ... + -------------- <- offset + len +*/ + +#define CBFS_FILE_MAGIC "LARCHIVE" + +struct cbfs_file { + char magic[8]; + u32 len; + u32 type; + u32 checksum; + u32 offset; +} __attribute__((packed)); + +/*** Component sub-headers ***/ + +/* Following are component sub-headers for the "standard" + component types */ + +/** This is the sub-header for stage components. Stages are + loaded by coreboot during the normal boot process */ + +struct cbfs_stage { + u32 compression; /** Compression type */ + u64 entry; /** entry point */ + u64 load; /** Where to load in memory */ + u32 len; /** length of data to load */ + u32 memlen; /** total length of object in memory */ +} __attribute__((packed)); + +/** this is the sub-header for payload components. Payloads + are loaded by coreboot at the end of the boot process */ + +struct cbfs_payload_segment { + u32 type; + u32 compression; + u32 offset; + u64 load_addr; + u32 len; + u32 mem_len; +} __attribute__((packed)); + +struct cbfs_payload { + struct cbfs_payload_segment segments; +}; + +#define PAYLOAD_SEGMENT_CODE 0x45444F43 +#define PAYLOAD_SEGMENT_DATA 0x41544144 +#define PAYLOAD_SEGMENT_BSS 0x20535342 +#define PAYLOAD_SEGMENT_PARAMS 0x41524150 +#define PAYLOAD_SEGMENT_ENTRY 0x52544E45 + +struct cbfs_optionrom { + u32 compression; + u32 len; +} __attribute__((packed)); + +#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file)) +#define CBFS_SUBHEADER(_p) ( (void *) ((((u8 *) (_p)) + ntohl((_p)->offset))) ) + +void * cbfs_get_file(const char *name); +struct cbfs_file *cbfs_find(const char *name); +void *cbfs_find_file(const char *name, unsigned int type, unsigned int *len); + +void open_cbfs(const char *filename); +#endif + Modified: trunk/util/nvramtool/common.c ============================================================================== --- trunk/util/nvramtool/common.c Fri Jan 21 08:19:59 2011 (r6284) +++ trunk/util/nvramtool/common.c Fri Jan 21 08:24:08 2011 (r6285) @@ -82,6 +82,7 @@ "LAYOUT_FILE.\n" " -t: Use CMOS layout specified by CMOS option " "table.\n" + " -C CBFS_FILE: Use CBFS file for layout and CMOS defaults.\n" " [-n] -r NAME: Show parameter NAME. If -n is given, " "show value only.\n" " -e NAME: Show all possible values for parameter " Modified: trunk/util/nvramtool/lbtable.c ============================================================================== --- trunk/util/nvramtool/lbtable.c Fri Jan 21 08:19:59 2011 (r6284) +++ trunk/util/nvramtool/lbtable.c Fri Jan 21 08:24:08 2011 (r6285) @@ -29,6 +29,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. \*****************************************************************************/ +#include <arpa/inet.h> #include <string.h> #include <sys/mman.h> #include "common.h" @@ -38,6 +39,7 @@ #include "layout.h" #include "cmos_lowlevel.h" #include "hexdump.h" +#include "cbfs.h" typedef void (*lbtable_print_fn_t) (const struct lb_record * rec); @@ -315,6 +317,21 @@ exit(1); } +static void process_layout(void) +{ + if ((cmos_table) == NULL) { + fprintf(stderr, + "%s: CMOS option table not found in coreboot table. " + "Apparently, the coreboot installed on this system was " + "built without specifying CONFIG_HAVE_OPTION_TABLE.\n", + prog_name); + exit(1); + } + + process_cmos_table(); + get_cmos_checksum_info(); +} + /**************************************************************************** * get_layout_from_cmos_table * @@ -327,18 +344,18 @@ get_lbtable(); cmos_table = (const struct cmos_option_table *) find_lbrec(LB_TAG_CMOS_OPTION_TABLE); + process_layout(); +} - if ((cmos_table) == NULL) { - fprintf(stderr, - "%s: CMOS option table not found in coreboot table. " - "Apparently, the coreboot installed on this system was " - "built without specifying CONFIG_HAVE_OPTION_TABLE.\n", - prog_name); - exit(1); - } - - process_cmos_table(); - get_cmos_checksum_info(); +void get_layout_from_cbfs_file(void) +{ + static struct lb_header header; + u32 len; + cmos_table = cbfs_find_file("cmos_layout.bin", CBFS_COMPONENT_CMOS_LAYOUT, &len); + lbtable = &header; + header.header_bytes = (u32)cmos_table-(u32)lbtable; + header.table_bytes = ntohl(len); + process_layout(); } /**************************************************************************** Modified: trunk/util/nvramtool/lbtable.h ============================================================================== --- trunk/util/nvramtool/lbtable.h Fri Jan 21 08:19:59 2011 (r6284) +++ trunk/util/nvramtool/lbtable.h Fri Jan 21 08:24:08 2011 (r6285) @@ -35,6 +35,7 @@ void get_lbtable(void); void get_layout_from_cmos_table(void); +void get_layout_from_cbfs_file(void); void dump_lbtable(void); void list_lbtable_choices(void); void list_lbtable_item(const char item[]); Modified: trunk/util/nvramtool/nvramtool.c ============================================================================== --- trunk/util/nvramtool/nvramtool.c Fri Jan 21 08:19:59 2011 (r6284) +++ trunk/util/nvramtool/nvramtool.c Fri Jan 21 08:24:08 2011 (r6285) @@ -38,6 +38,7 @@ #include "cmos_lowlevel.h" #include "reg_expr.h" #include "hexdump.h" +#include "cbfs.h" typedef void (*op_fn_t) (void); @@ -92,7 +93,7 @@ ****************************************************************************/ int main(int argc, char *argv[]) { - cmos_layout_get_fn_t fn; + cmos_layout_get_fn_t fn = get_layout_from_cmos_table; parse_nvramtool_args(argc, argv); @@ -100,8 +101,18 @@ set_layout_filename(nvramtool_op_modifiers [NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].param); fn = get_layout_from_file; - } else + } else if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE].found) { fn = get_layout_from_cmos_table; + } else if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CBFS_FILE].found) { + open_cbfs(nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CBFS_FILE].param); + void *cmosdefault = cbfs_find_file("cmos.default", CBFS_COMPONENT_CMOS_DEFAULT, NULL); + if (cmosdefault == NULL) { + printf("Need a cmos.default in the CBFS image for now.\n"); + exit(1); + } + select_hal(HAL_MEMORY, cmosdefault); + fn = get_layout_from_cbfs_file; + } register_cmos_layout_get_fn(fn); op_fns[nvramtool_op.op] (); Modified: trunk/util/nvramtool/opts.c ============================================================================== --- trunk/util/nvramtool/opts.c Fri Jan 21 08:19:59 2011 (r6284) +++ trunk/util/nvramtool/opts.c Fri Jan 21 08:24:08 2011 (r6285) @@ -41,7 +41,7 @@ static void resolve_op_modifiers(void); static void sanity_check_args(void); -static const char getopt_string[] = "-ab:B:c::de:hil::np:r:tvw:xX:y:Y"; +static const char getopt_string[] = "-ab:B:c::C:de:hil::np:r:tvw:xX:y:Y"; /**************************************************************************** * parse_nvramtool_args @@ -82,6 +82,10 @@ register_op(&op_found, NVRAMTOOL_OP_CMOS_CHECKSUM, handle_optional_arg(argc, argv)); break; + case 'C': + register_op_modifier(NVRAMTOOL_MOD_USE_CBFS_FILE, + optarg); + break; case 'd': register_op(&op_found, NVRAMTOOL_OP_LBTABLE_DUMP, NULL); break; Modified: trunk/util/nvramtool/opts.h ============================================================================== --- trunk/util/nvramtool/opts.h Fri Jan 21 08:19:59 2011 (r6284) +++ trunk/util/nvramtool/opts.h Fri Jan 21 08:24:08 2011 (r6285) @@ -58,6 +58,7 @@ typedef enum { NVRAMTOOL_MOD_SHOW_VALUE_ONLY = 0, NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE, + NVRAMTOOL_MOD_USE_CBFS_FILE, NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE, NVRAMTOOL_NUM_OP_MODIFIERS /* must always be last */ } nvramtool_op_modifier_t;

1 0

[commit] r6284 - trunk/util/nvramtool
by repository service 21 Jan '11

21 Jan '11

Author: oxygene Date: Fri Jan 21 08:19:59 2011 New Revision: 6284 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6284 Log: Add support for working on in-memory CMOS data (eg. as loaded from a file). Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/util/nvramtool/cmos_lowlevel.c trunk/util/nvramtool/cmos_lowlevel.h Modified: trunk/util/nvramtool/cmos_lowlevel.c ============================================================================== --- trunk/util/nvramtool/cmos_lowlevel.c Fri Jan 21 08:18:20 2011 (r6283) +++ trunk/util/nvramtool/cmos_lowlevel.c Fri Jan 21 08:19:59 2011 (r6284) @@ -37,20 +37,36 @@ #include "cmos_lowlevel.h" /* Hardware Abstraction Layer: lowlevel byte-wise write access */ + typedef struct { void (*init)(void* data); unsigned char (*read)(unsigned addr); void (*write)(unsigned addr, unsigned char value); + void (*set_iopl)(int level); } cmos_access_t; static void cmos_hal_init(void* data); static unsigned char cmos_hal_read(unsigned addr); static void cmos_hal_write(unsigned addr, unsigned char value); +static void cmos_set_iopl(int level); static cmos_access_t cmos_hal = { .init = cmos_hal_init, .read = cmos_hal_read, - .write = cmos_hal_write + .write = cmos_hal_write, + .set_iopl = cmos_set_iopl, +}; + +static void mem_hal_init(void* data); +static unsigned char mem_hal_read(unsigned addr); +static void mem_hal_write(unsigned addr, unsigned char value); +static void mem_set_iopl(int level); + +static cmos_access_t memory_hal = { + .init = mem_hal_init, + .read = mem_hal_read, + .write = mem_hal_write, + .set_iopl = mem_set_iopl, }; static cmos_access_t *current_access = &cmos_hal; @@ -96,6 +112,37 @@ OUTB(value, port_1); } +static unsigned char* mem_hal_data = (unsigned char*)-1; +static void mem_hal_init(void *data) +{ + mem_hal_data = data; +} + +static unsigned char mem_hal_read(unsigned index) +{ + assert(mem_hal_data != (unsigned char*)-1); + return mem_hal_data[index]; +} + +static void mem_hal_write(unsigned index, unsigned char value) +{ + assert(mem_hal_data != (unsigned char*)-1); + mem_hal_data[index] = value; +} + +void select_hal(hal_t hal, void *data) +{ + switch(hal) { + case HAL_CMOS: + current_access = &cmos_hal; + break; + case HAL_MEMORY: + current_access = &memory_hal; + break; + } + current_access->init(data); +} + /* Bit-level access */ typedef struct { unsigned byte_index; @@ -303,6 +350,11 @@ ****************************************************************************/ void set_iopl(int level) { + current_access->set_iopl(level); +} + +static void cmos_set_iopl(int level) +{ #if defined(__FreeBSD__) static int io_fd = -1; #endif @@ -333,6 +385,10 @@ #endif } +static void mem_set_iopl(__attribute__ ((unused)) int level) +{ +} + /**************************************************************************** * verify_cmos_op * Modified: trunk/util/nvramtool/cmos_lowlevel.h ============================================================================== --- trunk/util/nvramtool/cmos_lowlevel.h Fri Jan 21 08:18:20 2011 (r6283) +++ trunk/util/nvramtool/cmos_lowlevel.h Fri Jan 21 08:19:59 2011 (r6284) @@ -34,6 +34,9 @@ #include "common.h" #include "layout.h" +typedef enum { HAL_CMOS, HAL_MEMORY } hal_t; +void select_hal(hal_t hal, void *data); + #define CMOS_AREA_OUT_OF_RANGE (CMOS_RESULT_START + 0) #define CMOS_AREA_OVERLAPS_RTC (CMOS_RESULT_START + 1) #define CMOS_AREA_TOO_WIDE (CMOS_RESULT_START + 2)

1 0

[commit] r6283 - trunk/util/nvramtool
by repository service 21 Jan '11

21 Jan '11

Author: oxygene Date: Fri Jan 21 08:18:20 2011 New Revision: 6283 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6283 Log: Abstract CMOS accesses a bit more in preparation of using files for CMOS data. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/util/nvramtool/cmos_lowlevel.c Modified: trunk/util/nvramtool/cmos_lowlevel.c ============================================================================== --- trunk/util/nvramtool/cmos_lowlevel.c Fri Jan 21 08:04:05 2011 (r6282) +++ trunk/util/nvramtool/cmos_lowlevel.c Fri Jan 21 08:18:20 2011 (r6283) @@ -36,6 +36,67 @@ #include "common.h" #include "cmos_lowlevel.h" +/* Hardware Abstraction Layer: lowlevel byte-wise write access */ +typedef struct { + void (*init)(void* data); + unsigned char (*read)(unsigned addr); + void (*write)(unsigned addr, unsigned char value); +} cmos_access_t; + +static void cmos_hal_init(void* data); +static unsigned char cmos_hal_read(unsigned addr); +static void cmos_hal_write(unsigned addr, unsigned char value); + +static cmos_access_t cmos_hal = { + .init = cmos_hal_init, + .read = cmos_hal_read, + .write = cmos_hal_write +}; + +static cmos_access_t *current_access = &cmos_hal; + +/* no need to initialize anything */ +static void cmos_hal_init(__attribute__((unused)) void *data) +{ +} + +static unsigned char cmos_hal_read(unsigned index) +{ + unsigned short port_0, port_1; + + assert(!verify_cmos_byte_index(index)); + + if (index < 128) { + port_0 = 0x70; + port_1 = 0x71; + } else { + port_0 = 0x72; + port_1 = 0x73; + } + + OUTB(index, port_0); + return INB(port_1); +} + +static void cmos_hal_write(unsigned index, unsigned char value) +{ + unsigned short port_0, port_1; + + assert(!verify_cmos_byte_index(index)); + + if (index < 128) { + port_0 = 0x70; + port_1 = 0x71; + } else { + port_0 = 0x72; + port_1 = 0x73; + } + + OUTB(index, port_0); + OUTB(value, port_1); +} + +/* Bit-level access */ typedef struct { unsigned byte_index; unsigned bit_offset; @@ -181,20 +242,7 @@ ****************************************************************************/ unsigned char cmos_read_byte(unsigned index) { - unsigned short port_0, port_1; - - assert(!verify_cmos_byte_index(index)); - - if (index < 128) { - port_0 = 0x70; - port_1 = 0x71; - } else { - port_0 = 0x72; - port_1 = 0x73; - } - - OUTB(index, port_0); - return INB(port_1); + return current_access->read(index); } /**************************************************************************** @@ -209,20 +257,7 @@ ****************************************************************************/ void cmos_write_byte(unsigned index, unsigned char value) { - unsigned short port_0, port_1; - - assert(!verify_cmos_byte_index(index)); - - if (index < 128) { - port_0 = 0x70; - port_1 = 0x71; - } else { - port_0 = 0x72; - port_1 = 0x73; - } - - OUTB(index, port_0); - OUTB(value, port_1); + current_access->write(index, value); } /****************************************************************************

1 0

[commit] r6282 - trunk/util/nvramtool
by repository service 21 Jan '11

21 Jan '11

Author: oxygene Date: Fri Jan 21 08:04:05 2011 New Revision: 6282 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6282 Log: There's another place where nvramtool can look for the CMOS checksum specification. When using nvramtool on files (instead of CMOS and runtime firmware) it's the only place. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/util/nvramtool/lbtable.c Modified: trunk/util/nvramtool/lbtable.c ============================================================================== --- trunk/util/nvramtool/lbtable.c Thu Jan 20 07:28:25 2011 (r6281) +++ trunk/util/nvramtool/lbtable.c Fri Jan 21 08:04:05 2011 (r6282) @@ -632,6 +632,10 @@ checksum = (struct cmos_checksum *)find_lbrec(LB_TAG_OPTION_CHECKSUM); + if (checksum == NULL) { + checksum = (struct cmos_checksum *)next_cmos_rec((const struct lb_record *)first_cmos_table_enum(), LB_TAG_OPTION_CHECKSUM); + } + if (checksum != NULL) { /* We are lucky. The coreboot table hints us to the checksum. * We might have to check the type field here though. */

1 0

Re: [coreboot] abuild error
by Nils 21 Jan '11

21 Jan '11

I investigated this some more and i think i found the problem. The crosscompiler is working ok now and my coreboot rom has the same size as the one from the automatic build system of coreboot.org exept for the SeaBios payload mine is 46881 bytes and the one from the automatic build system of coreboot.org is 33545 bytes.(same stable version) My SeaBios payload exceeds the romchip size of the technologic/ts5300 hence the error. Correct me if i am wrong but it seems to me that the SeaBios payload is not build by crossgcc . To have a host independable coreboot buildsystem i think the SeaBios makefile should be patched after downloading in the same way as the coreboot makefile so it uses the crossgcc. That way everybody that uses crossgcc should have the same results as the automatic build system of coreboot.org. I think that when the results are not the same on all different host systems the crosgcc is useless as reference. Thanks, Nils.

3 2

← Newer
1
...
12
13
14
15
16
17
18
...
30
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 January 2011