coreboot October 2008

coreboot@coreboot.org

84 participants
608 discussions

r908 - in coreboot-v3/arch/x86: . amd geodelx i586
by svn＠coreboot.org 08 Oct '08

08 Oct '08

Author: hailfinger Date: 2008-10-08 18:07:29 +0200 (Wed, 08 Oct 2008) New Revision: 908 Added: coreboot-v3/arch/x86/stage0_common.S Modified: coreboot-v3/arch/x86/amd/stage0.S coreboot-v3/arch/x86/geodelx/stage0.S coreboot-v3/arch/x86/i586/stage0.S Log: We have lots of bit-for-bit identical code in the various stage0 implementations. Factor out the 16 bit code with associated protected mode activation. I'm open to moving even more common code out, but this is a well-defined start. This cleanup has been prepared for by r902, r905 and r907. Boot tested on qemu. Build tested on i586, geodelx, k8. The diffstat is most enlightening: amd/stage0.S | 145 --------------------------------------------- geodelx/stage0.S | 145 --------------------------------------------- i586/stage0.S | 145 --------------------------------------------- stage0_common.S | 145 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 432 deletions(-) Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: coreboot-v3/arch/x86/amd/stage0.S =================================================================== --- coreboot-v3/arch/x86/amd/stage0.S 2008-10-07 23:53:02 UTC (rev 907) +++ coreboot-v3/arch/x86/amd/stage0.S 2008-10-08 16:07:29 UTC (rev 908) @@ -38,112 +38,7 @@ #define CacheSizeAPStack 0x400 /* 1K */ #endif - .code16 - .globl _stage0 -_stage0: - cli - /* Save the BIST result. */ - movl %eax, %ebp; - - /* thanks to kmliu(a)sis.com.tw for this TLB fix */ - /* IMMEDIATELY invalidate the translation lookaside buffer (TLB) before - * executing any further code. Even though paging is disabled we - * could still get false address translations due to the TLB if we - * didn't invalidate it. - */ - xorl %eax, %eax - movl %eax, %cr3 /* Invalidate TLB. */ - - /* Switch to protected mode. */ - - /* NOTE: With GNU assembler version 2.15.94.0.2.2 (i386-redhat-linux) - * using BFD version 2.15.94.0.2.2 20041220 this works fine without all - * the ld hackery and other things. So leave it as is with this comment. - */ - - data32 lgdt %cs:gdtptr - - movl %cr0, %eax - andl $0x7FFAFFD1, %eax /* PG, AM, WP, NE, TS, EM, MP = 0 */ - orl $0x60000001, %eax /* CD, NW, PE = 1 */ - movl %eax, %cr0 - - /* Restore BIST result. */ - movl %ebp, %eax - - // port80_post(0x23) - - /* Now we are in protected mode. Jump to a 32 bit code segment. */ - data32 ljmp $ROM_CODE_SEG, $protected_stage0 - - /* I am leaving this weird jump in here in the event that future gas - * bugs force it to be used. - */ - /* .byte 0x66 */ - .code32 - /* ljmp $ROM_CODE_SEG, $protected_stage0 */ - - /* .code16 */ - .align 4 - .globl gdt16 -gdt16 = . - _stage0 -gdt16x: - .word gdt16xend - gdt16x -1 /* Compute the table limit. */ - .long gdt16x - .word 0 - - /* selgdt 0x08, flat code segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x9b, 0xcf, 0x00 - - /* selgdt 0x10, flat data segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x93, 0xcf, 0x00 -gdt16xend: - - /* From now on we are 32 bit. */ - .code32 - - /* We have two gdts where we could have one. That is ok. - * - * Let's not worry about this -- optimizing gdt is pointless since - * we're only in it for a little bit. - * - * Btw. note the trick below: The GDT points to ITSELF, and the first - * good descriptor is at offset 8. So you word-align the table, and - * then because you chose 8, you get a nice 64-bit aligned GDT entry, - * which is good as this is the size of the entry. - * Just in case you ever wonder why people do this. - */ - .align 4 - .globl gdtptr - .globl gdt_limit -gdt_limit = gdt_end - gdt - 1 /* Compute the table limit. */ - -gdt: -gdtptr: - .word gdt_end - gdt -1 /* Compute the table limit. */ - .long gdt /* We know the offset. */ - .word 0 - - /* selgdt 0x08, flat code segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x9b, 0xcf, 0x00 - - /* selgdt 0x10, flat data segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x93, 0xcf, 0x00 - - /* selgdt 0x18, flat code segment for CAR */ - .word 0xffff, 0x0000 - .byte 0x00, 0x9b, 0xcf, 0x00 - - /* selgdt 0x20, flat data segment for CAR */ - .word 0xffff, 0x0000 - .byte 0x00, 0x93, 0xcf, 0x00 -gdt_end: - /* When we come here we are in protected mode. We expand the stack * and copy the data segment from ROM to the memory. * @@ -468,42 +363,4 @@ .long 0xC001001A, 0xC001001D .long 0x000 /* NULL, end of table */ -/* Reset vector. */ - -/* - * RVECTOR: Size of reset vector, default is 0x10. - * RESRVED: Size of vpd code, default is 0xf0. - * BOOTBLK: Size of bootblock code, default is 0x1f00 (8k-256b). - */ - -SEGMENT_SIZE = 0x10000 -RVECTOR = 0x00010 - -/* Due to YET ANOTHER BUG in GNU bintools, you can NOT have a code16 here. - * I think we should leave it this way forever, as the bugs come and - * go -- and come again. - * - * .code16 - * .section ".rom.text" - */ -.section ".reset", "ax" - .globl _resetjump -_resetjump: - /* GNU bintools bugs again. This jumps to stage0 - 2. Sigh. */ - /* jmp _stage0 */ - .byte 0xe9 - .int _stage0 - ( . + 2 ) - - /* Note: The above jump is hand coded to work around bugs in binutils. - * 5 bytes are used for a 3 byte instruction. This works because x86 - * is little endian and allows us to use supported 32 bit relocations - * instead of the weird 16 bit relocations that binutils does not - * handle consistenly between versions because they are used so rarely. - */ -.byte 0 - -/* Date? ID string? We might want to put something else in here. */ -.ascii DATE - -/* Checksum. */ -/* .word 0 */ +#include "../stage0_common.S" Modified: coreboot-v3/arch/x86/geodelx/stage0.S =================================================================== --- coreboot-v3/arch/x86/geodelx/stage0.S 2008-10-07 23:53:02 UTC (rev 907) +++ coreboot-v3/arch/x86/geodelx/stage0.S 2008-10-08 16:07:29 UTC (rev 908) @@ -28,112 +28,7 @@ #include <macros.h> #include <amd_geodelx.h> - .code16 - .globl _stage0 -_stage0: - cli - /* Save the BIST result. */ - movl %eax, %ebp; - - /* thanks to kmliu(a)sis.com.tw for this TLB fix */ - /* IMMEDIATELY invalidate the translation lookaside buffer (TLB) before - * executing any further code. Even though paging is disabled we - * could still get false address translations due to the TLB if we - * didn't invalidate it. - */ - xorl %eax, %eax - movl %eax, %cr3 /* Invalidate TLB. */ - - /* Switch to protected mode. */ - - /* NOTE: With GNU assembler version 2.15.94.0.2.2 (i386-redhat-linux) - * using BFD version 2.15.94.0.2.2 20041220 this works fine without all - * the ld hackery and other things. So leave it as is with this comment. - */ - - data32 lgdt %cs:gdtptr - - movl %cr0, %eax - andl $0x7FFAFFD1, %eax /* PG, AM, WP, NE, TS, EM, MP = 0 */ - orl $0x60000001, %eax /* CD, NW, PE = 1 */ - movl %eax, %cr0 - - /* Restore BIST result. */ - movl %ebp, %eax - - // port80_post(0x23) - - /* Now we are in protected mode. Jump to a 32 bit code segment. */ - data32 ljmp $ROM_CODE_SEG, $protected_stage0 - - /* I am leaving this weird jump in here in the event that future gas - * bugs force it to be used. - */ - /* .byte 0x66 */ - .code32 - /* ljmp $ROM_CODE_SEG, $protected_stage0 */ - - /* .code16 */ - .align 4 - .globl gdt16 -gdt16 = . - _stage0 -gdt16x: - .word gdt16xend - gdt16x -1 /* Compute the table limit. */ - .long gdt16x - .word 0 - - /* selgdt 0x08, flat code segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x9b, 0xcf, 0x00 - - /* selgdt 0x10, flat data segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x93, 0xcf, 0x00 -gdt16xend: - - /* From now on we are 32 bit. */ - .code32 - - /* We have two gdts where we could have one. That is ok. - * - * Let's not worry about this -- optimizing gdt is pointless since - * we're only in it for a little bit. - * - * Btw. note the trick below: The GDT points to ITSELF, and the first - * good descriptor is at offset 8. So you word-align the table, and - * then because you chose 8, you get a nice 64-bit aligned GDT entry, - * which is good as this is the size of the entry. - * Just in case you ever wonder why people do this. - */ - .align 4 - .globl gdtptr - .globl gdt_limit -gdt_limit = gdt_end - gdt - 1 /* Compute the table limit. */ - -gdt: -gdtptr: - .word gdt_end - gdt -1 /* Compute the table limit. */ - .long gdt /* We know the offset. */ - .word 0 - - /* selgdt 0x08, flat code segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x9b, 0xcf, 0x00 - - /* selgdt 0x10, flat data segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x93, 0xcf, 0x00 - - /* selgdt 0x18, flat code segment for CAR */ - .word 0xffff, 0x0000 - .byte 0x00, 0x9b, 0xcf, 0x00 - - /* selgdt 0x20, flat data segment for CAR */ - .word 0xffff, 0x0000 - .byte 0x00, 0x93, 0xcf, 0x00 -gdt_end: - /* When we come here we are in protected mode. We expand the stack * and copy the data segment from ROM to the memory. * @@ -379,42 +274,4 @@ jmp stage1_main /* We will not go back. */ -/* Reset vector. */ - -/* - * RVECTOR: Size of reset vector, default is 0x10. - * RESRVED: Size of vpd code, default is 0xf0. - * BOOTBLK: Size of bootblock code, default is 0x1f00 (8k-256b). - */ - -SEGMENT_SIZE = 0x10000 -RVECTOR = 0x00010 - -/* Due to YET ANOTHER BUG in GNU bintools, you can NOT have a code16 here. - * I think we should leave it this way forever, as the bugs come and - * go -- and come again. - * - * .code16 - * .section ".rom.text" - */ -.section ".reset", "ax" - .globl _resetjump -_resetjump: - /* GNU bintools bugs again. This jumps to stage0 - 2. Sigh. */ - /* jmp _stage0 */ - .byte 0xe9 - .int _stage0 - ( . + 2 ) - - /* Note: The above jump is hand coded to work around bugs in binutils. - * 5 bytes are used for a 3 byte instruction. This works because x86 - * is little endian and allows us to use supported 32 bit relocations - * instead of the weird 16 bit relocations that binutils does not - * handle consistenly between versions because they are used so rarely. - */ -.byte 0 - -/* Date? ID string? We might want to put something else in here. */ -.ascii DATE - -/* Checksum. */ -/* .word 0 */ +#include "../stage0_common.S" Modified: coreboot-v3/arch/x86/i586/stage0.S =================================================================== --- coreboot-v3/arch/x86/i586/stage0.S 2008-10-07 23:53:02 UTC (rev 907) +++ coreboot-v3/arch/x86/i586/stage0.S 2008-10-08 16:07:29 UTC (rev 908) @@ -32,112 +32,7 @@ #define CACHE_RAM_CODE_SEG 0x18 #define CACHE_RAM_DATA_SEG 0x20 - .code16 - .globl _stage0 -_stage0: - cli - /* Save the BIST result. */ - movl %eax, %ebp; - - /* thanks to kmliu(a)sis.com.tw for this TLB fix */ - /* IMMEDIATELY invalidate the translation lookaside buffer (TLB) before - * executing any further code. Even though paging is disabled we - * could still get false address translations due to the TLB if we - * didn't invalidate it. - */ - xorl %eax, %eax - movl %eax, %cr3 /* Invalidate TLB. */ - - /* Switch to protected mode. */ - - /* NOTE: With GNU assembler version 2.15.94.0.2.2 (i386-redhat-linux) - * using BFD version 2.15.94.0.2.2 20041220 this works fine without all - * the ld hackery and other things. So leave it as is with this comment. - */ - - data32 lgdt %cs:gdtptr - - movl %cr0, %eax - andl $0x7FFAFFD1, %eax /* PG, AM, WP, NE, TS, EM, MP = 0 */ - orl $0x60000001, %eax /* CD, NW, PE = 1 */ - movl %eax, %cr0 - - /* Restore BIST result. */ - movl %ebp, %eax - - // port80_post(0x23) - - /* Now we are in protected mode. Jump to a 32 bit code segment. */ - data32 ljmp $ROM_CODE_SEG, $protected_stage0 - - /* I am leaving this weird jump in here in the event that future gas - * bugs force it to be used. - */ - /* .byte 0x66 */ - .code32 - /* ljmp $ROM_CODE_SEG, $protected_stage0 */ - - /* .code16 */ - .align 4 - .globl gdt16 -gdt16 = . - _stage0 -gdt16x: - .word gdt16xend - gdt16x -1 /* Compute the table limit. */ - .long gdt16x - .word 0 - - /* selgdt 0x08, flat code segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x9b, 0xcf, 0x00 - - /* selgdt 0x10, flat data segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x93, 0xcf, 0x00 -gdt16xend: - - /* From now on we are 32 bit. */ - .code32 - - /* We have two gdts where we could have one. That is ok. - * - * Let's not worry about this -- optimizing gdt is pointless since - * we're only in it for a little bit. - * - * Btw. note the trick below: The GDT points to ITSELF, and the first - * good descriptor is at offset 8. So you word-align the table, and - * then because you chose 8, you get a nice 64-bit aligned GDT entry, - * which is good as this is the size of the entry. - * Just in case you ever wonder why people do this. - */ - .align 4 - .globl gdtptr - .globl gdt_limit -gdt_limit = gdt_end - gdt - 1 /* Compute the table limit. */ - -gdt: -gdtptr: - .word gdt_end - gdt -1 /* Compute the table limit. */ - .long gdt /* We know the offset. */ - .word 0 - - /* selgdt 0x08, flat code segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x9b, 0xcf, 0x00 - - /* selgdt 0x10, flat data segment */ - .word 0xffff, 0x0000 - .byte 0x00, 0x93, 0xcf, 0x00 - - /* selgdt 0x18, flat code segment for CAR */ - .word 0xffff, 0x0000 - .byte 0x00, 0x9b, 0xcf, 0x00 - - /* selgdt 0x20, flat data segment for CAR */ - .word 0xffff, 0x0000 - .byte 0x00, 0x93, 0xcf, 0x00 -gdt_end: - /* When we come here we are in protected mode. We expand the stack * and copy the data segment from ROM to the memory. * @@ -465,42 +360,4 @@ .long 0x20C, 0x20D, 0x20E, 0x20F .long 0x000 /* NULL, end of table */ -/* Reset vector. */ - -/* - * RVECTOR: Size of reset vector, default is 0x10. - * RESRVED: Size of vpd code, default is 0xf0. - * BOOTBLK: Size of bootblock code, default is 0x1f00 (8k-256b). - */ - -SEGMENT_SIZE = 0x10000 -RVECTOR = 0x00010 - -/* Due to YET ANOTHER BUG in GNU bintools, you can NOT have a code16 here. - * I think we should leave it this way forever, as the bugs come and - * go -- and come again. - * - * .code16 - * .section ".rom.text" - */ -.section ".reset", "ax" - .globl _resetjump -_resetjump: - /* GNU bintools bugs again. This jumps to stage0 - 2. Sigh. */ - /* jmp _stage0 */ - .byte 0xe9 - .int _stage0 - ( . + 2 ) - - /* Note: The above jump is hand coded to work around bugs in binutils. - * 5 bytes are used for a 3 byte instruction. This works because x86 - * is little endian and allows us to use supported 32 bit relocations - * instead of the weird 16 bit relocations that binutils does not - * handle consistenly between versions because they are used so rarely. - */ -.byte 0 - -/* Date? ID string? We might want to put something else in here. */ -.ascii DATE - -/* Checksum. */ -/* .word 0 */ +#include "../stage0_common.S" Added: coreboot-v3/arch/x86/stage0_common.S =================================================================== --- coreboot-v3/arch/x86/stage0_common.S (rev 0) +++ coreboot-v3/arch/x86/stage0_common.S 2008-10-08 16:07:29 UTC (rev 908) @@ -0,0 +1,164 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 1999 Ronald G. Minnich + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + .code16 + .globl _stage0 +_stage0: + cli + + /* Save the BIST result. */ + movl %eax, %ebp; + + /* thanks to kmliu(a)sis.com.tw for this TLB fix */ + /* IMMEDIATELY invalidate the translation lookaside buffer (TLB) before + * executing any further code. Even though paging is disabled we + * could still get false address translations due to the TLB if we + * didn't invalidate it. + */ + xorl %eax, %eax + movl %eax, %cr3 /* Invalidate TLB. */ + + /* Switch to protected mode. */ + + /* NOTE: With GNU assembler version 2.15.94.0.2.2 (i386-redhat-linux) + * using BFD version 2.15.94.0.2.2 20041220 this works fine without all + * the ld hackery and other things. So leave it as is with this comment. + */ + + data32 lgdt %cs:gdtptr + + movl %cr0, %eax + andl $0x7FFAFFD1, %eax /* PG, AM, WP, NE, TS, EM, MP = 0 */ + orl $0x60000001, %eax /* CD, NW, PE = 1 */ + movl %eax, %cr0 + + /* Restore BIST result. */ + movl %ebp, %eax + + // port80_post(0x23) + + /* Now we are in protected mode. Jump to a 32 bit code segment. */ + data32 ljmp $ROM_CODE_SEG, $protected_stage0 + + /* I am leaving this weird jump in here in the event that future gas + * bugs force it to be used. + */ + /* .byte 0x66 */ + .code32 + /* ljmp $ROM_CODE_SEG, $protected_stage0 */ + + /* .code16 */ + .align 4 + .globl gdt16 +gdt16 = . - _stage0 +gdt16x: + .word gdt16xend - gdt16x -1 /* Compute the table limit. */ + .long gdt16x + .word 0 + + /* selgdt 0x08, flat code segment */ + .word 0xffff, 0x0000 + .byte 0x00, 0x9b, 0xcf, 0x00 + + /* selgdt 0x10, flat data segment */ + .word 0xffff, 0x0000 + .byte 0x00, 0x93, 0xcf, 0x00 +gdt16xend: + + /* From now on we are 32 bit. */ + .code32 + + /* We have two gdts where we could have one. That is ok. + * + * Let's not worry about this -- optimizing gdt is pointless since + * we're only in it for a little bit. + * + * Btw. note the trick below: The GDT points to ITSELF, and the first + * good descriptor is at offset 8. So you word-align the table, and + * then because you chose 8, you get a nice 64-bit aligned GDT entry, + * which is good as this is the size of the entry. + * Just in case you ever wonder why people do this. + */ + .align 4 + .globl gdtptr + .globl gdt_limit +gdt_limit = gdt_end - gdt - 1 /* Compute the table limit. */ + +gdt: +gdtptr: + .word gdt_end - gdt -1 /* Compute the table limit. */ + .long gdt /* We know the offset. */ + .word 0 + + /* selgdt 0x08, flat code segment */ + .word 0xffff, 0x0000 + .byte 0x00, 0x9b, 0xcf, 0x00 + + /* selgdt 0x10, flat data segment */ + .word 0xffff, 0x0000 + .byte 0x00, 0x93, 0xcf, 0x00 + + /* selgdt 0x18, flat code segment for CAR */ + .word 0xffff, 0x0000 + .byte 0x00, 0x9b, 0xcf, 0x00 + + /* selgdt 0x20, flat data segment for CAR */ + .word 0xffff, 0x0000 + .byte 0x00, 0x93, 0xcf, 0x00 +gdt_end: + +/* Reset vector. */ + +/* + * RVECTOR: Size of reset vector, default is 0x10. + * RESRVED: Size of vpd code, default is 0xf0. + * BOOTBLK: Size of bootblock code, default is 0x1f00 (8k-256b). + */ + +SEGMENT_SIZE = 0x10000 +RVECTOR = 0x00010 + +/* Due to YET ANOTHER BUG in GNU bintools, you can NOT have a code16 here. + * I think we should leave it this way forever, as the bugs come and + * go -- and come again. + * + * .code16 + * .section ".rom.text" + */ +.section ".reset", "ax" + .globl _resetjump +_resetjump: + /* GNU bintools bugs again. This jumps to stage0 - 2. Sigh. */ + /* jmp _stage0 */ + .byte 0xe9 + .int _stage0 - ( . + 2 ) + + /* Note: The above jump is hand coded to work around bugs in binutils. + * 5 bytes are used for a 3 byte instruction. This works because x86 + * is little endian and allows us to use supported 32 bit relocations + * instead of the weird 16 bit relocations that binutils does not + * handle consistenly between versions because they are used so rarely. + */ +.byte 0 + +/* Date? ID string? We might want to put something else in here. */ +.ascii DATE + +/* Checksum. */ +/* .word 0 */

