coreboot-gerrit May 2015

coreboot-gerrit@coreboot.org

1 participants
1299 discussions

Patch merged into coreboot/master: 2591e93 secmon: allow for serial console
by gerrit＠coreboot.org 13 May '15

13 May '15

the following patch was just integrated into master: commit 2591e937e76ccb797d77adbcb667939ca9dfdae5 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed May 13 13:38:59 2015 -0500 secmon: allow for serial console Add necessary checks and objects for secmon serial console. Change-Id: Ibafa19061255ef6847a424922565a866328ff34c Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: http://review.coreboot.org/10197 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/10197 for details. -gerrit

1 0

Patch merged into coreboot/master: fd6fb26 verstage: provide support for serial console
by gerrit＠coreboot.org 13 May '15

13 May '15

the following patch was just integrated into master: commit fd6fb26ae77ae125fb9b9f0c7949e3e8b5796fd1 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed May 13 13:37:43 2015 -0500 verstage: provide support for serial console verstage previously lacked serial console support. Add the necessary objects and macro checks to allow verstage to include the serial console. Change-Id: Ibe911ad347cac0b089f5bc0d4263956f44f3d116 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: http://review.coreboot.org/10196 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/10196 for details. -gerrit

1 0

Patch merged into coreboot/master: ce2c50d vboot: indicate verstage loading on console
by gerrit＠coreboot.org 13 May '15

13 May '15

the following patch was just integrated into master: commit ce2c50d895ea57798c1eb4296f205d593288925d Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed May 13 13:33:27 2015 -0500 vboot: indicate verstage loading on console There was no indication of verstage being loaded. Provide this output so that one can follow the flow from console messages. Change-Id: I67ae6bb334608fe10a4a12fe690498afaf6b8366 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: http://review.coreboot.org/10195 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/10195 for details. -gerrit

1 0

Patch merged into coreboot/master: aab1326 console: enumerate all known stages
by gerrit＠coreboot.org 13 May '15

13 May '15

the following patch was just integrated into master: commit aab13266b1dca903ff25a0941a67586248a3fa66 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed May 13 13:32:11 2015 -0500 console: enumerate all known stages There are more stages than currently handled in the initial message from console_init(). Add support for those including an UNKNOWN catchall. Change-Id: I2374db590072bdca8ff35116e2ecb2ad6459b697 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-on: http://review.coreboot.org/10194 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/10194 for details. -gerrit

1 0

New patch to review for coreboot: bb8b768 secmon: allow for serial console
by Aaron Durbin 13 May '15

13 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/10197 -gerrit commit bb8b7687771f830fba3134be485a9cd7e91c6c8b Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed May 13 13:38:59 2015 -0500 secmon: allow for serial console Add necessary checks and objects for secmon serial console. Change-Id: Ibafa19061255ef6847a424922565a866328ff34c Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/include/console/uart.h | 2 +- src/lib/Makefile.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/console/uart.h b/src/include/console/uart.h index 7c744dd..1304003 100644 --- a/src/include/console/uart.h +++ b/src/include/console/uart.h @@ -57,7 +57,7 @@ void oxford_remap(unsigned int new_base); #define __CONSOLE_SERIAL_ENABLE__ CONFIG_CONSOLE_SERIAL && \ (ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_VERSTAGE || \ - (ENV_SMM && CONFIG_DEBUG_SMI)) + ENV_SECMON || (ENV_SMM && CONFIG_DEBUG_SMI)) #if __CONSOLE_SERIAL_ENABLE__ static inline void __uart_init(void) { uart_init(CONFIG_UART_FOR_CONSOLE); } diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 7d374c6..d6d7b84 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -147,6 +147,7 @@ $(obj)/lib/version.bootblock.o : $(obj)/build.h $(obj)/lib/version.romstage.o : $(obj)/build.h $(obj)/lib/version.ramstage.o : $(obj)/build.h $(obj)/lib/version.smm.o : $(obj)/build.h +$(obj)/lib/version.secmon.o : $(obj)/build.h $(obj)/lib/version.verstage.o : $(obj)/build.h romstage-y += bootmode.c

1 0

New patch to review for coreboot: 7bc8406 verstage: provide support for serial console
by Aaron Durbin 13 May '15

