OpenBIOS March 2010

openbios@openbios.org

11 participants
56 discussions

[commit] r703 - in trunk/openbios-devel/arch: amd64 x86
by repository service 18 Mar '10

18 Mar '10

Author: mcayland Date: Wed Mar 17 23:20:12 2010 New Revision: 703 URL: http://tracker.coreboot.org/trac/openbios/changeset/703 Log: Change the location of the function prototype for collect_sys_info() so that it both works for x86 and is the same location as for the amd64 build. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/amd64/sys_info.c trunk/openbios-devel/arch/x86/sys_info.c Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 22:40:22 2010 (r702) +++ trunk/openbios-devel/arch/amd64/openbios.c Wed Mar 17 23:20:12 2010 (r703) @@ -17,7 +17,6 @@ #include "relocate.h" void boot(void); -void collect_sys_info(struct sys_info *info); static char intdict[256 * 1024]; Modified: trunk/openbios-devel/arch/amd64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 22:40:22 2010 (r702) +++ trunk/openbios-devel/arch/amd64/sys_info.c Wed Mar 17 23:20:12 2010 (r703) @@ -11,6 +11,7 @@ #endif void collect_multiboot_info(struct sys_info *); +void collect_sys_info(struct sys_info *info); void collect_sys_info(struct sys_info *info) { Modified: trunk/openbios-devel/arch/x86/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 22:40:22 2010 (r702) +++ trunk/openbios-devel/arch/x86/sys_info.c Wed Mar 17 23:20:12 2010 (r703) @@ -10,6 +10,7 @@ #endif void collect_multiboot_info(struct sys_info *); +void collect_sys_info(struct sys_info *info); void collect_sys_info(struct sys_info *info) {

3 2

Missing prototype
by Programmingkid 17 Mar '10

17 Mar '10

I found a little bug in arch/x86/sys_info.c. There is a missing function prototype for void collect_sys_info(struct sys_info *info). Just adding void collect_sys_info(struct sys_info *info); right above the function definition fixes the problem.

2 2

[commit] r699 - in trunk/openbios-devel/include: libopenbios openbios
by repository service 16 Mar '10

16 Mar '10

