coreboot-gerrit May 2015

coreboot-gerrit@coreboot.org

1 participants
1299 discussions

Patch set updated for coreboot: 58bcc1a cbfstool: Remove trailing whitespace
by HAOUAS Elyes 13 May '15

13 May '15

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10181 -gerrit commit 58bcc1ada8652fa33756a4d55f99841ac7ae4d3b Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Tue May 12 22:20:41 2015 +0200 cbfstool: Remove trailing whitespace Change-Id: I33ee9c8b420e1a8df2503a8d33a3760fff9b1851 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- util/cbfstool/fmd_scanner.c | 85 ++++++++++++++++++++++----------------------- util/cbfstool/fmd_scanner.h | 6 ++-- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/util/cbfstool/fmd_scanner.c b/util/cbfstool/fmd_scanner.c index d0d93d3..5547cd6 100644 --- a/util/cbfstool/fmd_scanner.c +++ b/util/cbfstool/fmd_scanner.c @@ -33,7 +33,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -50,7 +50,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; @@ -176,7 +176,7 @@ extern FILE *yyin, *yyout; #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) - + /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ @@ -233,7 +233,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -558,7 +558,7 @@ extern int yywrap (void ); #endif static void yyunput (int c,char *buf_ptr ); - + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ); #endif @@ -684,7 +684,7 @@ YY_DECL register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - + if ( !(yy_init) ) { (yy_init) = 1; @@ -1097,7 +1097,7 @@ static int yy_get_next_buffer (void) { register yy_state_type yy_current_state; register char *yy_cp; - + yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) @@ -1151,7 +1151,7 @@ static int yy_get_next_buffer (void) static void yyunput (int c, register char * yy_bp ) { register char *yy_cp; - + yy_cp = (yy_c_buf_p); /* undo effects of setting up yytext */ @@ -1194,7 +1194,7 @@ static int yy_get_next_buffer (void) { int c; - + *(yy_c_buf_p) = (yy_hold_char); if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) @@ -1261,12 +1261,12 @@ static int yy_get_next_buffer (void) /** Immediately switch to a different input stream. * @param input_file A readable stream. - * + * * @note This function does not reset the start condition to @c INITIAL . */ void yyrestart (FILE * input_file ) { - + if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -1279,11 +1279,11 @@ static int yy_get_next_buffer (void) /** Switch to a different input buffer. * @param new_buffer The new input buffer. - * + * */ void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { - + /* TODO. We should be able to replace this entire function body * with * yypop_buffer_state(); @@ -1323,13 +1323,13 @@ static void yy_load_buffer_state (void) /** Allocate and initialize an input buffer state. * @param file A readable stream. * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * + * * @return the allocated buffer state. */ YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) { YY_BUFFER_STATE b; - + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1352,11 +1352,11 @@ static void yy_load_buffer_state (void) /** Destroy the buffer. * @param b a buffer created with yy_create_buffer() - * + * */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - + if ( ! b ) return; @@ -1377,7 +1377,7 @@ static void yy_load_buffer_state (void) { int oerrno = errno; - + yy_flush_buffer(b ); b->yy_input_file = file; @@ -1393,13 +1393,13 @@ static void yy_load_buffer_state (void) } b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - + errno = oerrno; } /** Discard all buffered characters. On the next scan, YY_INPUT will be called. * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * + * */ void yy_flush_buffer (YY_BUFFER_STATE b ) { @@ -1428,7 +1428,7 @@ static void yy_load_buffer_state (void) * the current state. This function will allocate the stack * if necessary. * @param new_buffer The new state. - * + * */ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) { @@ -1458,7 +1458,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) /** Removes and deletes the top of the stack, if present. * The next element becomes the new top. - * + * */ void yypop_buffer_state (void) { @@ -1482,7 +1482,7 @@ void yypop_buffer_state (void) static void yyensure_buffer_stack (void) { yy_size_t num_to_alloc; - + if (!(yy_buffer_stack)) { /* First allocation is just for 2 elements, since we don't know if this @@ -1495,9 +1495,9 @@ static void yyensure_buffer_stack (void) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -1525,13 +1525,13 @@ static void yyensure_buffer_stack (void) /** Setup the input buffer state to scan directly from a user-specified character buffer. * @param base the character buffer * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. + * + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) @@ -1560,14 +1560,14 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan - * + * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) { - + return yy_scan_bytes(yystr,strlen(yystr) ); } @@ -1575,7 +1575,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. - * + * * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) @@ -1584,7 +1584,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len char *buf; yy_size_t n; yy_size_t i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; buf = (char *) yyalloc(n ); @@ -1638,16 +1638,16 @@ static void yy_fatal_error (yyconst char* msg ) /* Accessor methods (get/set functions) to struct members. */ /** Get the current line number. - * + * */ int yyget_lineno (void) { - + return yylineno; } /** Get the input stream. - * + * */ FILE *yyget_in (void) { @@ -1655,7 +1655,7 @@ FILE *yyget_in (void) } /** Get the output stream. - * + * */ FILE *yyget_out (void) { @@ -1663,7 +1663,7 @@ FILE *yyget_out (void) } /** Get the length of the current token. - * + * */ yy_size_t yyget_leng (void) { @@ -1671,7 +1671,7 @@ yy_size_t yyget_leng (void) } /** Get the current token. - * + * */ char *yyget_text (void) @@ -1681,18 +1681,18 @@ char *yyget_text (void) /** Set the current line number. * @param line_number - * + * */ void yyset_lineno (int line_number ) { - + yylineno = line_number; } /** Set the input stream. This does not discard the current * input buffer. * @param in_str A readable stream. - * + * * @see yy_switch_to_buffer */ void yyset_in (FILE * in_str ) @@ -1746,7 +1746,7 @@ static int yy_init_globals (void) /* yylex_destroy is for both reentrant and non-reentrant scanners. */ int yylex_destroy (void) { - + /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ yy_delete_buffer(YY_CURRENT_BUFFER ); @@ -1849,4 +1849,3 @@ int copy_string(const char *input) yylval.strval = strdup(input); return STRING; } - diff --git a/util/cbfstool/fmd_scanner.h b/util/cbfstool/fmd_scanner.h index 595b530..679aad5 100644 --- a/util/cbfstool/fmd_scanner.h +++ b/util/cbfstool/fmd_scanner.h @@ -36,7 +36,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -53,7 +53,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; @@ -178,7 +178,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */

