March 2010 - coreboot - mail.coreboot.org

[commit] r5295 - in trunk/payloads/libpayload: . arch/i386 drivers drivers/video include include/i386/arch
by repository service March 25, 2010

March 25, 2010

Author: stepan Date: Thu Mar 25 19:56:26 2010 New Revision: 5295 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5295 Log: Add coreboot framebuffer support to libpayload Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Added: trunk/payloads/libpayload/drivers/video/corebootfb.c Modified: trunk/payloads/libpayload/Config.in trunk/payloads/libpayload/arch/i386/coreboot.c trunk/payloads/libpayload/drivers/Makefile.inc trunk/payloads/libpayload/drivers/video/geodelx.c trunk/payloads/libpayload/drivers/video/vga.c trunk/payloads/libpayload/drivers/video/video.c trunk/payloads/libpayload/include/coreboot_tables.h trunk/payloads/libpayload/include/i386/arch/endian.h trunk/payloads/libpayload/include/sysinfo.h trunk/payloads/libpayload/include/video_console.h Modified: trunk/payloads/libpayload/Config.in ============================================================================== --- trunk/payloads/libpayload/Config.in Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/Config.in Thu Mar 25 19:56:26 2010 (r5295) @@ -116,6 +116,14 @@ depends on VIDEO_CONSOLE default n +config COREBOOT_VIDEO_CONSOLE + bool "coreboot video console driver" + depends on VIDEO_CONSOLE && !GEODELX_VIDEO_CONSOLE + default n + help + Say Y here if coreboot switched to a graphics mode and + your payload wants to use it. + config PC_KEYBOARD bool "Allow input from a PC keyboard" default y Modified: trunk/payloads/libpayload/arch/i386/coreboot.c ============================================================================== --- trunk/payloads/libpayload/arch/i386/coreboot.c Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/arch/i386/coreboot.c Thu Mar 25 19:56:26 2010 (r5295) @@ -95,6 +95,13 @@ } #endif +#ifdef CONFIG_COREBOOT_VIDEO_CONSOLE +static void cb_parse_framebuffer(unsigned char *ptr, struct sysinfo_t *info) +{ + info->framebuffer = (struct cb_framebuffer *)ptr; +} +#endif + static int cb_parse_header(void *addr, int len, struct sysinfo_t *info) { struct cb_header *header; @@ -147,6 +154,13 @@ cb_parse_checksum(ptr, info); break; #endif +#ifdef CONFIG_COREBOOT_VIDEO_CONSOLE + // FIXME we should warn on serial if coreboot set up a + // framebuffer buf the payload does not know about it. + case CB_TAG_FRAMEBUFFER: + cb_parse_framebuffer(ptr, info); + break; +#endif } ptr += rec->size; Modified: trunk/payloads/libpayload/drivers/Makefile.inc ============================================================================== --- trunk/payloads/libpayload/drivers/Makefile.inc Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/drivers/Makefile.inc Thu Mar 25 19:56:26 2010 (r5295) @@ -48,6 +48,10 @@ TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/geodelx.o TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/font8x16.o +# coreboot generic framebuffer driver +TARGETS-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += drivers/video/corebootfb.o +TARGETS-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += drivers/video/font8x16.o + # USB stack TARGETS-$(CONFIG_USB) += drivers/usb/usbinit.o TARGETS-$(CONFIG_USB) += drivers/usb/usb.o Added: trunk/payloads/libpayload/drivers/video/corebootfb.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/drivers/video/corebootfb.c Thu Mar 25 19:56:26 2010 (r5295) @@ -0,0 +1,268 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * Copyright (C) 2010 coresystems GmbH + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <libpayload.h> +#include <coreboot_tables.h> +#include <pci.h> +#include <video_console.h> +#include <arch/msr.h> +#include "font8x16.h" + +struct video_console coreboot_video_console; + +static unsigned int cursor_x = 0, cursor_y = 0, cursor_en = 0; + +/* color definitions for the 16 standard colors */ + +#define VGA_COLOR_DEFAULT 7 +static const u32 vga_colors[] = { + // BLUE | GREEN | RED + (0x00 << 16) | (0x00 << 8) | 0x00, + (0xAA << 16) | (0x00 << 8) | 0x00, + (0x00 << 16) | (0xAA << 8) | 0x00, + (0xAA << 16) | (0x55 << 8) | 0x00, + (0x00 << 16) | (0x00 << 8) | 0xAA, + (0xAA << 16) | (0x00 << 8) | 0xAA, + (0x00 << 16) | (0xAA << 8) | 0xAA, + (0xAA << 16) | (0xAA << 8) | 0xAA, + (0x55 << 16) | (0x55 << 8) | 0x55, + (0xFF << 16) | (0x55 << 8) | 0x55, + (0x55 << 16) | (0xFF << 8) | 0x55, + (0xFF << 16) | (0xFF << 8) | 0x55, + (0x55 << 16) | (0x55 << 8) | 0xFF, + (0xFF << 16) | (0x55 << 8) | 0xFF, + (0x55 << 16) | (0xFF << 8) | 0xFF, + (0xFF << 16) | (0xFF << 8) | 0xFF, +}; + +/* Addresses for the various components */ +static unsigned long fbinfo; +static unsigned long fbaddr; +static unsigned long chars; + +#define FI ((struct cb_framebuffer *) phys_to_virt(fbinfo)) +#define FB ((unsigned char *) phys_to_virt(fbaddr)) +#define CHARS ((unsigned short *) phys_to_virt(chars)) + +static void corebootfb_scroll_up(void) +{ + unsigned char *dst = FB; + unsigned char *src = FB + (FI->bytes_per_line * FONT_HEIGHT); + int y; + + /* Scroll all lines up */ + for(y = 0; y < FI->y_resolution - FONT_HEIGHT; y++) { + memcpy(dst, src, FI->x_resolution * (FI->bits_per_pixel >> 3)); + + dst += FI->bytes_per_line; + src += FI->bytes_per_line; + } + + /* Erase last line */ + dst = FB + (FI->y_resolution - FONT_HEIGHT) * FI->bytes_per_line; + + for(; y < FI->y_resolution; y++) { + memset(dst, 0, FI->x_resolution * (FI->bits_per_pixel >> 3)); + dst += FI->bytes_per_line; + } + + /* And update the char buffer */ + dst = (unsigned char *) CHARS; + src = (unsigned char *) (CHARS + coreboot_video_console.columns); + memcpy(dst, src, coreboot_video_console.columns * + (coreboot_video_console.rows - 1) * 2); + int column; + for (column = 0; column < coreboot_video_console.columns; column++) + CHARS[(coreboot_video_console.rows - 1) * coreboot_video_console.columns + column] = (VGA_COLOR_DEFAULT << 8); + + cursor_y--; +} + +static void corebootfb_clear(void) +{ + int row, column; + unsigned char *ptr = FB; + + /* Clear the screen */ + for(row = 0; row < FI->y_resolution; row++) { + memset(ptr, 0, FI->x_resolution * (FI->bits_per_pixel >> 3)); + ptr += FI->bytes_per_line; + } + + /* And update the char buffer */ + for(row = 0; row < coreboot_video_console.rows; row++) + for (column = 0; column < coreboot_video_console.columns; column++) + CHARS[row * coreboot_video_console.columns + column] = (VGA_COLOR_DEFAULT << 8); +} + +static void corebootfb_putchar(u8 row, u8 col, unsigned int ch) +{ + unsigned char *dst; + unsigned char *glyph = font8x16 + ((ch & 0xFF) * FONT_HEIGHT); + + unsigned char bg = (ch >> 12) & 0xF; + unsigned char fg = (ch >> 8) & 0xF; + u32 fgval = 0, bgval = 0; + u16 *dst16; + u32 *dst32; + + int x, y; + + if (FI->bits_per_pixel > 8) { + bgval = ((((vga_colors[bg] >> 0) & 0xff) >> (8 - FI->blue_mask_size)) << FI->blue_mask_pos) | + ((((vga_colors[bg] >> 8) & 0xff) >> (8 - FI->green_mask_size)) << FI->green_mask_pos) | + ((((vga_colors[bg] >> 16) & 0xff) >> (8 - FI->red_mask_size)) << FI->red_mask_pos); + fgval = ((((vga_colors[fg] >> 0) & 0xff) >> (8 - FI->blue_mask_size)) << FI->blue_mask_pos) | + ((((vga_colors[fg] >> 8) & 0xff) >> (8 - FI->green_mask_size)) << FI->green_mask_pos) | + ((((vga_colors[fg] >> 16) & 0xff) >> (8 - FI->red_mask_size)) << FI->red_mask_pos); + } + + + dst = FB + ((row * FONT_HEIGHT) * FI->bytes_per_line); + dst += (col * FONT_WIDTH * (FI->bits_per_pixel >> 3)); + + for(y = 0; y < FONT_HEIGHT; y++) { + for(x = FONT_WIDTH - 1; x >= 0; x--) { + + switch (FI->bits_per_pixel) { + case 8: /* Indexed */ + dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3)] = (*glyph & (1 << x)) ? fg : bg; + break; + case 16: /* 16 bpp */ + dst16 = (u16 *)(dst + (FONT_WIDTH - x) * (FI->bits_per_pixel >> 3)); + *dst16 = (*glyph & (1 << x)) ? fgval : bgval; + break; + case 24: /* 24 bpp */ + if (*glyph & (1 << x)) { + dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 0] = fgval & 0xff; + dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 1] = (fgval >> 8) & 0xff; + dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 2] = (fgval >> 16) & 0xff; + } else { + dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 0] = bgval & 0xff; + dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 1] = (bgval >> 8) & 0xff; + dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 2] = (bgval >> 16) & 0xff; + } + break; + case 32: /* 32 bpp */ + dst32 = (u32 *)(dst + (FONT_WIDTH - x) * (FI->bits_per_pixel >> 3)); + *dst32 = (*glyph & (1 << x)) ? fgval : bgval; + break; + } + } + + dst += FI->bytes_per_line; + glyph++; + } +} + +static void corebootfb_putc(u8 row, u8 col, unsigned int ch) +{ + CHARS[row * coreboot_video_console.columns + col] = ch; + corebootfb_putchar(row, col, ch); +} + +static void corebootfb_update_cursor(void) +{ + int ch, paint; + if(cursor_en) { + ch = CHARS[cursor_y * coreboot_video_console.columns + cursor_x]; + paint = (ch & 0xff) | ((ch<<4) & 0xf000) | ((ch >> 4) & 0x0f00); + } else { + paint = CHARS[cursor_y * coreboot_video_console.columns + cursor_x]; + } + + if (cursor_y >= 0 && cursor_y < coreboot_video_console.rows) + corebootfb_putchar(cursor_y, cursor_x, paint); +} + +static void corebootfb_enable_cursor(int state) +{ + cursor_en = state; + corebootfb_update_cursor(); +} + +static void corebootfb_get_cursor(unsigned int *x, unsigned int *y, unsigned int *en) +{ + *x = cursor_x; + *y = cursor_y; + *en = cursor_en; +} + +static void corebootfb_set_cursor(unsigned int x, unsigned int y) +{ + int cursor_remember = cursor_en; + if (cursor_remember) + corebootfb_enable_cursor(0); + + cursor_x = x; + cursor_y = y; + + if (cursor_remember) + corebootfb_enable_cursor(1); +} + +static int corebootfb_init(void) +{ + if (lib_sysinfo.framebuffer == NULL) + return -1; + + fbinfo = (unsigned long)lib_sysinfo.framebuffer; + + fbaddr = FI->physical_address; + + coreboot_video_console.columns = FI->x_resolution / FONT_WIDTH; + coreboot_video_console.rows = FI->y_resolution / FONT_HEIGHT; + + chars = (unsigned long) malloc(coreboot_video_console.rows * + coreboot_video_console.columns * 2); + + // clear boot splash screen if there is one. + corebootfb_clear(); + + corebootfb_set_cursor(0, 0); + corebootfb_enable_cursor(1); + + return 0; +} + +struct video_console coreboot_video_console = { + .init = corebootfb_init, + .putc = corebootfb_putc, + .clear = corebootfb_clear, + .scroll_up = corebootfb_scroll_up, + + .get_cursor = corebootfb_get_cursor, + .set_cursor = corebootfb_set_cursor, + .enable_cursor = corebootfb_enable_cursor, + + .columns = 80, + .rows = 25 +}; + Modified: trunk/payloads/libpayload/drivers/video/geodelx.c ============================================================================== --- trunk/payloads/libpayload/drivers/video/geodelx.c Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/drivers/video/geodelx.c Thu Mar 25 19:56:26 2010 (r5295) @@ -287,5 +287,12 @@ .init = geodelx_init, .putc = geodelx_putc, .clear = geodelx_clear, - .scroll_up = geodelx_scroll_up + .scroll_up = geodelx_scroll_up, + + /* TODO .get_cursor */ + /* TODO .set_cursor */ + /* TODO .enable_cursor */ + + .columns = 80, + .rows = 25 }; Modified: trunk/payloads/libpayload/drivers/video/vga.c ============================================================================== --- trunk/payloads/libpayload/drivers/video/vga.c Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/drivers/video/vga.c Thu Mar 25 19:56:26 2010 (r5295) @@ -30,13 +30,15 @@ #include <libpayload.h> #include <video_console.h> +struct video_console vga_video_console; + #define VGA_COLOR_WHITE 7 #define CRTC_INDEX 0x3d4 #define CRTC_DATA 0x3d5 #define VIDEO(_r, _c)\ - ((u16 *) (phys_to_virt(0xB8000) + ((_r) * (VIDEO_COLS * 2)) + ((_c) * 2))) + ((u16 *) (phys_to_virt(0xB8000) + ((_r) * (vga_video_console.columns * 2)) + ((_c) * 2))) static u8 crtc_read(u8 index) { @@ -56,8 +58,8 @@ addr = ((unsigned int) crtc_read(0x0E)) << 8; addr += crtc_read(0x0F); - *x = addr % VIDEO_COLS; - *y = addr / VIDEO_COLS; + *x = addr % vga_video_console.columns; + *y = addr / vga_video_console.columns; *en = !(crtc_read(0x0A) & (1 << 5)); } @@ -66,7 +68,7 @@ { unsigned int addr; - addr = x + (VIDEO_COLS * y); + addr = x + (vga_video_console.columns * y); crtc_write(addr >> 8, 0x0E); crtc_write(addr, 0x0F); } @@ -89,7 +91,7 @@ int col; u16 *ptr = VIDEO(row, 0); - for(col = 0; col < VIDEO_COLS; col++) + for(col = 0; col < vga_video_console.columns; col++) ptr[col] = ((attr & 0xFF) << 8) | (ch & 0xFF); } @@ -99,16 +101,16 @@ u16 *dst = VIDEO(0,0); int i; - for(i = 0; i < (VIDEO_ROWS - 1) * VIDEO_COLS; i++) + for(i = 0; i < (vga_video_console.rows - 1) * vga_video_console.columns; i++) *dst++ = *src++; - vga_clear_line(VIDEO_ROWS - 1, ' ', VGA_COLOR_WHITE); + vga_clear_line(vga_video_console.rows - 1, ' ', VGA_COLOR_WHITE); } static void vga_fill(u8 ch, u8 attr) { u8 row; - for(row = 0; row < VIDEO_ROWS; row++) + for(row = 0; row < vga_video_console.rows; row++) vga_clear_line(row, ch, attr); } @@ -151,4 +153,7 @@ .get_cursor = vga_get_cursor, .set_cursor = vga_set_cursor, .enable_cursor = vga_enable_cursor, + + .columns = 80, + .rows = 25 }; Modified: trunk/payloads/libpayload/drivers/video/video.c ============================================================================== --- trunk/payloads/libpayload/drivers/video/video.c Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/drivers/video/video.c Thu Mar 25 19:56:26 2010 (r5295) @@ -35,6 +35,10 @@ extern struct video_console geodelx_video_console; #endif +#ifdef CONFIG_COREBOOT_VIDEO_CONSOLE +extern struct video_console coreboot_video_console; +#endif + #ifdef CONFIG_VGA_VIDEO_CONSOLE extern struct video_console vga_video_console; #endif @@ -44,6 +48,9 @@ #ifdef CONFIG_GEODELX_VIDEO_CONSOLE &geodelx_video_console, #endif +#ifdef CONFIG_COREBOOT_VIDEO_CONSOLE + &coreboot_video_console, +#endif #ifdef CONFIG_VGA_VIDEO_CONSOLE &vga_video_console, #endif @@ -66,12 +73,12 @@ if (cursory < 0) cursory = 0; - if (cursorx >= VIDEO_COLS) { + if (cursorx >= console->columns) { cursorx = 0; cursory++; } - while(cursory >= VIDEO_ROWS) { + while(cursory >= console->rows) { console->scroll_up(); cursory--; } @@ -112,10 +119,12 @@ void video_console_putchar(unsigned int ch) { /* replace black-on-black with light-gray-on-black. - do it here, instead of in libc/console.c */ + * do it here, instead of in libc/console.c + */ if ((ch & 0xFF00) == 0) { ch |= 0x0700; } + switch(ch & 0xFF) { case '\r': cursorx = 0; @@ -129,12 +138,12 @@ cursorx--; if (cursorx < 0) { cursory--; - cursorx = VIDEO_COLS; + cursorx = console->columns; } break; case '\t': - while(cursorx % 8 && cursorx < VIDEO_COLS) { + while(cursorx % 8 && cursorx < console->columns) { if (console) console->putc(cursory, cursorx, (ch & 0xFF00) | ' '); Modified: trunk/payloads/libpayload/include/coreboot_tables.h ============================================================================== --- trunk/payloads/libpayload/include/coreboot_tables.h Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/include/coreboot_tables.h Thu Mar 25 19:56:26 2010 (r5295) @@ -136,6 +136,26 @@ u64 forward; }; +#define CB_TAG_FRAMEBUFFER 0x0012 +struct cb_framebuffer { + u32 tag; + u32 size; + + u64 physical_address; + u32 x_resolution; + u32 y_resolution; + u32 bytes_per_line; + u8 bits_per_pixel; + u8 red_mask_pos; + u8 red_mask_size; + u8 green_mask_pos; + u8 green_mask_size; + u8 blue_mask_pos; + u8 blue_mask_size; + u8 reserved_mask_pos; + u8 reserved_mask_size; +}; + #define CB_TAG_CMOS_OPTION_TABLE 0x00c8 struct cb_cmos_option_table { u32 tag; Modified: trunk/payloads/libpayload/include/i386/arch/endian.h ============================================================================== --- trunk/payloads/libpayload/include/i386/arch/endian.h Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/include/i386/arch/endian.h Thu Mar 25 19:56:26 2010 (r5295) @@ -38,4 +38,9 @@ (( (in) & 0xFF0000) >> 8) | (( (in) & 0xFF000000) >> 24)) #define ntohll(in) (((u64) ntohl( (in) & 0xFFFFFFFF) << 32) | ((u64) ntohl( (in) >> 32))) + +#define htonw(in) ntohw(in) +#define htonl(in) ntohl(in) +#define htonll(in) ntohll(in) + #endif Modified: trunk/payloads/libpayload/include/sysinfo.h ============================================================================== --- trunk/payloads/libpayload/include/sysinfo.h Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/include/sysinfo.h Thu Mar 25 19:56:26 2010 (r5295) @@ -50,6 +50,8 @@ u32 cmos_range_end; u32 cmos_checksum_location; + struct cb_framebuffer *framebuffer; + unsigned long *mbtable; /** Pointer to the multiboot table */ }; Modified: trunk/payloads/libpayload/include/video_console.h ============================================================================== --- trunk/payloads/libpayload/include/video_console.h Thu Mar 25 19:54:43 2010 (r5294) +++ trunk/payloads/libpayload/include/video_console.h Thu Mar 25 19:56:26 2010 (r5295) @@ -30,9 +30,6 @@ #ifndef _VIDEO_CONSOLE_H #define _VIDEO_CONSOLE_H -#define VIDEO_ROWS 25 -#define VIDEO_COLS 80 - struct video_console { int (*init)(void); void (*putc)(u8, u8, unsigned int); @@ -42,6 +39,9 @@ void (*get_cursor)(unsigned int *, unsigned int *, unsigned int *); void (*set_cursor)(unsigned int, unsigned int); void (*enable_cursor)(int); + + unsigned int rows; + unsigned int columns; }; #endif