13 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/10196 -gerrit commit 7bc8406958736c491940859d8a1694af3f8451a0 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed May 13 13:37:43 2015 -0500 verstage: provide support for serial console verstage previously lacked serial console support. Add the necessary objects and macro checks to allow verstage to include the serial console. Change-Id: Ibe911ad347cac0b089f5bc0d4263956f44f3d116 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/console/Makefile.inc | 2 ++ src/drivers/uart/Makefile.inc | 1 + src/include/console/console.h | 2 +- src/include/console/uart.h | 2 +- src/lib/Makefile.inc | 2 ++ 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index 75a75eb..cae8f60 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -6,6 +6,8 @@ ramstage-y += die.c smm-$(CONFIG_DEBUG_SMI) += init.c console.c vtxprintf.c printk.c smm-$(CONFIG_SMM_TSEG) += die.c +verstage-y += init.c +verstage-y += printk.c verstage-y += vtxprintf.c verstage-y += console.c verstage-y += die.c diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc index 1c2b69e..509837e 100644 --- a/src/drivers/uart/Makefile.inc +++ b/src/drivers/uart/Makefile.inc @@ -4,6 +4,7 @@ romstage-y += util.c ramstage-y += util.c bootblock-y += util.c secmon-y += util.c +verstage-y += util.c smm-$(CONFIG_DEBUG_SMI) += util.c # Add the driver, only one can be enabled. The driver files may diff --git a/src/include/console/console.h b/src/include/console/console.h index ad93a9a..65e65bb 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -57,7 +57,7 @@ void __attribute__ ((noreturn)) die(const char *msg); #define __CONSOLE_ENABLE__ \ ((ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE) || \ - ENV_SECMON || \ + ENV_SECMON || ENV_VERSTAGE || \ ENV_ROMSTAGE || ENV_RAMSTAGE || (ENV_SMM && CONFIG_DEBUG_SMI)) #if __CONSOLE_ENABLE__ diff --git a/src/include/console/uart.h b/src/include/console/uart.h index 94933fe..7c744dd 100644 --- a/src/include/console/uart.h +++ b/src/include/console/uart.h @@ -56,7 +56,7 @@ static inline void *uart_platform_baseptr(int idx) void oxford_remap(unsigned int new_base); #define __CONSOLE_SERIAL_ENABLE__ CONFIG_CONSOLE_SERIAL && \ - (ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || \ + (ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_VERSTAGE || \ (ENV_SMM && CONFIG_DEBUG_SMI)) #if __CONSOLE_SERIAL_ENABLE__ diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index db83698..7d374c6 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -141,11 +141,13 @@ romstage-y += version.c ramstage-y += version.c smm-y += version.c secmon-y += version.c +verstage-y += version.c $(obj)/lib/version.bootblock.o : $(obj)/build.h $(obj)/lib/version.romstage.o : $(obj)/build.h $(obj)/lib/version.ramstage.o : $(obj)/build.h $(obj)/lib/version.smm.o : $(obj)/build.h +$(obj)/lib/version.verstage.o : $(obj)/build.h romstage-y += bootmode.c ramstage-y += bootmode.c

1 0

New patch to review for coreboot: 4a41b04 vboot: indicate verstage loading on console
by Aaron Durbin 13 May '15

13 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/10195 -gerrit commit 4a41b04b212140cbce36bf327b1f70596853bbf9 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed May 13 13:33:27 2015 -0500 vboot: indicate verstage loading on console There was no indication of verstage being loaded. Provide this output so that one can follow the flow from console messages. Change-Id: I67ae6bb334608fe10a4a12fe690498afaf6b8366 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/vendorcode/google/chromeos/vboot2/vboot_loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c index 9e60472..fd64798 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c @@ -94,6 +94,8 @@ static int vboot_loader_active(struct prog *prog) .name = CONFIG_CBFS_PREFIX "/verstage", }; + printk(BIOS_DEBUG, "VBOOT: Loading verstage.\n"); + /* load verstage from RO */ if (cbfs_load_prog_stage(CBFS_DEFAULT_MEDIA, &verstage)) die("failed to load verstage");

1 0

New patch to review for coreboot: 943a166 console: enumerate all known stages
by Aaron Durbin 13 May '15

13 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/10194 -gerrit commit 943a166a2565076c30f12e5a91a2226f4c945aad Author: Aaron Durbin <adurbin(a)chromium.org> Date: Wed May 13 13:32:11 2015 -0500 console: enumerate all known stages There are more stages than currently handled in the initial message from console_init(). Add support for those including an UNKNOWN catchall. Change-Id: I2374db590072bdca8ff35116e2ecb2ad6459b697 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/console/init.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/console/init.c b/src/console/init.c index dc727b0..5bca6ad 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -24,6 +24,7 @@ #include <console/streams.h> #include <device/pci.h> #include <option.h> +#include <rules.h> #include <version.h> /* While in romstage, console loglevel is built-time constant. */ @@ -49,12 +50,18 @@ void console_init(void) printk(BIOS_INFO, "\n\ncoreboot-%s%s %s %s starting...\n", coreboot_version, coreboot_extra_version, coreboot_build, -#if defined(__BOOTBLOCK__) +#if ENV_BOOTBLOCK "bootblock" -#elif defined(__PRE_RAM__) +#elif ENV_ROMSTAGE "romstage" -#else +#elif ENV_RAMSTAGE "ramstage" +#elif ENV_VERSTAGE + "verstage" +#elif ENV_SECMON + "secmon" +#else + "UNKNOWN" #endif ); }

1 0

New patch to review for coreboot: 0aec377 util/cbfstool: Fix FTBFS on Ubuntu 12.04
by Timothy Pearson 13 May '15

13 May '15

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10193 -gerrit commit 0aec3773edd69b16e22c2d567cde3c57ee10d04d Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Wed May 13 13:34:47 2015 -0500 util/cbfstool: Fix FTBFS on Ubuntu 12.04 Change-Id: I4569488bd2feb603e8c65be7ab967cb0ee43c66c Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- util/cbfstool/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 1aa9d76..a55475b 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -42,7 +42,7 @@ rmodobj += elfheaders.o rmodobj += xdr.o TOOLCFLAGS ?= -std=c99 -Werror -Wall -Wextra -TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow +TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings TOOLCPPFLAGS ?= -D_DEFAULT_SOURCE # memccpy() from string.h TOOLCPPFLAGS += -D_POSIX_C_SOURCE=200809L # strdup() from string.h

1 0

New patch to review for coreboot: 0a47718 util/cbfstool/fmd_scanner: Fix lint trailing whitespace error
by Timothy Pearson 13 May '15

13 May '15

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10192 -gerrit commit 0a4771857121366902c79cb1c2d3f79fc27a068a Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Wed May 13 13:34:28 2015 -0500 util/cbfstool/fmd_scanner: Fix lint trailing whitespace error Change-Id: Ia8756a93401bdf9d8d047a8080d995b6d3f3a73a Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- util/cbfstool/fmd_scanner.c | 84 ++++++++++++++++++++++----------------------- util/cbfstool/fmd_scanner.h | 6 ++-- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/util/cbfstool/fmd_scanner.c b/util/cbfstool/fmd_scanner.c index d0d93d3..bb5531e 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 ); 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2015