Author: mcayland Date: Sun Mar 14 22:02:58 2010 New Revision: 699 URL: http://tracker.coreboot.org/trac/openbios/changeset/699 Log: Only one file remains - asm.m4. I have absolutely no idea what this file is supposed to do (since it doesn't seem to be called) so I'll move in into include/libopenbios for the time being. Anyone know what this file is used for? Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/asm.m4 (props changed) - copied unchanged from r698, trunk/openbios-devel/include/openbios/asm.m4 Deleted: trunk/openbios-devel/include/openbios/ Copied: trunk/openbios-devel/include/libopenbios/asm.m4 (from r698, trunk/openbios-devel/include/openbios/asm.m4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/asm.m4 Sun Mar 14 22:02:58 2010 (r699, copy of r698, trunk/openbios-devel/include/openbios/asm.m4) @@ -0,0 +1,137 @@ +/* -*- asm -*- + * Creation Date: <2001/12/30 20:08:53 samuel> + * Time-stamp: <2002/01/14 00:48:09 samuel> + * + * <asm.m4> + * + * m4 initialization (m4 is used as an assembly preprocessor) + * + * Copyright (C) 2001, 2002 Samuel Rydh (samuel(a)ibrium.se) + * + * 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 + * + */ + +/* This end-of-quote matches the start-of-quote in mol_config.h */ +]]]]] +changequote([,]) + +dnl m4 macros to avoid in header files (we can not rename these) +dnl ========================================================== +dnl shift, eval, expr, decr, incr, ifelse, popdef, pushdef + + +dnl ************************************************************** +dnl * Rename to reduce namespace conflicts +dnl ************************************************************** + +dnl *** Changing the name of built-in macros using defn does not always work *** + +undefine([changecom]) +undefine([changequote]) +dnl undefine([decr]) +undefine([defn]) +undefine([divert]) +undefine([divnum]) +undefine([errprint]) +dnl undefine([eval]) +dnl undefine([expr]) +undefine([file]) +undefine([format]) +undefine([len]) +undefine([line]) +dnl undefine([ifelse]) +dnl undefine([incr]) +undefine([indir]) +undefine([include]) +undefine([index]) +undefine([maketemp]) +undefine([paste]) +undefine([patsubst]) +dnl undefine([popdef]) +dnl undefine([pushdef]) +undefine([regexp]) +dnl undefine([shift]) +undefine([sinclude]) +undefine([spaste]) +undefine([substr]) +undefine([syscmd]) +undefine([sysval]) +undefine([translit]) +undefine([traceoff]) +undefine([traceon]) +undefine([undivert]) +undefine([unix]) +dnl undefine([__gnu__]) +dnl undefine([__unix__]) + +dnl Uncomment to list m4 definitions +dnl dumpdef m4exit + +/************************************************************************/ +/* M4 Macros */ +/************************************************************************/ + +/* WARNING - M4 BUG IN MacOS X (10.1.2): + * eval() in MacOS X (10.1.2) handles '&' as '&&' and '|' as '||'. + */ + +/* FORLOOP(var, from, to, [body var...]) */ +define([mFORLOOP], [pushdef([$1], [$2])_mFORLOOP([$1], [$2], [$3], [$4])popdef([$1])]) +define([_mFORLOOP], [$4[]ifelse($1, [$3], , + [define([$1], incr($1))_mFORLOOP([$1], [$2], [$3], [$4])])]) + +define([mFIRST],[$1]) +define([mCONCAT_C],[ [$@] ]) + +/* FOREACH(var, [item1, ...], [body var ...]) */ +define([mFOREACH],[pushdef([$1],mFIRST($2))_mFOREACH([$1],[shift($2)],[$3])popdef([$1])]) +define([_mFOREACH],[$3] [ifelse(mFIRST($2),,,[define([$1],mFIRST($2)) _mFOREACH([$1],[shift($2)],[$3])])]) + + +/******************** Nice macro definitions **************************/ + +/* MACRO(name, [param1, ...], [body _param1 ...]) */ +#ifdef __linux__ +define([MACRO], [ + .macro [$1] $2 + mFOREACH([i],[$2],[ pushdef(_[]i,\i) ]) + $3 + .endm + mFOREACH([i],[$2],[ popdef(_[]i) ]) +]) +#else +define([MACRO], [ + .macro [$1] + pushdef([_n],0) + mFOREACH([i],[$2],[ pushdef(_[]i,[$[]]_n) define([_n],incr(_n)) ]) + $3 + .endmacro + mFOREACH([i],[$2],[ popdef(_[]i) ]) + popdef([_n]) +]) +#endif +define([MACRO_0], [MACRO([$1],[_dummy_param_],[$2])]) + + +/* mDEFINE(name, [param1, ...], [body _param1 ...]) */ +define([mDEFINE], [ + pushdef([_n],1) + mFOREACH([i],[$2],[ pushdef(_[]i,[$[]]_n) define([_n],incr(_n)) ]) + define([$1], mCONCAT_C($3) ) + mFOREACH([i],[$2],[ popdef(_[]i) ]) + popdef([_n]) +]) + + +/* rLABEL(label): b label_b ; b label_f */ +define(rLABEL,[dnl +ifdef([$1]_curnum,,[$1[]f:])dnl + define([_tmp_curnum],ifdef($1[]_curnum, [eval($1_curnum+1)], 1)) dnl + define([$1]_curnum,_tmp_curnum)dnl + define([$1]f,$1_[]eval($1_curnum[]+1) )dnl + define([$1]b,$1_[]$1_curnum[] ) +$1[]_[]$1_curnum[]dnl +])

3 2

Program state and elf/linux/a.out/Fcode loaders
by Mark Cave-Ayland 14 Mar '10

14 Mar '10