1 0

r3642 build service
by coreboot information 08 Oct '08

08 Oct '08

Dear coreboot readers! This is the automated build check service of coreboot. The developer "jcrouse" checked in revision 3642 to the coreboot source repository and caused the following changes: Change Log: libpayload: Rename Geode video driver to Geode LX video driver. This is simply wrong, the "Geode" video driver is only good for LX and one of our users got bit by this just now. Signed-off-by: Peter Stuge <peter(a)stuge.se> Acked-by: Jordan Crouse <jordan.crouse(a)amd.com> Build Log: Compilation of jetway:j7f24 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3642&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=3642&device=epia-cn&vendor… If something broke during this checkin please be a pain in jcrouse'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

small bug/typo in libpayload
by Roman Yeryomin 08 Oct '08

08 Oct '08

If you do not include "See output on a video console" it falls out with error AS build/i386/head.S.o CC build/i386/main.o CC build/i386/sysinfo.o CC build/i386/timer.o CC build/i386/coreboot.o AS build/i386/util.S.o AS build/i386/exec.S.o CC build/i386/virtual.o CC build/crypto/sha1.o CC build/libc/malloc.o CC build/libc/printf.o CC build/libc/console.o CC build/libc/string.o CC build/libc/memory.o CC build/libc/ctype.o CC build/libc/ipchecksum.o CC build/libc/lib.o CC build/libc/rand.o CC build/libc/time.o CC build/libc/lar.o CC build/libc/exec.o CC build/libc/readline.o CC build/drivers/pci.o CC build/drivers/speaker.o CC build/drivers/serial.o CC build/drivers/keyboard.o CC build/drivers/nvram.o CC build/drivers/options.o CC build/curses/keyboard.o CC build/curses/tinycurses.o cc1: warnings being treated as errors /home/wiz/dev/coreboot/libpayload-r/curses/tinycurses.c: In function ‘wnoutrefresh’: /home/wiz/dev/coreboot/libpayload-r/curses/tinycurses.c:739: warning: unused variable ‘c’ make: *** [/home/wiz/dev/coreboot/libpayload-r/build/curses/tinycurses.o] Error 1 this can be fixed with including unsigned int c = ((int)color_pairs[PAIR_NUMBER(attr)]) << 8; in #ifdef CONFIG_VIDEO_CONSOLE like this: #ifdef CONFIG_VIDEO_CONSOLE unsigned int c = ((int)color_pairs[PAIR_NUMBER(attr)]) << 8; #endif Regards, Roman

