GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix code to allow usage of -Wall in libpayload and the sample (trivial). 

This even fixes two bugs:

 - get_cpu_speed() didn't return a value.

 - The line
     win->_color - PAIR_NUMBER(0);
   should actually be
     win->_color = PAIR_NUMBER(0);

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3182 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2008-03-20 20:46:44 +00:00
parent 35845a2acb
commit 14a3feb068
10 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
payloads/libpayload/Makefile
View File

@ -61,7 +61,7 @@ include $(PLATFORM-y) $(BUILD-y)
INCLUDES := -I./include
INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include
CFLAGS := -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
CFLAGS := -Wall -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
libpayload.a: $(TARGETS-y)
$(AR) rc $@ $(TARGETS-y)

2
payloads/libpayload/curses/colors.c
View File

@ -57,4 +57,6 @@ int pair_content(short index, short *fg, short *bg)
*bg = (color_pairs[index] >> 4) & 0xF;
*fg = color_pairs[index] & 0xF;
return 0;
}

1
payloads/libpayload/curses/keyboard.c
View File

@ -268,6 +268,7 @@ int wgetch(WINDOW *win)
int nodelay(WINDOW *win, NCURSES_BOOL flag)
{
win->_delay = flag ? 0 : -1;
return 0;
}
#ifdef CONFIG_VGA_CONSOLE

7
payloads/libpayload/curses/tinycurses.c
View File

@ -145,7 +145,7 @@ int delwin(WINDOW *win)
}
WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
{
WINDOW *win;
WINDOW *win = NULL;
int i;
int flags = _SUBWIN;
@ -167,6 +167,7 @@ WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
if (orig->_flags & _ISPAD)
flags |= _ISPAD;
// FIXME
//// if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy,
//// orig->_begx + begx, flags)) == 0)
//// return NULL;
@ -308,8 +309,8 @@ WINDOW *newwin(int num_lines, int num_columns, int begy, int begx)
win->_line = &ldat_list[ldat_count++];
/* FIXME: Is this right? Should the window attributes be normal? */
win->_color - PAIR_NUMBER(0);
/* FIXME: Is this right? Should the window attributes be normal? */
win->_color = PAIR_NUMBER(0);
win->_attrs = A_NORMAL;
for (i = 0; i < num_lines; i++)

2
payloads/libpayload/drivers/vga.c
View File

@ -184,7 +184,7 @@ void vga_putchar(unsigned int ch)
vga_fixup_cursor();
}
int vga_move_cursor(int x, int y)
void vga_move_cursor(int x, int y)
{
cursorx = x;
cursory = y;

2
payloads/libpayload/i386/coreboot.c
View File

@ -83,7 +83,7 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
for (i = 0; i < len; i += 16, ptr += 16) {
header = (struct cb_header *)ptr;
if (!strncmp(header->signature, "LBIO", 4))
if (!strncmp((const char *)header->signature, "LBIO", 4))
break;
}

2
payloads/libpayload/i386/main.c
View File

@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <arch/types.h>
#include <libpayload.h>
/*
* This structure seeds the stack. We provide the return address of our main

2
payloads/libpayload/i386/timer.c
View File

@ -62,6 +62,8 @@ unsigned int get_cpu_speed(void)
* Multiply that by the number of measured clocks to get the kHz value.
*/
cpu_khz = (unsigned int)((end - start) * 1193180U / (1000 * 0xffff));
return cpu_khz;
}
static inline void _delay(unsigned int delta)

2
payloads/libpayload/include/libpayload.h
View File

@ -59,7 +59,7 @@ void vga_fill(uint8_t ch, uint8_t attr);
void vga_clear(void);
void vga_putc(uint8_t row, uint8_t col, unsigned int c);
void vga_putchar(unsigned int ch);
int vga_move_cursor(int x, int y);
void vga_move_cursor(int x, int y);
void vga_init(void);
/* libc/console.c */

2
payloads/libpayload/sample/Makefile
View File

@ -37,7 +37,7 @@ INCLUDES += -I$(shell $(CC) $(CROSS_CFLAGS) -print-search-dirs | head -n 1 | cut
LIBPAYLOAD = ../libpayload.a
LIBGCC := $(shell $(CC) $(CROSS_CFLAGS) -print-libgcc-file-name)
CFLAGS := -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
CFLAGS := -Wall -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES)
all: hello.elf