Hi everyone, Having spent a lot of time learning about how OpenBIOS is organised this weekend, it seems quite obvious that the ELF, Linux, a.out and Fcode loaders currently duplicated for each architecture really should live in libopenbios. A quick diff of the loader code in each of the arch/* directories shows that there are only trivial differences between each version, and so it would make a lot of sense to have just one copy of the loader code and then use headers and/or callbacks to make the loader code work across all architectures. This also ties in with some of the work I've been doing for SPARC64 in that in order to implement the "go" word, we need to reorganise the boot word and hence implement the "program state" concept from the OF documentation. If all of the loaders are in one place then this shouldn't be too complicated a fix. Can anyone think of a reason why we wouldn't want to move the loaders into libopenbios? And also, how I would I be able to get hold of the various types of file (ELF, Linux, a.out) for each platform in order verify that I hadn't made a mistake in the merge? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

1 0

[commit] r702 - trunk/openbios-devel/kernel
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 22:40:22 2010 New Revision: 702 URL: http://tracker.coreboot.org/trac/openbios/changeset/702 Log: Correct comments in kernel/primitives.c as pointed out by ProgrammingKid and Andreas Färber. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/kernel/primitives.c Modified: trunk/openbios-devel/kernel/primitives.c ============================================================================== --- trunk/openbios-devel/kernel/primitives.c Sun Mar 14 22:35:54 2010 (r701) +++ trunk/openbios-devel/kernel/primitives.c Sun Mar 14 22:40:22 2010 (r702) @@ -30,10 +30,10 @@ #include "forth.c" -/* words[] is a function array of all native code functions in used by +/* words[] is a function array of all native code functions used by * the dictionary, i.e. CFAs and primitives. * Any change here needs a matching change in the primitive word's - * name list that is kept for bootstrapping in arch/unix/unix.c + * name list that is kept for bootstrapping in kernel/bootstrap.c * * NOTE: THIS LIST SHALL NOT CHANGE (EXCEPT MANDATORY ADDITIONS AT * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER

1 0

[commit] r701 - trunk/openbios-devel/kernel
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 22:35:54 2010 New Revision: 701 URL: http://tracker.coreboot.org/trac/openbios/changeset/701 Log: Fix a debug whereby the debug banner was being printed to the debug output rather than the console. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/kernel/internal.c Modified: trunk/openbios-devel/kernel/internal.c ============================================================================== --- trunk/openbios-devel/kernel/internal.c Sun Mar 14 22:14:04 2010 (r700) +++ trunk/openbios-devel/kernel/internal.c Sun Mar 14 22:35:54 2010 (r701) @@ -635,7 +635,7 @@ default: /* Display debug banner */ - printk(DEBUG_BANNER); + printf_console(DEBUG_BANNER); while (!availchar()); k = getchar(); }

1 0

Tidying up the modules subdirectory
by Mark Cave-Ayland 14 Mar '10

14 Mar '10