3 2

author for early startup code needed
by Carl-Daniel Hailfinger 08 Oct '08

08 Oct '08

Hi, we have a small problem in v3: Author attributions for the early 16-bit/32-bit startup code have been lost. The earliest evidence of that code is in v2 revision 1657, committed by Eric Biederman. Some code there has a copyright 2000 by Ron, some other code is unclear. I'd rather avoid wrong copyright headers in a new file in v3. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

libpayload: Rename Geode video driver to Geode LX video driver.
by Peter Stuge 08 Oct '08

08 Oct '08

Please ack and commit. I can not commit to the libpayload repo, so whoever acks it gets to commit too. After applying the patch, please also run: svn mv drivers/video/geode.c drivers/video/geodelx.c //Peter

2 1

r3642 - in trunk/payloads/libpayload: . configs drivers drivers/video
by svn＠coreboot.org 08 Oct '08

08 Oct '08

Author: jcrouse Date: 2008-10-08 16:47:41 +0200 (Wed, 08 Oct 2008) New Revision: 3642 Added: trunk/payloads/libpayload/drivers/video/geodelx.c Removed: trunk/payloads/libpayload/drivers/video/geode.c Modified: trunk/payloads/libpayload/Config.in trunk/payloads/libpayload/configs/defconfig trunk/payloads/libpayload/drivers/Makefile.inc trunk/payloads/libpayload/drivers/video/video.c Log: libpayload: Rename Geode video driver to Geode LX video driver. This is simply wrong, the "Geode" video driver is only good for LX and one of our users got bit by this just now. Signed-off-by: Peter Stuge <peter(a)stuge.se> Acked-by: Jordan Crouse <jordan.crouse(a)amd.com> Modified: trunk/payloads/libpayload/Config.in =================================================================== --- trunk/payloads/libpayload/Config.in 2008-10-08 11:17:25 UTC (rev 3641) +++ trunk/payloads/libpayload/Config.in 2008-10-08 14:47:41 UTC (rev 3642) @@ -91,8 +91,8 @@ depends on VIDEO_CONSOLE default y -config GEODE_VIDEO_CONSOLE - bool "Geode video console driver" +config GEODELX_VIDEO_CONSOLE + bool "Geode LX video console driver" depends on VIDEO_CONSOLE default n Modified: trunk/payloads/libpayload/configs/defconfig =================================================================== --- trunk/payloads/libpayload/configs/defconfig 2008-10-08 11:17:25 UTC (rev 3641) +++ trunk/payloads/libpayload/configs/defconfig 2008-10-08 14:47:41 UTC (rev 3642) @@ -20,7 +20,7 @@ # CONFIG_SERIAL_ACS_FALLBACK is not set CONFIG_VIDEO_CONSOLE=y CONFIG_VGA_VIDEO_CONSOLE=y -# CONFIG_GEODE_VIDEO_CONSOLE is not set +# CONFIG_GEODELX_VIDEO_CONSOLE is not set CONFIG_PC_KEYBOARD=y CONFIG_PC_KEYBOARD_LAYOUT_US=y # CONFIG_PC_KEYBOARD_LAYOUT_DE is not set Modified: trunk/payloads/libpayload/drivers/Makefile.inc =================================================================== --- trunk/payloads/libpayload/drivers/Makefile.inc 2008-10-08 11:17:25 UTC (rev 3641) +++ trunk/payloads/libpayload/drivers/Makefile.inc 2008-10-08 14:47:41 UTC (rev 3642) @@ -44,9 +44,9 @@ TARGETS-$(CONFIG_VIDEO_CONSOLE) += drivers/video/video.o TARGETS-$(CONFIG_VGA_VIDEO_CONSOLE) += drivers/video/vga.o -# Geode console drivers -TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/geode.o -TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/font8x16.o +# Geode LX console drivers +TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/geodelx.o +TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/font8x16.o # USB stack TARGETS-$(CONFIG_USB) += drivers/usb/usbinit.o Deleted: trunk/payloads/libpayload/drivers/video/geode.c =================================================================== --- trunk/payloads/libpayload/drivers/video/geode.c 2008-10-08 11:17:25 UTC (rev 3641) +++ trunk/payloads/libpayload/drivers/video/geode.c 2008-10-08 14:47:41 UTC (rev 3642) @@ -1,291 +0,0 @@ -/* - * This file is part of the libpayload project. - * - * Copyright (C) 2008 Advanced Micro Devices, Inc. - * - * 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 <pci.h> -#include <video_console.h> -#include <arch/msr.h> -#include "font8x16.h" - -/* This is the video mode that we're going to use for our VGA screen */ - -static const struct mode { - unsigned int pll; - unsigned int hactive, hblankstart, hsyncstart; - unsigned int hsyncend, hblankend, htotal; - unsigned int vactive, vblankstart, vsyncstart; - unsigned int vsyncend, vblankend, vtotal; - unsigned int synccfg; -} vga_mode = { - .pll = 0x215D, - .hactive = 640, - .vactive = 400, - .hblankstart = 640, - .hsyncstart = 640 + 40, - .hsyncend = 640 + 40 + 96, - .hblankend = 640 + 40 + 96 + 24, - .htotal = 640 + 40 + 96 + 24, - .vblankstart = 400, - .vsyncstart = 400 + 39, - .vsyncend = 400 + 39 + 2, - .vblankend = 400 + 39 + 2 + 9, - .vtotal = 400 + 39 + 2 + 9, - .synccfg = 0x300, -}; - -/* These are the color definitions for the 16 standard colors */ - -static const unsigned int vga_colors[] = { - (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 dcaddr; -static unsigned long vgaddr; -static unsigned long gpaddr; -static unsigned long fbaddr; - -#define DC (phys_to_virt(dcaddr)) -#define VG (phys_to_virt(vgaddr)) -#define GP (phys_to_virt(gpaddr)) -#define FB ((unsigned char *) phys_to_virt(fbaddr)) - -static void init_video_mode(void) -{ - unsigned int lo, hi, val; - int i; - - /* Set the PLL */ - - rdmsr(0x4c000015, lo, hi); - - hi = vga_mode.pll; - - lo &= ~0x1008000; - lo |= 0x01; - - wrmsr(0x4c000015, lo, hi); - udelay(100); - - for(i = 0; i < 1000; i++) { - rdmsr(0x4c000015, lo, hi); - if (lo & 0x2000000) - break; - } - - lo &= ~0x01; - wrmsr(0x4c000015, lo, hi); - - rdmsr(0x48002001, lo, hi); - lo &= ~0x38; - wrmsr(0x48002001, lo, hi); - - writel(0x4758, DC + 0x00); - - val = readl(DC + 0x00); - - writel(0, DC + 0x10); - writel(0, DC + 0x14); - writel(0, DC + 0x18); - - /* Set up the default scaling */ - - val = readl(DC + 0xD4); - - writel((0x4000 << 16) | 0x4000, DC + 0x90); - writel(0, DC + 0x94); - writel(val & ~0xf3040000, DC + 0xD4); - - /* Set up the compression (or lack thereof) */ - writel(vga_mode.hactive * vga_mode.vactive | 0x01, DC + 0x2C); - - val = readl(DC + 0x88); - writel(val & ~0xC00, DC + 0x88); - writel(0, DC + 0x8C); - - /* Set the pitch */ - writel(vga_mode.hactive >> 3, DC + 0x34); - writel((vga_mode.hactive + 7) >> 3, DC + 0x30); - - /* Set up default watermarks */ - - lo = 0xC0; - wrmsr(0x80000011, lo, hi); - - /* Write the timings */ - - writel((vga_mode.hactive - 1) | ((vga_mode.htotal - 1) << 16), - DC + 0x40); - - writel((vga_mode.hblankstart - 1) | ((vga_mode.hblankend - 1) << 16), - DC + 0x44); - - writel((vga_mode.hsyncstart - 1) | ((vga_mode.hsyncend - 1) << 16), - DC + 0x48); - - writel((vga_mode.vactive - 1) | ((vga_mode.vtotal - 1) << 16), - DC + 0x50); - - writel((vga_mode.vblankstart - 1) | ((vga_mode.vblankend - 1) << 16), - DC + 0x54); - - writel((vga_mode.vsyncstart - 1) | ((vga_mode.vsyncend - 1) << 16), - DC + 0x58); - - writel(((vga_mode.hactive - 1) << 16) | (vga_mode.vactive - 1), - DC + 0x5C); - - - /* Write the VG configuration */ - - writel(0x290000F | vga_mode.synccfg, VG + 0x08); - - /* Turn on the dacs */ - - val = readl(VG + 0x50); - writel((val & ~0xC00) | 0x01, VG + 0x50); - - /* Set the framebuffer base */ - writel(fbaddr, DC + 0x84); - - /* Write the final configuration */ - - writel(0xB000059, DC + 0x08); - writel(0, DC + 0x0C); - writel(0x2B601, DC + 0x04); -} - -static void geode_set_palette(int entry, unsigned int color) -{ - writel(entry, DC + 0x70); - writel(color, DC + 0x74); -} - -static void geode_scroll_up(void) -{ - unsigned char *dst = FB; - unsigned char *src = FB + vga_mode.hactive; - int y; - - for(y = 0; y < vga_mode.vactive - FONT_HEIGHT; y++) { - memcpy(dst, src, vga_mode.hactive); - - dst += vga_mode.hactive; - src += vga_mode.hactive; - } - - dst = FB + (vga_mode.vactive - FONT_HEIGHT) * vga_mode.hactive; - - for(; y < vga_mode.vactive; y++) { - memset(dst, 0, vga_mode.hactive); - dst += vga_mode.hactive; - } -} - -static void geode_clear(void) -{ - int row; - unsigned char *ptr = FB; - - for(row = 0; row < vga_mode.vactive; row++) { - memset(ptr, 0, vga_mode.hactive); - ptr += vga_mode.hactive; - } -} - -static void geode_putc(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; - - int x, y; - - dst = FB + ((row * FONT_HEIGHT) * vga_mode.hactive); - dst += (col * FONT_WIDTH); - - for(y = 0; y < FONT_HEIGHT; y++) { - - for(x = FONT_WIDTH - 1; x >= 0; x--) - dst[FONT_WIDTH - x] = (*glyph & (1 << x)) ? - fg : bg; - - dst += vga_mode.hactive; - glyph++; - } -} - -static int geode_init(void) -{ - pcidev_t dev; - int i; - - if (!pci_find_device(0x1022, 0x2081, &dev)) - return -1; - - fbaddr = pci_read_resource(dev, 0); - gpaddr = pci_read_resource(dev, 1); - dcaddr = pci_read_resource(dev, 2); - vgaddr = pci_read_resource(dev, 3); - - init_video_mode(); - - /* Set up the palette */ - - for(i = 0; i < ARRAY_SIZE(vga_colors); i++) { - geode_set_palette(i, vga_colors[i]); - } - - return 0; -} - -struct video_console geode_video_console = { - .init = geode_init, - .putc = geode_putc, - .clear = geode_clear, - .scroll_up = geode_scroll_up -}; Copied: trunk/payloads/libpayload/drivers/video/geodelx.c (from rev 3626, trunk/payloads/libpayload/drivers/video/geode.c) =================================================================== --- trunk/payloads/libpayload/drivers/video/geodelx.c (rev 0) +++ trunk/payloads/libpayload/drivers/video/geodelx.c 2008-10-08 14:47:41 UTC (rev 3642) @@ -0,0 +1,291 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * 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 <pci.h> +#include <video_console.h> +#include <arch/msr.h> +#include "font8x16.h" + +/* This is the video mode that we're going to use for our VGA screen */ + +static const struct mode { + unsigned int pll; + unsigned int hactive, hblankstart, hsyncstart; + unsigned int hsyncend, hblankend, htotal; + unsigned int vactive, vblankstart, vsyncstart; + unsigned int vsyncend, vblankend, vtotal; + unsigned int synccfg; +} vga_mode = { + .pll = 0x215D, + .hactive = 640, + .vactive = 400, + .hblankstart = 640, + .hsyncstart = 640 + 40, + .hsyncend = 640 + 40 + 96, + .hblankend = 640 + 40 + 96 + 24, + .htotal = 640 + 40 + 96 + 24, + .vblankstart = 400, + .vsyncstart = 400 + 39, + .vsyncend = 400 + 39 + 2, + .vblankend = 400 + 39 + 2 + 9, + .vtotal = 400 + 39 + 2 + 9, + .synccfg = 0x300, +}; + +/* These are the color definitions for the 16 standard colors */ + +static const unsigned int vga_colors[] = { + (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 dcaddr; +static unsigned long vgaddr; +static unsigned long gpaddr; +static unsigned long fbaddr; + +#define DC (phys_to_virt(dcaddr)) +#define VG (phys_to_virt(vgaddr)) +#define GP (phys_to_virt(gpaddr)) +#define FB ((unsigned char *) phys_to_virt(fbaddr)) + +static void init_video_mode(void) +{ + unsigned int lo, hi, val; + int i; + + /* Set the PLL */ + + rdmsr(0x4c000015, lo, hi); + + hi = vga_mode.pll; + + lo &= ~0x1008000; + lo |= 0x01; + + wrmsr(0x4c000015, lo, hi); + udelay(100); + + for(i = 0; i < 1000; i++) { + rdmsr(0x4c000015, lo, hi); + if (lo & 0x2000000) + break; + } + + lo &= ~0x01; + wrmsr(0x4c000015, lo, hi); + + rdmsr(0x48002001, lo, hi); + lo &= ~0x38; + wrmsr(0x48002001, lo, hi); + + writel(0x4758, DC + 0x00); + + val = readl(DC + 0x00); + + writel(0, DC + 0x10); + writel(0, DC + 0x14); + writel(0, DC + 0x18); + + /* Set up the default scaling */ + + val = readl(DC + 0xD4); + + writel((0x4000 << 16) | 0x4000, DC + 0x90); + writel(0, DC + 0x94); + writel(val & ~0xf3040000, DC + 0xD4); + + /* Set up the compression (or lack thereof) */ + writel(vga_mode.hactive * vga_mode.vactive | 0x01, DC + 0x2C); + + val = readl(DC + 0x88); + writel(val & ~0xC00, DC + 0x88); + writel(0, DC + 0x8C); + + /* Set the pitch */ + writel(vga_mode.hactive >> 3, DC + 0x34); + writel((vga_mode.hactive + 7) >> 3, DC + 0x30); + + /* Set up default watermarks */ + + lo = 0xC0; + wrmsr(0x80000011, lo, hi); + + /* Write the timings */ + + writel((vga_mode.hactive - 1) | ((vga_mode.htotal - 1) << 16), + DC + 0x40); + + writel((vga_mode.hblankstart - 1) | ((vga_mode.hblankend - 1) << 16), + DC + 0x44); + + writel((vga_mode.hsyncstart - 1) | ((vga_mode.hsyncend - 1) << 16), + DC + 0x48); + + writel((vga_mode.vactive - 1) | ((vga_mode.vtotal - 1) << 16), + DC + 0x50); + + writel((vga_mode.vblankstart - 1) | ((vga_mode.vblankend - 1) << 16), + DC + 0x54); + + writel((vga_mode.vsyncstart - 1) | ((vga_mode.vsyncend - 1) << 16), + DC + 0x58); + + writel(((vga_mode.hactive - 1) << 16) | (vga_mode.vactive - 1), + DC + 0x5C); + + + /* Write the VG configuration */ + + writel(0x290000F | vga_mode.synccfg, VG + 0x08); + + /* Turn on the dacs */ + + val = readl(VG + 0x50); + writel((val & ~0xC00) | 0x01, VG + 0x50); + + /* Set the framebuffer base */ + writel(fbaddr, DC + 0x84); + + /* Write the final configuration */ + + writel(0xB000059, DC + 0x08); + writel(0, DC + 0x0C); + writel(0x2B601, DC + 0x04); +} + +static void geodelx_set_palette(int entry, unsigned int color) +{ + writel(entry, DC + 0x70); + writel(color, DC + 0x74); +} + +static void geodelx_scroll_up(void) +{ + unsigned char *dst = FB; + unsigned char *src = FB + vga_mode.hactive; + int y; + + for(y = 0; y < vga_mode.vactive - FONT_HEIGHT; y++) { + memcpy(dst, src, vga_mode.hactive); + + dst += vga_mode.hactive; + src += vga_mode.hactive; + } + + dst = FB + (vga_mode.vactive - FONT_HEIGHT) * vga_mode.hactive; + + for(; y < vga_mode.vactive; y++) { + memset(dst, 0, vga_mode.hactive); + dst += vga_mode.hactive; + } +} + +static void geodelx_clear(void) +{ + int row; + unsigned char *ptr = FB; + + for(row = 0; row < vga_mode.vactive; row++) { + memset(ptr, 0, vga_mode.hactive); + ptr += vga_mode.hactive; + } +} + +static void geodelx_putc(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; + + int x, y; + + dst = FB + ((row * FONT_HEIGHT) * vga_mode.hactive); + dst += (col * FONT_WIDTH); + + for(y = 0; y < FONT_HEIGHT; y++) { + + for(x = FONT_WIDTH - 1; x >= 0; x--) + dst[FONT_WIDTH - x] = (*glyph & (1 << x)) ? + fg : bg; + + dst += vga_mode.hactive; + glyph++; + } +} + +static int geodelx_init(void) +{ + pcidev_t dev; + int i; + + if (!pci_find_device(0x1022, 0x2081, &dev)) + return -1; + + fbaddr = pci_read_resource(dev, 0); + gpaddr = pci_read_resource(dev, 1); + dcaddr = pci_read_resource(dev, 2); + vgaddr = pci_read_resource(dev, 3); + + init_video_mode(); + + /* Set up the palette */ + + for(i = 0; i < ARRAY_SIZE(vga_colors); i++) { + geodelx_set_palette(i, vga_colors[i]); + } + + return 0; +} + +struct video_console geodelx_video_console = { + .init = geodelx_init, + .putc = geodelx_putc, + .clear = geodelx_clear, + .scroll_up = geodelx_scroll_up +}; Property changes on: trunk/payloads/libpayload/drivers/video/geodelx.c ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/payloads/libpayload/drivers/video/video.c =================================================================== --- trunk/payloads/libpayload/drivers/video/video.c 2008-10-08 11:17:25 UTC (rev 3641) +++ trunk/payloads/libpayload/drivers/video/video.c 2008-10-08 14:47:41 UTC (rev 3642) @@ -31,8 +31,8 @@ #include <libpayload.h> #include <video_console.h> -#ifdef CONFIG_GEODE_VIDEO_CONSOLE -extern struct video_console geode_video_console; +#ifdef CONFIG_GEODELX_VIDEO_CONSOLE +extern struct video_console geodelx_video_console; #endif #ifdef CONFIG_VGA_VIDEO_CONSOLE @@ -41,8 +41,8 @@ static struct video_console *console_list[] = { -#ifdef CONFIG_GEODE_VIDEO_CONSOLE - &geode_video_console, +#ifdef CONFIG_GEODELX_VIDEO_CONSOLE + &geodelx_video_console, #endif #ifdef CONFIG_VGA_VIDEO_CONSOLE &vga_video_console,

