coreboot September 2008

coreboot@coreboot.org

59 participants
415 discussions

r3606 - trunk/payloads/libpayload/drivers
by svn＠coreboot.org 26 Sep '08

26 Sep '08

Author: stepan Date: 2008-09-26 20:39:06 +0200 (Fri, 26 Sep 2008) New Revision: 3606 Modified: trunk/payloads/libpayload/drivers/options.c Log: fix option handling in libpayload Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Jordan Crouse <jordan.crouse(a)amd.com> Modified: trunk/payloads/libpayload/drivers/options.c =================================================================== --- trunk/payloads/libpayload/drivers/options.c 2008-09-26 18:37:26 UTC (rev 3605) +++ trunk/payloads/libpayload/drivers/options.c 2008-09-26 18:39:06 UTC (rev 3606) @@ -33,9 +33,9 @@ static int options_checksum_valid(void) { int i; - int range_start = lib_sysinfo.cmos_range_start; - int range_end = lib_sysinfo.cmos_range_end; - int checksum_location = lib_sysinfo.cmos_checksum_location; + int range_start = lib_sysinfo.cmos_range_start / 8; + int range_end = lib_sysinfo.cmos_range_end / 8; + int checksum_location = lib_sysinfo.cmos_checksum_location / 8; u16 checksum = 0, checksum_old; for(i = range_start; i <= range_end; i++) { @@ -80,7 +80,7 @@ int get_option(void *dest, char *name) { - struct cb_cmos_option_table *option_table = lib_sysinfo.option_table; + struct cb_cmos_option_table *option_table = phys_to_virt(lib_sysinfo.option_table); struct cb_cmos_entries *cmos_entry; int len = strnlen(name, CMOS_MAX_NAME_LENGTH);

1 0

r3605 - in trunk/payloads/libpayload: . drivers include
by svn＠coreboot.org 26 Sep '08

26 Sep '08

Author: stepan Date: 2008-09-26 20:37:26 +0200 (Fri, 26 Sep 2008) New Revision: 3605 Modified: trunk/payloads/libpayload/Config.in trunk/payloads/libpayload/drivers/keyboard.c trunk/payloads/libpayload/include/libpayload.h Log: * add keyboard layout support to libpayload * add a reset handler mechanism (CTRL-ALT-DEL) Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Jordan Crouse <jordan.crouse(a)amd.com> Modified: trunk/payloads/libpayload/Config.in =================================================================== --- trunk/payloads/libpayload/Config.in 2008-09-26 18:36:26 UTC (rev 3604) +++ trunk/payloads/libpayload/Config.in 2008-09-26 18:37:26 UTC (rev 3605) @@ -100,6 +100,16 @@ bool "Allow input from a PC keyboard" default y +config PC_KEYBOARD_LAYOUT_US + bool "English (US) keyboard layout" + depends on PC_KEYBOARD + default y + +config PC_KEYBOARD_LAYOUT_DE + bool "German keyboard layout" + depends on PC_KEYBOARD + default n + endmenu menu "Drivers" Modified: trunk/payloads/libpayload/drivers/keyboard.c =================================================================== --- trunk/payloads/libpayload/drivers/keyboard.c 2008-09-26 18:36:26 UTC (rev 3604) +++ trunk/payloads/libpayload/drivers/keyboard.c 2008-09-26 18:37:26 UTC (rev 3605) @@ -28,6 +28,7 @@ */ #include <libpayload.h> +#include <config.h> #include <curses.h> #define I8042_CMD_READ_MODE 0x20 @@ -35,7 +36,18 @@ #define I8042_MODE_XLATE 0x40 -unsigned short map[4][0x57] = { +static void (*reset_handler)(void) = NULL; + +struct layout_maps { + char *country; + unsigned short map[4][0x57]; +}; + +struct layout_maps *map; + +struct layout_maps keyboard_layouts[] = { +#ifdef CONFIG_PC_KEYBOARD_LAYOUT_US +{ .country = "us", .map = { { /* No modifier */ 0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x2D, 0x3D, 0x08, 0x09, @@ -88,6 +100,65 @@ KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END, KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x00 } +}}, +#endif +#ifdef CONFIG_PC_KEYBOARD_LAYOUT_DE +{ .country = "de", .map = { + { /* No modifier */ + 0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, + 0x37, 0x38, 0x39, 0x30, 0x00, 0x27, 0x08, 0x09, + 0x71, 0x77, 0x65, 0x72, 0x74, 0x7A, 0x75, 0x69, + 0x6F, 0x70, 0x00, 0x2B, 0x0A, 0x00, 0x61, 0x73, + 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x00, + 0x00, 0x5E, 0x00, 0x23, 0x79, 0x78, 0x63, 0x76, + 0x62, 0x6E, 0x6D, 0x2C, 0x2E, 0x2D, 0x00, 0x2A, + 0x00, 0x20, 0x00, KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5), + KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10), 0x00, 0x00, KEY_HOME, + KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END, + KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x3C + }, + { /* Shift */ + 0x00, 0x1B, 0x21, 0x22, 0xA7, 0x24, 0x25, 0x26, + 0x2F, 0x28, 0x29, 0x3D, 0x3F, 0x60, 0x08, 0x00, + 0x51, 0x57, 0x45, 0x52, 0x54, 0x5A, 0x55, 0x49, + 0x4F, 0x50, 0x00, 0x2A, 0x0A, 0x00, 0x41, 0x53, + 0x44, 0x46, 0x47, 0x48, 0x4A, 0x4B, 0x4C, 0x00, + 0x00, 0x7E, 0x00, 0x27, 0x59, 0x58, 0x43, 0x56, + 0x42, 0x4E, 0x4D, 0x3B, 0x3A, 0x5F, 0x00, 0x2A, + 0x00, 0x20, 0x00, KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5), + KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10), 0x00, 0x00, KEY_HOME, + KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END, + KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x3E + }, + { /* ALT */ + 0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, + 0x7B, 0x5B, 0x5D, 0x7D, 0x5C, 0x3D, 0x08, 0x09, + 0x40, 0x77, 0x65, 0x72, 0x74, 0x79, 0x75, 0x69, + 0x6F, 0x70, 0x5B, 0x7E, 0x0A, 0x00, 0x61, 0x73, + 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x3B, + 0x27, 0x60, 0x00, 0x5C, 0x7A, 0x78, 0x63, 0x76, + 0x62, 0x6E, 0x6D, 0x2C, 0x2E, 0x2F, 0x00, 0x2A, + 0x00, 0x20, 0x00, KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5), + KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10), 0x00, 0x00, KEY_HOME, + KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END, + KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x7C + }, + { /* Shift-ALT */ + /* copied from US */ + 0x00, 0x1B, 0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, + 0x26, 0x2A, 0x28, 0x29, 0x5F, 0x2B, 0x08, 0x00, + 0x51, 0x57, 0x45, 0x52, 0x54, 0x59, 0x55, 0x49, + 0x4F, 0x50, 0x7B, 0x7D, 0x0A, 0x00, 0x41, 0x53, + 0x44, 0x46, 0x47, 0x48, 0x4A, 0x4B, 0x4C, 0x3A, + 0x22, 0x7E, 0x00, 0x7C, 0x5A, 0x58, 0x43, 0x56, + 0x42, 0x4E, 0x4D, 0x3C, 0x3E, 0x3F, 0x00, 0x2A, + 0x00, 0x20, 0x00, KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5), + KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10), 0x00, 0x00, KEY_HOME, + KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END, + KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x00 + } +}}, +#endif }; #define MOD_SHIFT (1 << 0) @@ -95,6 +166,16 @@ #define MOD_CAPSLOCK (1 << 2) #define MOD_ALT (1 << 3) +static void keyboard_cmd(unsigned char cmd, unsigned char val) +{ + outb(cmd, 0x60); + /* wait until keyboard controller accepts cmds: */ + while (inb(0x64) & 2); + outb(val, 0x60); + while (inb(0x64) & 2); +} + + int keyboard_havechar(void) { unsigned char c = inb(0x64); @@ -144,10 +225,13 @@ modifier &= ~MOD_CTRL; break; case 0x3a: - if (modifier & MOD_CAPSLOCK) + if (modifier & MOD_CAPSLOCK) { modifier &= ~MOD_CAPSLOCK; - else + keyboard_cmd(0xed, (0 << 2)); + } else { modifier |= MOD_CAPSLOCK; + keyboard_cmd(0xed, (1 << 2)); + } break; } @@ -158,12 +242,21 @@ if (modifier & MOD_ALT) shift += 2; - ret = map[shift][ch]; + ret = map->map[shift][ch]; - if (modifier & MOD_CTRL) - ret = (ret >= 'a' && ret <= 'z') ? ret & 0x1f : 0; - - return ret; + if (modifier & MOD_CTRL) { + switch (ret) { + case 'a' ... 'z': + ret &= 0x1f; + break; + case KEY_DC: + /* vulcan nerve pinch */ + if ((modifier & MOD_ALT) && reset_handler) + reset_handler(); + default: + ret = 0; + } + } } return ret; @@ -203,9 +296,41 @@ outb(mode, 0x60); } +/** + * Set keyboard layout + * @param country string describing the keyboard layout language. + * Valid values are "en", "de". + */ + +int keyboard_set_layout(char *country) +{ + int i; + + for (i=0; i<ARRAY_SIZE(keyboard_layouts); i++) { + if (strncmp(keyboard_layouts[i].country, country, + strlen(keyboard_layouts[i].country))) + continue; + + /* Found, changing keyboard layout */ + map = &keyboard_layouts[i]; + return 0; + } + + /* Nothing found, not changed */ + return -1; +} + +int keyboard_add_reset_handler(void (*new_handler)(void)) +{ + reset_handler = new_handler; + + return 0; +} + void keyboard_init(void) { u8 mode; + map = &keyboard_layouts[0]; /* Empty keyboard buffer */ while (keyboard_havechar()) keyboard_getchar(); Modified: trunk/payloads/libpayload/include/libpayload.h =================================================================== --- trunk/payloads/libpayload/include/libpayload.h 2008-09-26 18:36:26 UTC (rev 3604) +++ trunk/payloads/libpayload/include/libpayload.h 2008-09-26 18:37:26 UTC (rev 3605) @@ -123,6 +123,8 @@ int keyboard_havechar(void); 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

r3604 - in trunk/payloads/libpayload: curses drivers include
by svn＠coreboot.org 26 Sep '08

26 Sep '08

Author: stepan Date: 2008-09-26 20:36:26 +0200 (Fri, 26 Sep 2008) New Revision: 3604 Modified: trunk/payloads/libpayload/curses/keyboard.c trunk/payloads/libpayload/curses/tinycurses.c trunk/payloads/libpayload/drivers/serial.c trunk/payloads/libpayload/include/curses.h trunk/payloads/libpayload/include/libpayload.h Log: * factor out serial hardware init * add reverse color support for serial * add cursor enable/disable support for serial * fix tinycurses compilation if serial is disabled * add functions to query whether serial or vga console is enabled in tinycurses * initialize uninitialized COLOR_PAIRS variable * implement has_colors(), wredrawln() functions in curses Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Jordan Crouse <jordan.crouse(a)amd.com> Modified: trunk/payloads/libpayload/curses/keyboard.c =================================================================== --- trunk/payloads/libpayload/curses/keyboard.c 2008-09-26 17:41:34 UTC (rev 3603) +++ trunk/payloads/libpayload/curses/keyboard.c 2008-09-26 18:36:26 UTC (rev 3604) @@ -44,6 +44,7 @@ /* ============== Serial ==================== */ +#ifdef CONFIG_SERIAL_CONSOLE /* We treat serial like a vt100 terminal. For now we do the cooking in here, but we should probably eventually pass it to dedicated vt100 code */ @@ -135,6 +136,7 @@ return ch; } } +#endif /* ================ Keyboard ================ */ @@ -215,8 +217,14 @@ else curses_flags &= ~F_ENABLE_CONSOLE; } + +int curses_vga_enabled(void) +{ + return (curses_flags & F_ENABLE_CONSOLE) != 0; +} #else void curses_enable_vga(int state) { } +int curses_vga_enabled(void) { return 0; } #endif #ifdef CONFIG_SERIAL_CONSOLE @@ -227,7 +235,14 @@ else curses_flags &= ~F_ENABLE_SERIAL; } + +int curses_serial_enabled(void) +{ + return (curses_flags & F_ENABLE_SERIAL) != 0; +} + #else void curses_enable_serial(int state) { } +int curses_serial_enabled(void) { return 0; } #endif Modified: trunk/payloads/libpayload/curses/tinycurses.c =================================================================== --- trunk/payloads/libpayload/curses/tinycurses.c 2008-09-26 17:41:34 UTC (rev 3603) +++ trunk/payloads/libpayload/curses/tinycurses.c 2008-09-26 18:36:26 UTC (rev 3604) @@ -77,7 +77,7 @@ /* Globals */ int COLORS; /* Currently unused? */ -int COLOR_PAIRS; +int COLOR_PAIRS = 255; WINDOW *stdscr; WINDOW *curscr; WINDOW *newscr; @@ -111,6 +111,7 @@ '|', '<', '>', '*', '!', 'f', 'o', ' ', }; +#ifdef CONFIG_SERIAL_CONSOLE #ifdef CONFIG_SERIAL_ACS_FALLBACK chtype serial_acs_map[128]; #else @@ -135,7 +136,9 @@ 'x', 'y', 'z', '{', '|', '}', '~', 0, }; #endif +#endif +#ifdef CONFIG_VIDEO_CONSOLE /* See acsc of linux. */ chtype console_acs_map[128] = { @@ -156,6 +159,7 @@ '\304', '\304', '\304', '_', '\303', '\264', '\301', '\302', '\263', '\363', '\362', '\343', '\330', '\234', '\376', 0, }; +#endif // FIXME: Ugly (and insecure!) hack! char sprintf_tmp[1024]; @@ -196,13 +200,16 @@ // int color_content(short color, short *r, short *g, short *b) {} int curs_set(int on) { +#ifdef CONFIG_SERIAL_CONSOLE if (curses_flags & F_ENABLE_SERIAL) { - // TODO + serial_cursor_enable(on); } - +#endif +#ifdef CONFIG_VIDEO_CONSOLE if (curses_flags & F_ENABLE_CONSOLE) { video_console_cursor_enable(on); } +#endif return OK; } @@ -284,7 +291,7 @@ // int flash(void) {} int flushinp(void) { /* TODO */ return 0; } // WINDOW *getwin (FILE *) {} -bool has_colors (void) { /* TODO */ return(*(bool *)0); } +bool has_colors (void) { return(TRUE); } // bool has_ic (void) {} // bool has_il (void) {} // void idcok (WINDOW *, bool) {} @@ -300,21 +307,23 @@ for (i = 0; i < 128; i++) acs_map[i] = (chtype) i | A_ALTCHARSET; - +#ifdef CONFIG_SERIAL_CONSOLE if (curses_flags & F_ENABLE_SERIAL) { serial_clear(); } - +#endif +#ifdef CONFIG_VIDEO_CONSOLE if (curses_flags & F_ENABLE_CONSOLE) { /* Clear the screen and kill the cursor */ video_console_clear(); video_console_cursor_enable(0); } +#endif // Speaker init? - stdscr = newwin(SCREEN_Y, SCREEN_X, 0, 0); + stdscr = newwin(SCREEN_Y, SCREEN_X + 1, 0, 0); // TODO: curscr, newscr? werase(stdscr); @@ -693,18 +702,23 @@ (((c) & 0x4400) >> 2) | ((c) & 0xAA00) | (((c) & 0x1100) << 2) int wnoutrefresh(WINDOW *win) { +#ifdef CONFIG_SERIAL_CONSOLE // FIXME. int serial_is_bold = 0; + int serial_is_reverse = 0; int serial_is_altcharset = 0; int serial_cur_pair = 0; + int need_altcharset; + short fg, bg; +#endif int x, y; chtype ch; - int need_altcharset; - short fg, bg; +#ifdef CONFIG_SERIAL_CONSOLE serial_end_bold(); serial_end_altcharset(); +#endif for (y = 0; y <= win->_maxy; y++) { @@ -713,9 +727,11 @@ /* Position the serial cursor */ +#ifdef CONFIG_SERIAL_CONSOLE if (curses_flags & F_ENABLE_SERIAL) serial_set_cursor(win->_begy + y, win->_begx + win->_line[y].firstchar); +#endif for (x = win->_line[y].firstchar; x <= win->_line[y].lastchar; x++) { attr_t attr = win->_line[y].text[x].attr; @@ -723,6 +739,7 @@ unsigned int c = ((int)color_pairs[PAIR_NUMBER(attr)]) << 8; +#ifdef CONFIG_SERIAL_CONSOLE if (curses_flags & F_ENABLE_SERIAL) { ch = win->_line[y].text[x].chars[0]; @@ -731,15 +748,35 @@ serial_start_bold(); serial_is_bold = 1; } - } - else { + } else { if (serial_is_bold) { serial_end_bold(); serial_is_bold = 0; + /* work around serial.c + * shortcoming: + */ + serial_is_reverse = 0; serial_cur_pair = 0; } } + if (attr & A_REVERSE) { + if (!serial_is_reverse) { + serial_start_reverse(); + serial_is_reverse = 1; + } + } else { + if (serial_is_reverse) { + serial_end_reverse(); + serial_is_reverse = 0; + /* work around serial.c + * shortcoming: + */ + serial_is_bold = 0; + serial_cur_pair = 0; + } + } + need_altcharset = 0; if (attr & A_ALTCHARSET) { if (serial_acs_map[ch & 0x7f]) { @@ -767,7 +804,8 @@ serial_putchar(ch); } - +#endif +#ifdef CONFIG_VIDEO_CONSOLE c = SWAP_RED_BLUE(c); if (curses_flags & F_ENABLE_CONSOLE) { @@ -799,16 +837,21 @@ c |= (chtype) (ch & 0xff); video_console_putc(win->_begy + y, win->_begx + x, c); } +#endif } win->_line[y].firstchar = _NOCHANGE; win->_line[y].lastchar = _NOCHANGE; } +#ifdef CONFIG_SERIAL_CONSOLE if (curses_flags & F_ENABLE_SERIAL) serial_set_cursor(win->_begy + win->_cury, win->_begx + win->_curx); +#endif +#ifdef CONFIG_VIDEO_CONSOLE if (curses_flags & F_ENABLE_CONSOLE) video_console_set_cursor(win->_begx + win->_curx, win->_begy + win->_cury); +#endif return OK; } @@ -823,7 +866,19 @@ return code; } -// int wredrawln (WINDOW *,int,int) {} + +int wredrawln (WINDOW *win, int beg_line, int num_lines) +{ + int i; + + for (i = beg_line; i < beg_line + num_lines; i++) { + win->_line[i].firstchar = 0; + win->_line[i].lastchar = win->_maxx; + } + + return OK; +} + int wrefresh(WINDOW *win) { // FIXME Modified: trunk/payloads/libpayload/drivers/serial.c =================================================================== --- trunk/payloads/libpayload/drivers/serial.c 2008-09-26 17:41:34 UTC (rev 3603) +++ trunk/payloads/libpayload/drivers/serial.c 2008-09-26 18:36:26 UTC (rev 3604) @@ -32,32 +32,36 @@ #include <libpayload.h> #define IOBASE lib_sysinfo.ser_ioport +#define DIVISOR(x) (115200 / x) -#ifdef CONFIG_SERIAL_SET_SPEED -#define DIVISOR (115200 / CONFIG_SERIAL_BAUD_RATE) -#endif - -void serial_init(void) +void serial_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits) { -#ifdef CONFIG_SERIAL_SET_SPEED unsigned char reg; + /* We will assume 8n1 for now. Does anyone use anything else these days? */ + /* Disable interrupts. */ - outb(0, IOBASE + 0x01); + outb(0, port + 0x01); /* Assert RTS and DTR. */ - outb(3, IOBASE + 0x04); + outb(3, port + 0x04); /* Set the divisor latch. */ - reg = inb(IOBASE + 0x03); - outb(reg | 0x80, IOBASE + 0x03); + reg = inb(port + 0x03); + outb(reg | 0x80, port + 0x03); /* Write the divisor. */ - outb(DIVISOR & 0xFF, IOBASE); - outb(DIVISOR >> 8 & 0xFF, IOBASE + 1); + outb(DIVISOR(speed) & 0xFF, port); + outb(DIVISOR(speed) >> 8 & 0xFF, port + 1); /* Restore the previous value of the divisor. */ - outb(reg &= ~0x80, IOBASE + 0x03); + outb(reg &= ~0x80, port + 0x03); +} + +void serial_init(void) +{ +#ifdef CONFIG_SERIAL_SET_SPEED + serial_hardware_init(IOBASE, CONFIG_SERIAL_BAUD_RATE, 8, 0, 1); #endif } @@ -81,9 +85,17 @@ /* These are thinly veiled vt100 functions used by curses */ #define VT100_CLEAR "\e[H\e[J" +/* These defines will fail if you use bold and reverse at the same time. + * Switching off one of them will switch off both. tinycurses knows about + * this and does the right thing. + */ #define VT100_SBOLD "\e[1m" #define VT100_EBOLD "\e[m" +#define VT100_SREVERSE "\e[7m" +#define VT100_EREVERSE "\e[m" #define VT100_CURSOR_ADDR "\e[%d;%dH" +#define VT100_CURSOR_ON "\e[?25l" +#define VT100_CURSOR_OFF "\e[?25h" /* The following smacs/rmacs are actually for xterm; a real vt100 has enacs=\E(B\E)0, smacs=^N, rmacs=^O. */ #define VT100_SMACS "\e(0" @@ -112,6 +124,16 @@ serial_putcmd(VT100_EBOLD); } +void serial_start_reverse(void) +{ + serial_putcmd(VT100_SREVERSE); +} + +void serial_end_reverse(void) +{ + serial_putcmd(VT100_EREVERSE); +} + void serial_start_altcharset(void) { serial_putcmd(VT100_SMACS); @@ -141,3 +163,11 @@ snprintf(buffer, sizeof(buffer), VT100_CURSOR_ADDR, y + 1, x + 1); serial_putcmd(buffer); } + +void serial_cursor_enable(int state) +{ + if (state) + serial_putcmd(VT100_CURSOR_ON); + else + serial_putcmd(VT100_CURSOR_OFF); +} Modified: trunk/payloads/libpayload/include/curses.h =================================================================== --- trunk/payloads/libpayload/include/curses.h 2008-09-26 17:41:34 UTC (rev 3603) +++ trunk/payloads/libpayload/include/curses.h 2008-09-26 18:36:26 UTC (rev 3604) @@ -1673,4 +1673,7 @@ void curses_enable_vga(int); void curses_enable_serial(int); +int curses_vga_enabled(void); +int curses_serial_enabled(void); + #endif /* _CURSES_H */ Modified: trunk/payloads/libpayload/include/libpayload.h =================================================================== --- trunk/payloads/libpayload/include/libpayload.h 2008-09-26 17:41:34 UTC (rev 3603) +++ trunk/payloads/libpayload/include/libpayload.h 2008-09-26 18:36:26 UTC (rev 3604) @@ -131,15 +131,19 @@ * @{ */ void serial_init(void); +void serial_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits); void serial_putchar(unsigned char c); int serial_havechar(void); int serial_getchar(void); void serial_clear(void); void serial_start_bold(void); void serial_end_bold(void); +void serial_start_reverse(void); +void serial_end_reverse(void); void serial_start_altcharset(void); void serial_end_altcharset(void); void serial_set_color(short fg, short bg); +void serial_cursor_enable(int state); void serial_set_cursor(int y, int x); /** @} */

1 0

r3603 build service
by coreboot information 26 Sep '08

26 Sep '08

Dear coreboot readers! This is the automated build check service of coreboot. The developer "mjones" checked in revision 3603 to the coreboot source repository and caused the following changes: Change Log: Add IRQ12 to the dbm690t mptable for mouse interrupt support. Signed-off-by: Marc Jones <marc.jones(a)amd.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Build Log: Compilation of jetway:j7f24 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3603&device=j7f24&vendor=j… Compilation of via:epia-cn is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3603&device=epia-cn&vendor… If something broke during this checkin please be a pain in mjones'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

[patch] irq12 for dbm690t mainboard
by Marc Jones 26 Sep '08

26 Sep '08

Patch attached. Marc -- Marc Jones Senior Firmware Engineer (970) 226-9684 Office mailto:Marc.Jones@amd.com http://www.amd.com/embeddedprocessors Add IRQ12 to the dbm690t mptable for mouse interrupt support. Signed-off-by: Marc Jones <marc.jones(a)amd.com> Index: coreboot-v2/src/mainboard/amd/dbm690t/mptable.c =================================================================== --- coreboot-v2.orig/src/mainboard/amd/dbm690t/mptable.c 2008-09-26 11:10:34.000000000 -0600 +++ coreboot-v2/src/mainboard/amd/dbm690t/mptable.c 2008-09-26 10:11:30.000000000 -0600 @@ -135,6 +135,8 @@ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, 0x7, apicid_sb600, 0x7); smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, + bus_isa, 0xc, apicid_sb600, 0xc); + smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, 0xd, apicid_sb600, 0xd); smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, 0xe, apicid_sb600, 0xe);

2 2

r3603 - trunk/coreboot-v2/src/mainboard/amd/dbm690t
by svn＠coreboot.org 26 Sep '08

26 Sep '08

Author: mjones Date: 2008-09-26 19:41:34 +0200 (Fri, 26 Sep 2008) New Revision: 3603 Modified: trunk/coreboot-v2/src/mainboard/amd/dbm690t/mptable.c Log: Add IRQ12 to the dbm690t mptable for mouse interrupt support. Signed-off-by: Marc Jones <marc.jones(a)amd.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/coreboot-v2/src/mainboard/amd/dbm690t/mptable.c =================================================================== --- trunk/coreboot-v2/src/mainboard/amd/dbm690t/mptable.c 2008-09-26 13:19:02 UTC (rev 3602) +++ trunk/coreboot-v2/src/mainboard/amd/dbm690t/mptable.c 2008-09-26 17:41:34 UTC (rev 3603) @@ -135,6 +135,8 @@ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, 0x7, apicid_sb600, 0x7); smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, + bus_isa, 0xc, apicid_sb600, 0xc); + smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, 0xd, apicid_sb600, 0xd); smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, 0xe, apicid_sb600, 0xe);

