coreboot November 2012

coreboot@coreboot.org

35 participants
895 discussions

Patch merged into coreboot/master: 90ca3b6 Add multi-architecture support to cbfstool
by gerrit＠coreboot.org 29 Nov '12

29 Nov '12

the following patch was just integrated into master: commit 90ca3b6bd7d7849898fe2363a9e6d0e002c95943 Author: David Hendricks <dhendrix(a)chromium.org> Date: Fri Nov 16 14:48:22 2012 -0800 Add multi-architecture support to cbfstool This is an initial re-factoring of CBFS code to enable multiple architectures. To achieve a clean solution, an additional field describing the architecture has to be added to the master header. Hence we also increase the version number in the master header. Change-Id: Icda681673221f8c27efbc46f16c2c5682b16a265 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: http://review.coreboot.org/1944 Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Fri Nov 30 00:26:40 2012, giving +1 See http://review.coreboot.org/1944 for details. -gerrit

1 0

Patch merged into coreboot/master: 11a20b6 Lumpy: Need byteorder.h in romstage
by gerrit＠coreboot.org 29 Nov '12

29 Nov '12

the following patch was just integrated into master: commit 11a20b614e708582ebd7607d39487938f35f2550 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Nov 29 15:19:43 2012 -0800 Lumpy: Need byteorder.h in romstage Not sure why this never triggered an error before. Change-Id: I85d8b3b862492df04163a5f751c7ea4288406860 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: http://review.coreboot.org/1946 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Build-Tested: build bot (Jenkins) at Fri Nov 30 00:32:35 2012, giving +1 See http://review.coreboot.org/1946 for details. -gerrit

1 0

New patch to review for coreboot: b87ff1c Lumpy: Need byteorder.h in romstage
by Stefan Reinauer 29 Nov '12

29 Nov '12

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1946 -gerrit commit b87ff1c0812f9b7a2b5fae5bd2a5ec3d8b68ae01 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Nov 29 15:19:43 2012 -0800 Lumpy: Need byteorder.h in romstage Not sure why this never triggered an error before. Change-Id: I85d8b3b862492df04163a5f751c7ea4288406860 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- src/mainboard/samsung/lumpy/romstage.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c index 57c6eea..5600cf6 100644 --- a/src/mainboard/samsung/lumpy/romstage.c +++ b/src/mainboard/samsung/lumpy/romstage.c @@ -24,6 +24,7 @@ #include <timestamp.h> #include <arch/io.h> #include <arch/romcc_io.h> +#include <arch/byteorder.h> #include <device/pci_def.h> #include <device/pnp_def.h> #include <cpu/x86/lapic.h>

1 0

Patch set updated for coreboot: 0227862 Add multi-architecture support to cbfstool
by Stefan Reinauer 29 Nov '12