1 0

r3641 build service
by coreboot information 08 Oct '08

08 Oct '08

Dear coreboot readers! This is the automated build check service of coreboot. The developer "oxygene" checked in revision 3641 to the coreboot source repository and caused the following changes: Change Log: move variable declaration to where it is used, to prevent gcc failure. Reported by Roman Yeryomin (and also seen reported earlier). (trivial) Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Build Log: Compilation of jetway:j7f24 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3641&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=3641&device=epia-cn&vendor… 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

r3641 - trunk/payloads/libpayload/curses
by svn＠coreboot.org 08 Oct '08

08 Oct '08

Author: oxygene Date: 2008-10-08 13:17:25 +0200 (Wed, 08 Oct 2008) New Revision: 3641 Modified: trunk/payloads/libpayload/curses/tinycurses.c Log: move variable declaration to where it is used, to prevent gcc failure. Reported by Roman Yeryomin (and also seen reported earlier). (trivial) Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Modified: trunk/payloads/libpayload/curses/tinycurses.c =================================================================== --- trunk/payloads/libpayload/curses/tinycurses.c 2008-10-07 16:25:10 UTC (rev 3640) +++ trunk/payloads/libpayload/curses/tinycurses.c 2008-10-08 11:17:25 UTC (rev 3641) @@ -736,9 +736,6 @@ for (x = win->_line[y].firstchar; x <= win->_line[y].lastchar; x++) { attr_t attr = win->_line[y].text[x].attr; - 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]; @@ -806,6 +803,9 @@ } #endif #ifdef CONFIG_VIDEO_CONSOLE + unsigned int c = + ((int)color_pairs[PAIR_NUMBER(attr)]) << 8; + c = SWAP_RED_BLUE(c); if (curses_flags & F_ENABLE_CONSOLE) {