1 0

Patch set updated for coreboot: 2c62cd8 libpayload: x86: correct types used for IO
by Aaron Durbin 12 May '15

12 May '15

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10186 -gerrit commit 2c62cd89c6d67a38ebd3b5555c06d8873519bcb5 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 12 16:46:27 2015 -0500 libpayload: x86: correct types used for IO libpayload on x86 defines u32 and uint32_t as typedefs of unsigned int. However, the readl/writel routines use long. With alias checking this throws type punning errors. Align the readl/writel/inl/outl types with the 32-bit fixed width ones that are exposed. Change-Id: Ie51cff8af4596948f6132e3cb743f1bc4ea8f204 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- payloads/libpayload/include/x86/arch/io.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/payloads/libpayload/include/x86/arch/io.h b/payloads/libpayload/include/x86/arch/io.h index 0cb610f..cd48d7c 100644 --- a/payloads/libpayload/include/x86/arch/io.h +++ b/payloads/libpayload/include/x86/arch/io.h @@ -33,13 +33,13 @@ #define readb(_a) (*(volatile const unsigned char *) (_a)) #define readw(_a) (*(volatile const unsigned short *) (_a)) -#define readl(_a) (*(volatile const unsigned long *) (_a)) +#define readl(_a) (*(volatile const unsigned int *) (_a)) #define writeb(_v, _a) (*(volatile unsigned char *) (_a) = (_v)) #define writew(_v, _a) (*(volatile unsigned short *) (_a) = (_v)) -#define writel(_v, _a) (*(volatile unsigned long *) (_a) = (_v)) +#define writel(_v, _a) (*(volatile unsigned int *) (_a) = (_v)) -static inline unsigned long inl(int port) +static inline unsigned int inl(int port) { unsigned long val; __asm__ __volatile__("inl %w1, %0" : "=a"(val) : "Nd"(port)); @@ -60,7 +60,7 @@ static inline unsigned char inb(int port) return val; } -static inline void outl(unsigned long val, int port) +static inline void outl(unsigned int val, int port) { __asm__ __volatile__("outl %0, %w1" : : "a"(val), "Nd"(port)); }