29 Nov '12

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1944 -gerrit commit 0227862be6c72329fa378469201eb51d2a841608 Author: David Hendricks <dhendrix(a)chromium.org> Date: Fri Nov 16 14:48:22 2012 -0800 Add multi-architecture support to cbfstool This is an initial re-factoring of CBFS code to enable multiple architectures. To achieve a clean solution, an additional field describing the architecture has to be added to the master header. Hence we also increase the version number in the master header. Change-Id: Icda681673221f8c27efbc46f16c2c5682b16a265 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- documentation/cbfs.txt | 24 +++- payloads/coreinfo/cbfs_module.c | 3 +- payloads/libpayload/include/cbfs_core.h | 24 +++- src/arch/x86/Makefile.inc | 2 +- src/include/cbfs_core.h | 26 ++-- util/cbfstool/cbfs-mkpayload.c | 12 +- util/cbfstool/cbfs-mkstage.c | 9 +- util/cbfstool/cbfs.h | 15 ++- util/cbfstool/cbfstool.c | 32 +++-- util/cbfstool/common.c | 211 +++++++++++++++++++++++++++----- util/cbfstool/common.h | 5 + 11 files changed, 290 insertions(+), 73 deletions(-) diff --git a/documentation/cbfs.txt b/documentation/cbfs.txt index 61f9f79..4b266f2 100644 --- a/documentation/cbfs.txt +++ b/documentation/cbfs.txt @@ -144,11 +144,15 @@ need to read the pointer and do the appropriate math to locate the header. The following is the structure of the master header: struct cbfs_header { - unsigned int magic; - unsigned int size; - unsigned int align; - unsigned int offset; -}; + u32 magic; + u32 version; + u32 romsize; + u32 bootblocksize; + u32 align; + u32 offset; + u32 architecture; + u32 pad[1]; +} __attribute__((packed)); The meaning of each member is as follows: @@ -156,9 +160,14 @@ The meaning of each member is as follows: magic number is 0x4F524243, which is 'ORBC' in ASCII. -'size' is the size of the ROM in bytes. Coreboot will subtract 'size' from +'version' is a version number for CBFS header. cbfs_header structure may be +different if version is not matched. + +'romsize' is the size of the ROM in bytes. Coreboot will subtract 'size' from 0xFFFFFFFF to locate the beginning of the ROM in memory. +'bootblocksize' is the size of bootblock reserved in firmware image. + 'align' is the number of bytes that each component is aligned to within the ROM. This is used to make sure that each component is aligned correctly with @@ -169,6 +178,9 @@ component at runtime without disturbing the others. the ROM). This is to allow for arbitrary space to be left at the beginning of the ROM for things like embedded controller firmware. +'architecture' describes which architecture (x86, arm, ...) this CBFS is created +for. + = Bootblock = The bootblock is a mandatory component in the ROM. It is located in the last diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c index ceb0e3c..0635747 100644 --- a/payloads/coreinfo/cbfs_module.c +++ b/payloads/coreinfo/cbfs_module.c @@ -41,7 +41,8 @@ struct cbheader { u32 bootblocksize; u32 align; u32 offset; - u32 pad[2]; + u32 architecture; + u32 pad[1]; } __attribute__ ((packed)); struct cbfile { diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index 70368f8..32f2670 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> + * Copyright (C) 2012 Google, Inc. * * This file is dual-licensed. You can choose between: * - The GNU GPL, version 2, as published by the Free Software Foundation @@ -76,13 +77,17 @@ /** 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. */ + actually lives is up to coreboot. On x86, 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 +#if CONFIG_ARCH_X86 +#define CBFS_HEADPTR_ADDR 0xFFFFFFFC +#endif #define VERSION1 0x31313131 +#define VERSION2 0x31313132 +#define VERSION VERSION2 struct cbfs_header { uint32_t magic; @@ -91,9 +96,17 @@ struct cbfs_header { uint32_t bootblocksize; uint32_t align; uint32_t offset; - uint32_t pad[2]; + uint32_t architecture; + uint32_t pad[1]; } __attribute__((packed)); +/* "Unknown" refers to CBFS headers version 1, + * before the architecture was defined (i.e., x86 only). + */ +#define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF +#define CBFS_ARCHITECTURE_X86 0x00000001 +#define CBFS_ARCHITECTURE_ARMV7 0x00000010 + /** This is a component header - every entry in the CBFS will have this header. @@ -178,4 +191,3 @@ void *cbfs_find_file(const char *name, int type); int cbfs_decompress(int algo, void *src, void *dst, int len); struct cbfs_header *get_cbfs_header(void); #endif - diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 68e5dcd..4afa7d5 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -65,7 +65,7 @@ prebuild-files = \ prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) - $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \ + $(CBFSTOOL) $@.tmp create -m x86 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \ -B $(objcbfs)/bootblock.bin -a 64 \ -o $$(( $(CONFIG_ROM_SIZE) - $(CONFIG_CBFS_SIZE) )) $(prebuild-files) true diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index 43e6b9b..32f2670 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> + * Copyright (C) 2012 Google, Inc. * * This file is dual-licensed. You can choose between: * - The GNU GPL, version 2, as published by the Free Software Foundation @@ -49,8 +50,6 @@ #ifndef _CBFS_CORE_H_ #define _CBFS_CORE_H_ -#include <arch/byteorder.h> - /** 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 @@ -78,13 +77,17 @@ /** 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. */ + actually lives is up to coreboot. On x86, 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 +#if CONFIG_ARCH_X86 +#define CBFS_HEADPTR_ADDR 0xFFFFFFFC +#endif #define VERSION1 0x31313131 +#define VERSION2 0x31313132 +#define VERSION VERSION2 struct cbfs_header { uint32_t magic; @@ -93,9 +96,17 @@ struct cbfs_header { uint32_t bootblocksize; uint32_t align; uint32_t offset; - uint32_t pad[2]; + uint32_t architecture; + uint32_t pad[1]; } __attribute__((packed)); +/* "Unknown" refers to CBFS headers version 1, + * before the architecture was defined (i.e., x86 only). + */ +#define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF +#define CBFS_ARCHITECTURE_X86 0x00000001 +#define CBFS_ARCHITECTURE_ARMV7 0x00000010 + /** This is a component header - every entry in the CBFS will have this header. @@ -180,4 +191,3 @@ void *cbfs_find_file(const char *name, int type); int cbfs_decompress(int algo, void *src, void *dst, int len); struct cbfs_header *get_cbfs_header(void); #endif - diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c index e4ef5c8..0d3986e 100644 --- a/util/cbfstool/cbfs-mkpayload.c +++ b/util/cbfstool/cbfs-mkpayload.c @@ -35,7 +35,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output, comp_algo algo) { Elf32_Phdr *phdr; - Elf32_Ehdr *ehdr; + Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input; Elf32_Shdr *shdr; char *header; char *strtab; @@ -48,16 +48,20 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output, int i; if(!iself(input)){ - printf("Fatal error: the payload file is not in ELF format!\n"); - exit(1); + fprintf(stderr, "E: The payload file is not in ELF format!\n"); + return -1; } + if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) && + !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) { + fprintf(stderr, "E: The payload file has the wrong architecture\n"); + return -1; + } comp_func_ptr compress = compression_function(algo); if (!compress) return -1; - ehdr = (Elf32_Ehdr *) input; headers = ehdr->e_phnum; header = (char *)ehdr; diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c index 55c81c6..0541d4b 100644 --- a/util/cbfstool/cbfs-mkstage.c +++ b/util/cbfstool/cbfs-mkstage.c @@ -4,6 +4,7 @@ * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> * 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -67,7 +68,13 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output, return -1; if (!iself(input)) { - fprintf(stderr, "E: The incoming file is not an ELF\n"); + fprintf(stderr, "E: The stage file is not in ELF format!\n"); + return -1; + } + + if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) && + !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) { + fprintf(stderr, "E: The stage file has the wrong architecture\n"); return -1; } diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index f161ed4..5251d65 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -21,6 +21,12 @@ #include <stdint.h> +#define CBFS_HEADER_MAGIC 0x4F524243 +#define CBFS_HEADPTR_ADDR_X86 0xFFFFFFFC +#define VERSION1 0x31313131 +#define VERSION2 0x31313132 +#define VERSION VERSION2 + struct cbfs_header { uint32_t magic; uint32_t version; @@ -28,9 +34,14 @@ struct cbfs_header { uint32_t bootblocksize; uint32_t align; uint32_t offset; - uint32_t pad[2]; + uint32_t architecture; /* Version 2 */ + uint32_t pad[1]; } __attribute__ ((packed)); +#define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF +#define CBFS_ARCHITECTURE_X86 0x00000001 +#define CBFS_ARCHITECTURE_ARMV7 0x00000010 + struct cbfs_file { uint8_t magic[8]; uint32_t len; @@ -94,7 +105,7 @@ struct cbfs_payload { */ #define CBFS_COMPONENT_NULL 0xFFFFFFFF -int cbfs_file_header(uint32_t physaddr); +int cbfs_file_header(unsigned long physaddr); struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size); #endif diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 66db379..a09e75b 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -3,6 +3,7 @@ * * Copyright (C) 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -372,6 +373,11 @@ static int cbfs_create(void) return 1; } + if (arch == CBFS_ARCHITECTURE_UNKNOWN) { + fprintf(stderr, "E: You need to specify -m/--machine arch\n"); + return 1; + } + return create_cbfs_image(cbfs_name, rom_size, rom_bootblock, rom_alignment, rom_offset); } @@ -450,7 +456,7 @@ static const struct command commands[] = { {"add-stage", "f:n:t:c:b:h?", cbfs_add_stage}, {"add-flat-binary", "f:n:l:e:c:b:h?", cbfs_add_flat_binary}, {"remove", "n:h?", cbfs_remove}, - {"create", "s:B:a:o:h?", cbfs_create}, + {"create", "s:B:a:o:m:h?", cbfs_create}, {"locate", "f:n:a:h?", cbfs_locate}, {"print", "h?", cbfs_print}, {"extract", "n:f:h?", cbfs_extract}, @@ -468,6 +474,7 @@ static struct option long_options[] = { {"alignment", required_argument, 0, 'a' }, {"offset", required_argument, 0, 'o' }, {"file", required_argument, 0, 'f' }, + {"arch", required_argument, 0, 'm' }, {"verbose", no_argument, 0, 'v' }, {"help", no_argument, 0, 'h' }, {NULL, 0, 0, 0 } @@ -481,26 +488,28 @@ static void usage(char *name) " %s FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n" " -h Display this help message\n\n" "COMMANDs:\n" - " add -f FILE -n NAME -t TYPE [-b base-address] " + " add -f FILE -n NAME -t TYPE [-b base-address] " "Add a component\n" - " add-payload -f FILE -n NAME [-c compression] [-b base] " + " add-payload -f FILE -n NAME [-c compression] [-b base] " "Add a payload to the ROM\n" - " add-stage -f FILE -n NAME [-c compression] [-b base] " + " add-stage -f FILE -n NAME [-c compression] [-b base] " "Add a stage to the ROM\n" " add-flat-binary -f FILE -n NAME -l load-address \\\n" - " -e entry-point [-c compression] [-b base] " + " -e entry-point [-c compression] [-b base] " "Add a 32bit flat mode binary\n" - " remove -n NAME " + " remove -n NAME " "Remove a component\n" - " create -s size -B bootblock [-a align] [-o offset] " + " create -s size -B bootblock -m ARCH [-a align] [-o offset] " "Create a ROM file\n" - " locate -f FILE -n NAME -a align " + " locate -f FILE -n NAME -a align " "Find a place for a file of that size\n" - " print " + " print " "Show the contents of the ROM\n" - " extract -n NAME -f FILE " + " extract -n NAME -f FILE " "Extracts a raw payload from ROM\n" "\n" + "ARCHes:\n" + " armv7, x86\n" "TYPEs:\n", name, name ); print_supported_filetypes(); @@ -610,6 +619,9 @@ int main(int argc, char **argv) case 'v': verbose++; break; + case 'm': + arch = string_to_arch(optarg); + break; case 'h': case '?': usage(argv[0]); diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 6c67c39..d29df60 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -3,6 +3,7 @@ * * Copyright (C) 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -73,16 +74,101 @@ static struct cbfs_header *master_header; static uint32_t phys_start, phys_end, align; uint32_t romsize; void *offset; +uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN; + +static struct { + uint32_t arch; + const char *name; +} arch_names[] = { + { CBFS_ARCHITECTURE_ARMV7, "armv7" }, + { CBFS_ARCHITECTURE_X86, "x86" }, + { CBFS_ARCHITECTURE_UNKNOWN, "unknown" } +}; + +uint32_t string_to_arch(const char *arch_string) +{ + int i; + uint32_t ret = CBFS_ARCHITECTURE_UNKNOWN; + + for (i = 0; i < ARRAY_SIZE(arch_names); i++) { + if (!strcasecmp(arch_string, arch_names[i].name)) { + ret = arch_names[i].arch; + break; + } + } + + return ret; +} + +const char *arch_to_string(uint32_t a) +{ + int i; + const char *ret = NULL; + + for (i = 0; i < ARRAY_SIZE(arch_names); i++) { + if (a == arch_names[i].arch) { + ret = arch_names[i].name; + break; + } + } + + return ret; + +} + +int find_master_header(void *romarea, size_t size) +{ + size_t offset; + + if (master_header) + return 0; + + for (offset = 0; offset < size - sizeof(struct cbfs_header); offset++) { + struct cbfs_header *tmp = romarea + offset; + + if (tmp->magic == ntohl(CBFS_HEADER_MAGIC)) { + master_header = tmp; + break; + } + } + + return master_header ? 0 : 1; +} void recalculate_rom_geometry(void *romarea) { - offset = romarea + romsize - 0x100000000ULL; - master_header = (struct cbfs_header *) - phys_to_virt(*((uint32_t *) phys_to_virt(0xfffffffc))); - phys_start = (0 - romsize + ntohl(master_header->offset)) & 0xffffffff; - phys_end = - (0 - ntohl(master_header->bootblocksize) - - sizeof(struct cbfs_header)) & 0xffffffff; + if (find_master_header(romarea, romsize)) { + fprintf(stderr, "E: Cannot find master header\n"); + exit(1); + } + + /* Update old headers */ + if (master_header->version == VERSION1 && + ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) { + printf("Updating CBFS master header to version 2\n"); + master_header->architecture = htonl(CBFS_ARCHITECTURE_X86); + } + + arch = ntohl(master_header->architecture); + + switch (arch) { + case CBFS_ARCHITECTURE_ARMV7: + offset = romarea; + phys_start = (0 + ntohl(master_header->offset)) & 0xffffffff; + phys_end = romsize & 0xffffffff; + break; + case CBFS_ARCHITECTURE_X86: + offset = romarea + romsize - 0x100000000ULL; + phys_start = (0 - romsize + ntohl(master_header->offset)) & + 0xffffffff; + phys_end = (0 - ntohl(master_header->bootblocksize) - + sizeof(struct cbfs_header)) & 0xffffffff; + break; + default: + fprintf(stderr, "E: Unknown architecture\n"); + exit(1); + } + align = ntohl(master_header->align); } @@ -114,7 +200,7 @@ int writerom(const char *filename, void *start, uint32_t size) return 0; } -int cbfs_file_header(uint32_t physaddr) +int cbfs_file_header(unsigned long physaddr) { /* maybe improve this test */ return (strncmp(phys_to_virt(physaddr), "LARCHIVE", 8) == 0); @@ -188,9 +274,10 @@ uint64_t intfiletype(const char *name) void print_cbfs_directory(const char *filename) { printf - ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\nAlignment: %d bytes\n\n", + ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n" + "Alignment: %d bytes, architecture: %s\n\n", basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize), - romsize, ntohl(master_header->offset), align); + romsize, ntohl(master_header->offset), align, arch_to_string(arch)); printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type"); uint32_t current = phys_start; while (current < phys_end) { @@ -206,8 +293,8 @@ void print_cbfs_directory(const char *filename) fname = "(empty)"; printf("%-30s 0x%-8x %-12s %d\n", fname, - current - phys_start, strfiletype(ntohl(thisfile->type)), - length); + current - phys_start + ntohl(master_header->offset), + strfiletype(ntohl(thisfile->type)), length); current = ALIGN(current + ntohl(thisfile->len) + ntohl(thisfile->offset), align); @@ -451,7 +538,7 @@ void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize, } int create_cbfs_image(const char *romfile, uint32_t _romsize, - const char *bootblock, uint32_t align, uint32_t offs) + const char *bootblock, uint32_t align, uint32_t offs) { uint32_t bootblocksize = 0; struct cbfs_header *master_header; @@ -466,9 +553,6 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize, } memset(romarea, 0xff, romsize); - // Set up physical/virtual mapping - offset = romarea + romsize - 0x100000000ULL; - if (align == 0) align = 64; @@ -481,24 +565,83 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize, return 1; } - master_header = - (struct cbfs_header *)(romarea + romsize - bootblocksize - - sizeof(struct cbfs_header)); - master_header->magic = ntohl(0x4f524243); - master_header->version = ntohl(0x31313131); - master_header->romsize = htonl(romsize); - master_header->bootblocksize = htonl(bootblocksize); - master_header->align = htonl(align); - master_header->offset = htonl(offs); - ((uint32_t *) phys_to_virt(0xfffffffc))[0] = - virt_to_phys(master_header); - - recalculate_rom_geometry(romarea); - - cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff, - romsize - offs - bootblocksize - - sizeof(struct cbfs_header) - - sizeof(struct cbfs_file) - 16); + // TODO(hungte) Replace magic numbers by named constants. + switch (arch) { + case CBFS_ARCHITECTURE_ARMV7: + /* Set up physical/virtual mapping */ + offset = romarea; + + // should be aligned to align but then we need to dynamically + // create the jump to the bootblock + loadfile(bootblock, &bootblocksize, romarea + 0x20 + + sizeof(struct cbfs_header), SEEK_SET); + master_header = (struct cbfs_header *)(romarea + 0x20); + uint32_t *arm_vec = (uint32_t *)romarea; + /* + * Encoding for this branch instruction is: + * 31:28 - condition (0xe for always/unconditional) + * 27:24 - 0xa + * 23: 0 - sign-extended offset (in multiples of 4) + * + * When executing the branch, the PC will read as the address + * of current instruction + 8. + */ + arm_vec[0] = htonl(0x0e0000ea); // branch to . + 64 bytes + + master_header->magic = ntohl(CBFS_HEADER_MAGIC); + master_header->version = ntohl(VERSION); + master_header->romsize = htonl(romsize); + master_header->bootblocksize = htonl(bootblocksize); + master_header->align = htonl(align); + master_header->offset = htonl( + ALIGN((0x40 + bootblocksize), align)); + master_header->architecture = htonl(CBFS_ARCHITECTURE_ARMV7); + + ((uint32_t *) phys_to_virt(0x4))[0] = + virt_to_phys(master_header); + + recalculate_rom_geometry(romarea); + + cbfs_create_empty_file( + ALIGN((0x40 + bootblocksize), align), + romsize - ALIGN((bootblocksize + 0x40), align) + //- sizeof(struct cbfs_header) + - sizeof(struct cbfs_file) ); + break; + + case CBFS_ARCHITECTURE_X86: + // Set up physical/virtual mapping + offset = romarea + romsize - 0x100000000ULL; + + loadfile(bootblock, &bootblocksize, romarea + romsize, + SEEK_END); + master_header = (struct cbfs_header *)(romarea + romsize - + bootblocksize - sizeof(struct cbfs_header)); + + master_header->magic = ntohl(CBFS_HEADER_MAGIC); + master_header->version = ntohl(VERSION); + master_header->romsize = htonl(romsize); + master_header->bootblocksize = htonl(bootblocksize); + master_header->align = htonl(align); + master_header->offset = htonl(offs); + master_header->architecture = htonl(CBFS_ARCHITECTURE_X86); + + ((uint32_t *) phys_to_virt(CBFS_HEADPTR_ADDR_X86))[0] = + virt_to_phys(master_header); + + recalculate_rom_geometry(romarea); + + cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff, + romsize - offs - bootblocksize - + sizeof(struct cbfs_header) - + sizeof(struct cbfs_file) - 16); + break; + + default: + // Should not happen. + fprintf(stderr, "E: You found a bug in cbfstool.\n"); + exit(1); + } writerom(romfile, romarea, romsize); free(romarea); diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 4fcc1ee..b5258a3 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -29,6 +30,10 @@ extern void *offset; extern uint32_t romsize; extern int host_bigendian; +extern uint32_t arch; + +const char *arch_to_string(uint32_t a); +uint32_t string_to_arch(const char *arch_string); static inline void *phys_to_virt(uint32_t addr) {

1 0

Patch merged into coreboot/master: 421288d Make libgcc wrappers arch-specific, add ARMv7
by gerrit＠coreboot.org 29 Nov '12

29 Nov '12

the following patch was just integrated into master: commit 421288d6e6924bfb814ba06050be048b891719a9 Author: David Hendricks <dhendrix(a)chromium.org> Date: Wed Nov 28 20:19:23 2012 -0800 Make libgcc wrappers arch-specific, add ARMv7 Change-Id: Ia0bbd3bec6588219ce24951c0bcebefc6b6ec80e Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: http://review.coreboot.org/1940 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Thu Nov 29 23:57:08 2012, giving +1 Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Thu Nov 29 23:48:27 2012, giving +2 See http://review.coreboot.org/1940 for details. -gerrit

1 0

Patch merged into coreboot/master: 5367e47 Add dummy Kconfig options for armv7
by gerrit＠coreboot.org 29 Nov '12

29 Nov '12

the following patch was just integrated into master: commit 5367e47ef1d53cd2effafc0b4832af15bdc8fd21 Author: David Hendricks <dhendrix(a)chromium.org> Date: Wed Nov 28 20:16:28 2012 -0800 Add dummy Kconfig options for armv7 This adds a dummy config for ARMV7 for developing various follow-up patches which rely on ARCH_ARMV7. Change-Id: Id913054d916f41607d10ebc02aaf74082e14b554 Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: http://review.coreboot.org/1939 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Fri Nov 30 00:03:01 2012, giving +1 Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Thu Nov 29 23:48:20 2012, giving +2 See http://review.coreboot.org/1939 for details. -gerrit

1 0

Patch set updated for coreboot: 9c3e066 Add multi-architecture support to cbfstool
by Stefan Reinauer 29 Nov '12

29 Nov '12

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1944 -gerrit commit 9c3e06636ac32389f9cae6184801f81d1e6070d5 Author: David Hendricks <dhendrix(a)chromium.org> Date: Fri Nov 16 14:48:22 2012 -0800 Add multi-architecture support to cbfstool This is an initial re-factoring of CBFS code to enable multiple architectures. To achieve a clean solution, an additional field describing the architecture has to be added to the master header. Hence we also increase the version number in the master header. Change-Id: Icda681673221f8c27efbc46f16c2c5682b16a265 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- documentation/cbfs.txt | 24 +++- payloads/coreinfo/cbfs_module.c | 3 +- payloads/libpayload/include/cbfs_core.h | 24 +++- src/arch/x86/Makefile.inc | 2 +- src/include/cbfs_core.h | 26 ++-- util/cbfstool/cbfs-mkpayload.c | 12 +- util/cbfstool/cbfs-mkstage.c | 9 +- util/cbfstool/cbfs.h | 15 ++- util/cbfstool/cbfstool.c | 32 +++-- util/cbfstool/common.c | 211 +++++++++++++++++++++++++++----- util/cbfstool/common.h | 5 + 11 files changed, 290 insertions(+), 73 deletions(-) diff --git a/documentation/cbfs.txt b/documentation/cbfs.txt index 61f9f79..4b266f2 100644 --- a/documentation/cbfs.txt +++ b/documentation/cbfs.txt @@ -144,11 +144,15 @@ need to read the pointer and do the appropriate math to locate the header. The following is the structure of the master header: struct cbfs_header { - unsigned int magic; - unsigned int size; - unsigned int align; - unsigned int offset; -}; + u32 magic; + u32 version; + u32 romsize; + u32 bootblocksize; + u32 align; + u32 offset; + u32 architecture; + u32 pad[1]; +} __attribute__((packed)); The meaning of each member is as follows: @@ -156,9 +160,14 @@ The meaning of each member is as follows: magic number is 0x4F524243, which is 'ORBC' in ASCII. -'size' is the size of the ROM in bytes. Coreboot will subtract 'size' from +'version' is a version number for CBFS header. cbfs_header structure may be +different if version is not matched. + +'romsize' is the size of the ROM in bytes. Coreboot will subtract 'size' from 0xFFFFFFFF to locate the beginning of the ROM in memory. +'bootblocksize' is the size of bootblock reserved in firmware image. + 'align' is the number of bytes that each component is aligned to within the ROM. This is used to make sure that each component is aligned correctly with @@ -169,6 +178,9 @@ component at runtime without disturbing the others. the ROM). This is to allow for arbitrary space to be left at the beginning of the ROM for things like embedded controller firmware. +'architecture' describes which architecture (x86, arm, ...) this CBFS is created +for. + = Bootblock = The bootblock is a mandatory component in the ROM. It is located in the last diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c index ceb0e3c..0635747 100644 --- a/payloads/coreinfo/cbfs_module.c +++ b/payloads/coreinfo/cbfs_module.c @@ -41,7 +41,8 @@ struct cbheader { u32 bootblocksize; u32 align; u32 offset; - u32 pad[2]; + u32 architecture; + u32 pad[1]; } __attribute__ ((packed)); struct cbfile { diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index 70368f8..32f2670 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> + * Copyright (C) 2012 Google, Inc. * * This file is dual-licensed. You can choose between: * - The GNU GPL, version 2, as published by the Free Software Foundation @@ -76,13 +77,17 @@ /** 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. */ + actually lives is up to coreboot. On x86, 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 +#if CONFIG_ARCH_X86 +#define CBFS_HEADPTR_ADDR 0xFFFFFFFC +#endif #define VERSION1 0x31313131 +#define VERSION2 0x31313132 +#define VERSION VERSION2 struct cbfs_header { uint32_t magic; @@ -91,9 +96,17 @@ struct cbfs_header { uint32_t bootblocksize; uint32_t align; uint32_t offset; - uint32_t pad[2]; + uint32_t architecture; + uint32_t pad[1]; } __attribute__((packed)); +/* "Unknown" refers to CBFS headers version 1, + * before the architecture was defined (i.e., x86 only). + */ +#define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF +#define CBFS_ARCHITECTURE_X86 0x00000001 +#define CBFS_ARCHITECTURE_ARMV7 0x00000010 + /** This is a component header - every entry in the CBFS will have this header. @@ -178,4 +191,3 @@ void *cbfs_find_file(const char *name, int type); int cbfs_decompress(int algo, void *src, void *dst, int len); struct cbfs_header *get_cbfs_header(void); #endif - diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 68e5dcd..4afa7d5 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -65,7 +65,7 @@ prebuild-files = \ prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) - $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \ + $(CBFSTOOL) $@.tmp create -m x86 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \ -B $(objcbfs)/bootblock.bin -a 64 \ -o $$(( $(CONFIG_ROM_SIZE) - $(CONFIG_CBFS_SIZE) )) $(prebuild-files) true diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index 43e6b9b..32f2670 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> + * Copyright (C) 2012 Google, Inc. * * This file is dual-licensed. You can choose between: * - The GNU GPL, version 2, as published by the Free Software Foundation @@ -49,8 +50,6 @@ #ifndef _CBFS_CORE_H_ #define _CBFS_CORE_H_ -#include <arch/byteorder.h> - /** 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 @@ -78,13 +77,17 @@ /** 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. */ + actually lives is up to coreboot. On x86, 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 +#if CONFIG_ARCH_X86 +#define CBFS_HEADPTR_ADDR 0xFFFFFFFC +#endif #define VERSION1 0x31313131 +#define VERSION2 0x31313132 +#define VERSION VERSION2 struct cbfs_header { uint32_t magic; @@ -93,9 +96,17 @@ struct cbfs_header { uint32_t bootblocksize; uint32_t align; uint32_t offset; - uint32_t pad[2]; + uint32_t architecture; + uint32_t pad[1]; } __attribute__((packed)); +/* "Unknown" refers to CBFS headers version 1, + * before the architecture was defined (i.e., x86 only). + */ +#define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF +#define CBFS_ARCHITECTURE_X86 0x00000001 +#define CBFS_ARCHITECTURE_ARMV7 0x00000010 + /** This is a component header - every entry in the CBFS will have this header. @@ -180,4 +191,3 @@ void *cbfs_find_file(const char *name, int type); int cbfs_decompress(int algo, void *src, void *dst, int len); struct cbfs_header *get_cbfs_header(void); #endif - diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c index e4ef5c8..0d3986e 100644 --- a/util/cbfstool/cbfs-mkpayload.c +++ b/util/cbfstool/cbfs-mkpayload.c @@ -35,7 +35,7 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output, comp_algo algo) { Elf32_Phdr *phdr; - Elf32_Ehdr *ehdr; + Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input; Elf32_Shdr *shdr; char *header; char *strtab; @@ -48,16 +48,20 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output, int i; if(!iself(input)){ - printf("Fatal error: the payload file is not in ELF format!\n"); - exit(1); + fprintf(stderr, "E: The payload file is not in ELF format!\n"); + return -1; } + if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) && + !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) { + fprintf(stderr, "E: The payload file has the wrong architecture\n"); + return -1; + } comp_func_ptr compress = compression_function(algo); if (!compress) return -1; - ehdr = (Elf32_Ehdr *) input; headers = ehdr->e_phnum; header = (char *)ehdr; diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c index 55c81c6..0541d4b 100644 --- a/util/cbfstool/cbfs-mkstage.c +++ b/util/cbfstool/cbfs-mkstage.c @@ -4,6 +4,7 @@ * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> * 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -67,7 +68,13 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output, return -1; if (!iself(input)) { - fprintf(stderr, "E: The incoming file is not an ELF\n"); + fprintf(stderr, "E: The stage file is not in ELF format!\n"); + return -1; + } + + if (!((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARMV7)) && + !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) { + fprintf(stderr, "E: The stage file has the wrong architecture\n"); return -1; } diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index f161ed4..5251d65 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -21,6 +21,12 @@ #include <stdint.h> +#define CBFS_HEADER_MAGIC 0x4F524243 +#define CBFS_HEADPTR_ADDR_X86 0xFFFFFFFC +#define VERSION1 0x31313131 +#define VERSION2 0x31313132 +#define VERSION VERSION2 + struct cbfs_header { uint32_t magic; uint32_t version; @@ -28,9 +34,14 @@ struct cbfs_header { uint32_t bootblocksize; uint32_t align; uint32_t offset; - uint32_t pad[2]; + uint32_t architecture; /* Version 2 */ + uint32_t pad[1]; } __attribute__ ((packed)); +#define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF +#define CBFS_ARCHITECTURE_X86 0x00000001 +#define CBFS_ARCHITECTURE_ARMV7 0x00000010 + struct cbfs_file { uint8_t magic[8]; uint32_t len; @@ -94,7 +105,7 @@ struct cbfs_payload { */ #define CBFS_COMPONENT_NULL 0xFFFFFFFF -int cbfs_file_header(uint32_t physaddr); +int cbfs_file_header(unsigned long physaddr); struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size); #endif diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 66db379..a09e75b 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -3,6 +3,7 @@ * * Copyright (C) 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -372,6 +373,11 @@ static int cbfs_create(void) return 1; } + if (arch == CBFS_ARCHITECTURE_UNKNOWN) { + fprintf(stderr, "E: You need to specify -m/--machine arch\n"); + return 1; + } + return create_cbfs_image(cbfs_name, rom_size, rom_bootblock, rom_alignment, rom_offset); } @@ -450,7 +456,7 @@ static const struct command commands[] = { {"add-stage", "f:n:t:c:b:h?", cbfs_add_stage}, {"add-flat-binary", "f:n:l:e:c:b:h?", cbfs_add_flat_binary}, {"remove", "n:h?", cbfs_remove}, - {"create", "s:B:a:o:h?", cbfs_create}, + {"create", "s:B:a:o:m:h?", cbfs_create}, {"locate", "f:n:a:h?", cbfs_locate}, {"print", "h?", cbfs_print}, {"extract", "n:f:h?", cbfs_extract}, @@ -468,6 +474,7 @@ static struct option long_options[] = { {"alignment", required_argument, 0, 'a' }, {"offset", required_argument, 0, 'o' }, {"file", required_argument, 0, 'f' }, + {"arch", required_argument, 0, 'm' }, {"verbose", no_argument, 0, 'v' }, {"help", no_argument, 0, 'h' }, {NULL, 0, 0, 0 } @@ -481,26 +488,28 @@ static void usage(char *name) " %s FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n" " -h Display this help message\n\n" "COMMANDs:\n" - " add -f FILE -n NAME -t TYPE [-b base-address] " + " add -f FILE -n NAME -t TYPE [-b base-address] " "Add a component\n" - " add-payload -f FILE -n NAME [-c compression] [-b base] " + " add-payload -f FILE -n NAME [-c compression] [-b base] " "Add a payload to the ROM\n" - " add-stage -f FILE -n NAME [-c compression] [-b base] " + " add-stage -f FILE -n NAME [-c compression] [-b base] " "Add a stage to the ROM\n" " add-flat-binary -f FILE -n NAME -l load-address \\\n" - " -e entry-point [-c compression] [-b base] " + " -e entry-point [-c compression] [-b base] " "Add a 32bit flat mode binary\n" - " remove -n NAME " + " remove -n NAME " "Remove a component\n" - " create -s size -B bootblock [-a align] [-o offset] " + " create -s size -B bootblock -m ARCH [-a align] [-o offset] " "Create a ROM file\n" - " locate -f FILE -n NAME -a align " + " locate -f FILE -n NAME -a align " "Find a place for a file of that size\n" - " print " + " print " "Show the contents of the ROM\n" - " extract -n NAME -f FILE " + " extract -n NAME -f FILE " "Extracts a raw payload from ROM\n" "\n" + "ARCHes:\n" + " armv7, x86\n" "TYPEs:\n", name, name ); print_supported_filetypes(); @@ -610,6 +619,9 @@ int main(int argc, char **argv) case 'v': verbose++; break; + case 'm': + arch = string_to_arch(optarg); + break; case 'h': case '?': usage(argv[0]); diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 6c67c39..d29df60 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -3,6 +3,7 @@ * * Copyright (C) 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -73,16 +74,101 @@ static struct cbfs_header *master_header; static uint32_t phys_start, phys_end, align; uint32_t romsize; void *offset; +uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN; + +static struct { + uint32_t arch; + const char *name; +} arch_names[] = { + { CBFS_ARCHITECTURE_ARMV7, "armv7" }, + { CBFS_ARCHITECTURE_X86, "x86" }, + { CBFS_ARCHITECTURE_UNKNOWN, "unknown" } +}; + +uint32_t string_to_arch(const char *arch_string) +{ + int i; + uint32_t ret = CBFS_ARCHITECTURE_UNKNOWN; + + for (i = 0; i < ARRAY_SIZE(arch_names); i++) { + if (!strcasecmp(arch_string, arch_names[i].name)) { + ret = arch_names[i].arch; + break; + } + } + + return ret; +} + +const char *arch_to_string(uint32_t a) +{ + int i; + const char *ret = NULL; + + for (i = 0; i < ARRAY_SIZE(arch_names); i++) { + if (a == arch_names[i].arch) { + ret = arch_names[i].name; + break; + } + } + + return ret; + +} + +int find_master_header(void *romarea, size_t size) +{ + size_t offset; + + if (master_header) + return 0; + + for (offset = 0; offset < size - sizeof(struct cbfs_header); offset++) { + struct cbfs_header *tmp = romarea + offset; + + if (tmp->magic == ntohl(CBFS_HEADER_MAGIC)) { + master_header = tmp; + break; + } + } + + return master_header ? 0 : 1; +} void recalculate_rom_geometry(void *romarea) { - offset = romarea + romsize - 0x100000000ULL; - master_header = (struct cbfs_header *) - phys_to_virt(*((uint32_t *) phys_to_virt(0xfffffffc))); - phys_start = (0 - romsize + ntohl(master_header->offset)) & 0xffffffff; - phys_end = - (0 - ntohl(master_header->bootblocksize) - - sizeof(struct cbfs_header)) & 0xffffffff; + if (find_master_header(romarea, romsize)) { + fprintf(stderr, "E: Cannot find master header\n"); + exit(1); + } + + /* Update old headers */ + if (master_header->version == VERSION1 && + ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) { + printf("Updating CBFS master header to version 2\n"); + master_header->architecture = htonl(CBFS_ARCHITECTURE_X86); + } + + arch = ntohl(master_header->architecture); + + switch (arch) { + case CBFS_ARCHITECTURE_ARMV7: + offset = romarea; + phys_start = (0 + ntohl(master_header->offset)) & 0xffffffff; + phys_end = romsize & 0xffffffff; + break; + case CBFS_ARCHITECTURE_X86: + offset = romarea + romsize - 0x100000000ULL; + phys_start = (0 - romsize + ntohl(master_header->offset)) & + 0xffffffff; + phys_end = (0 - ntohl(master_header->bootblocksize) - + sizeof(struct cbfs_header)) & 0xffffffff; + break; + default: + fprintf(stderr, "E: Unknown architecture\n"); + exit(1); + } + align = ntohl(master_header->align); } @@ -114,7 +200,7 @@ int writerom(const char *filename, void *start, uint32_t size) return 0; } -int cbfs_file_header(uint32_t physaddr) +int cbfs_file_header(unsigned long physaddr) { /* maybe improve this test */ return (strncmp(phys_to_virt(physaddr), "LARCHIVE", 8) == 0); @@ -188,9 +274,10 @@ uint64_t intfiletype(const char *name) void print_cbfs_directory(const char *filename) { printf - ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\nAlignment: %d bytes\n\n", + ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n" + "Alignment: %d bytes, architecture: %s\n\n", basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize), - romsize, ntohl(master_header->offset), align); + romsize, ntohl(master_header->offset), align, arch_to_string(arch)); printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type"); uint32_t current = phys_start; while (current < phys_end) { @@ -206,8 +293,8 @@ void print_cbfs_directory(const char *filename) fname = "(empty)"; printf("%-30s 0x%-8x %-12s %d\n", fname, - current - phys_start, strfiletype(ntohl(thisfile->type)), - length); + current - phys_start + ntohl(master_header->offset), + strfiletype(ntohl(thisfile->type)), length); current = ALIGN(current + ntohl(thisfile->len) + ntohl(thisfile->offset), align); @@ -451,7 +538,7 @@ void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize, } int create_cbfs_image(const char *romfile, uint32_t _romsize, - const char *bootblock, uint32_t align, uint32_t offs) + const char *bootblock, uint32_t align, uint32_t offs) { uint32_t bootblocksize = 0; struct cbfs_header *master_header; @@ -466,9 +553,6 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize, } memset(romarea, 0xff, romsize); - // Set up physical/virtual mapping - offset = romarea + romsize - 0x100000000ULL; - if (align == 0) align = 64; @@ -481,24 +565,83 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize, return 1; } - master_header = - (struct cbfs_header *)(romarea + romsize - bootblocksize - - sizeof(struct cbfs_header)); - master_header->magic = ntohl(0x4f524243); - master_header->version = ntohl(0x31313131); - master_header->romsize = htonl(romsize); - master_header->bootblocksize = htonl(bootblocksize); - master_header->align = htonl(align); - master_header->offset = htonl(offs); - ((uint32_t *) phys_to_virt(0xfffffffc))[0] = - virt_to_phys(master_header); - - recalculate_rom_geometry(romarea); - - cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff, - romsize - offs - bootblocksize - - sizeof(struct cbfs_header) - - sizeof(struct cbfs_file) - 16); + // TODO(hungte) Replace magic numbers by named constants. + switch (arch) { + case CBFS_ARCHITECTURE_ARMV7: + /* Set up physical/virtual mapping */ + offset = romarea; + + // should be aligned to align but then we need to dynamically + // create the jump to the bootblock + loadfile(bootblock, &bootblocksize, romarea + 0x20 + + sizeof(struct cbfs_header), SEEK_SET); + master_header = (struct cbfs_header *)(romarea + 0x20); + uint32_t *arm_vec = (uint32_t *)romarea; + /* + * Encoding for this branch instruction is: + * 31:28 - condition (0xe for always/unconditional) + * 27:24 - 0xa + * 23: 0 - sign-extended offset (in multiples of 4) + * + * When executing the branch, the PC will read as the address + * of current instruction + 8. + */ + arm_vec[0] = htonl(0x0e0000ea); // branch to . + 64 bytes + + master_header->magic = ntohl(CBFS_HEADER_MAGIC); + master_header->version = ntohl(VERSION); + master_header->romsize = htonl(romsize); + master_header->bootblocksize = htonl(bootblocksize); + master_header->align = htonl(align); + master_header->offset = htonl( + ALIGN((0x40 + bootblocksize), align)); + master_header->architecture = htonl(CBFS_ARCHITECTURE_ARMV7); + + ((uint32_t *) phys_to_virt(0x4))[0] = + virt_to_phys(master_header); + + recalculate_rom_geometry(romarea); + + cbfs_create_empty_file( + ALIGN((0x40 + bootblocksize), align), + romsize - ALIGN((bootblocksize + 0x40), align) + //- sizeof(struct cbfs_header) + - sizeof(struct cbfs_file) ); + break; + + case CBFS_ARCHITECTURE_X86: + // Set up physical/virtual mapping + offset = romarea + romsize - 0x100000000ULL; + + loadfile(bootblock, &bootblocksize, romarea + romsize, + SEEK_END); + master_header = (struct cbfs_header *)(romarea + romsize - + bootblocksize - sizeof(struct cbfs_header)); + + master_header->magic = ntohl(CBFS_HEADER_MAGIC); + master_header->version = ntohl(VERSION); + master_header->romsize = htonl(romsize); + master_header->bootblocksize = htonl(bootblocksize); + master_header->align = htonl(align); + master_header->offset = htonl(offs); + master_header->architecture = htonl(CBFS_ARCHITECTURE_X86); + + ((uint32_t *) phys_to_virt(CBFS_HEADPTR_ADDR_X86))[0] = + virt_to_phys(master_header); + + recalculate_rom_geometry(romarea); + + cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff, + romsize - offs - bootblocksize - + sizeof(struct cbfs_header) - + sizeof(struct cbfs_file) - 16); + break; + + default: + // Should not happen. + fprintf(stderr, "E: You found a bug in cbfstool.\n"); + exit(1); + } writerom(romfile, romarea, romsize); free(romarea); diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 4fcc1ee..b5258a3 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -29,6 +30,10 @@ extern void *offset; extern uint32_t romsize; extern int host_bigendian; +extern uint32_t arch; + +const char *arch_to_string(uint32_t a); +uint32_t string_to_arch(const char *arch_string); static inline void *phys_to_virt(uint32_t addr) {

1 0

Patch merged into coreboot/master: f2e13b0 Add the maxim MAX77686 power controller.
by gerrit＠coreboot.org 29 Nov '12

29 Nov '12

the following patch was just integrated into master: commit f2e13b0b198455b83d2162a27704ad7a61eca286 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Wed Nov 28 10:44:12 2012 -0800 Add the maxim MAX77686 power controller. Create a new directory in drivers for power controllers. Add the MAXIM MAX77686 power control support. Accessing this controller requires I2C support. Note that this will not build until the I2C usage is changed for coreboot. I'm putting it in mainly because we need it soon and I want to see if the new directory is acceptable. Change-Id: I6c2a6d2165f33b41d2c8e4813222b21d2385e879 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> SIgned-off-by: Hung-Te Lin <hungte(a)chromium.org> Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Reviewed-on: http://review.coreboot.org/1938 Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Thu Nov 29 20:41:23 2012, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Thu Nov 29 20:53:52 2012, giving +2 See http://review.coreboot.org/1938 for details. -gerrit

1 0

Patch set updated for coreboot: 95ce4ff Add the maxim MAX77686 power controller.
by Ronald G. Minnich 29 Nov '12

29 Nov '12

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1938 -gerrit commit 95ce4ff7e9f047b54314ee5ccf30b316b5cf2e72 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Wed Nov 28 10:44:12 2012 -0800 Add the maxim MAX77686 power controller. Create a new directory in drivers for power controllers. Add the MAXIM MAX77686 power control support. Accessing this controller requires I2C support. Note that this will not build until the I2C usage is changed for coreboot. I'm putting it in mainly because we need it soon and I want to see if the new directory is acceptable. Change-Id: I6c2a6d2165f33b41d2c8e4813222b21d2385e879 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> SIgned-off-by: Hung-Te Lin <hungte(a)chromium.org> Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- src/drivers/power/Kconfig | 5 + src/drivers/power/Makefile.inc | 20 ++++ src/drivers/power/max77686.c | 257 +++++++++++++++++++++++++++++++++++++++++ src/drivers/power/max77686.h | 134 +++++++++++++++++++++ 4 files changed, 416 insertions(+) diff --git a/src/drivers/power/Kconfig b/src/drivers/power/Kconfig new file mode 100644 index 0000000..84ace13 --- /dev/null +++ b/src/drivers/power/Kconfig @@ -0,0 +1,5 @@ +config DRIVER_MAXIM_77686 + bool "Maxim 77686" + default n + help + Maxim 77686 power regulator diff --git a/src/drivers/power/Makefile.inc b/src/drivers/power/Makefile.inc new file mode 100644 index 0000000..3fc7104 --- /dev/null +++ b/src/drivers/power/Makefile.inc @@ -0,0 +1,20 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2012 The ChromiumOS Authors +## +## 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 +## + +driver-$(CONFIG_DRIVER_MAXIM_77686) += max77686.c diff --git a/src/drivers/power/max77686.c b/src/drivers/power/max77686.c new file mode 100644 index 0000000..8fbcb8f --- /dev/null +++ b/src/drivers/power/max77686.c @@ -0,0 +1,257 @@ +/* + * Copyright (C) 2012 Samsung Electronics + * Alim Akhtar <alim.akhtar(a)samsung.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * 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; either version 2 of + * the License, or (at your option) any later version. + * + * 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., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <smbus.h> +#include <max77686.h> + +/* Chip register numbers (not exported from this module) */ +enum { + REG_BBAT = 0x7e, + + /* Bits for BBAT */ + BBAT_BBCHOSTEN_MASK = 1 << 0, + BBAT_BBCVS_SHIFT = 3, + BBAT_BBCVS_MASK = 3 << BBAT_BBCVS_SHIFT, +}; + +/* + * Max77686 parameters values + * see max77686.h for parameters details + */ +struct max77686_para max77686_param[] = {/*{regnum, vol_addr, vol_bitpos, + vol_bitmask, reg_enaddr, reg_enbitpos, reg_enbitmask, reg_enbiton, + reg_enbitoff, vol_min, vol_div}*/ + {PMIC_BUCK1, 0x11, 0x0, 0x3F, 0x10, 0x0, 0x3, 0x3, 0x0, 750, 50000}, + {PMIC_BUCK2, 0x14, 0x0, 0xFF, 0x12, 0x4, 0x3, 0x1, 0x0, 600, 12500}, + {PMIC_BUCK3, 0x1E, 0x0, 0xFF, 0x1C, 0x4, 0x3, 0x1, 0x0, 600, 12500}, + {PMIC_BUCK4, 0x28, 0x0, 0xFF, 0x26, 0x4, 0x3, 0x1, 0x0, 600, 12500}, + {PMIC_BUCK5, 0x31, 0x0, 0x3F, 0x30, 0x0, 0x3, 0x3, 0x0, 750, 50000}, + {PMIC_BUCK6, 0x33, 0x0, 0x3F, 0x32, 0x0, 0x3, 0x3, 0x0, 750, 50000}, + {PMIC_BUCK7, 0x35, 0x0, 0x3F, 0x34, 0x0, 0x3, 0x3, 0x0, 750, 50000}, + {PMIC_BUCK8, 0x37, 0x0, 0x3F, 0x36, 0x0, 0x3, 0x3, 0x0, 750, 50000}, + {PMIC_BUCK9, 0x39, 0x0, 0x3F, 0x38, 0x0, 0x3, 0x3, 0x0, 750, 50000}, + {PMIC_LDO1, 0x40, 0x0, 0x3F, 0x40, 0x6, 0x3, 0x3, 0x0, 800, 25000}, + {PMIC_LDO2, 0x41, 0x0, 0x3F, 0x41, 0x6, 0x3, 0x1, 0x0, 800, 25000}, + {PMIC_LDO3, 0x42, 0x0, 0x3F, 0x42, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO4, 0x43, 0x0, 0x3F, 0x43, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO5, 0x44, 0x0, 0x3F, 0x44, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO6, 0x45, 0x0, 0x3F, 0x45, 0x6, 0x3, 0x1, 0x0, 800, 25000}, + {PMIC_LDO7, 0x46, 0x0, 0x3F, 0x46, 0x6, 0x3, 0x1, 0x0, 800, 25000}, + {PMIC_LDO8, 0x47, 0x0, 0x3F, 0x47, 0x6, 0x3, 0x1, 0x0, 800, 25000}, + {PMIC_LDO9, 0x48, 0x0, 0x3F, 0x48, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO10, 0x49, 0x0, 0x3F, 0x49, 0x6, 0x3, 0x1, 0x0, 800, 50000}, + {PMIC_LDO11, 0x4A, 0x0, 0x3F, 0x4A, 0x6, 0x3, 0x1, 0x0, 800, 50000}, + {PMIC_LDO12, 0x4B, 0x0, 0x3F, 0x4B, 0x6, 0x3, 0x1, 0x0, 800, 50000}, + {PMIC_LDO13, 0x4C, 0x0, 0x3F, 0x4C, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO14, 0x4D, 0x0, 0x3F, 0x4D, 0x6, 0x3, 0x1, 0x0, 800, 50000}, + {PMIC_LDO15, 0x4E, 0x0, 0x3F, 0x4E, 0x6, 0x3, 0x1, 0x0, 800, 25000}, + {PMIC_LDO16, 0x4F, 0x0, 0x3F, 0x4F, 0x6, 0x3, 0x1, 0x0, 800, 50000}, + {PMIC_LDO17, 0x50, 0x0, 0x3F, 0x50, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO18, 0x51, 0x0, 0x3F, 0x51, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO19, 0x52, 0x0, 0x3F, 0x52, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO20, 0x53, 0x0, 0x3F, 0x53, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO21, 0x54, 0x0, 0x3F, 0x54, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO22, 0x55, 0x0, 0x3F, 0x55, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO23, 0x56, 0x0, 0x3F, 0x56, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO24, 0x57, 0x0, 0x3F, 0x57, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO25, 0x58, 0x0, 0x3F, 0x58, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_LDO26, 0x59, 0x0, 0x3F, 0x59, 0x6, 0x3, 0x3, 0x0, 800, 50000}, + {PMIC_EN32KHZ_CP, 0x0, 0x0, 0x0, 0x7F, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0}, +}; + +/* + * Write a value to a register + * + * @param chip_addr i2c addr for max77686 + * @param reg reg number to write + * @param val value to be written + * + */ +static inline int max77686_i2c_write(unsigned char chip_addr, + unsigned int reg, unsigned char val) +{ + return i2c_write(chip_addr, reg, 1, &val, 1); +} + +/* + * Read a value from a register + * + * @param chip_addr i2c addr for max77686 + * @param reg reg number to write + * @param val value to be written + * + */ +static inline int max77686_i2c_read(unsigned char chip_addr, + unsigned int reg, unsigned char *val) +{ + return i2c_read(chip_addr, reg, 1, val, 1); +} + +/* + * Enable the max77686 register + * + * @param reg register number of buck/ldo to be enabled + * @param enable enable or disable bit + * + * REG_DISABLE = 0, + needed to set the buck/ldo enable bit OFF + * @return Return 0 if ok, else -1 + */ +static int max77686_enablereg(enum max77686_regnum reg, int enable) +{ + struct max77686_para *pmic; + unsigned char read_data; + int ret; + + pmic = &max77686_param[reg]; + + ret = max77686_i2c_read(MAX77686_I2C_ADDR, pmic->reg_enaddr, + &read_data); + if (ret != 0) { + debug("max77686 i2c read failed.\n"); + return -1; + } + + if (enable == REG_DISABLE) { + clrbits_8(&read_data, + pmic->reg_enbitmask << pmic->reg_enbitpos); + } else { + clrsetbits_8(&read_data, + pmic->reg_enbitmask << pmic->reg_enbitpos, + pmic->reg_enbiton << pmic->reg_enbitpos); + } + + ret = max77686_i2c_write(MAX77686_I2C_ADDR, + pmic->reg_enaddr, read_data); + if (ret != 0) { + debug("max77686 i2c write failed.\n"); + return -1; + } + + return 0; +} + +static int max77686_do_volsetting(enum max77686_regnum reg, unsigned int volt, + int enable, int volt_units) +{ + struct max77686_para *pmic; + unsigned char read_data; + int vol_level = 0; + int ret; + + pmic = &max77686_param[reg]; + + if (pmic->vol_addr == 0) { + debug("not a voltage register.\n"); + return -1; + } + + ret = max77686_i2c_read(MAX77686_I2C_ADDR, pmic->vol_addr, &read_data); + if (ret != 0) { + debug("max77686 i2c read failed.\n"); + return -1; + } + + if (volt_units == MAX77686_UV) + vol_level = volt - pmic->vol_min * 1000; + else + vol_level = (volt - pmic->vol_min) * 1000; + + if (vol_level < 0) { + debug("Not a valid voltage level to set\n"); + return -1; + } + vol_level /= pmic->vol_div; + + clrsetbits_8(&read_data, pmic->vol_bitmask << pmic->vol_bitpos, + vol_level << pmic->vol_bitpos); + + ret = max77686_i2c_write(MAX77686_I2C_ADDR, pmic->vol_addr, read_data); + if (ret != 0) { + debug("max77686 i2c write failed.\n"); + return -1; + } + + ret = max77686_enablereg(reg, enable); + if (ret != 0) { + debug("Failed to enable buck/ldo.\n"); + return -1; + } + + return 0; +} + +int max77686_volsetting(enum max77686_regnum reg, unsigned int volt, + int enable, int volt_units) +{ + int old_bus = i2c_get_bus_num(); + int ret; + + i2c_set_bus_num(0); + ret = max77686_do_volsetting(reg, volt, enable, volt_units); + i2c_set_bus_num(old_bus); + return ret; +} + +int max77686_enable_32khz_cp(void) +{ + i2c_set_bus_num(0); + return max77686_enablereg(PMIC_EN32KHZ_CP, REG_ENABLE); +} + +int max77686_disable_backup_batt(void) +{ + unsigned char val; + int ret; + + i2c_set_bus_num(0); + ret = max77686_i2c_read(MAX77686_I2C_ADDR, REG_BBAT, &val); + if (ret) { + debug("max77686 i2c read failed\n"); + return ret; + } + + /* If we already have the correct values, exit */ + if ((val & (BBAT_BBCVS_MASK | BBAT_BBCHOSTEN_MASK)) == + BBAT_BBCVS_MASK) + return 0; + + /* First disable charging */ + val &= ~BBAT_BBCHOSTEN_MASK; + ret = max77686_i2c_write(MAX77686_I2C_ADDR, REG_BBAT, val); + if (ret) { + debug("max77686 i2c write failed\n"); + return -1; + } + + /* Finally select 3.5V to minimize power consumption */ + val |= BBAT_BBCVS_MASK; + ret = max77686_i2c_write(MAX77686_I2C_ADDR, REG_BBAT, val); + if (ret) { + debug("max77686 i2c write failed\n"); + return -1; + } + + return 0; +} diff --git a/src/drivers/power/max77686.h b/src/drivers/power/max77686.h new file mode 100644 index 0000000..345471e --- /dev/null +++ b/src/drivers/power/max77686.h @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2012 Samsung Electronics + * Alim Akhtar <alim.akhtar(a)samsung.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * 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; either version 2 of + * the License, or (at your option) any later version. + * + * 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., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __MAX77686_H_ +#define __MAX77686_H_ + +enum max77686_regnum { + PMIC_BUCK1 = 0, + PMIC_BUCK2, + PMIC_BUCK3, + PMIC_BUCK4, + PMIC_BUCK5, + PMIC_BUCK6, + PMIC_BUCK7, + PMIC_BUCK8, + PMIC_BUCK9, + PMIC_LDO1, + PMIC_LDO2, + PMIC_LDO3, + PMIC_LDO4, + PMIC_LDO5, + PMIC_LDO6, + PMIC_LDO7, + PMIC_LDO8, + PMIC_LDO9, + PMIC_LDO10, + PMIC_LDO11, + PMIC_LDO12, + PMIC_LDO13, + PMIC_LDO14, + PMIC_LDO15, + PMIC_LDO16, + PMIC_LDO17, + PMIC_LDO18, + PMIC_LDO19, + PMIC_LDO20, + PMIC_LDO21, + PMIC_LDO22, + PMIC_LDO23, + PMIC_LDO24, + PMIC_LDO25, + PMIC_LDO26, + PMIC_EN32KHZ_CP, +}; + +/** + * struct max77686_para - max77686 register parameters + * @param vol_addr i2c address of the given buck/ldo register + * @param vol_bitpos bit position to be set or clear within register + * @param vol_bitmask bit mask value + * @param reg_enaddr control register address, which enable the given + * given buck/ldo. + * @param reg_enbitpos bit position to be enabled + * @param reg_enbiton value to be written to buck/ldo to make it ON + * @param reg_enbitoff value to be written to buck/ldo to make it OFF + * @param vol_min minimum voltage level supported by given buck/ldo + * @param vol_div voltage division value of given buck/ldo + */ +struct max77686_para { + enum max77686_regnum regnum; + u8 vol_addr; + u8 vol_bitpos; + u8 vol_bitmask; + u8 reg_enaddr; + u8 reg_enbitpos; + u8 reg_enbitmask; + u8 reg_enbiton; + u8 reg_enbitoff; + u32 vol_min; + u32 vol_div; +}; + +/* I2C device address for pmic max77686 */ +#define MAX77686_I2C_ADDR (0x12 >> 1) + +enum { + REG_DISABLE = 0, + REG_ENABLE +}; + +enum { + MAX77686_MV = 0, /* mili volt */ + MAX77686_UV /* micro volt */ +}; + +/** + * This function enables the 32KHz coprocessor clock. + * + * Return 0 if ok, else -1 + */ +int max77686_enable_32khz_cp(void); + +/** + * Set the required voltage level of pmic + * + * @param reg register number of buck/ldo to be set + * @param volt voltage level to be set + * @param enable enable or disable bit + * @param volt_units MAX77686_MV or MAX77686_UV, unit of the + * voltage parameters + * + * @return Return 0 if ok, else -1 + */ +int max77686_volsetting(enum max77686_regnum reg, unsigned int volt, + int enable, int volt_units); + +/** + * Disable charging of the RTC backup battery + * + * @return Return 0 if ok, else -1 + */ +int max77686_disable_backup_batt(void); + +#endif /* __MAX77686_PMIC_H_ */

1 0

New patch to review for coreboot: 97779b1 Add multi-architecture support to cbfstool
by Stefan Reinauer 29 Nov '12

29 Nov '12

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1944 -gerrit commit 97779b107fc26b26dedd141a51d9ae8c6aaa625c Author: David Hendricks <dhendrix(a)chromium.org> Date: Fri Nov 16 14:48:22 2012 -0800 Add multi-architecture support to cbfstool This is an initial re-factoring of CBFS code to enable multiple architectures. To achieve a clean solution, an additional field describing the architecture has to be added to the master header. Hence we also increase the version number in the master header. Change-Id: Icda681673221f8c27efbc46f16c2c5682b16a265 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- documentation/cbfs.txt | 24 +++- payloads/coreinfo/cbfs_module.c | 3 +- payloads/libpayload/include/cbfs_core.h | 24 +++- src/Kconfig | 4 + src/arch/x86/Makefile.inc | 2 +- src/include/cbfs_core.h | 26 ++-- util/cbfstool/cbfs-mkstage.c | 7 ++ util/cbfstool/cbfs.h | 15 ++- util/cbfstool/cbfstool.c | 32 +++-- util/cbfstool/common.c | 204 ++++++++++++++++++++++++++------ util/cbfstool/common.h | 11 ++ 11 files changed, 284 insertions(+), 68 deletions(-) diff --git a/documentation/cbfs.txt b/documentation/cbfs.txt index 61f9f79..4b266f2 100644 --- a/documentation/cbfs.txt +++ b/documentation/cbfs.txt @@ -144,11 +144,15 @@ need to read the pointer and do the appropriate math to locate the header. The following is the structure of the master header: struct cbfs_header { - unsigned int magic; - unsigned int size; - unsigned int align; - unsigned int offset; -}; + u32 magic; + u32 version; + u32 romsize; + u32 bootblocksize; + u32 align; + u32 offset; + u32 architecture; + u32 pad[1]; +} __attribute__((packed)); The meaning of each member is as follows: @@ -156,9 +160,14 @@ The meaning of each member is as follows: magic number is 0x4F524243, which is 'ORBC' in ASCII. -'size' is the size of the ROM in bytes. Coreboot will subtract 'size' from +'version' is a version number for CBFS header. cbfs_header structure may be +different if version is not matched. + +'romsize' is the size of the ROM in bytes. Coreboot will subtract 'size' from 0xFFFFFFFF to locate the beginning of the ROM in memory. +'bootblocksize' is the size of bootblock reserved in firmware image. + 'align' is the number of bytes that each component is aligned to within the ROM. This is used to make sure that each component is aligned correctly with @@ -169,6 +178,9 @@ component at runtime without disturbing the others. the ROM). This is to allow for arbitrary space to be left at the beginning of the ROM for things like embedded controller firmware. +'architecture' describes which architecture (x86, arm, ...) this CBFS is created +for. + = Bootblock = The bootblock is a mandatory component in the ROM. It is located in the last diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c index ceb0e3c..0635747 100644 --- a/payloads/coreinfo/cbfs_module.c +++ b/payloads/coreinfo/cbfs_module.c @@ -41,7 +41,8 @@ struct cbheader { u32 bootblocksize; u32 align; u32 offset; - u32 pad[2]; + u32 architecture; + u32 pad[1]; } __attribute__ ((packed)); struct cbfile { diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index 70368f8..32f2670 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> + * Copyright (C) 2012 Google, Inc. * * This file is dual-licensed. You can choose between: * - The GNU GPL, version 2, as published by the Free Software Foundation @@ -76,13 +77,17 @@ /** 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. */ + actually lives is up to coreboot. On x86, 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 +#if CONFIG_ARCH_X86 +#define CBFS_HEADPTR_ADDR 0xFFFFFFFC +#endif #define VERSION1 0x31313131 +#define VERSION2 0x31313132 +#define VERSION VERSION2 struct cbfs_header { uint32_t magic; @@ -91,9 +96,17 @@ struct cbfs_header { uint32_t bootblocksize; uint32_t align; uint32_t offset; - uint32_t pad[2]; + uint32_t architecture; + uint32_t pad[1]; } __attribute__((packed)); +/* "Unknown" refers to CBFS headers version 1, + * before the architecture was defined (i.e., x86 only). + */ +#define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF +#define CBFS_ARCHITECTURE_X86 0x00000001 +#define CBFS_ARCHITECTURE_ARMV7 0x00000010 + /** This is a component header - every entry in the CBFS will have this header. @@ -178,4 +191,3 @@ void *cbfs_find_file(const char *name, int type); int cbfs_decompress(int algo, void *src, void *dst, int len); struct cbfs_header *get_cbfs_header(void); #endif - diff --git a/src/Kconfig b/src/Kconfig index 188d0bd..77e5154 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -204,6 +204,10 @@ config ARCH_X86 bool default n +config ARCH_ARMV7 + bool + default n + # Warning: The file is included whether or not the if is here. # but the if controls how the evaluation occurs. if ARCH_X86 diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 68e5dcd..4afa7d5 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -65,7 +65,7 @@ prebuild-files = \ prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) - $(CBFSTOOL) $@.tmp create -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \ + $(CBFSTOOL) $@.tmp create -m x86 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \ -B $(objcbfs)/bootblock.bin -a 64 \ -o $$(( $(CONFIG_ROM_SIZE) - $(CONFIG_CBFS_SIZE) )) $(prebuild-files) true diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index 43e6b9b..32f2670 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> + * Copyright (C) 2012 Google, Inc. * * This file is dual-licensed. You can choose between: * - The GNU GPL, version 2, as published by the Free Software Foundation @@ -49,8 +50,6 @@ #ifndef _CBFS_CORE_H_ #define _CBFS_CORE_H_ -#include <arch/byteorder.h> - /** 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 @@ -78,13 +77,17 @@ /** 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. */ + actually lives is up to coreboot. On x86, 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 +#if CONFIG_ARCH_X86 +#define CBFS_HEADPTR_ADDR 0xFFFFFFFC +#endif #define VERSION1 0x31313131 +#define VERSION2 0x31313132 +#define VERSION VERSION2 struct cbfs_header { uint32_t magic; @@ -93,9 +96,17 @@ struct cbfs_header { uint32_t bootblocksize; uint32_t align; uint32_t offset; - uint32_t pad[2]; + uint32_t architecture; + uint32_t pad[1]; } __attribute__((packed)); +/* "Unknown" refers to CBFS headers version 1, + * before the architecture was defined (i.e., x86 only). + */ +#define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF +#define CBFS_ARCHITECTURE_X86 0x00000001 +#define CBFS_ARCHITECTURE_ARMV7 0x00000010 + /** This is a component header - every entry in the CBFS will have this header. @@ -180,4 +191,3 @@ void *cbfs_find_file(const char *name, int type); int cbfs_decompress(int algo, void *src, void *dst, int len); struct cbfs_header *get_cbfs_header(void); #endif - diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c index 55c81c6..a34a963 100644 --- a/util/cbfstool/cbfs-mkstage.c +++ b/util/cbfstool/cbfs-mkstage.c @@ -4,6 +4,7 @@ * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> * 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -71,6 +72,12 @@ int parse_elf_to_stage(unsigned char *input, unsigned char **output, return -1; } + if (!((ehdr->e_machine == EM_ARM) && (arch == ARCH_ARMV7)) && + !((ehdr->e_machine == EM_386) && (arch == ARCH_X86))) { + fprintf(stderr, "E: The incoming file has the wrong architecture\n"); + return -1; + } + if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) { elf_bigendian = 1; } diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index f161ed4..5251d65 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -21,6 +21,12 @@ #include <stdint.h> +#define CBFS_HEADER_MAGIC 0x4F524243 +#define CBFS_HEADPTR_ADDR_X86 0xFFFFFFFC +#define VERSION1 0x31313131 +#define VERSION2 0x31313132 +#define VERSION VERSION2 + struct cbfs_header { uint32_t magic; uint32_t version; @@ -28,9 +34,14 @@ struct cbfs_header { uint32_t bootblocksize; uint32_t align; uint32_t offset; - uint32_t pad[2]; + uint32_t architecture; /* Version 2 */ + uint32_t pad[1]; } __attribute__ ((packed)); +#define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF +#define CBFS_ARCHITECTURE_X86 0x00000001 +#define CBFS_ARCHITECTURE_ARMV7 0x00000010 + struct cbfs_file { uint8_t magic[8]; uint32_t len; @@ -94,7 +105,7 @@ struct cbfs_payload { */ #define CBFS_COMPONENT_NULL 0xFFFFFFFF -int cbfs_file_header(uint32_t physaddr); +int cbfs_file_header(unsigned long physaddr); struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size); #endif diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 66db379..55b6574 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -3,6 +3,7 @@ * * Copyright (C) 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -372,6 +373,11 @@ static int cbfs_create(void) return 1; } + if (arch == ARCH_UNKNOWN) { + fprintf(stderr, "E: You need to specify -m/--machine arch\n"); + return 1; + } + return create_cbfs_image(cbfs_name, rom_size, rom_bootblock, rom_alignment, rom_offset); } @@ -450,7 +456,7 @@ static const struct command commands[] = { {"add-stage", "f:n:t:c:b:h?", cbfs_add_stage}, {"add-flat-binary", "f:n:l:e:c:b:h?", cbfs_add_flat_binary}, {"remove", "n:h?", cbfs_remove}, - {"create", "s:B:a:o:h?", cbfs_create}, + {"create", "s:B:a:o:m:h?", cbfs_create}, {"locate", "f:n:a:h?", cbfs_locate}, {"print", "h?", cbfs_print}, {"extract", "n:f:h?", cbfs_extract}, @@ -468,6 +474,7 @@ static struct option long_options[] = { {"alignment", required_argument, 0, 'a' }, {"offset", required_argument, 0, 'o' }, {"file", required_argument, 0, 'f' }, + {"arch", required_argument, 0, 'm' }, {"verbose", no_argument, 0, 'v' }, {"help", no_argument, 0, 'h' }, {NULL, 0, 0, 0 } @@ -481,26 +488,28 @@ static void usage(char *name) " %s FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n" " -h Display this help message\n\n" "COMMANDs:\n" - " add -f FILE -n NAME -t TYPE [-b base-address] " + " add -f FILE -n NAME -t TYPE [-b base-address] " "Add a component\n" - " add-payload -f FILE -n NAME [-c compression] [-b base] " + " add-payload -f FILE -n NAME [-c compression] [-b base] " "Add a payload to the ROM\n" - " add-stage -f FILE -n NAME [-c compression] [-b base] " + " add-stage -f FILE -n NAME [-c compression] [-b base] " "Add a stage to the ROM\n" " add-flat-binary -f FILE -n NAME -l load-address \\\n" - " -e entry-point [-c compression] [-b base] " + " -e entry-point [-c compression] [-b base] " "Add a 32bit flat mode binary\n" - " remove -n NAME " + " remove -n NAME " "Remove a component\n" - " create -s size -B bootblock [-a align] [-o offset] " + " create -s size -B bootblock -m ARCH [-a align] [-o offset] " "Create a ROM file\n" - " locate -f FILE -n NAME -a align " + " locate -f FILE -n NAME -a align " "Find a place for a file of that size\n" - " print " + " print " "Show the contents of the ROM\n" - " extract -n NAME -f FILE " + " extract -n NAME -f FILE " "Extracts a raw payload from ROM\n" "\n" + "ARCHes:\n" + " armv7, x86\n" "TYPEs:\n", name, name ); print_supported_filetypes(); @@ -610,6 +619,9 @@ int main(int argc, char **argv) case 'v': verbose++; break; + case 'm': + arch = string_to_arch(optarg); + break; case 'h': case '?': usage(argv[0]); diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 6c67c39..dd630c9 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -3,6 +3,7 @@ * * Copyright (C) 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -73,16 +74,93 @@ static struct cbfs_header *master_header; static uint32_t phys_start, phys_end, align; uint32_t romsize; void *offset; +arch_t arch = ARCH_UNKNOWN; + +static struct { + arch_t arch; + const char *name; +} arch_names[] = { + { ARCH_ARMV7, "armv7" }, + { ARCH_X86, "x86" }, + { ARCH_UNKNOWN, "unknown" } +}; + +arch_t string_to_arch(const char *arch_string) +{ + int i; + arch_t ret = ARCH_UNKNOWN; + + for (i = 0; i < ARRAY_SIZE(arch_names); i++) { + if (!strcasecmp(arch_string, arch_names[i].name)) { + ret = arch_names[i].arch; + break; + } + } + + return ret; +} + +const char *arch_to_string(arch_t a) +{ + int i; + const char *ret = NULL; + + for (i = 0; i < ARRAY_SIZE(arch_names); i++) { + if (a == arch_names[i].arch) { + ret = arch_names[i].name; + break; + } + } + + return ret; + +} + +int find_master_header(void *romarea, size_t size) +{ + size_t offset; + + if (master_header) + return 0; + + for (offset = 0; offset < size; offset++) { + struct cbfs_header *tmp = romarea + offset; + + if (tmp->magic == ntohl(CBFS_HEADER_MAGIC)) { + master_header = tmp; + break; + } + } + + return master_header ? 0 : 1; +} void recalculate_rom_geometry(void *romarea) { - offset = romarea + romsize - 0x100000000ULL; - master_header = (struct cbfs_header *) - phys_to_virt(*((uint32_t *) phys_to_virt(0xfffffffc))); - phys_start = (0 - romsize + ntohl(master_header->offset)) & 0xffffffff; - phys_end = - (0 - ntohl(master_header->bootblocksize) - - sizeof(struct cbfs_header)) & 0xffffffff; + if (find_master_header(romarea, romsize)) { + printf("Cannot find master header\n"); + exit(1); + } + + switch (master_header->architecture) { + case CBFS_ARCHITECTURE_ARMV7: + offset = romarea; + phys_start = (0 + ntohl(master_header->offset)) & 0xffffffff; + phys_end = romsize & 0xffffffff; + break; + case CBFS_ARCHITECTURE_X86: + case CBFS_ARCHITECTURE_UNKNOWN: /* For old CBFS archives */ + offset = romarea + romsize - 0x100000000ULL; + phys_start = (0 - romsize + ntohl(master_header->offset)) & + 0xffffffff; + phys_end = (0 - ntohl(master_header->bootblocksize) - + sizeof(struct cbfs_header)) & 0xffffffff; + break; + default: + printf("Unknown architecture\n"); + exit(1); + } + align = ntohl(master_header->align); } @@ -114,7 +192,7 @@ int writerom(const char *filename, void *start, uint32_t size) return 0; } -int cbfs_file_header(uint32_t physaddr) +int cbfs_file_header(unsigned long physaddr) { /* maybe improve this test */ return (strncmp(phys_to_virt(physaddr), "LARCHIVE", 8) == 0); @@ -188,9 +266,10 @@ uint64_t intfiletype(const char *name) void print_cbfs_directory(const char *filename) { printf - ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\nAlignment: %d bytes\n\n", + ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n" + "Alignment: %d bytes, architecture: %s\n\n", basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize), - romsize, ntohl(master_header->offset), align); + romsize, ntohl(master_header->offset), align, arch_to_string(arch)); printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type"); uint32_t current = phys_start; while (current < phys_end) { @@ -206,8 +285,8 @@ void print_cbfs_directory(const char *filename) fname = "(empty)"; printf("%-30s 0x%-8x %-12s %d\n", fname, - current - phys_start, strfiletype(ntohl(thisfile->type)), - length); + current - phys_start + ntohl(master_header->offset), + strfiletype(ntohl(thisfile->type)), length); current = ALIGN(current + ntohl(thisfile->len) + ntohl(thisfile->offset), align); @@ -451,7 +530,7 @@ void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize, } int create_cbfs_image(const char *romfile, uint32_t _romsize, - const char *bootblock, uint32_t align, uint32_t offs) + const char *bootblock, uint32_t align, uint32_t offs) { uint32_t bootblocksize = 0; struct cbfs_header *master_header; @@ -466,9 +545,6 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize, } memset(romarea, 0xff, romsize); - // Set up physical/virtual mapping - offset = romarea + romsize - 0x100000000ULL; - if (align == 0) align = 64; @@ -481,24 +557,84 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize, return 1; } - master_header = - (struct cbfs_header *)(romarea + romsize - bootblocksize - - sizeof(struct cbfs_header)); - master_header->magic = ntohl(0x4f524243); - master_header->version = ntohl(0x31313131); - master_header->romsize = htonl(romsize); - master_header->bootblocksize = htonl(bootblocksize); - master_header->align = htonl(align); - master_header->offset = htonl(offs); - ((uint32_t *) phys_to_virt(0xfffffffc))[0] = - virt_to_phys(master_header); - - recalculate_rom_geometry(romarea); - - cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff, - romsize - offs - bootblocksize - - sizeof(struct cbfs_header) - - sizeof(struct cbfs_file) - 16); + // TODO(hungte) Replace magic numbers by named constants. + switch (arch) { + case ARCH_ARMV7: + /* Set up physical/virtual mapping */ + offset = romarea; + + // should be aligned to align but then we need to dynamically + // create the jump to the bootblock + loadfile(bootblock, &bootblocksize, romarea + 0x20 + + sizeof(struct cbfs_header), SEEK_SET); + master_header = (struct cbfs_header *)(romarea + 0x20); + uint32_t *arm_vec = (uint32_t *)romarea; + /* + * Encoding for this branch instruction is: + * 31:28 - condition (0xe for always/unconditional) + * 27:24 - 0xa + * 23: 0 - sign-extended offset (in multiples of 4) + * + * When executing the branch, the PC will read as the address + * of current instruction + 8. + */ + arm_vec[0] = htonl(0x0e0000ea); // branch to . + 64 bytes + + master_header->magic = ntohl(CBFS_HEADER_MAGIC); + master_header->version = ntohl(VERSION); + master_header->romsize = htonl(romsize); + master_header->bootblocksize = htonl(bootblocksize); + master_header->align = htonl(align); + master_header->offset = htonl( + ALIGN((0x40 + bootblocksize), align)); + /* FIXME: assume little-endian for now */ + master_header->architecture = CBFS_ARCHITECTURE_ARMV7; + + ((uint32_t *) phys_to_virt(0x4))[0] = + virt_to_phys(master_header); + + recalculate_rom_geometry(romarea); + + cbfs_create_empty_file( + ALIGN((0x40 + bootblocksize), align), + romsize - ALIGN((bootblocksize + 0x40), align) + //- sizeof(struct cbfs_header) + - sizeof(struct cbfs_file) ); + break; + + case ARCH_X86: + // Set up physical/virtual mapping + offset = romarea + romsize - 0x100000000ULL; + + loadfile(bootblock, &bootblocksize, romarea + romsize, + SEEK_END); + master_header = (struct cbfs_header *)(romarea + romsize - + bootblocksize - sizeof(struct cbfs_header)); + + master_header->magic = ntohl(CBFS_HEADER_MAGIC); + master_header->version = ntohl(VERSION1); + master_header->romsize = htonl(romsize); + master_header->bootblocksize = htonl(bootblocksize); + master_header->align = htonl(align); + master_header->offset = htonl(offs); + master_header->architecture = CBFS_ARCHITECTURE_X86; + + ((uint32_t *) phys_to_virt(CBFS_HEADPTR_ADDR_X86))[0] = + virt_to_phys(master_header); + + recalculate_rom_geometry(romarea); + + cbfs_create_empty_file((0 - romsize + offs) & 0xffffffff, + romsize - offs - bootblocksize - + sizeof(struct cbfs_header) - + sizeof(struct cbfs_file) - 16); + break; + + case ARCH_UNKNOWN: + // Should not happen. + printf("You found a bug in cbfstool.\n"); + exit(1); + } writerom(romfile, romarea, romsize); free(romarea); diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 4fcc1ee..1fa9b2f 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2009 coresystems GmbH * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * 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 @@ -30,6 +31,16 @@ extern void *offset; extern uint32_t romsize; extern int host_bigendian; +typedef enum { + ARCH_UNKNOWN, + ARCH_ARMV7, + ARCH_X86, +} arch_t; +extern arch_t arch; + +const char *arch_to_string(arch_t a); +arch_t string_to_arch(const char *arch_string); + static inline void *phys_to_virt(uint32_t addr) { return offset + addr;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
90
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 November 2012