1 0

[commit] r5294 - trunk/payloads/libpayload/bin
by repository service March 25, 2010

March 25, 2010

Author: stepan Date: Thu Mar 25 19:54:43 2010 New Revision: 5294 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5294 Log: don't hardcode i386 in lpgcc Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Modified: trunk/payloads/libpayload/bin/lpgcc Modified: trunk/payloads/libpayload/bin/lpgcc ============================================================================== --- trunk/payloads/libpayload/bin/lpgcc Thu Mar 25 19:54:08 2010 (r5293) +++ trunk/payloads/libpayload/bin/lpgcc Thu Mar 25 19:54:43 2010 (r5294) @@ -102,10 +102,12 @@ if [ "$CONFIG_TARGET_I386" = "y" ]; then _ARCHINCDIR=$_INCDIR/i386 + _ARCHLIBDIR=$_LIBDIR/i386 fi if [ "$CONFIG_TARGET_POWERPC" = "y" ]; then _ARCHINCDIR=$_INCDIR/powerpc + _ARCHLIBDIR=$_LIBDIR/powerpc fi _CFLAGS="-m32 -nostdinc -nostdlib -I$_INCDIR -I$_ARCHINCDIR" @@ -128,13 +130,13 @@ else _LIBGCC=`$DEFAULT_CC -m32 -print-libgcc-file-name` if [ $DEBUGME -eq 1 ]; then - echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $_LIBDIR/i386/head.o $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC" + echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $_ARCHLIBDIR/head.o $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC" fi - # Note: i386/head.o must be the first object being linked, because it + # Note: $_ARCHLIBDIR/head.o must be the first object being linked, because it # contains a Multiboot header. The Multiboot standard requires this # header to be placed below 0x2000 in the resulting image. See: # http://www.gnu.org/software/grub/manual/multiboot/html_node/OS-image-format… - $DEFAULT_CC $_CFLAGS $_LDFLAGS $_LIBDIR/i386/head.o $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC + $DEFAULT_CC $_CFLAGS $_LDFLAGS $_ARCHLIBDIR/head.o $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC fi