1 0

Patch merged into coreboot/master: 1f04e94 x86: expose tsc's timer_monotonic_get() in SMM
by gerrit＠coreboot.org 12 May '15

12 May '15

the following patch was just integrated into master: commit 1f04e94b7915ce599e49a71fd38cb72523c9c887 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 12 16:48:31 2015 -0500 x86: expose tsc's timer_monotonic_get() in SMM The implementation of timer_monotonic_get() for the tsc module was being guarded from SMM. Allow this to be linked into SMM as the generic spi flash driver now needs this support which can be included in SMM. Change-Id: I3909edecac8de117922c4ea6c53e6e561f6f435b Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: http://review.coreboot.org/10187 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/10187 for details. -gerrit

1 0

Patch merged into coreboot/master: 797ca1b baytrail: broadwell: correct refcode loading
by gerrit＠coreboot.org 12 May '15

12 May '15

the following patch was just integrated into master: commit 797ca1b71217675a1fcdde108b486e74632059a3 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 12 16:45:56 2015 -0500 baytrail: broadwell: correct refcode loading I messed up the conditionals on loading the reference code. The bug used || instead of && causing 2 reference codes to be loaded. Change-Id: I29a046bf0e8dc29a9efdb636ebfd04e11eb73f82 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: http://review.coreboot.org/10185 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/10185 for details. -gerrit

1 0

Patch merged into coreboot/master: 09560fa vboot: handle RELOCATABLE_RAMSTAGE
by gerrit＠coreboot.org 12 May '15

12 May '15

the following patch was just integrated into master: commit 09560facd4a599afbc8f2ed47f48a97aabf40579 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 12 16:43:10 2015 -0500 vboot: handle RELOCATABLE_RAMSTAGE The support for RELOCATABLE_RAMSTAGE was accidentally omitted in the vboot loader. Add said support. Change-Id: I569918823253c33f698acefd6a619133543c7aef Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: http://review.coreboot.org/10184 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/10184 for details. -gerrit

1 0

New patch to review for coreboot: c9354ae x86: expose tsc's timer_monotonic_get() in SMM
by Aaron Durbin 12 May '15

12 May '15

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10187 -gerrit commit c9354ae0d50300f0fa4e553e2aa7619b8b5262e4 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 12 16:48:31 2015 -0500 x86: expose tsc's timer_monotonic_get() in SMM The implementation of timer_monotonic_get() for the tsc module was being guarded from SMM. Allow this to be linked into SMM as the generic spi flash driver now needs this support which can be included in SMM. Change-Id: I3909edecac8de117922c4ea6c53e6e561f6f435b Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/cpu/x86/tsc/delay_tsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c index 07a4053..5aaba90 100644 --- a/src/cpu/x86/tsc/delay_tsc.c +++ b/src/cpu/x86/tsc/delay_tsc.c @@ -190,7 +190,7 @@ void udelay(unsigned us) } } -#if CONFIG_TSC_MONOTONIC_TIMER && !defined(__PRE_RAM__) && !defined(__SMM__) +#if CONFIG_TSC_MONOTONIC_TIMER && !defined(__PRE_RAM__) #include <timer.h> static struct monotonic_counter {

1 0

New patch to review for coreboot: 3ded1e9 libpayload: x86: correct types used for writel/readl
by Aaron Durbin 12 May '15