Hi everyone, In looking at the modules/ subdirectory, it seems to me that it is actually serving multiple purposes. Not only does it contain C implementations for Forth words defined within various extension packages, but also various random library routines. I'd like to propose creating a new directory called common/ and moving any files that don't contain C implementations of package words into this new directory. With this in place, I think it will be possible to share more files between the various architectures; in particular I think it will be possible to use one set of code for each of the different *-loaders, rather than requiring separate implementations for each architecture (e.g. arch/*/elfload.c). Thoughts/comments? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

2 13

[commit] r700 - trunk/openbios-devel/arch/ppc/qemu
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 22:14:04 2010 New Revision: 700 URL: http://tracker.coreboot.org/trac/openbios/changeset/700 Log: Fix PPC build - it seems that changing the headers around was masking the fact that virt_offset was not being defined within ppc/qemu.c compared to the other PPC builds. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 22:02:58 2010 (r699) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 22:14:04 2010 (r700) @@ -29,6 +29,8 @@ //#define DUMP_NVRAM +unsigned long virt_offset = 0; + void exit( int status __attribute__ ((unused))) {

1 0

[commit] r698 - in trunk/openbios-devel: arch/amd64 arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 drivers include/arch/common include/openbio...
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 21:34:01 2010 New Revision: 698 URL: http://tracker.coreboot.org/trac/openbios/changeset/698 Log: Split nvram.h into its proper two components - one for the arch-specific functions and another for the package functions. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/common/nvram.h (contents, props changed) - copied, changed from r696, trunk/openbios-devel/include/openbios/nvram.h trunk/openbios-devel/include/packages/nvram.h Deleted: trunk/openbios-devel/include/openbios/nvram.h Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/ppc/briq/briq.c trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/briq/main.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/mol/main.c trunk/openbios-devel/arch/ppc/mol/mol.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/main.c trunk/openbios-devel/arch/ppc/pearpc/pearpc.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/packages/nvram.c Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -5,7 +5,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/diskio.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/ppc/briq/briq.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 21:34:01 2010 (r698) @@ -18,7 +18,7 @@ #include "config.h" #include "kernel/kernel.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 21:34:01 2010 (r698) @@ -21,7 +21,7 @@ #include "config.h" #include "libopenbios/bindings.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "briq/briq.h" #include "libopenbios/ofmem.h" #include "openbios-version.h" Modified: trunk/openbios-devel/arch/ppc/briq/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 21:34:01 2010 (r698) @@ -19,7 +19,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 21:34:01 2010 (r698) @@ -17,7 +17,7 @@ #include "config.h" #include "libopenbios/bindings.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "mol/mol.h" #include "libopenbios/ofmem.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/mol/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 21:34:01 2010 (r698) @@ -18,7 +18,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "mol/mol.h" Modified: trunk/openbios-devel/arch/ppc/mol/mol.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 21:34:01 2010 (r698) @@ -16,7 +16,7 @@ #include "config.h" #include "kernel/kernel.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" #include "mol/mol.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 21:34:01 2010 (r698) @@ -22,7 +22,7 @@ #include "config.h" #include "libopenbios/bindings.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "pearpc/pearpc.h" #include "libopenbios/ofmem.h" #include "openbios-version.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 21:34:01 2010 (r698) @@ -19,7 +19,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/pearpc.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 21:34:01 2010 (r698) @@ -18,7 +18,7 @@ #include "config.h" #include "kernel/kernel.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 21:34:01 2010 (r698) @@ -23,7 +23,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "drivers/drivers.h" #include "qemu/qemu.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 21:34:01 2010 (r698) @@ -17,7 +17,8 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" +#include "packages/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "kernel.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 21:34:01 2010 (r698) @@ -18,7 +18,7 @@ #include "config.h" #include "kernel/kernel.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -5,7 +5,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "drivers/drivers.h" #include "libc/diskio.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 21:34:01 2010 (r698) @@ -13,7 +13,8 @@ #include "dict.h" #include "kernel/kernel.h" #include "kernel/stack.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" +#include "packages/nvram.h" #include "../../drivers/timer.h" // XXX #include "libopenbios/sys_info.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -5,7 +5,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 21:34:01 2010 (r698) @@ -10,7 +10,8 @@ #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "dict.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" +#include "packages/nvram.h" #include "libopenbios/sys_info.h" #include "openbios.h" #include "drivers/pci.h" Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -5,7 +5,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/diskio.h" void boot(void); Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -10,7 +10,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libc/diskio.h" #include "libopenbios/sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 21:34:01 2010 (r698) @@ -9,7 +9,8 @@ */ #include "config.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" +#include "packages/nvram.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 21:34:01 2010 (r698) @@ -17,7 +17,7 @@ #include "libc/vsprintf.h" #include "drivers/drivers.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" #include "libopenbios/ofmem.h" #include "obio.h" #define NO_QEMU_PROTOS Copied and modified: trunk/openbios-devel/include/arch/common/nvram.h (from r696, trunk/openbios-devel/include/openbios/nvram.h) ============================================================================== --- trunk/openbios-devel/include/openbios/nvram.h Sun Mar 14 21:10:01 2010 (r696, copy source) +++ trunk/openbios-devel/include/arch/common/nvram.h Sun Mar 14 21:34:01 2010 (r698) @@ -21,8 +21,4 @@ extern void arch_nvram_get( char *buf ); extern void arch_nvram_put( char *buf ); -extern void nvconf_init( void ); -extern void nvram_init( const char *path ); -extern void update_nvram( void ); - #endif /* _H_NVRAM */ Added: trunk/openbios-devel/include/packages/nvram.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/packages/nvram.h Sun Mar 14 21:34:01 2010 (r698) @@ -0,0 +1,24 @@ +/* + * Creation Date: <2003/12/20 01:04:25 samuel> + * Time-stamp: <2004/01/07 19:59:11 samuel> + * + * <nvram.h> + * + * arch NVRAM interface + * + * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef _H_NVRAM_PACKAGE +#define _H_NVRAM_PACKAGE + +extern void nvconf_init( void ); +extern void nvram_init( const char *path ); +extern void update_nvram( void ); + +#endif /* _H_NVRAM_PACKAGE */ Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/packages/nvram.c Sun Mar 14 21:34:01 2010 (r698) @@ -16,7 +16,8 @@ #include "config.h" #include "libopenbios/bindings.h" -#include "openbios/nvram.h" +#include "arch/common/nvram.h" +#include "packages/nvram.h" #ifdef CONFIG_DEBUG_NVRAM #define DPRINTF(fmt, args...) \

1 0

[commit] r697 - in trunk/openbios-devel/include: drivers libopenbios packages
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 21:19:46 2010 New Revision: 697 URL: http://tracker.coreboot.org/trac/openbios/changeset/697 Log: Commit extra files I forgot to "svn add" from the previous commit :( Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/drivers/vga.h trunk/openbios-devel/include/libopenbios/console.h trunk/openbios-devel/include/packages/ trunk/openbios-devel/include/packages/video.h Added: trunk/openbios-devel/include/drivers/vga.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/drivers/vga.h Sun Mar 14 21:19:46 2010 (r697) @@ -0,0 +1,20 @@ +#ifndef VIDEO_VGA_H +#define VIDEO_VGA_H + +/* drivers/vga_load_regs.c */ +void vga_load_regs(void); + +/* drivers/vga_set_mode.c */ +void vga_set_gmode (void); +void vga_set_amode (void); +void vga_font_load(unsigned char *vidmem, const unsigned char *font, int height, int num_chars); + +/* drivers/vga_vbe.c */ +void vga_set_color(int i, unsigned int r, unsigned int g, unsigned int b); +void vga_vbe_set_mode(int width, int height, int depth); +void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, + unsigned long rom, uint32_t rom_size); + +extern volatile uint32_t *dac; + +#endif /* VIDEO_VGA_H */ Added: trunk/openbios-devel/include/libopenbios/console.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/console.h Sun Mar 14 21:19:46 2010 (r697) @@ -0,0 +1,9 @@ +#ifndef VIDEO_CONSOLE_H +#define VIDEO_CONSOLE_H + +/* libopenbios/console_common.c */ +int console_draw_str(const char *str); +int console_init(void); +void console_close(void); + +#endif /* VIDEO_CONSOLE_H */ Added: trunk/openbios-devel/include/packages/video.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/packages/video.h Sun Mar 14 21:19:46 2010 (r697) @@ -0,0 +1,11 @@ +#ifndef VIDEO_SUBR_H +#define VIDEO_SUBR_H + +/* packages/video.c */ +int video_get_res(int *w, int *h); +void draw_pixel(int x, int y, int colind); +void set_color(int ind, unsigned long color); +void video_scroll(int height); +void init_video(unsigned long fb, int width, int height, int depth, int rb); + +#endif /* VIDEO_SUBR_H */

2 1