1 0

[commit] r5293 - trunk/payloads/libpayload
by repository service March 25, 2010

March 25, 2010

Author: stepan Date: Thu Mar 25 19:54:08 2010 New Revision: 5293 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5293 Log: allow libpayload to completely build out of tree. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Modified: trunk/payloads/libpayload/Makefile Modified: trunk/payloads/libpayload/Makefile ============================================================================== --- trunk/payloads/libpayload/Makefile Thu Mar 25 19:53:20 2010 (r5292) +++ trunk/payloads/libpayload/Makefile Thu Mar 25 19:54:08 2010 (r5293) @@ -35,7 +35,7 @@ export objk := $(src)/build/util/kconfig export KERNELVERSION := 0.2.0 -export KCONFIG_AUTOHEADER := $(src)/include/libpayload-config.h +export KCONFIG_AUTOHEADER := $(obj)/include/libpayload-config.h export KCONFIG_AUTOCONFIG := $(obj)/auto.conf CONFIG_SHELL := sh @@ -52,8 +52,8 @@ CC = gcc HOSTCC = gcc HOSTCXX = g++ -HOSTCFLAGS := -I$(srck) -I$(objk) -HOSTCXXFLAGS := -I$(srck) -I$(objk) +HOSTCFLAGS := -I$(srck) -I$(objk) -pipe +HOSTCXXFLAGS := -I$(srck) -I$(objk) -pipe DESTDIR = /opt @@ -85,7 +85,7 @@ include $(PLATFORM-y) $(BUILD-y) OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y)) -INCLUDES := -Iinclude -Ibuild -Iinclude/$(ARCHDIR-y) +INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) -I$(obj)/include INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include try-run= $(shell set -e; \ @@ -101,16 +101,15 @@ STACKPROTECT += $(call cc-option, -fno-stack-protector,) # TODO: Re-add -Os as soon as we find out why it caused problems. -CFLAGS := -Wall -Werror $(STACKPROTECT) -nostdinc $(INCLUDES) -ffreestanding +CFLAGS := -Wall -Werror $(STACKPROTECT) -nostdinc $(INCLUDES) -ffreestanding -pipe all: lib -lib: $(obj)/lib/libpayload.a copystuff +lib: $(obj)/lib/libpayload.a $(obj)/lib/$(ARCHDIR-y)/head.o -# Copy libpayload.a and head.o into $(src)/lib where lpgcc et al expect them. -copystuff: $(obj)/arch/$(ARCHDIR-y)/head.S.o $(obj)/lib/libpayload.a - $(Q)cp $(obj)/arch/$(ARCHDIR-y)/head.S.o $(src)/lib/$(ARCHDIR-y)/head.o - $(Q)cp $(obj)/lib/libpayload.a $(src)/lib +$(obj)/lib/$(ARCHDIR-y)/head.o: $(obj)/arch/$(ARCHDIR-y)/head.S.o + $(Q)printf " CP $(subst $(shell pwd)/,,$(@))\n" + $(Q)cp $< $@ $(obj)/lib/libpayload.a: prepare $(OBJS) $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" @@ -121,26 +120,30 @@ install: lib $(Q)printf " INSTALL $(DESTDIR)/libpayload/lib\n" $(Q)install -m 755 -d $(DESTDIR)/libpayload/lib - $(Q)cp -r lib/* $(DESTDIR)/libpayload/lib/ + $(Q)install -m 644 $(obj)/lib/libpayload.a $(DESTDIR)/libpayload/lib/ + $(Q)install -m 755 -d $(DESTDIR)/libpayload/lib/$(ARCHDIR-y) + $(Q)install -m 644 $(obj)/lib/$(ARCHDIR-y)/head.o $(DESTDIR)/libpayload/lib/$(ARCHDIR-y) $(Q)printf " INSTALL $(DESTDIR)/libpayload/include\n" $(Q)install -m 755 -d $(DESTDIR)/libpayload/include $(Q)for file in `find include -name *.h -type f`; do \ install -m 755 -d $(DESTDIR)/libpayload/`dirname $$file`; \ install -m 644 $$file $(DESTDIR)/libpayload/$$file; \ done + $(Q)install -m 644 $(KCONFIG_AUTOHEADER) $(DESTDIR)/libpayload/include $(Q)printf " INSTALL $(DESTDIR)/libpayload/bin\n" $(Q)install -m 755 -d $(DESTDIR)/libpayload/bin $(Q)install -m 755 bin/lpgcc $(DESTDIR)/libpayload/bin $(Q)install -m 755 bin/lpas $(DESTDIR)/libpayload/bin $(Q)install -m 644 bin/lp.functions $(DESTDIR)/libpayload/bin - $(Q)install -m 644 $(KCONFIG_AUTOCONFIG) $(DESTDIR)/libpayload/libpayload.config + $(Q)install -m 644 .config $(DESTDIR)/libpayload/libpayload.config prepare: $(Q)mkdir -p $(obj)/util/kconfig/lxdialog $(Q)mkdir -p $(obj)/crypto $(obj)/curses $(obj)/drivers/video $(Q)mkdir -p $(obj)/drivers/usb $(Q)mkdir -p $(obj)/arch/$(ARCHDIR-y) $(obj)/lib/$(ARCHDIR-y) $(obj)/libc - $(Q)mkdir -p $(src)/lib/$(ARCHDIR-y) + $(Q)mkdir -p $(obj)/lib/$(ARCHDIR-y) + $(Q)mkdir -p $(obj)/include doxy: doxygen doxygen: @@ -153,12 +156,10 @@ clean: doxygen-clean $(Q)rm -rf $(obj)/crypto $(obj)/curses $(obj)/drivers $(Q)rm -rf $(obj)/i386 $(obj)/powerpc $(obj)/lib $(obj)/libc - $(Q)rm -rf $(src)/lib/i386 $(src)/lib/powerpc $(src)/lib/libpayload.a distclean: clean - $(Q)rm -rf build + $(Q)rm -rf build # should be $(obj) ? $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* - $(Q)rm -f $(src)/include/libpayload-config.h # This include must come _before_ the pattern rules below! # Order _does_ matter for pattern rules.

1 0

[commit] r5292 - trunk/payloads/libpayload/arch/i386
by repository service March 25, 2010

March 25, 2010

Author: stepan Date: Thu Mar 25 19:53:20 2010 New Revision: 5292 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5292 Log: prevent timer overflows in libpayload Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Modified: trunk/payloads/libpayload/arch/i386/timer.c Modified: trunk/payloads/libpayload/arch/i386/timer.c ============================================================================== --- trunk/payloads/libpayload/arch/i386/timer.c Thu Mar 25 19:52:24 2010 (r5291) +++ trunk/payloads/libpayload/arch/i386/timer.c Thu Mar 25 19:53:20 2010 (r5292) @@ -88,7 +88,7 @@ */ void ndelay(unsigned int n) { - _delay(n * cpu_khz / 1000000); + _delay((unsigned long long)n * cpu_khz / 1000000); } /** @@ -98,7 +98,7 @@ */ void udelay(unsigned int n) { - _delay(n * cpu_khz / 1000); + _delay((unsigned long long)n * cpu_khz / 1000); } /** @@ -108,7 +108,7 @@ */ void mdelay(unsigned int m) { - _delay(m * cpu_khz); + _delay((unsigned long long)m * cpu_khz); } /** @@ -118,5 +118,7 @@ */ void delay(unsigned int s) { - _delay(s * cpu_khz * 1000); + int i; + for (i=0; i<1000; i++) + _delay((unsigned long long)s * cpu_khz); }

1 0

[commit] r5291 - in trunk/payloads/libpayload: drivers include
by repository service March 25, 2010

March 25, 2010

Author: stepan Date: Thu Mar 25 19:52:24 2010 New Revision: 5291 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5291 Log: make keyboard reset driver generic (not pc keyboard driver dependent) so it can be used by usb, too Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Added: trunk/payloads/libpayload/drivers/hid.c Modified: trunk/payloads/libpayload/drivers/Makefile.inc trunk/payloads/libpayload/drivers/keyboard.c trunk/payloads/libpayload/include/libpayload.h Modified: trunk/payloads/libpayload/drivers/Makefile.inc ============================================================================== --- trunk/payloads/libpayload/drivers/Makefile.inc Thu Mar 25 16:49:40 2010 (r5290) +++ trunk/payloads/libpayload/drivers/Makefile.inc Thu Mar 25 19:52:24 2010 (r5291) @@ -58,3 +58,5 @@ TARGETS-$(CONFIG_USB_HID) += drivers/usb/usbhid.o TARGETS-$(CONFIG_USB_MSC) += drivers/usb/usbmsc.o +# used by both USB HID and keyboard +TARGETS-y += drivers/hid.o Added: trunk/payloads/libpayload/drivers/hid.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/payloads/libpayload/drivers/hid.c Thu Mar 25 19:52:24 2010 (r5291) @@ -0,0 +1,42 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008-2010 coresystems GmbH + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <libpayload-config.h> +#include <libpayload.h> + +void (*reset_handler)(void) = NULL; + +int add_reset_handler(void (*new_handler)(void)) +{ + reset_handler = new_handler; + + return 0; +} + + Modified: trunk/payloads/libpayload/drivers/keyboard.c ============================================================================== --- trunk/payloads/libpayload/drivers/keyboard.c Thu Mar 25 16:49:40 2010 (r5290) +++ trunk/payloads/libpayload/drivers/keyboard.c Thu Mar 25 19:52:24 2010 (r5291) @@ -36,16 +36,14 @@ #define I8042_MODE_XLATE 0x40 -static void (*reset_handler)(void) = NULL; - struct layout_maps { char *country; unsigned short map[4][0x57]; }; -struct layout_maps *map; +static struct layout_maps *map; -struct layout_maps keyboard_layouts[] = { +static struct layout_maps keyboard_layouts[] = { #ifdef CONFIG_PC_KEYBOARD_LAYOUT_US { .country = "us", .map = { { /* No modifier */ @@ -319,13 +317,6 @@ return -1; } -int keyboard_add_reset_handler(void (*new_handler)(void)) -{ - reset_handler = new_handler; - - return 0; -} - static struct console_input_driver cons = { .havekey = keyboard_havechar, .getchar = keyboard_getchar Modified: trunk/payloads/libpayload/include/libpayload.h ============================================================================== --- trunk/payloads/libpayload/include/libpayload.h Thu Mar 25 16:49:40 2010 (r5290) +++ trunk/payloads/libpayload/include/libpayload.h Thu Mar 25 19:52:24 2010 (r5291) @@ -125,6 +125,9 @@ * @{ @} */ +extern void (*reset_handler)(void); +int add_reset_handler(void (*new_handler)(void)); + /** * @defgroup keyboard Keyboard functions * @ingroup input @@ -135,7 +138,6 @@ unsigned char keyboard_get_scancode(void); int keyboard_getchar(void); int keyboard_set_layout(char *country); -int keyboard_add_reset_handler(void (*new_handler)(void)); /** @} */ /**

1 0

How coreboot passes e820-style system memory map to the OS?
by Darmawan Salihun March 25, 2010

March 25, 2010

Hi, I wonder how coreboot passes the "e820-style" system memory map to the OS. I found the following data structure pointer in the coreboot source code: static struct parameters *faked_real_mode = (void *)REAL_MODE_DATA_LOC; and also this line: void append_command_line(struct parameters *real_mode, char *arg, int arg_bytes) Does the second line above means "faked_real_mode" is passed as an argument to the bootloader (or probably directly as kernel parameter for Linux)? Or does SeaBIOS perform the necessary e820-style function to OS other than Linux? Thanks, Darmawan -- -------------------------------------------------------------------- -= Human knowledge belongs to the world =-

2 2

[PATCH]abuild -v should actually be verbose
by Patrick Georgi March 25, 2010

March 25, 2010

Hi, attached patch tells abuild to pass V=1 to make, so it's actually verbose when such is requested. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

2 1

build service results for r5290
by coreboot information March 25, 2010

March 25, 2010

Dear coreboot readers! This is the automatic build system of coreboot. The developer "oxygene" checked in revision 5290 to the coreboot repository. This caused the following changes: Change Log: Copy argument of -include as it's modified later. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Build Log: Compilation of soyo:sy-6ba-plus-iii has been fixed If something broke during this checkin please be a pain in oxygene's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r5290 - trunk/util/romcc
by repository service March 25, 2010

March 25, 2010

Author: oxygene Date: Thu Mar 25 16:49:40 2010 New Revision: 5290 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5290 Log: Copy argument of -include as it's modified later. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/util/romcc/romcc.c Modified: trunk/util/romcc/romcc.c ============================================================================== --- trunk/util/romcc/romcc.c Thu Mar 25 16:25:15 2010 (r5289) +++ trunk/util/romcc/romcc.c Thu Mar 25 16:49:40 2010 (r5290) @@ -25154,7 +25154,7 @@ } argv++; argc--; - include_filelist->filename = argv[1]; + include_filelist->filename = strdup(argv[1]); include_filelist->next = old_head; result = 0; }

1 0

build service results for r5289
by coreboot information March 25, 2010

March 25, 2010

Dear coreboot readers! This is the automatic build system of coreboot. The developer "oxygene" checked in revision 5289 to the coreboot repository. This caused the following changes: Change Log: It's really obj=, not O= (see toplevel Makefile) Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Build Log: Compilation of msi:ms6119 has been fixed Compilation of msi:ms6156 has been fixed Compilation of soyo:sy-6ba-plus-iii has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5289&device=sy-6ba-plus-ii… Compilation of tyan:s1846 has been fixed If something broke during this checkin please be a pain in oxygene's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0