12 May '15

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10186 -gerrit commit 3ded1e93d41b10d812e9da327f201910d5f6e777 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 12 16:46:27 2015 -0500 libpayload: x86: correct types used for writel/readl libpayload on x86 defines u32 and uint32_t as typedefs of unsigned int. However, the readl/writel routines use long. With alias checking this throws type punning errors. Align the readl/writel types with the 32-bit fixed width ones that are exposed. Change-Id: Ie51cff8af4596948f6132e3cb743f1bc4ea8f204 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- payloads/libpayload/include/x86/arch/io.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/include/x86/arch/io.h b/payloads/libpayload/include/x86/arch/io.h index 0cb610f..de53c15 100644 --- a/payloads/libpayload/include/x86/arch/io.h +++ b/payloads/libpayload/include/x86/arch/io.h @@ -33,11 +33,11 @@ #define readb(_a) (*(volatile const unsigned char *) (_a)) #define readw(_a) (*(volatile const unsigned short *) (_a)) -#define readl(_a) (*(volatile const unsigned long *) (_a)) +#define readl(_a) (*(volatile const unsigned int *) (_a)) #define writeb(_v, _a) (*(volatile unsigned char *) (_a) = (_v)) #define writew(_v, _a) (*(volatile unsigned short *) (_a) = (_v)) -#define writel(_v, _a) (*(volatile unsigned long *) (_a) = (_v)) +#define writel(_v, _a) (*(volatile unsigned int *) (_a) = (_v)) static inline unsigned long inl(int port) {

1 0

New patch to review for coreboot: 935c839 baytrail: broadwell: correct refcode loading
by Aaron Durbin 12 May '15