1 0

v3: please don't touch stage0.S files
by Carl-Daniel Hailfinger 08 Oct '08

08 Oct '08

Hi, I'm currently trying to consolidate as much v3 stage0 code as possible into one preferred form with the best comments and coding style. That will allow us to split out common parts and focus on the processor-specific code. However, I'm not yet done, so please don't perform cleanups/patches on these files right now. That saves me a lot of work. Thanks! Regards, Carl-Daniel -- http://www.hailfinger.org/

1 2

r907 - in coreboot-v3/arch/x86: amd geodelx i586
by svn＠coreboot.org 07 Oct '08

07 Oct '08

Author: hailfinger Date: 2008-10-08 01:53:02 +0200 (Wed, 08 Oct 2008) New Revision: 907 Modified: coreboot-v3/arch/x86/amd/stage0.S coreboot-v3/arch/x86/geodelx/stage0.S coreboot-v3/arch/x86/i586/stage0.S Log: stage0 code for K8 and i586 has lots of mostly identical parts even in CAR code. Reduce the diff of the mostly identical parts to zero. That involves changing comments, whitespace and instruction order. Now we can split out the common parts more easily and concentrate on the differences. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: coreboot-v3/arch/x86/amd/stage0.S =================================================================== --- coreboot-v3/arch/x86/amd/stage0.S 2008-10-07 23:13:49 UTC (rev 906) +++ coreboot-v3/arch/x86/amd/stage0.S 2008-10-07 23:53:02 UTC (rev 907) @@ -17,8 +17,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +/* Init code - Switch CPU to protected mode and enable Cache-as-Ram (CAR). */ + #define ASSEMBLY #include <macros.h> +#include <mtrr.h> +#include <amd/k8/k8.h> + #define CacheSize CONFIG_CARSIZE #define CacheBase CONFIG_CARBASE #define MEM_TOPK 2048 @@ -32,9 +38,6 @@ #define CacheSizeAPStack 0x400 /* 1K */ #endif -#include <mtrr.h> -#include <amd/k8/k8.h> - .code16 .globl _stage0 _stage0: @@ -239,13 +242,13 @@ clear_fixed_var_mtrr: lodsl (%esi), %eax testl %eax, %eax - jz clear_fixed_var_mtrr_out + jz clear_fixed_var_mtrr_out movl %eax, %ecx xorl %eax, %eax wrmsr - jmp clear_fixed_var_mtrr + jmp clear_fixed_var_mtrr clear_fixed_var_mtrr_out: /* 0x06 is the WB IO type for a given 4k segment. @@ -304,14 +307,14 @@ #endif #if CacheSize > 0x8000 - /* enable caching for 32K-64K using fixed mtrr */ - movl $0x268, %ecx /* fix4k_c0000*/ + /* enable caching for 32K-64K using fixed mtrr */ + movl $0x268, %ecx /* fix4k_c0000*/ simplemask CacheSize, 0x8000 - wrmsr + wrmsr #endif - /* enable caching for 0-32K using fixed mtrr */ - movl $0x269, %ecx /* fix4k_c8000*/ + /* enable caching for 0-32K using fixed mtrr */ + movl $0x269, %ecx /* fix4k_c8000*/ simplemask CacheSize, 0 wrmsr @@ -436,12 +439,15 @@ /* Restore the BIST result. */ movl %ebp, %eax - /* We need to set ebp ? No need */ + /* We need to set ebp? No need. */ movl %esp, %ebp - pushl %ebx /* init detected */ - pushl %eax /* bist */ + + /* Second parameter: init_detected */ + pushl %ebx + /* First parameter: bist */ + pushl %eax call stage1_main - /* We will not go back */ + /* We will not go back. */ movb $0xAF, %al /* Should never see this postcode */ outb %al, $0x80 @@ -462,7 +468,6 @@ .long 0xC001001A, 0xC001001D .long 0x000 /* NULL, end of table */ -cache_as_ram_setup_out: /* Reset vector. */ /* Modified: coreboot-v3/arch/x86/geodelx/stage0.S =================================================================== --- coreboot-v3/arch/x86/geodelx/stage0.S 2008-10-07 23:13:49 UTC (rev 906) +++ coreboot-v3/arch/x86/geodelx/stage0.S 2008-10-07 23:53:02 UTC (rev 907) @@ -92,7 +92,7 @@ .byte 0x00, 0x93, 0xcf, 0x00 gdt16xend: - /* From now on we are 32bit. */ + /* From now on we are 32 bit. */ .code32 /* We have two gdts where we could have one. That is ok. @@ -365,15 +365,17 @@ movl $0, %eax pushl %eax - /* Store zero for the unused init_detected parameter. */ - pushl %eax - /* Restore the BIST result. */ movl %ebp, %eax /* We need to set ebp? No need. */ movl %esp, %ebp - pushl %eax /* BIST */ + + /* Second parameter: init_detected */ + /* Store zero for the unused init_detected parameter. */ + pushl $0 + /* First parameter: bist */ + pushl %eax jmp stage1_main /* We will not go back. */ Modified: coreboot-v3/arch/x86/i586/stage0.S =================================================================== --- coreboot-v3/arch/x86/i586/stage0.S 2008-10-07 23:13:49 UTC (rev 906) +++ coreboot-v3/arch/x86/i586/stage0.S 2008-10-07 23:53:02 UTC (rev 907) @@ -23,7 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -# init code - switch cpu to pmode and enable cache as ram. +/* Init code - Switch CPU to protected mode and enable Cache-as-Ram (CAR). */ #include <macros.h> @@ -277,7 +277,7 @@ movl $0x00000c00, %eax wrmsr - /*Clear all MTRRs */ + /* Clear all MTRRs */ xorl %edx, %edx movl $fixed_mtrr_msr, %esi clear_fixed_var_mtrr: @@ -289,7 +289,7 @@ xorl %eax, %eax wrmsr - jmp clear_fixed_var_mtrr + jmp clear_fixed_var_mtrr clear_fixed_var_mtrr_out: /* 0x06 is the WB IO type for a given 4k segment. @@ -305,13 +305,13 @@ */ xorl \reg, \reg .elseif \segs == 1 - movl $0x06000000, \reg + movl $0x06000000, \reg /* WB IO type */ .elseif \segs == 2 - movl $0x06060000, \reg + movl $0x06060000, \reg /* WB IO type */ .elseif \segs == 3 - movl $0x06060600, \reg + movl $0x06060600, \reg /* WB IO type */ .elseif \segs >= 4 - movl $0x06060606, \reg + movl $0x06060606, \reg /* WB IO type */ .endif .endm @@ -439,16 +439,20 @@ movl $0, %eax pushl %eax - /* Store zero for the unused init_detected parameter. */ - pushl %eax - /* Restore the BIST result. */ movl %ebp, %eax - /* We need to set ebp ? No need */ + + /* We need to set ebp? No need. */ movl %esp, %ebp - pushl %eax /* bist */ - call stage1_main - /* We will not go back */ + + /* Second parameter: init_detected */ + /* Store zero for the unused init_detected parameter. */ + pushl $0 + /* First parameter: bist */ + pushl %eax + call stage1_main + /* We will not go back. */ + fixed_mtrr_msr: .long 0x250, 0x258, 0x259 .long 0x268, 0x269, 0x26A

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
61
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 October 2008