1 0

r3602 build service
by coreboot information 26 Sep '08

26 Sep '08

Dear coreboot readers! This is the automated build check service of coreboot. The developer "uwe" checked in revision 3602 to the coreboot source repository and caused the following changes: Change Log: Activate proper support for EN29F002(A)(N)[BT]. Fully tested for Probe/Read/Erase/Write on EN29F002NT. Jedec subroutines 'probe_jedec()' and 'erase_chip_jedec()' are still in use, but a tailored 'write_en29f002a()' is needed due to a byte wise writing mechanism for this chip. Signed-off-by: Mats Erik Andersson <mats.andersson(a)gisladisker.se> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Build Log: Compilation of jetway:j7f24 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3602&device=j7f24&vendor=j… Compilation of via:epia-cn is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3602&device=epia-cn&vendor… If something broke during this checkin please be a pain in uwe'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

r3602 - trunk/util/flashrom
by svn＠coreboot.org 26 Sep '08

26 Sep '08

Author: uwe Date: 2008-09-26 15:19:02 +0200 (Fri, 26 Sep 2008) New Revision: 3602 Modified: trunk/util/flashrom/Makefile trunk/util/flashrom/en29f002a.c trunk/util/flashrom/flash.h trunk/util/flashrom/flashchips.c Log: Activate proper support for EN29F002(A)(N)[BT]. Fully tested for Probe/Read/Erase/Write on EN29F002NT. Jedec subroutines 'probe_jedec()' and 'erase_chip_jedec()' are still in use, but a tailored 'write_en29f002a()' is needed due to a byte wise writing mechanism for this chip. Signed-off-by: Mats Erik Andersson <mats.andersson(a)gisladisker.se> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/util/flashrom/Makefile =================================================================== --- trunk/util/flashrom/Makefile 2008-09-26 11:21:21 UTC (rev 3601) +++ trunk/util/flashrom/Makefile 2008-09-26 13:19:02 UTC (rev 3602) @@ -26,7 +26,7 @@ OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.o \ sst28sf040.o am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o \ - w49f002u.o 82802ab.o pm49fl00x.o sst49lf040.o \ + w49f002u.o 82802ab.o pm49fl00x.o sst49lf040.o en29f002a.o \ sst49lfxxxc.o sst_fwhub.o layout.o cbtable.o flashchips.o \ flashrom.o w39v080fa.o sharplhf00l04.o w29ee011.o spi.o it87spi.o \ ichspi.o w39v040c.o Modified: trunk/util/flashrom/en29f002a.c =================================================================== --- trunk/util/flashrom/en29f002a.c 2008-09-26 11:21:21 UTC (rev 3601) +++ trunk/util/flashrom/en29f002a.c 2008-09-26 13:19:02 UTC (rev 3602) @@ -19,12 +19,17 @@ */ /* - EN29F512 has 1C,21 - EN29F010 has 1C,20 - EN29F040A has 1C,04 - EN29LV010 has 1C,6E and uses short F0 reset sequence - EN29LV040(A) has 1C,4F and uses short F0 reset sequence + * EN29F512 has 1C,21 + * EN29F010 has 1C,20 + * EN29F040A has 1C,04 + * EN29LV010 has 1C,6E and uses short F0 reset sequence + * EN29LV040(A) has 1C,4F and uses short F0 reset sequence */ + +#include <stdio.h> +#include <stdint.h> +#include "flash.h" + int probe_en29f512(struct flashchip *flash) { volatile uint8_t *bios = flash->virtual_memory; @@ -53,9 +58,11 @@ } /* - EN29F002AT has 1C,92 - EN29F002AB has 1C,97 + * EN29F002AT has 1C,92 + * EN29F002AB has 1C,97 */ + +/* This does not seem to function properly for EN29F002NT. */ int probe_en29f002a(struct flashchip *flash) { volatile uint8_t *bios = flash->virtual_memory; @@ -83,3 +90,35 @@ return 0; } +/* The EN29F002 chip needs repeated single byte writing, no block writing. */ +int write_en29f002a(struct flashchip *flash, uint8_t *buf) +{ + int i; + int total_size = flash->total_size * 1024; + volatile uint8_t *bios = flash->virtual_memory; + volatile uint8_t *dst = bios; + + // *bios = 0xF0; + myusec_delay(10); + erase_chip_jedec(flash); + + printf("Programming page: "); + for (i = 0; i < total_size; i++) { + /* write to the sector */ + if ((i & 0xfff) == 0) + printf("address: 0x%08lx", (unsigned long)i); + *(bios + 0x5555) = 0xAA; + *(bios + 0x2AAA) = 0x55; + *(bios + 0x5555) = 0xA0; + *dst++ = *buf++; + + /* wait for Toggle bit ready */ + toggle_ready_jedec(dst); + + if ((i & 0xfff) == 0) + printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); + } + + printf("\n"); + return 0; +} Modified: trunk/util/flashrom/flash.h =================================================================== --- trunk/util/flashrom/flash.h 2008-09-26 11:21:21 UTC (rev 3601) +++ trunk/util/flashrom/flash.h 2008-09-26 13:19:02 UTC (rev 3602) @@ -435,6 +435,11 @@ int erase_29f040b(struct flashchip *flash); int write_29f040b(struct flashchip *flash, uint8_t *buf); +/* en29f002a.c */ +int probe_en29f002a(struct flashchip *flash); +int erase_en29f002a(struct flashchip *flash); +int write_en29f002a(struct flashchip *flash, uint8_t *buf); + /* ichspi.c */ int ich_spi_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int ich_spi_read(struct flashchip *flash, uint8_t * buf); Modified: trunk/util/flashrom/flashchips.c =================================================================== --- trunk/util/flashrom/flashchips.c 2008-09-26 11:21:21 UTC (rev 3601) +++ trunk/util/flashrom/flashchips.c 2008-09-26 13:19:02 UTC (rev 3602) @@ -47,8 +47,8 @@ {"AMIC", "A29040B", AMIC_ID_NOPREFIX, AMIC_A29040B, 512, 64 * 1024, TEST_OK_PR, probe_29f040b, erase_29f040b, write_29f040b}, {"AMIC", "A49LF040A", AMIC_ID_NOPREFIX, AMIC_A49LF040A, 512, 64 * 1024, TEST_OK_PREW, probe_49fl00x, erase_49fl00x, write_49fl00x}, {"EMST", "F49B002UA", EMST_ID, EMST_F49B002UA, 256, 4096, TEST_UNTESTED, probe_jedec, erase_chip_jedec, write_49f002}, - {"EON", "EN29F002(A)(N)B", EON_ID, EN_29F002B, 256, 256, TEST_UNTESTED, probe_jedec, erase_chip_jedec, write_jedec}, - {"EON", "EN29F002(A)(N)T", EON_ID, EN_29F002T, 256, 256, TEST_UNTESTED, probe_jedec, erase_chip_jedec, write_jedec}, + {"EON", "EN29F002(A)(N)B", EON_ID, EN_29F002B, 256, 256, TEST_UNTESTED, probe_jedec, erase_chip_jedec, write_en29f002a}, + {"EON", "EN29F002(A)(N)T", EON_ID, EN_29F002T, 256, 256, TEST_OK_PREW, probe_jedec, erase_chip_jedec, write_en29f002a}, {"Fujitsu", "MBM29F400TC", FUJITSU_ID, MBM29F400TC_STRANGE, 512, 64 * 1024, TEST_UNTESTED, probe_m29f400bt, erase_m29f400bt, write_coreboot_m29f400bt}, {"Intel", "82802AB", INTEL_ID, 173, 512, 64 * 1024, TEST_OK_PREW, probe_82802ab, erase_82802ab, write_82802ab}, {"Intel", "82802AC", INTEL_ID, 172, 1024, 64 * 1024, TEST_OK_PREW, probe_82802ab, erase_82802ab, write_82802ab},

1 0

r3601 build service
by coreboot information 26 Sep '08

26 Sep '08

Dear coreboot readers! This is the automated build check service of coreboot. The developer "stepan" checked in revision 3601 to the coreboot source repository and caused the following changes: Change Log: Add default config file to libpayload so that one can do make defconfig without errors. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Build Log: Compilation of jetway:j7f24 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3601&device=j7f24&vendor=j… Compilation of via:epia-cn is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3601&device=epia-cn&vendor… If something broke during this checkin please be a pain in stepan'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

[FILO] #7: add support for completion
by FILO 26 Sep '08

26 Sep '08

#7: add support for completion ---------------------------------+------------------------------------------ Reporter: stepan | Owner: somebody Type: enhancement | Status: new Priority: major | Milestone: FILO 1.0 Component: FILO | Version: 1.0 Keywords: | Dependencies: Patchstatus: there is no patch | ---------------------------------+------------------------------------------ Summary says it all. FILO 1.0 should support tab completion for commands and files. -- Ticket URL: <http://tracker.coreboot.org/trac/filo/ticket/7> FILO <http://www.coreboot.org/FILO>

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
42
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 September 2008