12 May '15

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10185 -gerrit commit 935c8394ca8e71c2fab4cfda47031c14cf150b3a Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 12 16:45:56 2015 -0500 baytrail: broadwell: correct refcode loading I messed up the conditionals on loading the reference code. The bug used || instead of && causing 2 reference codes to be loaded. Change-Id: I29a046bf0e8dc29a9efdb636ebfd04e11eb73f82 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/soc/intel/baytrail/refcode.c | 2 +- src/soc/intel/broadwell/refcode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/soc/intel/baytrail/refcode.c b/src/soc/intel/baytrail/refcode.c index 558db3c..29a6461 100644 --- a/src/soc/intel/baytrail/refcode.c +++ b/src/soc/intel/baytrail/refcode.c @@ -112,7 +112,7 @@ static efi_wrapper_entry_t load_reference_code(void) return load_refcode_from_cache(); } - if (load_refcode_from_vboot(&refcode) || + if (load_refcode_from_vboot(&refcode) && load_refcode_from_cbfs(&refcode)) return NULL; diff --git a/src/soc/intel/broadwell/refcode.c b/src/soc/intel/broadwell/refcode.c index 201825a..0eb2ef3 100644 --- a/src/soc/intel/broadwell/refcode.c +++ b/src/soc/intel/broadwell/refcode.c @@ -108,7 +108,7 @@ static pei_wrapper_entry_t load_reference_code(void) return load_refcode_from_cache(); } - if (load_refcode_from_vboot(&refcode) || + if (load_refcode_from_vboot(&refcode) && load_refcode_from_cbfs(&refcode)) return NULL;

1 0

New patch to review for coreboot: 65e8701 vboot: handle RELOCATABLE_RAMSTAGE
by Aaron Durbin 12 May '15

12 May '15

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10184 -gerrit commit 65e870151548f426f04b1c75b876a1726c7a163e Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 12 16:43:10 2015 -0500 vboot: handle RELOCATABLE_RAMSTAGE The support for RELOCATABLE_RAMSTAGE was accidentally omitted in the vboot loader. Add said support. Change-Id: I569918823253c33f698acefd6a619133543c7aef Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/vendorcode/google/chromeos/vboot2/vboot_loader.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c index 505c9c0..9e60472 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c @@ -18,8 +18,10 @@ */ #include <cbfs.h> +#include <cbmem.h> #include <console/console.h> #include <program_loading.h> +#include <rmodule.h> #include <rules.h> #include <string.h> #include "misc.h" @@ -231,7 +233,15 @@ static int vboot_prepare(struct prog *prog) if (stage == 0) die("Vboot stage load failed."); - if (cbfs_load_prog_stage_by_offset(CBFS_DEFAULT_MEDIA, + if (ENV_ROMSTAGE && IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)) { + struct rmod_stage_load rmod_ram = { + .cbmem_id = CBMEM_ID_RAMSTAGE, + .prog = prog, + }; + + if (rmodule_stage_load(&rmod_ram, (void *)stage)) + die("Vboot couldn't load stage"); + } else if (cbfs_load_prog_stage_by_offset(CBFS_DEFAULT_MEDIA, prog, stage) < 0) die("Vboot couldn't load stage"); }

1 0

New patch to review for coreboot: ec94c70 DO NOT MERGE: Cyan configuration file
by Leroy P Leahy 12 May '15

12 May '15

Leroy P Leahy (leroy.p.leahy(a)intel.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10183 -gerrit commit ec94c703f8e1c2a3dec3a44eb3f80b800947aaaf Author: Lee Leahy <leroy.p.leahy(a)intel.com> Date: Tue May 12 14:12:26 2015 -0700 DO NOT MERGE: Cyan configuration file BRANCH=none BUG=None TEST=Build and run on cyan Change-Id: I265d35e1d6ba2c8a7c410018b0d738147fd10402 Signed-off-by: Lee Leahy <leroy.p.leahy(a)intel.com> --- .config | 66 ++++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/.config b/.config index 737d98a..3a004f9 100644 --- a/.config +++ b/.config @@ -64,12 +64,12 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" # CONFIG_VENDOR_GETAC is not set # CONFIG_VENDOR_GIGABYTE is not set # CONFIG_VENDOR_GIZMOSPHERE is not set -# CONFIG_VENDOR_GOOGLE is not set +CONFIG_VENDOR_GOOGLE=y # CONFIG_VENDOR_HP is not set # CONFIG_VENDOR_IBASE is not set # CONFIG_VENDOR_IBM is not set # CONFIG_VENDOR_IEI is not set -CONFIG_VENDOR_INTEL=y +# CONFIG_VENDOR_INTEL is not set # CONFIG_VENDOR_IWAVE is not set # CONFIG_VENDOR_IWILL is not set # CONFIG_VENDOR_JETWAY is not set @@ -102,9 +102,9 @@ CONFIG_VENDOR_INTEL=y # CONFIG_VENDOR_WINENT is not set # CONFIG_VENDOR_WYSE is not set CONFIG_BOARD_SPECIFIC_OPTIONS=y -CONFIG_MAINBOARD_DIR="intel/strago" -CONFIG_MAINBOARD_PART_NUMBER="Strago" -CONFIG_MAINBOARD_VENDOR="Intel" +CONFIG_MAINBOARD_DIR="google/cyan" +CONFIG_MAINBOARD_PART_NUMBER="Cyan" +CONFIG_MAINBOARD_VENDOR="Google" CONFIG_MAX_CPUS=4 CONFIG_VGA_BIOS_ID="8086,22b0" # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set @@ -124,22 +124,42 @@ CONFIG_UART_FOR_CONSOLE=0 CONFIG_ID_SECTION_OFFSET=0x80 CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_ME_BIN=y +# CONFIG_BOARD_GOOGLE_BOLT is not set +# CONFIG_BOARD_GOOGLE_BUTTERFLY is not set +# CONFIG_BOARD_GOOGLE_COSMOS is not set +CONFIG_BOARD_GOOGLE_CYAN=y +# CONFIG_BOARD_GOOGLE_DAISY is not set +# CONFIG_BOARD_GOOGLE_FALCO is not set +# CONFIG_BOARD_GOOGLE_LINK is not set +# CONFIG_BOARD_GOOGLE_NYAN_BIG is not set +# CONFIG_BOARD_GOOGLE_NYAN_BLAZE is not set +# CONFIG_BOARD_GOOGLE_NYAN is not set +# CONFIG_BOARD_GOOGLE_PANTHER is not set +# CONFIG_BOARD_GOOGLE_PARROT is not set +# CONFIG_BOARD_GOOGLE_PEACH_PIT is not set +# CONFIG_BOARD_GOOGLE_PEPPY is not set +# CONFIG_BOARD_GOOGLE_PURIN is not set +# CONFIG_BOARD_GOOGLE_RAMBI is not set +# CONFIG_BOARD_GOOGLE_RUSH is not set +# CONFIG_BOARD_GOOGLE_RUSH_RYU is not set +# CONFIG_BOARD_GOOGLE_SAMUS is not set +# CONFIG_BOARD_GOOGLE_SLIPPY is not set +# CONFIG_BOARD_GOOGLE_STORM is not set +# CONFIG_BOARD_GOOGLE_STOUT is not set +# CONFIG_BOARD_GOOGLE_URARA is not set +# CONFIG_BOARD_GOOGLE_VEYRON_BRAIN is not set +# CONFIG_BOARD_GOOGLE_VEYRON_DANGER is not set +# CONFIG_BOARD_GOOGLE_VEYRON_JERRY is not set +# CONFIG_BOARD_GOOGLE_VEYRON_MIGHTY is not set +# CONFIG_BOARD_GOOGLE_VEYRON_PINKY is not set +# CONFIG_BOARD_GOOGLE_VEYRON_RIALTO is not set +# CONFIG_BOARD_GOOGLE_VEYRON_SPEEDY is not set CONFIG_BOOT_MEDIA_SPI_BUS=0 +# CONFIG_DISPLAY_SPD_DATA is not set +# CONFIG_DYNAMIC_VNN_SUPPORT is not set +CONFIG_VBOOT_RAMSTAGE_INDEX=0x2 +CONFIG_VBOOT_REFCODE_INDEX=0x3 CONFIG_TTYS0_LCS=3 -# CONFIG_BOARD_INTEL_BAKERSPORT_FSP is not set -# CONFIG_BOARD_INTEL_BASKING_RIDGE is not set -# CONFIG_BOARD_INTEL_BAYLEYBAY_FSP is not set -# CONFIG_BOARD_INTEL_COUGAR_CANYON2 is not set -# CONFIG_BOARD_INTEL_D810E2CB is not set -# CONFIG_BOARD_INTEL_D945GCLF is not set -# CONFIG_BOARD_INTEL_EAGLEHEIGHTS is not set -# CONFIG_BOARD_INTEL_EMERALDLAKE2 is not set -# CONFIG_BOARD_INTEL_MINNOWMAX is not set -# CONFIG_BOARD_INTEL_MOHONPEAK is not set -# CONFIG_BOARD_INTEL_MTARVON is not set -CONFIG_BOARD_INTEL_STRAGO=y -# CONFIG_BOARD_INTEL_TRUXTON is not set -# CONFIG_BOARD_INTEL_WTM2 is not set # CONFIG_LOCK_MANAGEMENT_ENGINE is not set CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x100000 CONFIG_FSP_FILE="3rdparty/mainboard/$(MAINBOARDDIR)/fsp/BSWFSP.fd" @@ -148,10 +168,6 @@ CONFIG_VIRTUAL_ROM_SIZE=0x800000 CONFIG_POST_IO=y CONFIG_POST_DEVICE=y CONFIG_SEABIOS_MALLOC_UPPERMEMORY=y -# CONFIG_DISPLAY_SPD_DATA is not set -# CONFIG_DYNAMIC_VNN_SUPPORT is not set -CONFIG_VBOOT_RAMSTAGE_INDEX=0x2 -CONFIG_VBOOT_REFCODE_INDEX=0x3 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_MAINBOARD_VERSION="1.0" @@ -474,7 +490,7 @@ CONFIG_POST_DEVICE_NONE=y # CONFIG_POST_DEVICE_LPC is not set # CONFIG_POST_DEVICE_PCI_PCIE is not set CONFIG_POST_IO_PORT=0x80 -# CONFIG_HAVE_ACPI_RESUME is not set +CONFIG_HAVE_ACPI_RESUME=y # CONFIG_HAVE_ACPI_SLIC is not set CONFIG_HAVE_HARD_RESET=y CONFIG_HAVE_MONOTONIC_TIMER=y @@ -498,7 +514,7 @@ CONFIG_HAVE_ACPI_TABLES=y # CONFIG_GENERATE_MP_TABLE is not set # CONFIG_GENERATE_PIRQ_TABLE is not set CONFIG_GENERATE_SMBIOS_TABLES=y -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Strago" +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Cyan" # # Payload

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2015