- OpenBIOS - mail.coreboot.org

[commit] r798 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 arch/x86 forth/admin include/libopenbios libopenbios packages
by repository service 25 Jun '10

25 Jun '10

Author: mcayland Date: Fri Jun 25 22:42:00 2010 New Revision: 798 URL: http://tracker.coreboot.org/trac/openbios/changeset/798 Log: Implement a basic C loader function in load.c that tries to load each supported executable file format. Now that the ihandle hierarchy is correct, we can simply pass an ihandle into the loader and it will work correctly regardless of whether it is being invoked on an entire disk, partition or individual file. In order to test the new code, start by switching the Fcode loader over to the new infrastructure for testing on SPARC64. Note this patch also contains a correction to load-base on SPARC which was being set to a value other than 0x4000 which is the documented default. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/load.h trunk/openbios-devel/libopenbios/load.c Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/forth/admin/nvram.fs trunk/openbios-devel/include/libopenbios/fcode_load.h trunk/openbios-devel/libopenbios/build.xml trunk/openbios-devel/libopenbios/fcode_load.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/arch/sparc32/boot.c Fri Jun 25 22:42:00 2010 (r798) @@ -30,12 +30,16 @@ { void *boot_notes = NULL; ucell valid; + ihandle_t dev; push_str(path); fword("pathres-resolve-aliases"); bootpath = pop_fstr_copy(); printk("Trying %s (%s)\n", path, bootpath); + /* Open device used by this path */ + dev = open_dev(path); + #ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ elf_load(&sys_info, path, param, &boot_notes); @@ -59,7 +63,7 @@ #ifdef CONFIG_LOADER_FCODE /* Fcode loader */ - fcode_load(path); + fcode_load(dev); feval("state-valid @"); valid = POP(); if (valid) @@ -75,6 +79,8 @@ goto start_image; #endif + close_dev(dev); + return 0; Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/arch/sparc64/boot.c Fri Jun 25 22:42:00 2010 (r798) @@ -27,6 +27,10 @@ static int try_path(const char *path, char *param) { ucell valid; + ihandle_t dev; + + /* Open device used by this path */ + dev = open_dev(path); #ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ @@ -51,7 +55,7 @@ #ifdef CONFIG_LOADER_FCODE /* Fcode loader */ - fcode_load(path); + fcode_load(dev); feval("state-valid @"); valid = POP(); if (valid) @@ -67,6 +71,8 @@ goto start_image; #endif + close_dev(dev); + return 0; Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/arch/x86/boot.c Fri Jun 25 22:42:00 2010 (r798) @@ -24,6 +24,10 @@ static int try_path(const char *path, char *param) { ucell valid; + ihandle_t dev; + + /* Open device used by this path */ + dev = open_dev(path); #ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ @@ -48,7 +52,7 @@ #ifdef CONFIG_LOADER_FCODE /* Fcode loader */ - fcode_load(path); + fcode_load(dev); feval("state-valid @"); valid = POP(); if (valid) @@ -64,6 +68,8 @@ goto start_image; #endif + close_dev(dev); + return 0; Modified: trunk/openbios-devel/forth/admin/nvram.fs ============================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/forth/admin/nvram.fs Fri Jun 25 22:42:00 2010 (r798) @@ -358,7 +358,7 @@ [IFDEF] CONFIG_SPARC64 \ ---- SPARC64 ---- -s" 4000000" s" load-base" int-config +s" 4000" s" load-base" int-config s" false" s" little-endian?" bool-config [THEN] Modified: trunk/openbios-devel/include/libopenbios/fcode_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/fcode_load.h Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/include/libopenbios/fcode_load.h Fri Jun 25 22:42:00 2010 (r798) @@ -18,7 +18,7 @@ #define _H_FCODELOAD extern int is_fcode(unsigned char *fcode); -extern int fcode_load(const char *filename); +extern int fcode_load(ihandle_t dev); extern void fcode_init_program(void); #endif /* _H_FCODELOAD */ Added: trunk/openbios-devel/include/libopenbios/load.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/load.h Fri Jun 25 22:42:00 2010 (r798) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2010/06/25 20:00:00 mcayland> + * Time-stamp: <2010/06/25 20:00:00 mcayland> + * + * <load.h> + * + * C implementation of load + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * 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_LOAD +#define _H_LOAD + +extern void load(ihandle_t dev); + +#endif /* _H_LOAD */ Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/libopenbios/build.xml Fri Jun 25 22:42:00 2010 (r798) @@ -15,6 +15,7 @@ <object source="init.c"/> <object source="initprogram.c"/> <object source="ipchecksum.c"/> + <object source="load.c"/> <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> <object source="xcoff_load.c" condition="LOADER_XCOFF"/> Modified: trunk/openbios-devel/libopenbios/fcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/fcode_load.c Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/libopenbios/fcode_load.c Fri Jun 25 22:42:00 2010 (r798) @@ -24,7 +24,7 @@ } int -fcode_load(const char *filename) +fcode_load(ihandle_t dev) { int retval = -1; uint8_t fcode_header[8]; @@ -34,7 +34,7 @@ /* Mark the saved-program-state as invalid */ feval("0 state-valid !"); - fd = open_io(filename); + fd = open_ih(dev); if (!fd) goto out; @@ -42,7 +42,7 @@ seek_io(fd, offset); if (read_io(fd, &fcode_header, sizeof(fcode_header)) != sizeof(fcode_header)) { - debug("Can't read FCode header from file %s\n", filename); + debug("Can't read FCode header from ihandle " FMT_ucellx "\n", dev); retval = LOADER_NOT_SUPPORT; goto out; } @@ -59,11 +59,12 @@ size = (fcode_header[4] << 24) | (fcode_header[5] << 16) | (fcode_header[6] << 8) | fcode_header[7]; - start = 0x4000; + fword("load-base"); + start = POP(); - printf("Loading FCode image...\n"); + printf("\nLoading FCode image...\n"); - seek_io(fd, offset + sizeof(fcode_header)); + seek_io(fd, offset); if ((size_t)read_io(fd, (void *)start, size) != size) { printf("Can't read file (size 0x%lx)\n", size); @@ -92,6 +93,7 @@ { /* If the payload is Fcode then we execute it immediately */ ucell address; + uint8_t fcode_header[8]; fword("load-base"); address = POP(); @@ -101,7 +103,7 @@ return; } - PUSH(address); + PUSH(address + sizeof(fcode_header)); PUSH(1); fword("byte-load"); } Added: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/load.c Fri Jun 25 22:42:00 2010 (r798) @@ -0,0 +1,33 @@ +/* + * Creation Date: <2010/06/25 20:00:00 mcayland> + * Time-stamp: <2010/06/25 20:00:00 mcayland> + * + * <load.c> + * + * C implementation of load + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "config.h" +#include "kernel/kernel.h" +#include "libopenbios/bindings.h" +#include "libopenbios/load.h" + +#include "libopenbios/fcode_load.h" + + +void load(ihandle_t dev) +{ + /* Invoke the loaders on the specified device */ + +#ifdef CONFIG_LOADER_FCODE + fcode_load(dev); +#endif + +} Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/packages/disk-label.c Fri Jun 25 22:42:00 2010 (r798) @@ -177,7 +177,7 @@ xt = find_ih_method("load", di->part_ih); if (!xt) { - forth_printf("load currently not implemented for /packages/disk-label\n"); + forth_printf("load currently not implemented for ihandle " FMT_ucellx "\n", di->part_ih); PUSH(0); return; } Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/packages/mac-parts.c Fri Jun 25 22:42:00 2010 (r798) @@ -16,6 +16,7 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/load.h" #include "mac-parts.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" @@ -328,8 +329,8 @@ static void macparts_load( __attribute__((unused))macparts_info_t *di ) { - forth_printf("load currently not implemented for /packages/mac-parts\n"); - PUSH(0); + /* Invoke the loader */ + load(my_self()); } NODE_METHODS( macparts ) = { Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/packages/pc-parts.c Fri Jun 25 22:42:00 2010 (r798) @@ -14,6 +14,7 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/load.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "packages.h" @@ -352,8 +353,8 @@ static void pcparts_load( __attribute__((unused))pcparts_info_t *di ) { - forth_printf("load currently not implemented for /packages/pc-parts\n"); - PUSH(0); + /* Invoke the loader */ + load(my_self()); } Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Wed Jun 23 23:02:12 2010 (r797) +++ trunk/openbios-devel/packages/sun-parts.c Fri Jun 25 22:42:00 2010 (r798) @@ -14,6 +14,7 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/load.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "packages.h" @@ -284,8 +285,8 @@ static void sunparts_load( __attribute__((unused))sunparts_info_t *di ) { - forth_printf("load currently not implemented for /packages/sun-parts\n"); - PUSH(0); + /* Invoke the loader */ + load(my_self()); }

1 0

[commit] r797 - trunk/openbios-devel/fs/ext2
by repository service 23 Jun '10

23 Jun '10

Author: mcayland Date: Wed Jun 23 23:02:12 2010 New Revision: 797 URL: http://tracker.coreboot.org/trac/openbios/changeset/797 Log: ext2 magic is stored in little-endian format, not big-endian format. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/ext2/ext2_utils.c Modified: trunk/openbios-devel/fs/ext2/ext2_utils.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.c Wed Jun 23 22:41:34 2010 (r796) +++ trunk/openbios-devel/fs/ext2/ext2_utils.c Wed Jun 23 23:02:12 2010 (r797) @@ -20,7 +20,7 @@ seek_io(fd, 2 * 512 + offset); read_io(fd, super, sizeof (*super)); - if (__be16_to_cpu(super->s_magic) != EXT2_SUPER_MAGIC) { + if (__le16_to_cpu(super->s_magic) != EXT2_SUPER_MAGIC) { free(super); return 0; }

1 0

[commit] r796 - in trunk/openbios-devel: fs/ext2 fs/hfs fs/hfsplus fs/iso9660 include/fs packages
by repository service 23 Jun '10

23 Jun '10

Author: mcayland Date: Wed Jun 23 22:41:34 2010 New Revision: 796 URL: http://tracker.coreboot.org/trac/openbios/changeset/796 Log: Fix up non-grub iso9660 filesystem, plus correct a thinko where the sense of the existing hfs/ext2 probe functions was inverted by default. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/fs/iso9660/iso9660_mount.c trunk/openbios-devel/fs/iso9660/libiso9660.h trunk/openbios-devel/include/fs/fs.h trunk/openbios-devel/packages/misc-files.c Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Tue Jun 15 21:59:47 2010 (r795) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Wed Jun 23 22:41:34 2010 (r796) @@ -205,7 +205,7 @@ int fs_ext2_probe(int fd, llong offs) { if (ext2_probe(fd, offs)) - return -1; + return 0; - return 0; + return -1; } Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Tue Jun 15 21:59:47 2010 (r795) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Wed Jun 23 22:41:34 2010 (r796) @@ -463,7 +463,7 @@ fs_hfs_probe( int fd, llong offs ) { if (hfs_probe(fd, offs)) - return -1; + return 0; - return 0; + return -1; } Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Tue Jun 15 21:59:47 2010 (r795) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Wed Jun 23 22:41:34 2010 (r796) @@ -402,7 +402,7 @@ fs_hfsp_probe(int fd, llong offs) { if (volume_probe(fd, offs)) - return -1; + return 0; - return 0; + return -1; } Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Tue Jun 15 21:59:47 2010 (r795) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Wed Jun 23 22:41:34 2010 (r796) @@ -152,6 +152,15 @@ .get_fstype = get_fstype, }; +int +fs_iso9660_probe( int fd, llong offs ) +{ + if (iso9660_probe(fd, offs)) + return 0; + + return -1; +} + int fs_iso9660_open(int fd, fs_ops_t *fs) { iso9660_VOLUME *volume; Modified: trunk/openbios-devel/fs/iso9660/iso9660_mount.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_mount.c Tue Jun 15 21:59:47 2010 (r795) +++ trunk/openbios-devel/fs/iso9660/iso9660_mount.c Wed Jun 23 22:41:34 2010 (r796) @@ -189,6 +189,22 @@ return 0; } +int iso9660_probe(int fd, llong offset) +{ + struct iso_primary_descriptor ipd; + + seek_io(fd, 16 * ISOFS_BLOCK_SIZE + offset); + read_io(fd, &ipd, sizeof (ipd)); + + if ((ipd.type[0] != ISO_VD_PRIMARY) || + (strncmp(ipd.id, ISO_STANDARD_ID, sizeof (ipd.id)) != 0) || + (ipd.version[0] != 1)) { + return 0; + } + + return -1; +} + struct iso_directory_record *iso9660_get_root_node(iso9660_VOLUME* volume) { return (struct iso_directory_record *)volume->descriptor->root_directory_record; Modified: trunk/openbios-devel/fs/iso9660/libiso9660.h ============================================================================== --- trunk/openbios-devel/fs/iso9660/libiso9660.h Tue Jun 15 21:59:47 2010 (r795) +++ trunk/openbios-devel/fs/iso9660/libiso9660.h Wed Jun 23 22:41:34 2010 (r796) @@ -14,6 +14,7 @@ extern iso9660_VOLUME* iso9660_mount(int fd); extern int iso9660_umount(iso9660_VOLUME *volume); +extern int iso9660_probe(int fd, llong offs); extern iso9660_DIR* iso9660_opendir(iso9660_VOLUME *, const char *name); extern iso9660_FILE* iso9660_open(iso9660_VOLUME *, const char *pathname); extern int iso9660_closedir(iso9660_DIR *dir); Modified: trunk/openbios-devel/include/fs/fs.h ============================================================================== --- trunk/openbios-devel/include/fs/fs.h Tue Jun 15 21:59:47 2010 (r795) +++ trunk/openbios-devel/include/fs/fs.h Wed Jun 23 22:41:34 2010 (r796) @@ -69,8 +69,10 @@ #ifdef CONFIG_ISO9660 extern int fs_iso9660_open( int fd, fs_ops_t *fs ); +extern int fs_iso9660_probe( int fd, llong offs ); #else static inline int fs_iso9660_open( int fd, fs_ops_t *fs ) { return -1; } +static inline int fs_iso9660_probe( int fd, llong offs ) { return -1; } #endif #ifdef CONFIG_EXT2 Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Tue Jun 15 21:59:47 2010 (r795) +++ trunk/openbios-devel/packages/misc-files.c Wed Jun 23 22:41:34 2010 (r796) @@ -359,12 +359,12 @@ err = fs_hfs_probe(fd, offs); DPRINTF("--- HFS returned %d\n", err); } -/* + if( err ) { - err = fs_iso9660_open(fd, fs); + err = fs_iso9660_probe(fd, offs); DPRINTF("--- ISO9660 returned %d\n", err); } -*/ + if( err ) { err = fs_ext2_probe(fd, offs); DPRINTF("--- ext2 returned %d\n", err);

1 0

[commit] r793 - in trunk/openbios-devel/fs: hfs hfsplus
by repository service 17 Jun '10

17 Jun '10

Author: blueswirl Date: Thu Jun 10 20:35:25 2010 New Revision: 793 URL: http://tracker.coreboot.org/trac/openbios/changeset/793 Log: Fix PPC target build Fix errors like this: ../fs/hfs/volume.c:612:2: error: no newline at end of file Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfs/volume.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/hfsplus/volume.c Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Thu Jun 10 00:30:32 2010 (r792) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Thu Jun 10 20:35:25 2010 (r793) @@ -466,4 +466,4 @@ return -1; return 0; -} \ No newline at end of file +} Modified: trunk/openbios-devel/fs/hfs/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfs/volume.c Thu Jun 10 00:30:32 2010 (r792) +++ trunk/openbios-devel/fs/hfs/volume.c Thu Jun 10 20:35:25 2010 (r793) @@ -609,4 +609,4 @@ free(mdb); return -1; -} \ No newline at end of file +} Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Thu Jun 10 00:30:32 2010 (r792) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Thu Jun 10 20:35:25 2010 (r793) @@ -405,4 +405,4 @@ return -1; return 0; -} \ No newline at end of file +} Modified: trunk/openbios-devel/fs/hfsplus/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/volume.c Thu Jun 10 00:30:32 2010 (r792) +++ trunk/openbios-devel/fs/hfsplus/volume.c Thu Jun 10 20:35:25 2010 (r793) @@ -307,4 +307,4 @@ free(vol); return -1; -} \ No newline at end of file +}

6 18

[commit] r795 - trunk/openbios-devel/packages
by repository service 15 Jun '10

15 Jun '10

Author: mcayland Date: Tue Jun 15 21:59:47 2010 New Revision: 795 URL: http://tracker.coreboot.org/trac/openbios/changeset/795 Log: Fix partition string parsing code so that it correctly handles boot strings beginning with a comma of the form <device>,\path\to\file. This fixes all outstanding issues with PPC. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Tue Jun 15 18:31:54 2010 (r794) +++ trunk/openbios-devel/packages/mac-parts.c Tue Jun 15 21:59:47 2010 (r795) @@ -62,26 +62,37 @@ /* Arguments that we accept: id: [0-7] - [(id,)][filespec] + [(id)][,][filespec] */ if( str ) { if ( !strlen(str) ) parnum = -1; else { - /* If end of string, we just have a partition id */ - if (str[1] == '\0') { - parstr = str; - } else { - /* If a comma, then we have a partition id plus argument */ - if (str[1] == ',') { - str[1] = '\0'; - parstr = str; - argstr = &str[2]; - } else { - /* Otherwise we have just an argument */ - argstr = str; - } + /* Detect the boot parameters */ + char *ptr; + ptr = str; + + /* <id>,<file> */ + if (*ptr >= '0' && *ptr <= '9' && *(ptr + 1) == ',') { + parstr = ptr; + *(ptr + 1) = '\0'; + argstr = ptr + 2; + } + + /* <id> */ + else if (*ptr >= '0' && *ptr <='9' && *(ptr + 1) == '\0') { + parstr = ptr; + } + + /* ,<file> */ + else if (*ptr == ',') { + argstr = ptr + 1; + } + + /* <file> */ + else { + argstr = str; } /* Convert the id to a partition number */ Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Tue Jun 15 18:31:54 2010 (r794) +++ trunk/openbios-devel/packages/pc-parts.c Tue Jun 15 21:59:47 2010 (r795) @@ -89,26 +89,37 @@ /* Arguments that we accept: id: [0-7] - [(id,)][filespec] + [(id)][,][filespec] */ if( str ) { if ( !strlen(str) ) parnum = -1; else { - /* If end of string, we just have a partition id */ - if (str[1] == '\0') { - parstr = str; - } else { - /* If a comma, then we have a partition id plus argument */ - if (str[1] == ',') { - str[1] = '\0'; - parstr = str; - argstr = &str[2]; - } else { - /* Otherwise we have just an argument */ - argstr = str; - } + /* Detect the boot parameters */ + char *ptr; + ptr = str; + + /* <id>,<file> */ + if (*ptr >= '0' && *ptr <= '9' && *(ptr + 1) == ',') { + parstr = ptr; + *(ptr + 1) = '\0'; + argstr = ptr + 2; + } + + /* <id> */ + else if (*ptr >= '0' && *ptr <='9' && *(ptr + 1) == '\0') { + parstr = ptr; + } + + /* ,<file> */ + else if (*ptr == ',') { + argstr = ptr + 1; + } + + /* <file> */ + else { + argstr = str; } /* Convert the id to a partition number */ Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Tue Jun 15 18:31:54 2010 (r794) +++ trunk/openbios-devel/packages/sun-parts.c Tue Jun 15 21:59:47 2010 (r795) @@ -106,26 +106,37 @@ /* Arguments that we accept: id: [0-7] | [a-h] - [(id,)][filespec] + [(id)][,][filespec] */ if( str ) { if ( !strlen(str) ) parnum = -1; else { - /* If end of string, we just have a partition id */ - if (str[1] == '\0') { - parstr = str; - } else { - /* If a comma, then we have a partition id plus argument */ - if (str[1] == ',') { - str[1] = '\0'; - parstr = str; - argstr = &str[2]; - } else { - /* Otherwise we have just an argument */ - argstr = str; - } + /* Detect the boot parameters */ + char *ptr; + ptr = str; + + /* <id>,<file> */ + if (((*ptr >= '0' && *ptr <= '9') || (*ptr >= 'a' && *ptr <= 'a' + 8)) && *(ptr + 1) == ',') { + parstr = ptr; + *(ptr + 1) = '\0'; + argstr = ptr + 2; + } + + /* <id> */ + else if (((*ptr >= '0' && *ptr <= '9') || (*ptr >= 'a' && *ptr <= 'a' + 8)) && *(ptr + 1) == '\0') { + parstr = ptr; + } + + /* ,<file> */ + else if (*ptr == ',') { + argstr = ptr + 1; + } + + /* <file> */ + else { + argstr = str; } /* Convert the id to a partition number */ @@ -134,7 +145,7 @@ parnum = parstr[0] - 'a'; else parnum = atol(parstr); - } + } } }

1 0

[commit] r794 - in trunk/openbios-devel: fs/hfsplus packages
by repository service 15 Jun '10

15 Jun '10

Author: mcayland Date: Tue Jun 15 18:31:54 2010 New Revision: 794 URL: http://tracker.coreboot.org/trac/openbios/changeset/794 Log: Fix the HFSP probe function, plus also resolve an off-by-one error in the mac-parts partition code. This should fix PPC boot once again. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/volume.c trunk/openbios-devel/packages/mac-parts.c Modified: trunk/openbios-devel/fs/hfsplus/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/volume.c Thu Jun 10 20:35:25 2010 (r793) +++ trunk/openbios-devel/fs/hfsplus/volume.c Tue Jun 15 18:31:54 2010 (r794) @@ -294,17 +294,21 @@ int volume_probe(int fd, llong offset) { - struct hfsp_vh *vol; + UInt16 *vol; + int ret = 0; - vol = (struct hfsp_vh*)malloc(2 * 1 << HFSP_BLOCKSZ_BITS); + vol = (UInt16 *)malloc(2 * 1 << HFSP_BLOCKSZ_BITS); os_seek_offset( fd, 2 * (1 << HFSP_BLOCKSZ_BITS) + offset ); os_read(fd, vol, 2, HFSP_BLOCKSZ_BITS); - if (__be16_to_cpu(vol->signature) != HFSP_VOLHEAD_SIG) { - free(vol); - return 0; + if (__be16_to_cpu(vol[0]) == HFS_VOLHEAD_SIG && + __be16_to_cpu(vol[0x7c]) == HFSP_VOLHEAD_SIG) { + ret = -1; + } else if (__be16_to_cpu(vol[0]) == HFSP_VOLHEAD_SIG) { + ret = -1; } free(vol); - return -1; + return ret; } + Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Thu Jun 10 20:35:25 2010 (r793) +++ trunk/openbios-devel/packages/mac-parts.c Tue Jun 15 18:31:54 2010 (r794) @@ -127,13 +127,12 @@ /* search a bootable partition */ /* see PowerPC Microprocessor CHRP bindings */ - parnum = 1; - while (parnum <= __be32_to_cpu(par.pmMapBlkCnt)) { - SEEK( (bs * parnum) ); + for (parnum = 0; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { + SEEK( (bs * (parnum + 1)) ); READ( &par, sizeof(par) ); if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || !__be16_to_cpu(par.pmPartBlkCnt) ) - goto out; + break; DPRINTF("found partition type: %s\n", par.pmPartType); @@ -169,7 +168,6 @@ goto out; } - parnum++; } /* not found */ if (firstHFS != -1) { @@ -199,7 +197,7 @@ goto out; found: - SEEK( (bs * parnum) ); + SEEK( (bs * (parnum + 1)) ); READ( &par, sizeof(par) ); if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || !__be32_to_cpu(par.pmPartBlkCnt) ) goto out;

1 0

[commit] r792 - in trunk/openbios-devel: fs fs/ext2 fs/hfs fs/hfs/include fs/hfsplus fs/hfsplus/include include/fs packages
by repository service 10 Jun '10

10 Jun '10

Author: mcayland Date: Thu Jun 10 00:30:32 2010 New Revision: 792 URL: http://tracker.coreboot.org/trac/openbios/changeset/792 Log: Fix up the majority of the non-grubfs filesystems from my last commit, since they require a "probe with offset" function to allow the partition handler to identify a valid FS before interposition to /packages/misc-files. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/ext2/ext2_utils.c trunk/openbios-devel/fs/ext2/ext2_utils.h trunk/openbios-devel/fs/hfs/hfs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfs/include/hfs.h trunk/openbios-devel/fs/hfs/include/volume.h trunk/openbios-devel/fs/hfs/volume.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/hfsplus/include/volume.h trunk/openbios-devel/fs/hfsplus/volume.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/os.h trunk/openbios-devel/include/fs/fs.h trunk/openbios-devel/packages/misc-files.c Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Thu Jun 10 00:30:32 2010 (r792) @@ -201,3 +201,11 @@ return 0; } + +int fs_ext2_probe(int fd, llong offs) +{ + if (ext2_probe(fd, offs)) + return -1; + + return 0; +} Modified: trunk/openbios-devel/fs/ext2/ext2_utils.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.c Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/ext2/ext2_utils.c Thu Jun 10 00:30:32 2010 (r792) @@ -12,6 +12,23 @@ #include "libc/diskio.h" #include "libc/byteorder.h" +int ext2_probe(int fd, llong offset) +{ + struct ext2_super_block *super; + + super = (struct ext2_super_block*)malloc(sizeof(struct ext2_super_block)); + seek_io(fd, 2 * 512 + offset); + read_io(fd, super, sizeof (*super)); + + if (__be16_to_cpu(super->s_magic) != EXT2_SUPER_MAGIC) { + free(super); + return 0; + } + + free(super); + return -1; +} + void ext2_get_super(int fd, struct ext2_super_block *super) { seek_io(fd, 2 * 512); Modified: trunk/openbios-devel/fs/ext2/ext2_utils.h ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.h Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/ext2/ext2_utils.h Thu Jun 10 00:30:32 2010 (r792) @@ -36,6 +36,7 @@ /* utilities */ +extern int ext2_probe(int fd, llong offset); extern void ext2_get_super(int fd, struct ext2_super_block *super); extern void ext2_read_block(ext2_VOLUME* volume, unsigned int fsblock); extern void ext2_get_group_desc(ext2_VOLUME* volume, Modified: trunk/openbios-devel/fs/hfs/hfs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs.c Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/hfs/hfs.c Thu Jun 10 00:30:32 2010 (r792) @@ -736,3 +736,12 @@ return 0; } + +/* + * NAME: hfs->probe() + * DESCRIPTION: return whether a HFS filesystem is present at the given offset + */ +int hfs_probe(int fd, llong offset) +{ + return v_probe(fd, offset); +} Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Thu Jun 10 00:30:32 2010 (r792) @@ -458,3 +458,12 @@ return 0; } + +int +fs_hfs_probe( int fd, llong offs ) +{ + if (hfs_probe(fd, offs)) + return -1; + + return 0; +} \ No newline at end of file Modified: trunk/openbios-devel/fs/hfs/include/hfs.h ============================================================================== --- trunk/openbios-devel/fs/hfs/include/hfs.h Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/hfs/include/hfs.h Thu Jun 10 00:30:32 2010 (r792) @@ -177,3 +177,4 @@ int hfs_format(const char *, int, int, const char *, unsigned int, const unsigned long []); +int hfs_probe(int fd, llong offset); Modified: trunk/openbios-devel/fs/hfs/include/volume.h ============================================================================== --- trunk/openbios-devel/fs/hfs/include/volume.h Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/hfs/include/volume.h Thu Jun 10 00:30:32 2010 (r792) @@ -66,5 +66,6 @@ int v_scavenge(hfsvol *); +int v_probe(int fd, llong offset); #endif /* _H_VOLUME */ Modified: trunk/openbios-devel/fs/hfs/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfs/volume.c Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/hfs/volume.c Thu Jun 10 00:30:32 2010 (r792) @@ -32,6 +32,8 @@ #include "record.h" #include "os.h" +#include "libc/byteorder.h" + /* * NAME: vol->init() * DESCRIPTION: initialize volume structure @@ -589,3 +591,22 @@ fail: return -1; } + +/* Determine whether the volume is a HFS volume */ +int +v_probe(int fd, llong offset) +{ + MDB *mdb; + + mdb = (MDB*)malloc(2 * 512); + os_seek_offset( fd, 2 * 512 + offset ); + os_read(fd, mdb, 2, 9); + + if (__be16_to_cpu(mdb->drSigWord) != HFS_SIGWORD) { + free(mdb); + return 0; + } + + free(mdb); + return -1; +} \ No newline at end of file Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Thu Jun 10 00:30:32 2010 (r792) @@ -397,3 +397,12 @@ return 0; } + +int +fs_hfsp_probe(int fd, llong offs) +{ + if (volume_probe(fd, offs)) + return -1; + + return 0; +} \ No newline at end of file Modified: trunk/openbios-devel/fs/hfsplus/include/volume.h ============================================================================== --- trunk/openbios-devel/fs/hfsplus/include/volume.h Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/hfsplus/include/volume.h Thu Jun 10 00:30:32 2010 (r792) @@ -72,6 +72,8 @@ return vol->extents; } +/* Determine whether the volume is a HFS-plus volume */ +int volume_probe(int fd, llong offset); #ifdef DEBUG /* Print raw fork information to stdout */ Modified: trunk/openbios-devel/fs/hfsplus/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/volume.c Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/hfsplus/volume.c Thu Jun 10 00:30:32 2010 (r792) @@ -35,6 +35,7 @@ #include "swab.h" #include "hfstime.h" + /* Fill a given buffer with the given block in volume. */ int @@ -288,3 +289,22 @@ fail: vol->extents = NULL; } + +/* Determine whether the volume is a HFS-plus volume */ +int +volume_probe(int fd, llong offset) +{ + struct hfsp_vh *vol; + + vol = (struct hfsp_vh*)malloc(2 * 1 << HFSP_BLOCKSZ_BITS); + os_seek_offset( fd, 2 * (1 << HFSP_BLOCKSZ_BITS) + offset ); + os_read(fd, vol, 2, HFSP_BLOCKSZ_BITS); + + if (__be16_to_cpu(vol->signature) != HFSP_VOLHEAD_SIG) { + free(vol); + return 0; + } + + free(vol); + return -1; +} \ No newline at end of file Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/ioglue.c Thu Jun 10 00:30:32 2010 (r792) @@ -79,6 +79,12 @@ return blknum; } +void +os_seek_offset( int fd, llong offset ) +{ + seek_io(fd, offset); +} + int os_same( int fd1, int fd2 ) { Modified: trunk/openbios-devel/fs/os.h ============================================================================== --- trunk/openbios-devel/fs/os.h Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/fs/os.h Thu Jun 10 00:30:32 2010 (r792) @@ -47,5 +47,11 @@ */ unsigned long os_write( int fd, const void *buf, unsigned long len, int blksize_bits); +/* + * NAME: os->seek_offset() + * DESCRIPTION: set a descriptor's seek pointer (offset in bytes) + */ +void os_seek_offset( int fd, llong offset ); + #endif /* _H_OS */ Modified: trunk/openbios-devel/include/fs/fs.h ============================================================================== --- trunk/openbios-devel/include/fs/fs.h Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/include/fs/fs.h Thu Jun 10 00:30:32 2010 (r792) @@ -53,14 +53,18 @@ #ifdef CONFIG_HFSP extern int fs_hfsp_open( int fd, fs_ops_t *fs ); +extern int fs_hfsp_probe( int fd, llong offs ); #else static inline int fs_hfsp_open( int fd, fs_ops_t *fs ) { return -1; } +static inline int fs_hfsp_probe( int fd, llong offs ) { return -1; } #endif #ifdef CONFIG_HFS extern int fs_hfs_open( int fd, fs_ops_t *fs ); +extern int fs_hfs_probe( int fd, llong offs ); #else static inline int fs_hfs_open( int fd, fs_ops_t *fs ) { return -1; } +static inline int fs_hfs_probe( int fd, llong offs ) { return -1; } #endif #ifdef CONFIG_ISO9660 @@ -71,8 +75,10 @@ #ifdef CONFIG_EXT2 extern int fs_ext2_open( int fd, fs_ops_t *fs ); +extern int fs_ext2_probe( int fd, llong offs ); #else static inline int fs_ext2_open( int fd, fs_ops_t *fs ) { return -1; } +static inline int fs_ext2_probe( int fd, llong offs ) { return -1; } #endif #ifdef CONFIG_GRUBFS @@ -80,6 +86,7 @@ extern int fs_grubfs_probe( int fd, llong offs ); #else static inline int fs_grubfs_open( int fd, fs_ops_t *fs ) { return -1; } +static inline int fs_grubfs_probe( int fd, llong offs ) { return -1; } #endif Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Tue Jun 8 22:59:08 2010 (r791) +++ trunk/openbios-devel/packages/misc-files.c Thu Jun 10 00:30:32 2010 (r792) @@ -351,25 +351,24 @@ err = (fd = open_ih(ih)) == -1; if( !err ) { - /* - err = fs_hfsp_open(fd, fs); + + err = fs_hfsp_probe(fd, offs); DPRINTF("--- HFSP returned %d\n", err); if( err ) { - err = fs_hfs_open(fd, fs); + err = fs_hfs_probe(fd, offs); DPRINTF("--- HFS returned %d\n", err); } - +/* if( err ) { err = fs_iso9660_open(fd, fs); DPRINTF("--- ISO9660 returned %d\n", err); } - +*/ if( err ) { - err = fs_ext2_open(fd, fs); + err = fs_ext2_probe(fd, offs); DPRINTF("--- ext2 returned %d\n", err); } - */ if( err ) { err = fs_grubfs_probe(fd, offs);

1 0

Re: [OpenBIOS] when I push the enter button...
by Programmingkid 09 Jun '10

09 Jun '10

On Jun 8, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > Programmingkid wrote: > >> What code starts executing when I push the enter key in an OpenBIOS session? I thought it was interpret, but it isn't. > > Possibly the console code in packages/cmdline.c? > > > HTH, > > Mark. Thank you Mark for your help.

1 0

/packages/disk-label, /packages/sun-parts and /packages/misc-files
by Mark Cave-Ayland 08 Jun '10

08 Jun '10

Hi folks, Is there some kind of specification for the above packages or are we free to design the interface as we choose? The reason I ask is that the current interposition order doesn't seem to be particularly logical. At the moment, the order goes like this for a CDROM: cdrom -> deblocker -> disk-label -> (misc-files or sun-parts or pc-parts) But I think it makes more sense to do this: cdrom -> deblocker -> disk-label -> (sun-parts or pc-parts) -> misc-files The reason for suggesting a change is because by placing misc-files directly after disk-label, all partition offsets have to be bubbled back up the chain using a series of get-info words to the device. If this could be reordered, it should be possible to remove most of this logic and simply pass the read/seeks back up to the parent. Otherwise, like at the moment, there is lots of code in misc-files that has to work out whether you are accessing a file or a partition directly and act differently which can't be a good thing. 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 4

when I push the enter button...
by Programmingkid 07 Jun '10

07 Jun '10

What code starts executing when I push the enter key in an OpenBIOS session? I thought it was interpret, but it isn't.

2 1

Re: [OpenBIOS] /packages/disk-label, /packages/sun-parts and /packages/misc-files
by Mark Cave-Ayland 07 Jun '10

07 Jun '10

Laurent Vivier wrote: > Yes, I have: I added them last year to be able to manage the "dir" command... (*squints at the code*). Right, I see - the grubfs APIs aren't really designed for directory listings. Okay, I'll leave as it is at the moment. I did have a quick look at whether it would be worth re-syncing with GRUB2, but I think we'd have a licensing issue since GRUB 2 is GPLv3 whereas OpenBIOS is GPLv2. 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

Re: [OpenBIOS] ofmem_claim_phys - out of space
by Nick Couchman 04 Jun '10

04 Jun '10

Hmmm...when I start with -boot d, I get exactly the same output... -Nick >>> Igor Kovalenko 06/03/10 2:12 PM >>> On Thu, Jun 3, 2010 at 6:06 PM, Nick Couchman wrote: > Well, I've followed the traffic on the list quietly for a few months, updating qemu and openbios along the way as things have developed. I figured I'd throw out the error I'm getting, now, when I try to boot Milax 0.3.2 with qemu-system-sparc64 and see if this is expected, something that's in the works, or something that should be fixed. I start with the following command: > > sparc64-softmmu/qemu-system-sparc64 -hda disk0 -cdrom /misc/iso/Solaris/milax032sparc.iso -bios ../openbios-devel/obj-sparc64/openbios-builtin.elf.nostrip -nographic > > and then do a "boot cdrom" at the prompt. Here's the output (no debugging, verbosity, etc. - just normal output): > > OpenBIOS for Sparc64 > Configuration device id QEMU version 1 machine id 0 > kernel cmdline > CPUs: 1 x SUNW,UltraSPARC-IIi > UUID: 00000000-0000-0000-0000-000000000000 > Welcome to OpenBIOS v1.0 built on May 27 2010 20:47 > Type 'help' for detailed information > > [sparc64] Booting file 'disk' with parameters '' > Not a bootable ELF image > Not a Linux kernel image > Not a bootable a.out image > Not a bootable FCode image > Not a bootable ELF image > Not a Linux kernel image > Not a bootable a.out image > Not a bootable FCode image > Unsupported image format > > 0 > boot cdrom > [sparc64] Booting file 'cdrom' with parameters '' > Not a bootable ELF image > Not a Linux kernel image > Not a bootable a.out image > Loading FCode image... > Loaded 7084 bytes > entry point is 0x4000 > > Jumping to entry point 0000000000004000 for type 0000000000000010... > Evaluating FCode... > ofmem_claim_phys - out of space (failed request for 0000000000000000 bytes) > Unhandled Exception 0x0000000008000000 > PC = 0x00000000ffd1020c NPC = 0x00000000ffd10210 > Stopping execution > > Any hints? Any debugging I should turn on to provide more information? Or is there another Solaris-type O/S I should try? That's a bug. Adding "-boot d" to command line helps getting a bit further, whereas in fact there should be no difference between that and "boot cdrom" -- Kind regards, Igor V. Kovalenko -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

1 0

ofmem_claim_phys - out of space
by Nick Couchman 03 Jun '10

03 Jun '10

Well, I've followed the traffic on the list quietly for a few months, updating qemu and openbios along the way as things have developed. I figured I'd throw out the error I'm getting, now, when I try to boot Milax 0.3.2 with qemu-system-sparc64 and see if this is expected, something that's in the works, or something that should be fixed. I start with the following command: sparc64-softmmu/qemu-system-sparc64 -hda disk0 -cdrom /misc/iso/Solaris/milax032sparc.iso -bios ../openbios-devel/obj-sparc64/openbios-builtin.elf.nostrip -nographic and then do a "boot cdrom" at the prompt. Here's the output (no debugging, verbosity, etc. - just normal output): OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on May 27 2010 20:47 Type 'help' for detailed information [sparc64] Booting file 'disk' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Not a bootable FCode image Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Not a bootable FCode image Unsupported image format 0 > boot cdrom [sparc64] Booting file 'cdrom' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 7084 bytes entry point is 0x4000 Jumping to entry point 0000000000004000 for type 0000000000000010... Evaluating FCode... ofmem_claim_phys - out of space (failed request for 0000000000000000 bytes) Unhandled Exception 0x0000000008000000 PC = 0x00000000ffd1020c NPC = 0x00000000ffd10210 Stopping execution Any hints? Any debugging I should turn on to provide more information? Or is there another Solaris-type O/S I should try? Thanks! -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

Re: [OpenBIOS] /packages/disk-label, /packages/sun-parts and /packages/misc-files
by Laurent Vivier 03 Jun '10

03 Jun '10

>Laurent Vivier wrote: > >> This one compiles and works (on ppc). I have tested with some ISOs >> (Yaboot based, *BSD, haiku, morphos) and some disk images (Quik based >> debians). >> >> Please, test it with your disks. Don't forget: >> >> <option name="CONFIG_ISO9660" type="boolean" value="true"/> >> <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> >> >> Regards, >> Laurent > >Thanks for this Laurent. > >Since most of my testing is currently on SPARC64, I had to fiddle a >little bit with these options enabled as CONFIG_ISO9660 clashes with the >default CONFIG_GRUBFS and CONFIG_FSYS_ISO9660 options. > >Once I managed to build it, I had more of a play and found the in-built >ISO9660 module to be sadly lacking. In particular, it is case-sensitive >with respect to filenames, doesn't handle trailing periods correctly and >has no knowledge of RockRidge extensions compared to the grubfs version >which I fixed in r777. > >Given that the grubfs code also supports a wider variety of filesystems, >I'm quite tempted to rip out ALL the standard OpenBIOS fs drivers and >make use of the grubfs ones instead. Would anyone have any major >objections to this? > Yes, I have: I added them last year to be able to manage the "dir" command... Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

1 0

bug report
by Programmingkid 03 Jun '10

03 Jun '10

Sorry, I meant I had to delete the files in obj-x86/target/kernel.

4 5

Re: [OpenBIOS] /packages/disk-label, /packages/sun-parts and /packages/misc-files
by Laurent Vivier 03 Jun '10

03 Jun '10

>Mark Cave-Ayland wrote: > >> Hi folks, >> >> Is there some kind of specification for the above packages or are we >> free to design the interface as we choose? The reason I ask is that the >> current interposition order doesn't seem to be particularly logical. At >> the moment, the order goes like this for a CDROM: >> >> cdrom -> deblocker -> disk-label -> (misc-files or sun-parts or pc-parts) >> >> But I think it makes more sense to do this: >> >> cdrom -> deblocker -> disk-label -> (sun-parts or pc-parts) -> misc-files >> Moreover, I think ext2, hfs, hfsplus, iso9660 can be moved to their own packages (as it is done on macintosh new world openfirmware). I have a patch on my disk doing this for ISO9660 (not sure) but it is 7 months old and I don't know if it applies (and works) anymore. Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

3 4

[PATCH 0/3] sparc64 cleanups v1
by Igor V. Kovalenko 01 Jun '10

01 Jun '10

One code cleanup and another pci host bridge remap change, the latter requires qemu update with patch already posted to qemu list. v0->v1: added missing patch moving asi.h to arch includes --- Igor V. Kovalenko (3): sparc64: move asi.h to arch includes sparc64: replace ASI numbers with macros sparc64: fix pci host bridge offsets arch/sparc64/asi.h | 145 -------------------------------------------- arch/sparc64/entry.S | 2 - arch/sparc64/openbios.c | 12 ++-- arch/sparc64/spitfire.h | 2 - arch/sparc64/switch.S | 2 - arch/sparc64/vectors.S | 2 - include/arch/sparc64/asi.h | 145 ++++++++++++++++++++++++++++++++++++++++++++ include/arch/sparc64/io.h | 61 ++++++++++++------- 8 files changed, 196 insertions(+), 175 deletions(-) delete mode 100644 arch/sparc64/asi.h create mode 100644 include/arch/sparc64/asi.h -- Signature

6 15

Bug report
by Programmingkid 01 Jun '10

01 Jun '10

When I make changes to the file kernel/forth.c, the changes don't take effect until I manually delete the files in the folder obj-x86/host/kernel. Any changes make to forth.c should take place immediately after compilation.

1 0

Re: [OpenBIOS] /packages/disk-label, /packages/sun-parts and /packages/misc-files
by Mark Cave-Ayland 28 May '10

28 May '10

Laurent Vivier wrote: > In this cas are you able to manage disk with no partition table ? In my current patch set, if no partition table is found then all I do is interpose misc-files under disk-label. As long as we bubble back up the packages methods, no changes are required. > Could you have a look to "CHRP binding" document, I think it describes some behaviors about this ? No, this is great! According to p.59 or thereabouts, disk-label conditionally interposes the filesystem package depending upon what it finds. This was the main part of the patch I was unsure about. I notice there is no mention of the sun-parts or pc-parts packages though; does anyone know where there is a copy of the SPARC platform bindings for more information? 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

Re: [OpenBIOS] [PATCH 0/3] sparc64 cleanups v1
by Mark Cave-Ayland 28 May '10

28 May '10

Igor Kovalenko wrote: > Atomic quad ldda is indeed implemented by separate helper_ldda_asi not > helper_ld_asi as I expected. > With a bit more debugging it turns out that issue happens if MMU > primary context is not zero! > > IN: > 0x0000000000424d18: ldda [ %g1 ] #ASI_NUCLEUS_QUAD_LDD, %g4 > 0x0000000000424d1c: cmp %g4, %g6 > 0x0000000000424d20: bne,pn %xcc, 0x4076c0 > 0x0000000000424d24: mov 2, %g3 > > MMU: get_physical_address DATA tl=5 mmu_idx=2 primary context=1 > secondary context=1 address=8000000 > MMU: DMISS at 8000000 context 1 > --- do_interrupt tl=5 > 948404: Data Access MMU Miss (v=0068) pc=0000000000424d18 > npc=0000000000424d1c SP=00000000ffba1ef0 > pc: 0000000000424d18 npc: 0000000000424d1c > General Registers: > %g0-3: 0000000000000000 0000000008000000 0000000000004000 0000000000000002 > %g4-7: 00000000000003fe 0000000000000001 0000000000000020 0000000000004000 > > So helper_ldda_asi must be changed to do loads from NUCLEUS (0) context. > I'll post a patch now but with that applied I see no crash but not > that much progress either. Okay; I've just tried your patch and the crash is gone :) However, the boot now seems to freeze with "su: Cannot register IRQ 0" which didn't happen before the recent PCI fixes. I think that maybe another bug is being triggered somewhere now that the PCI bus is being handled more correctly. 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

[PATCH 00/10] encode-int related changes and pci bus scan amendment
by Igor V. Kovalenko 27 May '10

27 May '10

These mostly are cleanups up to pci bus scan amendment changes. The pci bus scan is reworked, now we start with pci host bridge which will initiate primary bus scan. PCI-to-PCI bridges do the same. Although bridges are still mostly unusable in qemu due to missing address space remappings one can now put e.g. ide and vga on sun4u behind secondary bus and see it is found correctly and can be configured. With these applied my debian etch ppc installation still boots to shell, and helenos can get to video screen (with appropriate QEMU,VGA driver.) Another bonus point that on sparc64 recent linux "btext" boot console works (colors are a bit off though.) --- Igor V. Kovalenko (10): ebus: set addressing to 2 address cells and 1 size cells ide: fix property data size video: framebuffer properties must be 32bit values pci: property encoding helpers pci: debug printk macros pci: bus scan amendment new style arch declarations for ppc/qemu pci: add host memory base to pci_arch_t pci: allow BARs with zero assigned address pci: assign relocatable address ranges arch/ppc/qemu/init.c | 96 ++++-- arch/sparc64/openbios.c | 3 drivers/ide.c | 22 + drivers/pci.c | 652 +++++++++++++++++++++++++++------------- drivers/pci.h | 4 drivers/pci_database.c | 2 drivers/pci_database.h | 3 drivers/vga_vbe.c | 8 include/drivers/pci.h | 3 include/libopenbios/bindings.h | 8 libopenbios/bindings.c | 6 packages/video.c | 10 - 12 files changed, 549 insertions(+), 268 deletions(-) --

5 19

[commit] r790 - trunk/openbios-devel/drivers
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:12:26 2010 New Revision: 790 URL: http://tracker.coreboot.org/trac/openbios/changeset/790 Log: pci: assign relocatable address ranges Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:23 2010 (r789) +++ trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:26 2010 (r790) @@ -546,24 +546,24 @@ static inline void pci_decode_pci_addr(pci_addr addr, int *flags, int *space_code, uint32_t *mask) { - if (addr & 0x01) { + *flags = 0; + if (addr & 0x01) { *space_code = IO_SPACE; - *flags = 0; *mask = 0x00000001; - - } else if (addr & 0x04) { - - *flags = IS_NOT_RELOCATABLE; - *space_code = MEMORY_SPACE_64; - *mask = 0x0000000F; - } else { + if (addr & 0x04) { + *space_code = MEMORY_SPACE_64; + *flags |= IS_NOT_RELOCATABLE; /* XXX: why not relocatable? */ + } else { + *space_code = MEMORY_SPACE_32; + } + + if (addr & 0x08) { + *flags |= IS_PREFETCHABLE; + } - *space_code = MEMORY_SPACE_32; - *flags = IS_NOT_RELOCATABLE; - *mask = 0x0000000F; - + *mask = 0x0000000F; } }

1 0

[commit] r789 - trunk/openbios-devel/drivers
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:12:23 2010 New Revision: 789 URL: http://tracker.coreboot.org/trac/openbios/changeset/789 Log: pci: allow BARs with zero assigned address - consider only PCI BARs with non-zero region size when pupulating "reg" and "assigned-addresses" properties Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:19 2010 (r788) +++ trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:23 2010 (r789) @@ -603,7 +603,8 @@ ncells = 0; for (i = 0; i < num_bars; i++) { - if (!config->assigned[i] || !config->sizes[i]) + /* consider only bars with non-zero region size */ + if (!config->sizes[i]) continue; pci_decode_pci_addr(config->assigned[i], &flags, &space_code, &mask); @@ -662,7 +663,8 @@ ncells += pci_encode_size(props + ncells, 0); for (i = 0; i < num_bars; i++) { - if (!config->assigned[i] || !config->sizes[i]) + /* consider only bars with non-zero region size */ + if (!config->sizes[i]) continue; pci_decode_pci_addr(config->regions[i],

1 0

[commit] r788 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 drivers include/drivers
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:12:19 2010 New Revision: 788 URL: http://tracker.coreboot.org/trac/openbios/changeset/788 Log: pci: add host memory base to pci_arch_t - sparc64 has PCI memory space at offset, therefore "ranges" property of host bridge must have different PCI and host memory addresses Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/include/drivers/pci.h Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Thu May 27 22:12:16 2010 (r787) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Thu May 27 22:12:19 2010 (r788) @@ -92,7 +92,8 @@ .cfg_data = 0x800c0000, .cfg_base = 0x80000000, .cfg_len = 0x00100000, - .mem_base = 0xf0000000, + .host_mem_base = 0xf0000000, + .pci_mem_base = 0xf0000000, .mem_len = 0x10000000, .io_base = 0x80000000, .io_len = 0x00010000, @@ -108,7 +109,8 @@ .cfg_data = 0xf2c00000, .cfg_base = 0xf2000000, .cfg_len = 0x02000000, - .mem_base = 0x80000000, + .host_mem_base = 0x80000000, + .pci_mem_base = 0x80000000, .mem_len = 0x10000000, .io_base = 0xf2000000, .io_len = 0x00800000, @@ -124,7 +126,8 @@ .cfg_data = 0xf0c00000, .cfg_base = 0xf0000000, .cfg_len = 0x02000000, - .mem_base = 0x80000000, + .host_mem_base = 0x80000000, + .pci_mem_base = 0x80000000, .mem_len = 0x10000000, .io_base = 0xf2000000, .io_len = 0x00800000, @@ -140,7 +143,8 @@ .cfg_data = 0xfee00000, .cfg_base = 0x80000000, .cfg_len = 0x7f000000, - .mem_base = 0x80000000, + .host_mem_base = 0x80000000, + .pci_mem_base = 0x80000000, .mem_len = 0x01000000, .io_base = 0xfe000000, .io_len = 0x00800000, Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Thu May 27 22:12:16 2010 (r787) +++ trunk/openbios-devel/arch/sparc64/openbios.c Thu May 27 22:12:19 2010 (r788) @@ -64,7 +64,8 @@ .cfg_data = APB_MEM_BASE, // PCI bus memory space .cfg_base = APB_SPECIAL_BASE, .cfg_len = 0x2000000, - .mem_base = APB_MEM_BASE, + .host_mem_base = APB_MEM_BASE, + .pci_mem_base = 0, .mem_len = 0x10000000, .io_base = APB_SPECIAL_BASE + 0x2000000ULL, // PCI Bus I/O space .io_len = 0x10000, Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:16 2010 (r787) +++ trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:19 2010 (r788) @@ -455,10 +455,10 @@ ncells += host_encode_phys_addr(props + ncells, arch->rbase); ncells += pci_encode_size(props + ncells, arch->rlen); } - if (arch->mem_base) { + if (arch->host_mem_base) { ncells += pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, - config->dev, 0, arch->mem_base); - ncells += host_encode_phys_addr(props + ncells, arch->mem_base); + config->dev, 0, arch->pci_mem_base); + ncells += host_encode_phys_addr(props + ncells, arch->host_mem_base); ncells += pci_encode_size(props + ncells, arch->mem_len); } set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); @@ -1255,7 +1255,7 @@ /* Find all PCI bridges */ - mem_base = arch->mem_base; + mem_base = arch->pci_mem_base; /* I/O ports under 0x400 are used by devices mapped at fixed location. */ io_base = arch->io_base + 0x400; Modified: trunk/openbios-devel/include/drivers/pci.h ============================================================================== --- trunk/openbios-devel/include/drivers/pci.h Thu May 27 22:12:16 2010 (r787) +++ trunk/openbios-devel/include/drivers/pci.h Thu May 27 22:12:19 2010 (r788) @@ -13,7 +13,8 @@ unsigned long cfg_data; unsigned long cfg_base; unsigned long cfg_len; - unsigned long mem_base; + unsigned long host_mem_base; /* in host memory space */ + unsigned long pci_mem_base; /* in PCI memory space */ unsigned long mem_len; unsigned long io_base; unsigned long io_len;

1 0

[commit] r787 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:12:16 2010 New Revision: 787 URL: http://tracker.coreboot.org/trac/openbios/changeset/787 Log: new style arch declarations for ppc/qemu - reformat to new style, no functional changes Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Thu May 27 22:12:11 2010 (r786) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Thu May 27 22:12:16 2010 (r787) @@ -84,34 +84,70 @@ } static const pci_arch_t known_arch[] = { - [ARCH_PREP] = { "PREP", PCI_VENDOR_ID_MOTOROLA, - PCI_DEVICE_ID_MOTOROLA_RAVEN, - 0x80800000, 0x800c0000, - 0x80000000, 0x00100000, 0xf0000000, 0x10000000, - 0x80000000, 0x00010000, 0x00000000, 0x00400000, - { 9, 11, 9, 11 } - }, - [ARCH_MAC99] = { "MAC99", PCI_VENDOR_ID_APPLE, - PCI_DEVICE_ID_APPLE_UNI_N_PCI, - 0xf2800000, 0xf2c00000, - 0xf2000000, 0x02000000, 0x80000000, 0x10000000, - 0xf2000000, 0x00800000, 0x00000000, 0x01000000, - { 0x1b, 0x1c, 0x1d, 0x1e } - }, - [ARCH_MAC99_U3] = { "MAC99_U3", PCI_VENDOR_ID_APPLE, - PCI_DEVICE_ID_APPLE_U3_AGP, - 0xf0800000, 0xf0c00000, - 0xf0000000, 0x02000000, 0x80000000, 0x10000000, - 0xf2000000, 0x00800000, 0x00000000, 0x01000000, - { 0x1b, 0x1c, 0x1d, 0x1e } - }, - [ARCH_HEATHROW] = { "HEATHROW", PCI_VENDOR_ID_MOTOROLA, - PCI_DEVICE_ID_MOTOROLA_MPC106, - 0xfec00000, 0xfee00000, - 0x80000000, 0x7f000000, 0x80000000, 0x01000000, - 0xfe000000, 0x00800000, 0xfd000000, 0x01000000, - { 21, 22, 23, 24 } - }, + [ARCH_PREP] = { + .name = "PREP", + .vendor_id = PCI_VENDOR_ID_MOTOROLA, + .device_id = PCI_DEVICE_ID_MOTOROLA_RAVEN, + .cfg_addr = 0x80800000, + .cfg_data = 0x800c0000, + .cfg_base = 0x80000000, + .cfg_len = 0x00100000, + .mem_base = 0xf0000000, + .mem_len = 0x10000000, + .io_base = 0x80000000, + .io_len = 0x00010000, + .rbase = 0x00000000, + .rlen = 0x00400000, + .irqs = { 9, 11, 9, 11 } + }, + [ARCH_MAC99] = { + .name = "MAC99", + .vendor_id = PCI_VENDOR_ID_APPLE, + .device_id = PCI_DEVICE_ID_APPLE_UNI_N_PCI, + .cfg_addr = 0xf2800000, + .cfg_data = 0xf2c00000, + .cfg_base = 0xf2000000, + .cfg_len = 0x02000000, + .mem_base = 0x80000000, + .mem_len = 0x10000000, + .io_base = 0xf2000000, + .io_len = 0x00800000, + .rbase = 0x00000000, + .rlen = 0x01000000, + .irqs = { 0x1b, 0x1c, 0x1d, 0x1e } + }, + [ARCH_MAC99_U3] = { + .name = "MAC99_U3", + .vendor_id = PCI_VENDOR_ID_APPLE, + .device_id = PCI_DEVICE_ID_APPLE_U3_AGP, + .cfg_addr = 0xf0800000, + .cfg_data = 0xf0c00000, + .cfg_base = 0xf0000000, + .cfg_len = 0x02000000, + .mem_base = 0x80000000, + .mem_len = 0x10000000, + .io_base = 0xf2000000, + .io_len = 0x00800000, + .rbase = 0x00000000, + .rlen = 0x01000000, + .irqs = { 0x1b, 0x1c, 0x1d, 0x1e } + }, + [ARCH_HEATHROW] = { + .name = "HEATHROW", + .vendor_id = PCI_VENDOR_ID_MOTOROLA, + .device_id = PCI_DEVICE_ID_MOTOROLA_MPC106, + .cfg_addr = 0xfec00000, + .cfg_data = 0xfee00000, + .cfg_base = 0x80000000, + .cfg_len = 0x7f000000, + .mem_base = 0x80000000, + .mem_len = 0x01000000, + .io_base = 0xfe000000, + .io_len = 0x00800000, + .rbase = 0xfd000000, + .rlen = 0x01000000, + .irqs = { 21, 22, 23, 24 } + }, }; uint32_t isa_io_base;

1 0

[commit] r786 - in trunk/openbios-devel: drivers include/libopenbios libopenbios
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:12:11 2010 New Revision: 786 URL: http://tracker.coreboot.org/trac/openbios/changeset/786 Log: pci: bus scan amendment - refactor scan procedure to start with PCI host controller - initiate scan of subordinate PCI bus from PCI host and PCI-to-PCI bridges - find out PCI subordinate bus numbers and write them to bride devices - automated assignment of "reg", "ranges", and "bus-range" properties Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci.h trunk/openbios-devel/drivers/pci_database.h trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/libopenbios/bindings.h trunk/openbios-devel/libopenbios/bindings.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:05 2010 (r785) +++ trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:11 2010 (r786) @@ -125,6 +125,18 @@ } */ +#if defined(CONFIG_DEBUG_PCI) +static void dump_reg_property(const char* description, int nreg, u32 *reg) +{ + int i; + printk("%s reg", description); + for (i=0; i < nreg; ++i) { + printk(" %08X", reg[i]); + } + printk("\n"); +} +#endif + static void ob_pci_open(int *idx) { @@ -153,6 +165,8 @@ int bus = 0; /* no information */ char *ptr; + PCI_DPRINTF("ob_pci_decode_unit idx=%p\n", idx); + fn = 0; reg = 0; n = 0; @@ -245,6 +259,10 @@ PUSH(lo); PUSH(mid); PUSH(hi); + + PCI_DPRINTF("ob_pci_decode_unit idx=%p addr=" + FMT_ucellx " " FMT_ucellx " " FMT_ucellx "\n", + idx, lo, mid, hi); } /* ( phys.lo phy.mid phys.hi -- str len ) */ @@ -305,6 +323,9 @@ break; } push_str(buf); + + PCI_DPRINTF("ob_pci_encode_unit space=%d dev=%d fn=%d buf=%s\n", + ss, dev, fn, buf); } NODE_METHODS(ob_pci_bus_node) = { @@ -323,11 +344,22 @@ static void pci_set_bus_range(const pci_config_t *config) { - phandle_t dev = get_cur_dev(); + phandle_t dev = find_dev(config->path); u32 props[2]; - props[0] = (config->dev >> 16) & 0xFF; - props[1] = 1; + props[0] = config->secondary_bus; + props[1] = config->subordinate_bus; + + PCI_DPRINTF("setting bus range for %s PCI device, " + "package handle " FMT_ucellx " " + "bus primary=%d secondary=%d subordinate=%d\n", + config->path, + dev, + config->primary_bus, + config->secondary_bus, + config->subordinate_bus); + + set_property(dev, "bus-range", (char *)props, 2 * sizeof(props[0])); } @@ -372,9 +404,10 @@ #endif } -static void pci_host_set_reg(const pci_config_t *config) +static void pci_host_set_reg(phandle_t phandle) { - phandle_t dev = get_cur_dev(); + phandle_t dev = phandle; + /* at most 2 integers for address and size */ u32 props[4]; int ncells = 0; @@ -386,6 +419,10 @@ arch->cfg_len); set_property(dev, "reg", (char *)props, ncells * sizeof(props[0])); + +#if defined(CONFIG_DEBUG_PCI) + dump_reg_property("pci_host_set_reg", 4, props); +#endif } /* child-phys : parent-phys : size */ @@ -438,68 +475,18 @@ int host_config_cb(const pci_config_t *config) { - phandle_t aliases; - - aliases = find_dev("/aliases"); - if (aliases) - set_property(aliases, "pci", - config->path, strlen(config->path) + 1); - //XXX this overrides "reg" property - pci_host_set_reg(config); + pci_host_set_reg(get_cur_dev()); pci_host_set_ranges(config); - pci_set_bus_range(config); pci_host_set_interrupt_map(config); return 0; } -int sabre_config_cb(const pci_config_t *config) +static int sabre_configure(phandle_t dev) { - phandle_t dev = get_cur_dev(); uint32_t props[28]; - props[0] = 0x00000000; - props[1] = 0x00000003; - set_property(dev, "bus-range", (char *)props, 2 * sizeof(props[0])); - props[0] = 0x000001fe; - props[1] = 0x00000000; - props[2] = 0x00000000; - props[3] = 0x00010000; - props[4] = 0x000001fe; - props[5] = 0x01000000; - props[6] = 0x00000000; - props[7] = 0x00000100; - set_property(dev, "reg", (char *)props, 8 * sizeof(props[0])); - props[0] = 0x00000000; - props[1] = 0x00000000; - props[2] = 0x00000000; - props[3] = 0x000001fe; - props[4] = 0x01000000; - props[5] = 0x00000000; - props[6] = 0x01000000; - props[7] = 0x01000000; - props[8] = 0x00000000; - props[9] = 0x00000000; - props[10] = 0x000001fe; - props[11] = 0x02000000; - props[12] = 0x00000000; - props[13] = 0x01000000; - props[14] = 0x02000000; - props[15] = 0x00000000; - props[16] = 0x00000000; - props[17] = 0x000001ff; - props[18] = 0x00000000; - props[19] = 0x00000001; - props[20] = 0x00000000; - props[21] = 0x03000000; - props[22] = 0x00000000; - props[23] = 0x00000000; - props[24] = 0x000001ff; - props[25] = 0x00000000; - props[26] = 0x00000001; - props[27] = 0x00000000; - set_property(dev, "ranges", (char *)props, 28 * sizeof(props[0])); props[0] = 0xc0000000; props[1] = 0x20000000; set_property(dev, "virtual-dma", (char *)props, 2 * sizeof(props[0])); @@ -518,6 +505,13 @@ return 0; } +int sabre_config_cb(const pci_config_t *config) +{ + host_config_cb(config); + + return sabre_configure(get_cur_dev()); +} + int bridge_config_cb(const pci_config_t *config) { phandle_t aliases; @@ -525,8 +519,6 @@ aliases = find_dev("/aliases"); set_property(aliases, "bridge", config->path, strlen(config->path) + 1); - pci_set_bus_range(config); - return 0; } @@ -599,9 +591,10 @@ ncells * sizeof(cell)); } -static void pci_set_assigned_addresses(const pci_config_t *config, int num_bars) +static void pci_set_assigned_addresses(phandle_t phandle, + const pci_config_t *config, int num_bars) { - phandle_t dev = get_cur_dev(); + phandle_t dev = phandle; u32 props[32]; int ncells; int i; @@ -628,9 +621,32 @@ ncells * sizeof(props[0])); } -static void pci_set_reg(const pci_config_t *config, int num_bars) +/* call after writing "reg" property to update config->path */ +static void ob_pci_reload_device_path(phandle_t phandle, pci_config_t *config) { - phandle_t dev = get_cur_dev(); + /* since "name" and "reg" are now assigned + we need to reload current node name */ + + PUSH(phandle); + fword("get-package-path"); + char *new_path = pop_fstr_copy(); + if (new_path) { + if (0 != strcmp(config->path, new_path)) { + PCI_DPRINTF("\n=== CHANGED === package path old=%s new=%s\n", + config->path, new_path); + strncpy(config->path, new_path, sizeof(config->path)); + config->path[sizeof(config->path)-1] = '\0'; + } + free(new_path); + } else { + PCI_DPRINTF("\n=== package path old=%s new=NULL\n", config->path); + } +} + +static void pci_set_reg(phandle_t phandle, + pci_config_t *config, int num_bars) +{ + phandle_t dev = phandle; u32 props[38]; int ncells; int i; @@ -662,6 +678,11 @@ } set_property(dev, "reg", (char *)props, ncells * sizeof(props[0])); + ob_pci_reload_device_path(dev, config); + +#if defined(CONFIG_DEBUG_PCI) + dump_reg_property("pci_set_reg", ncells, props); +#endif } @@ -746,10 +767,13 @@ return 0; } -static void ob_pci_add_properties(pci_addr addr, const pci_dev_t *pci_dev, +static void ob_pci_add_properties(phandle_t phandle, + pci_addr addr, const pci_dev_t *pci_dev, const pci_config_t *config, int num_bars) { - phandle_t dev=get_cur_dev(); + /* cannot use get_cur_dev() path resolution since "name" and "reg" + properties are being changed */ + phandle_t dev=phandle; int status,id; uint16_t vendor_id, device_id; uint8_t rev; @@ -760,6 +784,26 @@ rev = pci_config_read8(addr, PCI_REVISION_ID); class_code = pci_config_read16(addr, PCI_CLASS_DEVICE); + if (pci_dev) { + /**/ + if (pci_dev->name) { + push_str(pci_dev->name); + fword("encode-string"); + push_str("name"); + fword("property"); + } else { + char path[256]; + snprintf(path, sizeof(path), + "pci%x,%x", vendor_id, device_id); + push_str(path); + fword("encode-string"); + push_str("name"); + fword("property"); + } + } else { + PCI_DPRINTF("*** missing pci_dev\n"); + } + /* create properties as described in 2.5 */ set_int_property(dev, "vendor-id", vendor_id); @@ -826,14 +870,10 @@ pci_dev->icells); } - pci_set_reg(config, num_bars); - pci_set_assigned_addresses(config, num_bars); + pci_set_assigned_addresses(phandle, config, num_bars); OLDWORLD(pci_set_AAPL_address(config)); PCI_DPRINTF("\n"); - - if (pci_dev && pci_dev->config_cb) - pci_dev->config_cb(config); } #ifdef CONFIG_XBOX @@ -979,113 +1019,284 @@ pci_config_write16(addr, PCI_COMMAND, cmd); } -static void ob_scan_pci_bus(int bus, unsigned long *mem_base, - unsigned long *io_base, char **path) +static void ob_configure_pci_device(const char* parent_path, + int *bus_num, unsigned long *mem_base, unsigned long *io_base, + int bus, int devnum, int fn, int *p_is_multi); + +static void ob_scan_pci_bus(int *bus_num, unsigned long *mem_base, + unsigned long *io_base, const char *path, + int bus) { - int devnum, fn, is_multi, vid, did; - unsigned int htype; - pci_addr addr; - pci_config_t config; - const pci_dev_t *pci_dev; - uint32_t ccode; - uint8_t class, subclass, iface; - int num_bars, rom_bar; + int devnum, fn, is_multi; + + PCI_DPRINTF("\nScanning bus %d at %s...\n", bus, path); - activate_device("/"); for (devnum = 0; devnum < 32; devnum++) { is_multi = 0; for (fn = 0; fn==0 || (is_multi && fn<8); fn++) { -#ifdef CONFIG_XBOX - if (pci_xbox_blacklisted (bus, devnum, fn)) - continue; -#endif - addr = PCI_ADDR(bus, devnum, fn); - vid = pci_config_read16(addr, PCI_VENDOR_ID); - did = pci_config_read16(addr, PCI_DEVICE_ID); - - if (vid==0xffff || vid==0) - continue; - - ccode = pci_config_read16(addr, PCI_CLASS_DEVICE); - class = ccode >> 8; - subclass = ccode; - iface = pci_config_read8(addr, PCI_CLASS_PROG); - - pci_dev = pci_find_device(class, subclass, iface, - vid, did); - - PCI_DPRINTF("%x:%x.%x - %x:%x - ", bus, devnum, fn, - vid, did); - - htype = pci_config_read8(addr, PCI_HEADER_TYPE); - if (fn == 0) - is_multi = htype & 0x80; - - if (pci_dev == NULL || pci_dev->name == NULL) - snprintf(config.path, sizeof(config.path), - "%s/pci%x,%x", *path, vid, did); - else - snprintf(config.path, sizeof(config.path), - "%s/%s", *path, pci_dev->name); - - PCI_DPRINTF("%s - ", config.path); - - config.dev = addr & 0x00FFFFFF; - - if (class == PCI_BASE_CLASS_BRIDGE && - (subclass == PCI_SUBCLASS_BRIDGE_HOST || - subclass == PCI_SUBCLASS_BRIDGE_PCI)) - REGISTER_NAMED_NODE(ob_pci_bus_node, config.path); - else - REGISTER_NAMED_NODE(ob_pci_simple_node, config.path); - - activate_device(config.path); - - if (htype & PCI_HEADER_TYPE_BRIDGE) { - num_bars = 2; - rom_bar = PCI_ROM_ADDRESS1; - } else { - num_bars = 6; - rom_bar = PCI_ROM_ADDRESS; - } - - ob_pci_configure(addr, &config, num_bars, rom_bar, - mem_base, io_base); - ob_pci_add_properties(addr, pci_dev, &config, num_bars); - - if (class == PCI_BASE_CLASS_BRIDGE && - (subclass == PCI_SUBCLASS_BRIDGE_HOST || - subclass == PCI_SUBCLASS_BRIDGE_PCI)) { - /* host or bridge */ - free(*path); - *path = strdup(config.path); - } + ob_configure_pci_device(path, bus_num, mem_base, io_base, + bus, devnum, fn, &is_multi); } } - device_end(); +} + +static void ob_configure_pci_bridge(pci_addr addr, + int *bus_num, unsigned long *mem_base, + unsigned long *io_base, + int primary_bus, pci_config_t *config) +{ + config->primary_bus = primary_bus; + pci_config_write8(addr, PCI_PRIMARY_BUS, config->primary_bus); + + config->secondary_bus = *bus_num; + pci_config_write8(addr, PCI_SECONDARY_BUS, config->secondary_bus); + + config->subordinate_bus = 0xff; + pci_config_write8(addr, PCI_SUBORDINATE_BUS, config->subordinate_bus); + + PCI_DPRINTF("scanning new pci bus %u under bridge %s\n", + config->secondary_bus, config->path); + + /* make pci bridge parent device, prepare for recursion */ + + ob_scan_pci_bus(bus_num, mem_base, io_base, + config->path, config->secondary_bus); + + /* bus scan updates *bus_num to last revealed pci bus number */ + config->subordinate_bus = *bus_num; + pci_config_write8(addr, PCI_SUBORDINATE_BUS, config->subordinate_bus); + + PCI_DPRINTF("bridge %s PCI bus primary=%d secondary=%d subordinate=%d\n", + config->path, config->primary_bus, config->secondary_bus, + config->subordinate_bus); + + pci_set_bus_range(config); +} + +static int ob_pci_read_identification(int bus, int devnum, int fn, + int *p_vid, int *p_did, + uint8_t *p_class, uint8_t *p_subclass) +{ + int vid, did; + uint32_t ccode; + pci_addr addr; + +#ifdef CONFIG_XBOX + if (pci_xbox_blacklisted (bus, devnum, fn)) + return; +#endif + addr = PCI_ADDR(bus, devnum, fn); + vid = pci_config_read16(addr, PCI_VENDOR_ID); + did = pci_config_read16(addr, PCI_DEVICE_ID); + + if (vid==0xffff || vid==0) { + return 0; + } + + if (p_vid) { + *p_vid = vid; + } + + if (p_did) { + *p_did = did; + } + + ccode = pci_config_read16(addr, PCI_CLASS_DEVICE); + + if (p_class) { + *p_class = ccode >> 8; + } + + if (p_subclass) { + *p_subclass = ccode; + } + + return 1; +} + +static void ob_configure_pci_device(const char* parent_path, + int *bus_num, unsigned long *mem_base, unsigned long *io_base, + int bus, int devnum, int fn, int *p_is_multi) +{ + int vid, did; + unsigned int htype; + pci_addr addr; + pci_config_t config = {}; + const pci_dev_t *pci_dev; + uint8_t class, subclass, iface; + int num_bars, rom_bar; + + phandle_t phandle = 0; + int is_host_bridge = 0; + + if (!ob_pci_read_identification(bus, devnum, fn, &vid, &did, &class, &subclass)) { + return; + } + + addr = PCI_ADDR(bus, devnum, fn); + iface = pci_config_read8(addr, PCI_CLASS_PROG); + + pci_dev = pci_find_device(class, subclass, iface, + vid, did); + + PCI_DPRINTF("%x:%x.%x - %x:%x - ", bus, devnum, fn, + vid, did); + + htype = pci_config_read8(addr, PCI_HEADER_TYPE); + + if (fn == 0) { + if (p_is_multi) { + *p_is_multi = htype & 0x80; + } + } + + /* stop adding host bridge accessible from it's primary bus + PCI host bridge is to be added by host code + */ + if (class == PCI_BASE_CLASS_BRIDGE && + subclass == PCI_SUBCLASS_BRIDGE_HOST) { + is_host_bridge = 1; + } + + if (is_host_bridge) { + /* reuse device tree node */ + PCI_DPRINTF("host bridge found - "); + snprintf(config.path, sizeof(config.path), + "%s", parent_path); + } else if (pci_dev == NULL || pci_dev->name == NULL) { + snprintf(config.path, sizeof(config.path), + "%s/pci%x,%x", parent_path, vid, did); + } + else { + snprintf(config.path, sizeof(config.path), + "%s/%s", parent_path, pci_dev->name); + } + + PCI_DPRINTF("%s - ", config.path); + + config.dev = addr & 0x00FFFFFF; + + switch (class) { + case PCI_BASE_CLASS_BRIDGE: + if (subclass != PCI_SUBCLASS_BRIDGE_HOST) { + REGISTER_NAMED_NODE_PHANDLE(ob_pci_bus_node, config.path, phandle); + } + break; + default: + REGISTER_NAMED_NODE_PHANDLE(ob_pci_simple_node, config.path, phandle); + break; + } + + if (is_host_bridge) { + phandle = find_dev(config.path); + + if (get_property(phandle, "vendor-id", NULL)) { + PCI_DPRINTF("host bridge already configured\n"); + return; + } + } + + activate_dev(phandle); + + if (htype & PCI_HEADER_TYPE_BRIDGE) { + num_bars = 2; + rom_bar = PCI_ROM_ADDRESS1; + } else { + num_bars = 6; + rom_bar = PCI_ROM_ADDRESS; + } + + ob_pci_configure(addr, &config, num_bars, rom_bar, + mem_base, io_base); + + ob_pci_add_properties(phandle, addr, pci_dev, &config, num_bars); + + if (!is_host_bridge) { + pci_set_reg(phandle, &config, num_bars); + } + + /* call device-specific configuration callback */ + if (pci_dev && pci_dev->config_cb) { + //activate_device(config.path); + pci_dev->config_cb(&config); + } + + /* device is configured so we may move it out of scope */ + device_end(); + + /* scan bus behind bridge device */ + //if (htype & PCI_HEADER_TYPE_BRIDGE && class == PCI_BASE_CLASS_BRIDGE) { + if ( class == PCI_BASE_CLASS_BRIDGE && + ( subclass == PCI_SUBCLASS_BRIDGE_PCI || + subclass == PCI_SUBCLASS_BRIDGE_HOST ) ) { + + if (subclass == PCI_SUBCLASS_BRIDGE_PCI) { + /* reserve next pci bus number for this PCI bridge */ + ++(*bus_num); + } + + ob_configure_pci_bridge(addr, bus_num, mem_base, io_base, bus, &config); + } } int ob_pci_init(void) { - int bus; - unsigned long mem_base, io_base; - char *path; + int bus, devnum, fn; + uint8_t class, subclass; + unsigned long mem_base, io_base; - PCI_DPRINTF("Initializing PCI devices...\n"); + pci_config_t config = {}; /* host bridge */ + phandle_t phandle_host; - /* brute force bus scan */ + PCI_DPRINTF("Initializing PCI host bridge...\n"); - /* Find all PCI bridges */ + activate_device("/"); - mem_base = arch->mem_base; - /* I/O ports under 0x400 are used by devices mapped at fixed - location. */ - io_base = arch->io_base + 0x400; - path = strdup(""); - for (bus = 0; bus<0x100; bus++) { - ob_scan_pci_bus(bus, &mem_base, &io_base, &path); - } - free(path); - return 0; + /* Find all PCI bridges */ + + mem_base = arch->mem_base; + /* I/O ports under 0x400 are used by devices mapped at fixed + location. */ + io_base = arch->io_base + 0x400; + + bus = 0; + + for (devnum = 0; devnum < 32; devnum++) { + /* scan only fn 0 */ + fn = 0; + + if (!ob_pci_read_identification(bus, devnum, fn, + 0, 0, &class, &subclass)) { + continue; + } + + if (class != PCI_BASE_CLASS_BRIDGE || subclass != PCI_SUBCLASS_BRIDGE_HOST) { + continue; + } + + /* create root node for host PCI bridge */ + + /* configure */ + snprintf(config.path, sizeof(config.path), "/pci"); + + REGISTER_NAMED_NODE_PHANDLE(ob_pci_bus_node, config.path, phandle_host); + + pci_host_set_reg(phandle_host); + + /* update device path after changing "reg" property */ + ob_pci_reload_device_path(phandle_host, &config); + + ob_configure_pci_device(config.path, &bus, &mem_base, &io_base, + bus, devnum, fn, 0); + + /* we expect single host PCI bridge + but this may be machine-specific */ + break; + } + + + device_end(); + + return 0; } Modified: trunk/openbios-devel/drivers/pci.h ============================================================================== --- trunk/openbios-devel/drivers/pci.h Thu May 27 22:12:05 2010 (r785) +++ trunk/openbios-devel/drivers/pci.h Thu May 27 22:12:11 2010 (r786) @@ -34,7 +34,9 @@ #define PCI_HEADER_TYPE_NORMAL 0x00 #define PCI_HEADER_TYPE_BRIDGE 0x01 #define PCI_HEADER_TYPE_CARDBUS 0x02 -#define PCI_SECONDARY_BUS 0x19 +#define PCI_PRIMARY_BUS 0x18 +#define PCI_SECONDARY_BUS 0x19 +#define PCI_SUBORDINATE_BUS 0x1A #define PCI_BASE_ADDR_0 0x10 #define PCI_BASE_ADDR_1 0x14 #define PCI_BASE_ADDR_2 0x18 Modified: trunk/openbios-devel/drivers/pci_database.h ============================================================================== --- trunk/openbios-devel/drivers/pci_database.h Thu May 27 22:12:05 2010 (r785) +++ trunk/openbios-devel/drivers/pci_database.h Thu May 27 22:12:11 2010 (r786) @@ -8,6 +8,9 @@ uint32_t sizes[7]; int irq_pin; int irq_line; + u32 primary_bus; + u32 secondary_bus; + u32 subordinate_bus; }; typedef struct pci_dev_t pci_dev_t; Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Thu May 27 22:12:05 2010 (r785) +++ trunk/openbios-devel/drivers/vga_vbe.c Thu May 27 22:12:11 2010 (r786) @@ -155,7 +155,11 @@ vga_vbe_set_mode(width, height, depth); - ph = find_dev(path); +#if 0 + ph = find_dev(path); +#else + ph = get_cur_dev(); +#endif set_int_property(ph, "width", width); set_int_property(ph, "height", height); Modified: trunk/openbios-devel/include/libopenbios/bindings.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/bindings.h Thu May 27 22:12:05 2010 (r785) +++ trunk/openbios-devel/include/libopenbios/bindings.h Thu May 27 22:12:11 2010 (r786) @@ -112,6 +112,12 @@ path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ } while(0) +#define REGISTER_NAMED_NODE_PHANDLE( name, path, phandle ) do { \ + phandle = \ + bind_new_node( name##_flags_, name##_size_, \ + path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + #define REGISTER_NODE_METHODS( name, path ) do { \ const char *paths[1]; \ \ @@ -140,7 +146,7 @@ extern void bind_node( int flags, int size, const char * const *paths, int npaths, const method_t *methods, int nmethods ); -extern void bind_new_node( int flags, int size, const char *name, +extern phandle_t bind_new_node( int flags, int size, const char *name, const method_t *methods, int nmethods ); #define INSTALL_OPEN 1 /* install trivial open and close methods */ Modified: trunk/openbios-devel/libopenbios/bindings.c ============================================================================== --- trunk/openbios-devel/libopenbios/bindings.c Thu May 27 22:12:05 2010 (r785) +++ trunk/openbios-devel/libopenbios/bindings.c Thu May 27 22:12:11 2010 (r786) @@ -507,16 +507,18 @@ activate_dev( save_ph ); } -void +phandle_t bind_new_node( int flags, int size, const char *name, const method_t *methods, int nmet ) { phandle_t save_ph = get_cur_dev(); - + phandle_t new_ph; /* create node */ push_str( name ); fword("create-node"); add_methods( flags, size, methods, nmet ); + new_ph = get_cur_dev(); activate_dev( save_ph ); + return new_ph; }

1 0

[commit] r785 - trunk/openbios-devel/drivers
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:12:05 2010 New Revision: 785 URL: http://tracker.coreboot.org/trac/openbios/changeset/785 Log: pci: debug printk macros Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:02 2010 (r784) +++ trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:05 2010 (r785) @@ -32,6 +32,12 @@ #include "macio.h" #endif +#if defined (CONFIG_DEBUG_PCI) +# define PCI_DPRINTF(format, ...) printk(format, ## __VA_ARGS__) +#else +# define PCI_DPRINTF(format, ...) do { } while (0) +#endif + #define set_bool_property(ph, name) set_property(ph, name, NULL, 0); /* DECLARE data structures for the nodes. */ @@ -824,9 +830,7 @@ pci_set_assigned_addresses(config, num_bars); OLDWORLD(pci_set_AAPL_address(config)); -#ifdef CONFIG_DEBUG_PCI - printk("\n"); -#endif + PCI_DPRINTF("\n"); if (pci_dev && pci_dev->config_cb) pci_dev->config_cb(config); @@ -1010,10 +1014,9 @@ pci_dev = pci_find_device(class, subclass, iface, vid, did); -#ifdef CONFIG_DEBUG_PCI - printk("%x:%x.%x - %x:%x - ", bus, devnum, fn, + PCI_DPRINTF("%x:%x.%x - %x:%x - ", bus, devnum, fn, vid, did); -#endif + htype = pci_config_read8(addr, PCI_HEADER_TYPE); if (fn == 0) is_multi = htype & 0x80; @@ -1024,9 +1027,9 @@ else snprintf(config.path, sizeof(config.path), "%s/%s", *path, pci_dev->name); -#ifdef CONFIG_DEBUG_PCI - printk("%s - ", config.path); -#endif + + PCI_DPRINTF("%s - ", config.path); + config.dev = addr & 0x00FFFFFF; if (class == PCI_BASE_CLASS_BRIDGE && @@ -1069,9 +1072,7 @@ unsigned long mem_base, io_base; char *path; -#ifdef CONFIG_DEBUG_PCI - printk("Initializing PCI devices...\n"); -#endif + PCI_DPRINTF("Initializing PCI devices...\n"); /* brute force bus scan */

1 0

[commit] r784 - trunk/openbios-devel/drivers
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:12:02 2010 New Revision: 784 URL: http://tracker.coreboot.org/trac/openbios/changeset/784 Log: pci: property encoding helpers Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Thu May 27 22:11:59 2010 (r783) +++ trunk/openbios-devel/drivers/pci.c Thu May 27 22:12:02 2010 (r784) @@ -52,7 +52,21 @@ MEMORY_SPACE_64 = 3, }; -static inline void pci_encode_phys_addr(u32 *phys, int flags, int space_code, +static int encode_int32_cells(int num_cells, u32 *prop, ucell val) +{ + int i = 0; + + /* hi ... lo */ + for (i=0; i < num_cells; ++i) { + prop[num_cells - i - 1] = val; + val >>= 16; + val >>= 16; + } + + return num_cells; +} + +static inline int pci_encode_phys_addr(u32 *phys, int flags, int space_code, pci_addr dev, uint8_t reg, uint64_t addr) { @@ -67,8 +81,44 @@ /* phys.lo */ phys[2] = addr; + + return 3; } +static inline int pci_encode_size(u32 *prop, uint64_t size) +{ + return encode_int32_cells(2, prop, size); +} + +static int host_address_cells(void) +{ + return get_int_property(find_dev("/"), "#address-cells", NULL); +} + +static int host_encode_phys_addr(u32 *prop, ucell addr) +{ + return encode_int32_cells(host_address_cells(), prop, addr); +} + +static int host_size_cells(void) +{ + return get_int_property(find_dev("/"), "#size-cells", NULL); +} + +/* +static int parent_address_cells(void) +{ + phandle_t parent_ph = ih_to_phandle(my_parent()); + return get_int_property(parent_ph, "#address-cells", NULL); +} + +static int parent_size_cells(void) +{ + phandle_t parent_ph = ih_to_phandle(my_parent()); + return get_int_property(parent_ph, "#size-cells", NULL); +} +*/ + static void ob_pci_open(int *idx) { @@ -318,14 +368,23 @@ static void pci_host_set_reg(const pci_config_t *config) { - phandle_t dev = get_cur_dev(); - u32 props[2]; + phandle_t dev = get_cur_dev(); + /* at most 2 integers for address and size */ + u32 props[4]; + int ncells = 0; + + ncells += encode_int32_cells(host_address_cells(), props + ncells, + arch->cfg_base); + + ncells += encode_int32_cells(host_size_cells(), props + ncells, + arch->cfg_len); - props[0] = arch->cfg_base; - props[1] = arch->cfg_len; - set_property(dev, "reg", (char *)props, 2 * sizeof(props[0])); + set_property(dev, "reg", (char *)props, ncells * sizeof(props[0])); } +/* child-phys : parent-phys : size */ +/* 3 cells for PCI : 2 cells for 64bit parent : 2 cells for PCI */ + static void pci_host_set_ranges(const pci_config_t *config) { phandle_t dev = get_cur_dev(); @@ -333,29 +392,31 @@ int ncells; ncells = 0; + /* first encode PCI configuration space */ + { + ncells += pci_encode_phys_addr(props + ncells, 0, CONFIGURATION_SPACE, + config->dev, 0, 0); + ncells += host_encode_phys_addr(props + ncells, arch->cfg_addr); + ncells += pci_encode_size(props + ncells, arch->cfg_len); + } + if (arch->io_base) { - pci_encode_phys_addr(props + ncells, 0, IO_SPACE, + ncells += pci_encode_phys_addr(props + ncells, 0, IO_SPACE, config->dev, 0, 0); - ncells += 3; - props[ncells++] = arch->io_base; - props[ncells++] = 0x00000000; - props[ncells++] = arch->io_len; + ncells += host_encode_phys_addr(props + ncells, arch->io_base); + ncells += pci_encode_size(props + ncells, arch->io_len); } if (arch->rbase) { - pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, + ncells += pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, config->dev, 0, 0); - ncells += 3; - props[ncells++] = arch->rbase; - props[ncells++] = 0x00000000; - props[ncells++] = arch->rlen; + ncells += host_encode_phys_addr(props + ncells, arch->rbase); + ncells += pci_encode_size(props + ncells, arch->rlen); } if (arch->mem_base) { - pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, + ncells += pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, config->dev, 0, arch->mem_base); - ncells += 3; - props[ncells++] = arch->mem_base; - props[ncells++] = 0x00000000; - props[ncells++] = arch->mem_len; + ncells += host_encode_phys_addr(props + ncells, arch->mem_base); + ncells += pci_encode_size(props + ncells, arch->mem_len); } set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } @@ -548,11 +609,10 @@ pci_decode_pci_addr(config->assigned[i], &flags, &space_code, &mask); - pci_encode_phys_addr(props + ncells, + ncells += pci_encode_phys_addr(props + ncells, flags, space_code, config->dev, PCI_BASE_ADDR_0 + (i * sizeof(uint32_t)), config->assigned[i] & ~mask); - ncells += 3; props[ncells++] = 0x00000000; props[ncells++] = config->sizes[i]; @@ -571,13 +631,13 @@ uint32_t mask; int space_code, flags; - ncells = 0; - pci_encode_phys_addr(props + ncells, 0, CONFIGURATION_SPACE, + ncells = 0; + + /* first (addr, size) pair is the beginning of configuration address space */ + ncells += pci_encode_phys_addr(props + ncells, 0, CONFIGURATION_SPACE, config->dev, 0, 0); - ncells += 3; - props[ncells++] = 0x00000000; - props[ncells++] = 0x00000000; + ncells += pci_encode_size(props + ncells, 0); for (i = 0; i < num_bars; i++) { if (!config->assigned[i] || !config->sizes[i]) @@ -586,17 +646,15 @@ pci_decode_pci_addr(config->regions[i], &flags, &space_code, &mask); - pci_encode_phys_addr(props + ncells, + ncells += pci_encode_phys_addr(props + ncells, flags, space_code, config->dev, PCI_BASE_ADDR_0 + (i * sizeof(uint32_t)), config->regions[i] & ~mask); - ncells += 3; /* set size */ - - props[ncells++] = 0x00000000; - props[ncells++] = config->sizes[i]; + ncells += pci_encode_size(props + ncells, config->sizes[i]); } + set_property(dev, "reg", (char *)props, ncells * sizeof(props[0])); } @@ -624,10 +682,9 @@ pci_decode_pci_addr(config->assigned[i], &flags, &space_code, &mask); - pci_encode_phys_addr(props + ncells, flags, space_code, + ncells += pci_encode_phys_addr(props + ncells, flags, space_code, config->dev, 0x10 + i * 4, config->assigned[i] & ~mask); - ncells += 3; /* size */

1 0

[commit] r783 - in trunk/openbios-devel: drivers packages
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:11:59 2010 New Revision: 783 URL: http://tracker.coreboot.org/trac/openbios/changeset/783 Log: video: framebuffer properties must be 32bit values Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Thu May 27 22:11:56 2010 (r782) +++ trunk/openbios-devel/drivers/vga_vbe.c Thu May 27 22:11:59 2010 (r783) @@ -161,7 +161,7 @@ set_int_property(ph, "height", height); set_int_property(ph, "depth", depth); set_int_property(ph, "linebytes", linebytes); - set_int_property(ph, "address", fb & ~0x0000000F); + set_int_property(ph, "address", (u32)(fb & ~0x0000000F)); chosen = find_dev("/chosen"); push_str(path); Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Thu May 27 22:11:56 2010 (r782) +++ trunk/openbios-devel/packages/video.c Thu May 27 22:11:59 2010 (r783) @@ -320,11 +320,11 @@ video.fb.depth = depth; video.fb.rb = rb; while( (ph=dt_iterate_type(ph, "display")) ) { - set_property( ph, "width", (char*)&video.fb.w, 4 ); - set_property( ph, "height", (char*)&video.fb.h, 4 ); - set_property( ph, "depth", (char*)&video.fb.depth, 4 ); - set_property( ph, "linebytes", (char*)&video.fb.rb, 4 ); - set_property( ph, "address", (char*)&video.fb.mphys, 4 ); + set_int_property( ph, "width", video.fb.w ); + set_int_property( ph, "height", video.fb.h ); + set_int_property( ph, "depth", video.fb.depth ); + set_int_property( ph, "linebytes", video.fb.rb ); + set_int_property( ph, "address", video.fb.mphys ); } video.has_video = 1; video.pal = malloc( 256 * sizeof(ulong) );

1 0

[commit] r782 - trunk/openbios-devel/drivers
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:11:56 2010 New Revision: 782 URL: http://tracker.coreboot.org/trac/openbios/changeset/782 Log: ide: fix property data size Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/ide.c Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Thu May 27 22:11:53 2010 (r781) +++ trunk/openbios-devel/drivers/ide.c Thu May 27 22:11:56 2010 (r782) @@ -1369,7 +1369,7 @@ struct ide_channel *chan; int io_ports[IDE_MAX_CHANNELS]; int ctl_ports[IDE_MAX_CHANNELS]; - cell props[6]; + u32 props[6]; io_ports[0] = io_port0; ctl_ports[0] = ctl_port0 + 2; @@ -1428,17 +1428,17 @@ dnode = find_dev(nodebuff); -#ifndef CONFIG_PPC +#if !defined(CONFIG_PPC) && !defined(CONFIG_SPARC64) props[0]=14; props[1]=0; set_property(dnode, "interrupts", - (char *)&props, 2*sizeof(cell)); + (char *)&props, 2*sizeof(props[0])); #endif props[0] = __cpu_to_be32(chan->io_regs[0]); props[1] = __cpu_to_be32(1); props[2] = __cpu_to_be32(8); props[3] = __cpu_to_be32(chan->io_regs[8]); props[4] = __cpu_to_be32(1); props[5] = __cpu_to_be32(2); - set_property(dnode, "reg", (char *)&props, 6*sizeof(cell)); + set_property(dnode, "reg", (char *)&props, 6*sizeof(props[0])); IDE_DPRINTF(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", current_channel, chan->io_regs[0], @@ -1523,7 +1523,7 @@ int i, j; char nodebuff[128]; phandle_t dnode; - cell props[8]; + u32 props[8]; struct ide_channel *chan; for (i = 0; i < nb_channels; i++, current_channel++) { @@ -1585,7 +1585,7 @@ props[6] = 0x00000000; props[7] = 0x00000000; OLDWORLD(set_property(dnode, "AAPL,pio-timing", - (char *)&props, 8*sizeof(cell))); + (char *)&props, 8*sizeof(props[0]))); /* The first interrupt entry is the ide interrupt, the second the dbdma interrupt */ @@ -1610,25 +1610,25 @@ props[1] = 0x00000000; /* XXX level triggered on real hw */ props[3] = 0x00000000; set_property(dnode, "interrupts", - (char *)&props, 4*sizeof(cell)); + (char *)&props, 4*sizeof(props[0])); set_int_property(dnode, "#interrupt-cells", 2); OLDWORLD(set_property(dnode, "AAPL,interrupts", - (char *)&props, 2*sizeof(cell))); + (char *)&props, 2*sizeof(props[0]))); props[0] = MACIO_IDE_OFFSET + i * MACIO_IDE_SIZE; props[1] = MACIO_IDE_SIZE; props[2] = 0x00008b00 + i * 0x0200; props[3] = 0x0200; - set_property(dnode, "reg", (char *)&props, 4*sizeof(cell)); + set_property(dnode, "reg", (char *)&props, 4*sizeof(props[0])); props[0] = addr + MACIO_IDE_OFFSET + i * MACIO_IDE_SIZE; props[1] = addr + 0x00008b00 + i * 0x0200; OLDWORLD(set_property(dnode, "AAPL,address", - (char *)&props, 2*sizeof(cell))); + (char *)&props, 2*sizeof(props[0]))); props[0] = 0; OLDWORLD(set_property(dnode, "AAPL,bus-id", (char*)props, - 1 * sizeof(cell))); + 1 * sizeof(props[0]))); IDE_DPRINTF(DEV_NAME": [io ports 0x%lx]\n", current_channel, chan->mmio);

1 0

[commit] r781 - trunk/openbios-devel/drivers
by repository service 27 May '10

27 May '10

Author: blueswirl Date: Thu May 27 22:11:53 2010 New Revision: 781 URL: http://tracker.coreboot.org/trac/openbios/changeset/781 Log: ebus: set addressing to 2 address cells and 1 size cells Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci_database.c Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Wed May 26 21:10:25 2010 (r780) +++ trunk/openbios-devel/drivers/pci_database.c Thu May 27 22:11:53 2010 (r781) @@ -354,7 +354,7 @@ { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL, "ebus", "ebus", "pci108e,1000\0pciclass,068000\0", - 3, 2, 1, + 2, 1, 1, ebus_config_cb, NULL, }, {

1 0

[commit] r780 - trunk/openbios-devel/arch/sparc64
by repository service 26 May '10

26 May '10

Author: blueswirl Date: Wed May 26 21:10:25 2010 New Revision: 780 URL: http://tracker.coreboot.org/trac/openbios/changeset/780 Log: sparc64: fix pci host bridge offsets Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Wed May 26 21:10:23 2010 (r779) +++ trunk/openbios-devel/arch/sparc64/openbios.c Wed May 26 21:10:25 2010 (r780) @@ -60,13 +60,13 @@ .name = "SUNW,sabre", .vendor_id = PCI_VENDOR_ID_SUN, .device_id = PCI_DEVICE_ID_SUN_SABRE, - .cfg_addr = APB_SPECIAL_BASE + 0x1000000ULL, - .cfg_data = APB_MEM_BASE, - .cfg_base = 0x80000000ULL, - .cfg_len = 0, - .mem_base = APB_MEM_BASE + 0x400000ULL, + .cfg_addr = APB_SPECIAL_BASE + 0x1000000ULL, // PCI bus configuration space + .cfg_data = APB_MEM_BASE, // PCI bus memory space + .cfg_base = APB_SPECIAL_BASE, + .cfg_len = 0x2000000, + .mem_base = APB_MEM_BASE, .mem_len = 0x10000000, - .io_base = APB_SPECIAL_BASE + 0x2000000ULL, + .io_base = APB_SPECIAL_BASE + 0x2000000ULL, // PCI Bus I/O space .io_len = 0x10000, .irqs = { 0, 1, 2, 3 }, },

1 0

[commit] r779 - trunk/openbios-devel/include/arch/sparc64
by repository service 26 May '10

26 May '10

Author: blueswirl Date: Wed May 26 21:10:23 2010 New Revision: 779 URL: http://tracker.coreboot.org/trac/openbios/changeset/779 Log: sparc64: replace ASI numbers with macros Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/arch/sparc64/io.h Modified: trunk/openbios-devel/include/arch/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/io.h Wed May 26 21:10:21 2010 (r778) +++ trunk/openbios-devel/include/arch/sparc64/io.h Wed May 26 21:10:23 2010 (r779) @@ -2,6 +2,7 @@ #define _ASM_IO_H #include "asm/types.h" +#include "asi.h" #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" @@ -62,24 +63,30 @@ { int ret; - __asm__ __volatile__("lduba [%1] 0x15, %0\n\t" - :"=r"(ret):"r"(addr):"memory"); + __asm__ __volatile__("lduba [%1] %2, %0\n\t" + : "=r"(ret) + : "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E) + : "memory"); return ret; } static inline void out_8(volatile unsigned char *addr, int val) { - __asm__ __volatile__("stba %0, [%1] 0x15\n\t" - : : "r"(val), "r"(addr):"memory"); + __asm__ __volatile__("stba %0, [%1] %2\n\t" + : + : "r"(val), "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E) + : "memory"); } static inline int in_le16(volatile unsigned short *addr) { int ret; - __asm__ __volatile__("lduha [%1] 0x15, %0\n\t" - :"=r"(ret):"r"(addr):"memory"); + __asm__ __volatile__("lduha [%1] %2, %0\n\t" + : "=r"(ret) + : "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E) + : "memory"); return ret; } @@ -88,8 +95,10 @@ { int ret; - __asm__ __volatile__("lduha [%1] 0x1d, %0\n\t" - :"=r"(ret):"r"(addr):"memory"); + __asm__ __volatile__("lduha [%1] %2, %0\n\t" + : "=r"(ret) + : "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E_L) + : "memory"); return ret; } @@ -97,22 +106,28 @@ static inline void out_le16(volatile unsigned short *addr, int val) { - __asm__ __volatile__("stha %0, [%1] 0x15\n\t" - : : "r"(val), "r"(addr):"memory"); + __asm__ __volatile__("stha %0, [%1] %2\n\t" + : + : "r"(val), "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E) + : "memory"); } static inline void out_be16(volatile unsigned short *addr, int val) { - __asm__ __volatile__("stha %0, [%1] 0x1d\n\t" - : : "r"(val), "r"(addr):"memory"); + __asm__ __volatile__("stha %0, [%1] %2\n\t" + : + : "r"(val), "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E_L) + : "memory"); } static inline unsigned in_le32(volatile unsigned *addr) { unsigned ret; - __asm__ __volatile__("lduwa [%1] 0x15, %0\n\t" - :"=r"(ret):"r"(addr):"memory"); + __asm__ __volatile__("lduwa [%1] %2, %0\n\t" + : "=r"(ret) + : "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E) + : "memory"); return ret; } @@ -121,21 +136,27 @@ { unsigned ret; - __asm__ __volatile__("lduwa [%1] 0x1d, %0\n\t" - :"=r"(ret):"r"(addr):"memory"); + __asm__ __volatile__("lduwa [%1] %2, %0\n\t" + : "=r"(ret) + : "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E_L) + : "memory"); return ret; } static inline void out_le32(volatile unsigned *addr, int val) { - __asm__ __volatile__("stwa %0, [%1] 0x15\n\t" - : : "r"(val), "r"(addr):"memory"); + __asm__ __volatile__("stwa %0, [%1] %2\n\t" + : + : "r"(val), "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E) + : "memory"); } static inline void out_be32(volatile unsigned *addr, int val) { - __asm__ __volatile__("stwa %0, [%1] 0x1d\n\t" - : : "r"(val), "r"(addr):"memory"); + __asm__ __volatile__("stwa %0, [%1] %2\n\t" + : + : "r"(val), "r"(addr), "i" (ASI_PHYS_BYPASS_EC_E_L) + : "memory"); } static inline void _insw_ns(volatile uint16_t * port, void *buf, int ns)

1 0

[commit] r778 - in trunk/openbios-devel: arch/sparc64 include/arch/sparc64
by repository service 26 May '10

26 May '10

Author: blueswirl Date: Wed May 26 21:10:21 2010 New Revision: 778 URL: http://tracker.coreboot.org/trac/openbios/changeset/778 Log: sparc64: move asi.h to arch includes Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Added: trunk/openbios-devel/include/arch/sparc64/asi.h - copied, changed from r777, trunk/openbios-devel/arch/sparc64/asi.h Deleted: trunk/openbios-devel/arch/sparc64/asi.h Modified: trunk/openbios-devel/arch/sparc64/entry.S trunk/openbios-devel/arch/sparc64/spitfire.h trunk/openbios-devel/arch/sparc64/switch.S trunk/openbios-devel/arch/sparc64/vectors.S Modified: trunk/openbios-devel/arch/sparc64/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S Mon May 24 22:55:21 2010 (r777) +++ trunk/openbios-devel/arch/sparc64/entry.S Wed May 26 21:10:21 2010 (r778) @@ -8,7 +8,7 @@ */ #define __ASSEMBLY__ -#include "asi.h" +#include <asm/asi.h> #include "pstate.h" #include "lsu.h" #define NO_QEMU_PROTOS Modified: trunk/openbios-devel/arch/sparc64/spitfire.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/spitfire.h Mon May 24 22:55:21 2010 (r777) +++ trunk/openbios-devel/arch/sparc64/spitfire.h Wed May 26 21:10:21 2010 (r778) @@ -7,7 +7,7 @@ #ifndef _SPARC64_SPITFIRE_H #define _SPARC64_SPITFIRE_H -#include "asi.h" +#include <asm/asi.h> /* The following register addresses are accessible via ASI_DMMU * and ASI_IMMU, that is there is a distinct and unique copy of Modified: trunk/openbios-devel/arch/sparc64/switch.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/switch.S Mon May 24 22:55:21 2010 (r777) +++ trunk/openbios-devel/arch/sparc64/switch.S Wed May 26 21:10:21 2010 (r778) @@ -1,5 +1,5 @@ #include "pstate.h" -#include "asi.h" +#include <asm/asi.h> #define ASI_BP ASI_M_BYPASS #define REGWIN_SZ 0x40 Modified: trunk/openbios-devel/arch/sparc64/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S Mon May 24 22:55:21 2010 (r777) +++ trunk/openbios-devel/arch/sparc64/vectors.S Wed May 26 21:10:21 2010 (r778) @@ -25,7 +25,7 @@ #define __ASSEMBLY__ #include "pstate.h" -#include "asi.h" +#include <asm/asi.h> #define ASI_BP ASI_PHYS_BYPASS_EC_E #define PROM_ADDR 0x1fff0000000 #define SER_ADDR 0x1fe020003f8 Copied and modified: trunk/openbios-devel/include/arch/sparc64/asi.h (from r777, trunk/openbios-devel/arch/sparc64/asi.h) ==============================================================================

1 0

Help with creating a word
by Programmingkid 26 May '10

26 May '10

I need to make a word that can define another word. What I have tried is take the definition of the ':' and ';' words and do something like this: : createWord " MyWord" header 1 , ] ." hello from MyWord!" ( lit ) h# b7db9018 , reveal ( lit ) h# b7db9950 execute ; This doesn't work either: : createWord : MyWord ." hello from MyWord!" ; ; Anyone know how to define a word from within another word?

3 2

PATCH: Make creation of the MMU translation entries architecture-specific
by Mark Cave-Ayland 25 May '10

25 May '10

Hi folks, Following on from the thread "Re: [OpenBIOS] Haiku/ppc regression?", please find the attached patch for testing. Andreas, if this works, how much further does the Haiku boot get? 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

6 18

[PATCH 0/2] sparc64 cleanups
by Igor V. Kovalenko 25 May '10

25 May '10

One code cleanup and another pci host bridge remap change, the latter requires qemu update with patch already posted to qemu list. --- Igor V. Kovalenko (2): sparc64: replace ASI numbers with macros sparc64: fix pci host bridge offsets arch/sparc64/openbios.c | 12 ++++----- include/arch/sparc64/io.h | 61 ++++++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 26 deletions(-) --

1 2

[commit] r777 - trunk/openbios-devel/fs/grubfs
by repository service 24 May '10

24 May '10

Author: mcayland Date: Mon May 24 22:55:21 2010 New Revision: 777 URL: http://tracker.coreboot.org/trac/openbios/changeset/777 Log: Fix RR alignment bug in the grubfs iso9660 driver which prevented CD directory entries from being read correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/grubfs/fsys_iso9660.c Modified: trunk/openbios-devel/fs/grubfs/fsys_iso9660.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/fsys_iso9660.c Mon May 24 16:20:17 2010 (r776) +++ trunk/openbios-devel/fs/grubfs/fsys_iso9660.c Mon May 24 22:55:21 2010 (r777) @@ -173,8 +173,8 @@ rr_ptr.ptr = ((char *)idr + idr->name_len.ENDIAN + sizeof(struct iso_directory_record) - sizeof(idr->name)); - if (rr_ptr.i & 1) - rr_ptr.i++, rr_len--; + if (rr_len & 1) + rr_ptr.ptr++, rr_len--; ce_ptr = NULL; rr_flag = RR_FLAG_NM | RR_FLAG_PX;

1 0

[commit] r776 - trunk/fcode-utils-devel/shared
by repository service 24 May '10

24 May '10

Author: stepan Date: Mon May 24 16:20:17 2010 New Revision: 776 URL: http://tracker.coreboot.org/trac/openbios/changeset/776 Log: OpenSolaris amd64 support. Signed-off-by: Andreas Faerber <afaerber(a)opensolaris.org> Modified: trunk/fcode-utils-devel/shared/types.h Modified: trunk/fcode-utils-devel/shared/types.h ============================================================================== --- trunk/fcode-utils-devel/shared/types.h Mon May 24 15:31:15 2010 (r775) +++ trunk/fcode-utils-devel/shared/types.h Mon May 24 16:20:17 2010 (r776) @@ -52,7 +52,7 @@ typedef int32_t s32; typedef u_int32_t u32; -#elif defined(__sparc) +#elif defined(__sun__) #include <sys/types.h>

1 0

[commit] r759 - in trunk/fcode-utils-devel: detok romheaders toke
by repository service 24 May '10

24 May '10

Author: stepan Date: Mon Apr 26 19:01:01 2010 New Revision: 759 URL: http://tracker.coreboot.org/trac/openbios/changeset/759 Log: warning free build on OS X 10.5.8 Modified: trunk/fcode-utils-devel/detok/Makefile trunk/fcode-utils-devel/detok/addfcodes.c trunk/fcode-utils-devel/detok/decode.c trunk/fcode-utils-devel/detok/pcihdr.c trunk/fcode-utils-devel/detok/stream.c trunk/fcode-utils-devel/romheaders/Makefile trunk/fcode-utils-devel/toke/Makefile Modified: trunk/fcode-utils-devel/detok/Makefile ============================================================================== --- trunk/fcode-utils-devel/detok/Makefile Mon Apr 26 17:57:21 2010 (r758) +++ trunk/fcode-utils-devel/detok/Makefile Mon Apr 26 19:01:01 2010 (r759) @@ -29,7 +29,7 @@ INCLUDES = -I../shared # Normal Flags: -CFLAGS = -O2 -Wall -Wextra +CFLAGS = -O2 -Wall -ansi #-Wextra LDFLAGS = # Coverage: Modified: trunk/fcode-utils-devel/detok/addfcodes.c ============================================================================== --- trunk/fcode-utils-devel/detok/addfcodes.c Mon Apr 26 17:57:21 2010 (r758) +++ trunk/fcode-utils-devel/detok/addfcodes.c Mon Apr 26 19:01:01 2010 (r759) @@ -98,9 +98,9 @@ **************************************************************************** */ static char *current_vfc_line; -static char *vfc_remainder; +static u8 *vfc_remainder; static int vfc_line_no = 0; -static char *vfc_buf_end; +static u8 *vfc_buf_end; /* Special Functions List */ /* Initial fcode-field value of -1 guarantees they won't be used */ @@ -173,12 +173,12 @@ { bool retval = FALSE; /* TRUE = not at end yet */ while (vfc_remainder < vfc_buf_end) { - current_vfc_line = vfc_remainder; - vfc_remainder = strchr(current_vfc_line, '\n'); + current_vfc_line = (char *)vfc_remainder; + vfc_remainder = (u8 *)strchr((const char *)current_vfc_line, '\n'); *vfc_remainder = 0; vfc_remainder++; vfc_line_no++; - skip_whitespace(&current_vfc_line); + skip_whitespace((char **)&current_vfc_line); if (*current_vfc_line == 0) continue; /* Blank line */ if (*current_vfc_line == '#') Modified: trunk/fcode-utils-devel/detok/decode.c ============================================================================== --- trunk/fcode-utils-devel/detok/decode.c Mon Apr 26 17:57:21 2010 (r758) +++ trunk/fcode-utils-devel/detok/decode.c Mon Apr 26 19:01:01 2010 (r759) @@ -357,7 +357,7 @@ { u16 token; u8 len; - u8 *string; + char *string; output_token(); /* get forth string ( [len] [char0] ... [charn] ) */ Modified: trunk/fcode-utils-devel/detok/pcihdr.c ============================================================================== --- trunk/fcode-utils-devel/detok/pcihdr.c Mon Apr 26 17:57:21 2010 (r758) +++ trunk/fcode-utils-devel/detok/pcihdr.c Mon Apr 26 19:01:01 2010 (r759) @@ -461,7 +461,7 @@ } else { sprintf(temp_buf, "PCI Image padding-field of %d bytes " "had first non-zero byte at offset %ld", - filler_len, scan_ptr - filler_ptr); + filler_len, (unsigned long)(scan_ptr - filler_ptr)); } printremark(temp_buf); } Modified: trunk/fcode-utils-devel/detok/stream.c ============================================================================== --- trunk/fcode-utils-devel/detok/stream.c Mon Apr 26 17:57:21 2010 (r758) +++ trunk/fcode-utils-devel/detok/stream.c Mon Apr 26 19:01:01 2010 (r759) @@ -236,7 +236,7 @@ throw_eof(TRUE); } pc += nbytes; - return (retval); + return retval; } @@ -252,7 +252,7 @@ { bool retval; retval = INVERSE(pc == max); - return (retval); + return retval; } @@ -282,7 +282,7 @@ tok |= *(get_bytes(1)); } fcode = tok; - return (tok); + return tok; } u32 get_num32(void) @@ -293,7 +293,7 @@ num_str = get_bytes(4); retval = BIG_ENDIAN_LONG_FETCH(num_str); - return (retval); + return retval; } u16 get_num16(void) @@ -304,7 +304,7 @@ num_str = get_bytes(2); retval = BIG_ENDIAN_WORD_FETCH(num_str); - return (retval); + return retval; } u8 get_num8(void) @@ -326,7 +326,7 @@ retval |= (retval & 0x80) ? 0xff00 : 0; } - return (retval); + return retval; } /* ************************************************************************** @@ -356,12 +356,12 @@ u8 *get_string(u8 * len) { - char *retval; + u8 *retval; *len = get_num8(); retval = get_bytes((int) *len); - return (retval); + return retval; } @@ -405,7 +405,7 @@ char *retval; u8 sav_byt; - str_start = get_string(len); + str_start = (char *)get_string(len); sav_byt = *pc; *pc = 0; @@ -413,7 +413,7 @@ retval = strdup(str_start); *pc = sav_byt; - return (retval); + return retval; } /* ************************************************************************** @@ -462,7 +462,7 @@ } pc = save_pc; - return (retval); + return retval; } Modified: trunk/fcode-utils-devel/romheaders/Makefile ============================================================================== --- trunk/fcode-utils-devel/romheaders/Makefile Mon Apr 26 17:57:21 2010 (r758) +++ trunk/fcode-utils-devel/romheaders/Makefile Mon Apr 26 19:01:01 2010 (r759) @@ -24,7 +24,7 @@ CC ?= gcc STRIP = strip -CFLAGS = -O2 -Wall -W -ansi +CFLAGS = -O2 -Wall -Wextra -ansi INCLUDES = -I../shared SOURCES = romheaders.c ../shared/classcodes.c Modified: trunk/fcode-utils-devel/toke/Makefile ============================================================================== --- trunk/fcode-utils-devel/toke/Makefile Mon Apr 26 17:57:21 2010 (r758) +++ trunk/fcode-utils-devel/toke/Makefile Mon Apr 26 19:01:01 2010 (r759) @@ -29,7 +29,7 @@ INCLUDES = -I../shared # Normal flags -CFLAGS = -O2 -Wall -Wextra +CFLAGS = -O2 -Wall -ansi -Wno-pointer-sign #-Wextra LDFLAGS = # Coverage:

3 5

[commit] r775 - in trunk/fcode-utils-devel: detok romheaders toke
by repository service 24 May '10

24 May '10

Author: stepan Date: Mon May 24 15:31:15 2010 New Revision: 775 URL: http://tracker.coreboot.org/trac/openbios/changeset/775 Log: drop -ansi because opensolaris has some odd implications like breaking getopt if it's there. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/fcode-utils-devel/detok/Makefile trunk/fcode-utils-devel/romheaders/Makefile trunk/fcode-utils-devel/toke/Makefile Modified: trunk/fcode-utils-devel/detok/Makefile ============================================================================== --- trunk/fcode-utils-devel/detok/Makefile Sat May 22 15:34:10 2010 (r774) +++ trunk/fcode-utils-devel/detok/Makefile Mon May 24 15:31:15 2010 (r775) @@ -29,7 +29,7 @@ INCLUDES = -I../shared # Normal Flags: -CFLAGS = -O2 -Wall -ansi #-Wextra +CFLAGS = -O2 -Wall #-Wextra LDFLAGS = # Coverage: Modified: trunk/fcode-utils-devel/romheaders/Makefile ============================================================================== --- trunk/fcode-utils-devel/romheaders/Makefile Sat May 22 15:34:10 2010 (r774) +++ trunk/fcode-utils-devel/romheaders/Makefile Mon May 24 15:31:15 2010 (r775) @@ -24,7 +24,7 @@ CC ?= gcc STRIP = strip -CFLAGS = -O2 -Wall -Wextra -ansi +CFLAGS = -O2 -Wall -Wextra INCLUDES = -I../shared SOURCES = romheaders.c ../shared/classcodes.c Modified: trunk/fcode-utils-devel/toke/Makefile ============================================================================== --- trunk/fcode-utils-devel/toke/Makefile Sat May 22 15:34:10 2010 (r774) +++ trunk/fcode-utils-devel/toke/Makefile Mon May 24 15:31:15 2010 (r775) @@ -29,7 +29,7 @@ INCLUDES = -I../shared # Normal flags -CFLAGS = -O2 -Wall -ansi -Wno-pointer-sign #-Wextra +CFLAGS = -O2 -Wall #-Wextra LDFLAGS = # Coverage: @@ -39,6 +39,12 @@ # Debugging: # CFLAGS := $(CFLAGS) -g +# for gcc 4. remove if you fixed the code. +_GCC4_CFLAGS=$(shell echo 'main(int argc, char **argv){return 0;}' > .test.c; \ + $(CC) -Wno-pointer-sign -c .test.c -o .test.o > /dev/null 2>&1 \ + && echo -Wno-pointer-sign; rm .test.c .test.o ) +CFLAGS := $(CFLAGS) $(_GCC4_CFLAGS) + OBJS = clflags.o conditl.o devnode.o dictionary.o emit.o errhandler.o \ flowcontrol.o macros.o nextfcode.o parselocals.o scanner.o stack.o \ stream.o strsubvocab.o ticvocab.o toke.o tokzesc.o tracesyms.o \

1 0

QEMU OpenBIOS booting?
by Steven Noonan 24 May '10

24 May '10

Hi folks, I've been trying to use OpenBIOS with QEMU, and I've had trouble getting it to boot any PowerPC-based OS discs (Linux, Mac OS X, etc). OpenBIOS just doesn't seem to find anything bootable. If I try booting QEMU with -nographic, I get this output (I get the same with a self-built openbios-qemu.elf from the OpenBIOS SVN as well): ---- snip ---- >> ============================================================= >> OpenBIOS 1.0 [Apr 12 2009 00:55] >> Configuration device id QEMU version 1 machine id 1 >> CPUs: 1 >> Memory: 128M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,970FX Welcome to OpenBIOS v1.0 built on Apr 12 2009 00:55 >> ELF - yaboot_startup: Entering boot, no path >> ELF - try_bootinfo: Trying hd:0,ppc\bootinfo.txt >> ELF - try_bootinfo: Can't open hd:0,ppc\bootinfo.txt >> ELF - try_path: Trying hd:2,\ofclient >> ELF - try_path: Can't open hd:2,\ofclient >> ELF - try_path: Trying hd:2,\yaboot conf=hd:2,\yaboot.conf >> ELF - try_path: Can't open hd:2,\yaboot >> *** Boot failure! No secondary bootloader specified *** ---- snip ---- Laurent Vivier suggested in this conversation in February (http://lists.openbios.org/pipermail/openbios/2009-February/003476.html) that there could be a bug in partition map decoding. Has such a bug been confirmed? I was trying to find the bug myself (I am an experienced C/C++ programmer), but the bug seems to be subtle, and my lack of familiarity with the code base doesn't help much. I've been trying to figure this out for 7 hours straight now... Any advice or other help would be much appreciated! - Steven

13 55

[commit] r754 - trunk/fcode-utils-devel/shared
by repository service 24 May '10

24 May '10

Author: stepan Date: Mon Apr 26 17:39:20 2010 New Revision: 754 URL: http://tracker.coreboot.org/trac/openbios/changeset/754 Log: fcode-utils: support compilation on solaris. Modified: trunk/fcode-utils-devel/shared/types.h Modified: trunk/fcode-utils-devel/shared/types.h ============================================================================== --- trunk/fcode-utils-devel/shared/types.h Mon Apr 26 15:06:48 2010 (r753) +++ trunk/fcode-utils-devel/shared/types.h Mon Apr 26 17:39:20 2010 (r754) @@ -40,6 +40,7 @@ **************************************************************************** */ #if defined(__APPLE__) + #include <sys/types.h> typedef int8_t s8; @@ -51,6 +52,22 @@ typedef int32_t s32; typedef u_int32_t u32; +#elif defined(__sparc) + +#include <sys/types.h> + +typedef int8_t s8; +typedef uint8_t u8; + +typedef int16_t s16; +typedef uint16_t u16; + +typedef int32_t s32; +typedef uint32_t u32; + +typedef int64_t s64; +typedef uint64_t u64; + #else #include <asm/types.h> @@ -63,6 +80,7 @@ typedef __s32 s32; typedef __u32 u32; + #endif #ifdef FALSE /* Hack for AIX. */

2 1

[PATCH] Fixes for Makefile clean target
by Andreas Färber 22 May '10

22 May '10

Hello, Here are two fixes for Makefile.target: 1) Lots of .o files stay around after a `make clean`, on Mac OS X host. diff --git a/Makefile.target b/Makefile.target index aa45120..8a706b2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -62,7 +62,7 @@ info: clean: @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* - @find . -type f -name "*~" -o -name '*.o' -o -name '*.a' -exec rm \ {\} \; + @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ -exec rm \{\} \; @echo " ok" Without this grouping, `find` fails to exec anything. 2) Even with the `find` expression fixed, the two generated files with the date are not removed, so take care of that manually: diff --git a/Makefile.target b/Makefile.target index 8a706b2..bab5998 100644 --- a/Makefile.target +++ b/Makefile.target @@ -62,6 +62,7 @@ info: clean: @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* + @rm -f $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/ version.fs @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ - exec rm \{\} \; @echo " ok" Signed-off-by: Andreas Faerber <andreas.faerber(a)web.de> Regards, Andreas

2 1

[commit] r774 - trunk/openbios-devel
by repository service 22 May '10

22 May '10

Author: blueswirl Date: Sat May 22 15:34:10 2010 New Revision: 774 URL: http://tracker.coreboot.org/trac/openbios/changeset/774 Log: Clean generated version files Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Sat May 22 15:34:08 2010 (r773) +++ trunk/openbios-devel/Makefile.target Sat May 22 15:34:10 2010 (r774) @@ -62,6 +62,7 @@ clean: @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* + @rm -f $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ -exec rm \{\} \; @echo " ok"

1 0

[commit] r773 - trunk/openbios-devel
by repository service 22 May '10

22 May '10

Author: blueswirl Date: Sat May 22 15:34:08 2010 New Revision: 773 URL: http://tracker.coreboot.org/trac/openbios/changeset/773 Log: Fix find expression in clean target Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Fri May 21 13:07:53 2010 (r772) +++ trunk/openbios-devel/Makefile.target Sat May 22 15:34:08 2010 (r773) @@ -62,7 +62,7 @@ clean: @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* - @find . -type f -name "*~" -o -name '*.o' -o -name '*.a' -exec rm \{\} \; + @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ -exec rm \{\} \; @echo " ok" build-verbose: info build

1 0

Concatenating strings
by Programmingkid 21 May '10

21 May '10

Is there a way to concatenate strings in OpenBIOS using forth?

2 2

[commit] r772 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 include/libopenbios libopenbios
by repository service 21 May '10

21 May '10

Author: mcayland Date: Fri May 21 13:07:53 2010 New Revision: 772 URL: http://tracker.coreboot.org/trac/openbios/changeset/772 Log: Move creation of MMU translation property entries into architecture-specific files, rather than in ofmem_common.c. This is because different architectures have different translation entries described within the OF platform bindings. With thanks to Andreas Färber and Igor Kovalenko. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon May 3 13:29:38 2010 (r771) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Fri May 21 13:07:53 2010 (r772) @@ -141,6 +141,30 @@ return NULL; } +int ofmem_arch_get_translation_entry_size(void) +{ + /* Return size of a single MMU package translation property entry in cells */ + return 4; +} + +void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) +{ + /* Generate translation property entry for PPC. According to the + platform bindings for PPC (http://playground.sun.com/1275/bindings/ppc/release/ppc-2_1.html#REF34579) + a translation property entry has the following layout: + + virtual address + length + physical address + mode + */ + + transentry[0] = t->virt; + transentry[1] = t->size; + transentry[2] = t->phys; + transentry[3] = t->mode; +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 13:29:38 2010 (r771) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Fri May 21 13:07:53 2010 (r772) @@ -69,6 +69,28 @@ return (retain_t *)(qemu_mem_size - sizeof(retain_t)); } +int ofmem_arch_get_translation_entry_size(void) +{ + /* Return size of a single MMU package translation property entry in cells */ + return 3; +} + +void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) +{ + /* Generate translation property entry for SPARC. While there is no + formal documentation for this, both Linux kernel and OpenSolaris sources + expect a translation property entry to have the following layout: + + virtual address + length + mode + */ + + transentry[0] = t->virt; + transentry[1] = t->size; + transentry[2] = t->mode; +} + /************************************************************************/ /* misc */ /************************************************************************/ Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Mon May 3 13:29:38 2010 (r771) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Fri May 21 13:07:53 2010 (r772) @@ -63,6 +63,8 @@ extern ucell ofmem_arch_get_heap_top(void); extern ucell ofmem_arch_get_virt_top(void); extern retain_t* ofmem_arch_get_retained(void); +extern int ofmem_arch_get_translation_entry_size(void); +extern void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t); extern ucell ofmem_arch_default_translation_mode( ucell phys ); extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Mon May 3 13:29:38 2010 (r771) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Fri May 21 13:07:53 2010 (r772) @@ -182,15 +182,15 @@ for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) { } - props = malloc(ncells * sizeof(ucell) * 3); + props = malloc(ncells * sizeof(ucell) * ofmem_arch_get_translation_entry_size()); if (props == NULL) return; + /* Call architecture-specific routines to generate translation entries */ for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) { - props[ncells++] = t->virt; - props[ncells++] = t->size; - props[ncells++] = t->mode; + ofmem_arch_create_translation_entry(&props[ncells], t); + ncells += ofmem_arch_get_translation_entry_size(); } set_property(s_phandle_mmu, "translations",

1 0

Missing portid properties
by Mark Cave-Ayland 15 May '10

15 May '10

Hi everyone, I've just committed a partial implementation of the SUNW,retain word and so have moved further into booting OpenSolaris. Currently it's only a partial implementation because I can't get Qemu to perform a warm restart without crashing the guest, so I may need to revisit this later. Fortunately, the SUNW,retain word itself is there which now enables the OpenSolaris kernel to get further during boot: 0 > go Jumping to entry point 00000000010071d8 for type 0000000000000001... switching to new context: entry point 0x10071d8 stack 0x00000000ffe02a91 / panic[cpu0]/thread=180e000: portid not found 000000000180b750 unix:fill_cpu+418 (ffffffffffe2fbd8, 10b81b0, 10b83d0, 0, 10bac00, ffffffffffffffff) %l0-3: 00000000018127c0 00000000010b81b8 00000000010b8000 ffffffffffffffff %l4-7: 0000000000000000 0000000000000004 00000000ffe2fbd8 0000000000000004 000000000180b870 unix:map_wellknown+124 (ffffffffffe2fbd8, 0, 0, 180b940, 0, 10b8188) %l0-3: 0000000000000001 0000000000000000 0000000000000000 ffffffffffffffff %l4-7: 0000000000000000 00000000010b8000 0000000000000000 000000000180b92c 000000000180b960 unix:map_wellknown_devices+80 (0, f7, 0, 10bb000, 10bb000, 10b8000) %l0-3: 0000000001812c00 0000000000002000 00000000010b8000 0000000000000000 %l4-7: 000000000183ac00 0000000001812400 0000000000000010 0000000000000000 000000000180ba20 unix:mlsetup+308 (180c000, 180bec0, 10b6548, 180c000, 2000, 180e000) %l0-3: 000000000180e000 0000000070002000 0000000000000000 000000000183ac00 %l4-7: 0000000000000000 000000000180c000 0000000070002000 0000000000000000 Looking through the OpenSolaris source code[1], it appears that fill_cpu() is expecting a portid property on the CPU nodes. Also searching further within the same file, it seems have_pci() is expecting a portid property on the PCI bus node too. Does anyone with experience with real Sun kit know what the portid property for both the CPU and PCI device should be set to? It's fairly obvious that it's an integer, but I'm not sure how it should reflect the virtual hardware. ATB, Mark. [1] http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/uts/sun4u/os/… -- 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

3 13

Re: [OpenBIOS] making switch-arch executable
by Programmingkid 07 May '10

07 May '10

On May 7, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > On 5/6/10, Programmingkid <programmingkidx(a)gmail.com> wrote: >> I made a change to the documentation on the page http://www.openfirmware.info/OpenBIOS. I added a step in the Building OpenBIOS section to make the switch-arch script executable. I was wondering if it is possible to download OpenBIOS with the script being executable without the user having to change it permissions. This would save some time and frustration. > > The permissions are already set up correctly: > $ svn proplist config/scripts/switch-arch > Properties on 'config/scripts/switch-arch': > svn:executable > > So the problem is actually with the program creating the zip, or maybe > the zip format itself misses any executability bits. I am betting it is with the program creating the zip. I did a little test on my computer to see if I could preserve the permissions of a file inside a zip file. The test was a success. The improvement with the documentation should compensate for the program's issues.

1 0

making switch-arch executable
by Programmingkid 06 May '10

06 May '10

I made a change to the documentation on the page http://www.openfirmware.info/OpenBIOS. I added a step in the Building OpenBIOS section to make the switch-arch script executable. I was wondering if it is possible to download OpenBIOS with the script being executable without the user having to change it permissions. This would save some time and frustration.

2 1

[commit] r771 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 include/libopenbios libopenbios
by repository service 03 May '10

03 May '10

Author: mcayland Date: Mon May 3 13:29:38 2010 New Revision: 771 URL: http://tracker.coreboot.org/trac/openbios/changeset/771 Log: Move the retained magic block to the top of physical RAM and implement code that should do the right thing. Probably needs more testing though. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon May 3 08:56:57 2010 (r770) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon May 3 13:29:38 2010 (r771) @@ -135,6 +135,12 @@ /* none yet */ } +retain_t *ofmem_arch_get_retained(void) +{ + /* not implemented */ + return NULL; +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 08:56:57 2010 (r770) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 13:29:38 2010 (r771) @@ -31,6 +31,8 @@ translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; +extern uint64_t qemu_mem_size; + static inline size_t ALIGN_SIZE(size_t x, size_t a) { return (x + a - 1) & ~(a-1); @@ -61,6 +63,12 @@ return (ucell)TOP_OF_RAM; } +retain_t *ofmem_arch_get_retained(void) +{ + /* Retained area is at the top of physical RAM */ + return (retain_t *)(qemu_mem_size - sizeof(retain_t)); +} + /************************************************************************/ /* misc */ /************************************************************************/ @@ -79,8 +87,6 @@ /* init / cleanup */ /************************************************************************/ -extern uint64_t qemu_mem_size; - static int remap_page_range( ucell phys, ucell virt, ucell size, ucell mode ) { ofmem_claim_phys(phys, size, 0); @@ -95,32 +101,37 @@ return 0; } -#define RETAIN_OFMEM (TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)) #define RETAIN_MAGIC 0x1100220033004400 void ofmem_init( void ) { - retain_t *retained = (retain_t *)RETAIN_OFMEM; - - /* Clear all memory except any retained areas */ - if (!(retained->magic == RETAIN_MAGIC)) { - memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); - s_ofmem_data.ofmem.ramsize = qemu_mem_size; - - retained->magic = RETAIN_MAGIC; - } else { - /* TODO: walk retain_phys_range and add entries to phys_range to prevent - them being reused */ - OFMEM_TRACE("ofmem_init has detected retained magic but currently not implemented"); + retain_t *retained = ofmem_arch_get_retained(); + int i; - memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); - s_ofmem_data.ofmem.ramsize = qemu_mem_size; - } + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; /* inherit translations set up by entry.S */ ofmem_walk_boot_map(remap_page_range); /* Map the memory */ ofmem_map_page_range(0, 0, qemu_mem_size, 0x36); -} + if (!(retained->magic == RETAIN_MAGIC)) { + OFMEM_TRACE("ofmem_init: no retained magic found, creating\n"); + retained->magic = RETAIN_MAGIC; + retained->numentries = 0; + } else { + OFMEM_TRACE("ofmem_init: retained magic found, total %lld mappings\n", retained->numentries); + + /* Mark physical addresses as used so they are not reallocated */ + for (i = 0; i < retained->numentries; i++) { + ofmem_claim_phys(retained->retain_phys_range[i].start, + retained->retain_phys_range[i].size, 0); + } + + /* Reset retained area for next reset */ + retained->magic = RETAIN_MAGIC; + retained->numentries = 0; + } +} Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Mon May 3 08:56:57 2010 (r770) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Mon May 3 13:29:38 2010 (r771) @@ -46,28 +46,29 @@ range_t *phys_range; range_t *virt_range; - range_t *retain_phys_range; /* physical memory that should survive a warm reset */ translation_t *trans; /* this is really a translation_t */ } ofmem_t; -/* structure for retained data at the top of the heap */ +/* structure for retained data */ typedef struct { ucell magic; - range_t *retain_phys_range; + ucell numentries; + range_t retain_phys_range[8]; /* physical memory that should survive a warm reset */ } retain_t; /* TODO: temporary migration interface */ -extern ofmem_t* ofmem_arch_get_private(void); -extern void* ofmem_arch_get_malloc_base(void); -extern ucell ofmem_arch_get_heap_top(void); -extern ucell ofmem_arch_get_virt_top(void); -extern ucell ofmem_arch_default_translation_mode( ucell phys ); -extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, +extern ofmem_t* ofmem_arch_get_private(void); +extern void* ofmem_arch_get_malloc_base(void); +extern ucell ofmem_arch_get_heap_top(void); +extern ucell ofmem_arch_get_virt_top(void); +extern retain_t* ofmem_arch_get_retained(void); +extern ucell ofmem_arch_default_translation_mode( ucell phys ); +extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode); -extern void ofmem_arch_unmap_pages(ucell virt, ucell size); +extern void ofmem_arch_unmap_pages(ucell virt, ucell size); /* sparc64 uses this method */ -extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, +extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, ucell mode ); /* malloc interface */ Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Mon May 3 08:56:57 2010 (r770) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Mon May 3 13:29:38 2010 (r771) @@ -452,7 +452,7 @@ /* if align != 0, phys is ignored. Returns -1 on error */ ucell ofmem_retain( ucell phys, ucell size, ucell align ) { - ofmem_t *ofmem = ofmem_arch_get_private(); + retain_t *retained = ofmem_arch_get_retained(); ucell retain_phys; OFMEM_TRACE("ofmem_retain phys=" FMT_ucellx " size=" FMT_ucellx @@ -461,8 +461,11 @@ retain_phys = ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); - /* Also add to the retain_phys_range list */ - add_entry( phys, size, &ofmem->retain_phys_range ); + /* Add to the retain_phys_range list */ + retained->retain_phys_range[retained->numentries].next = NULL; + retained->retain_phys_range[retained->numentries].start = retain_phys; + retained->retain_phys_range[retained->numentries].size = size; + retained->numentries++; return retain_phys; }

1 0

Re: [OpenBIOS] [commit] r766 - in trunk/openbios-devel: arch/sparc64 include/libopenbios libopenbios
by Nick Couchman 03 May '10

03 May '10

After the changes in this rev, I get the following trying to compile: nick@nick0:/home/nick/Temp/openbios-devel> ./config/scripts/switch-arch cross-sparc64 Configuring OpenBIOS on amd64 for cross-sparc64 Initializing build tree obj-sparc64...ok. Creating target Makefile...ok. Creating config files...ok. nick@nick0:/home/nick/Temp/openbios-devel> make Building OpenBIOS for sparc32 sparc64 Building...ok. error: GEN target/include/static-dict.h CC target/arch/sparc64/builtin.o CC target/arch/sparc64/openbios.o CC target/arch/sparc64/console.o CC target/arch/sparc64/lib.o CC target/arch/sparc64/boot.o CC target/arch/sparc64/context.o CC target/arch/sparc64/switch.o CC target/arch/sparc64/linux_load.o CC target/arch/sparc64/sys_info.o CC target/arch/sparc64/ofmem_sparc64.o ../arch/sparc64/ofmem_sparc64.c: In function `ofmem_init': ../arch/sparc64/ofmem_sparc64.c:106: warning: comparison is always false due to limited range of data type make[1]: *** [target/arch/sparc64/ofmem_sparc64.o] Error 1 make[1]: Leaving directory `/home/nick/Temp/openbios-devel/obj-sparc64' make: *** [build] Error 1 I'm using gcc 3.4.5 cross-compilers with glibc 2.3.6. -Nick >>> repository service 05/02/10 1:27 PM >>> Author: mcayland Date: Sun May 2 21:26:29 2010 New Revision: 766 URL: http://tracker.coreboot.org/trac/openbios/changeset/766 Log: Commit partial implementation of SUNW,retain for SPARC64 based upon the existing physical allocation routines. I've been unable to finish the code and test retention after a restart since the OpenBIOS words reset and reset-all don't seem to work at the moment. However, it enables OpenSolaris boot to get further in the meantime. Signed-off-by: Mark Cave-Ayland Modified: trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun May 2 21:26:29 2010 (r766) @@ -394,11 +394,35 @@ ofmem_release_phys(phys, size); } +/* ( name-cstr phys size align --- phys ) */ +static void +mem_retain ( void ) +{ + ucell phys=-1UL, size, align; + + align = POP(); + size = POP(); + if (!align) { + phys = POP(); + phys <<= 32; + phys |= POP(); + } + + /* Currently do nothing with the name */ + POP(); + + phys = ofmem_retain(phys, size, align); + + PUSH(phys & 0xffffffffUL); + PUSH(phys >> 32); +} + DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); NODE_METHODS( memory ) = { { "claim", mem_claim }, { "release", mem_release }, + { "SUNW,retain", mem_retain }, }; DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun May 2 21:26:29 2010 (r766) @@ -26,19 +26,19 @@ ofmem_t ofmem; } s_ofmem_data; -#define OFMEM (&s_ofmem_data.ofmem) -#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) +#define OFMEM (&s_ofmem_data.ofmem) +#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; -static ucell get_heap_top( void ) +static inline size_t ALIGN_SIZE(size_t x, size_t a) { - return (ucell)TOP_OF_RAM; + return (x + a - 1) & ~(a-1); } -static inline size_t ALIGN_SIZE(size_t x, size_t a) +static ucell get_heap_top( void ) { - return (x + a - 1) & ~(a-1); + return (ucell)(TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)); } ofmem_t* ofmem_arch_get_private(void) @@ -95,10 +95,27 @@ return 0; } +#define RETAIN_OFMEM (TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)) +#define RETAIN_MAGIC 0x1100220033004400 + void ofmem_init( void ) { - memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); - s_ofmem_data.ofmem.ramsize = qemu_mem_size; + retain_t *retained = (retain_t *)RETAIN_OFMEM; + + /* Clear all memory except any retained areas */ + if (!retained->magic == RETAIN_MAGIC) { + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; + + retained->magic = RETAIN_MAGIC; + } else { + /* TODO: walk retain_phys_range and add entries to phys_range to prevent + them being reused */ + OFMEM_TRACE("ofmem_init has detected retained magic but currently not implemented"); + + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; + } /* inherit translations set up by entry.S */ ofmem_walk_boot_map(remap_page_range); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun May 2 21:26:29 2010 (r766) @@ -46,10 +46,17 @@ range_t *phys_range; range_t *virt_range; + range_t *retain_phys_range; /* physical memory that should survive a warm reset */ translation_t *trans; /* this is really a translation_t */ } ofmem_t; +/* structure for retained data at the top of the heap */ +typedef struct { + ucell magic; + range_t *retain_phys_range; +} retain_t; + /* TODO: temporary migration interface */ extern ofmem_t* ofmem_arch_get_private(void); extern void* ofmem_arch_get_malloc_base(void); @@ -86,6 +93,8 @@ extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); +extern ucell ofmem_retain( ucell phys, ucell size, ucell align ); + extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun May 2 21:26:29 2010 (r766) @@ -449,6 +449,23 @@ get_ram_size(), ofmem_arch_get_virt_top(), 0 ); } +/* if align != 0, phys is ignored. Returns -1 on error */ +ucell ofmem_retain( ucell phys, ucell size, ucell align ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + ucell retain_phys; + + OFMEM_TRACE("ofmem_retain phys=" FMT_ucellx " size=" FMT_ucellx + " align=" FMT_ucellx "\n", + phys, size, align); + + retain_phys = ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); + + /* Also add to the retain_phys_range list */ + add_entry( phys, size, &ofmem->retain_phys_range ); + + return retain_phys; +} /* allocate both physical and virtual space and add a translation */ ucell ofmem_claim( ucell addr, ucell size, ucell align ) -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

3 2

[commit] r770 - trunk/openbios-devel/arch/sparc64
by repository service 03 May '10

03 May '10

Author: mcayland Date: Mon May 3 08:56:57 2010 New Revision: 770 URL: http://tracker.coreboot.org/trac/openbios/changeset/770 Log: Fix missing parentheses from r766. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 01:00:21 2010 (r769) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 08:56:57 2010 (r770) @@ -103,7 +103,7 @@ retain_t *retained = (retain_t *)RETAIN_OFMEM; /* Clear all memory except any retained areas */ - if (!retained->magic == RETAIN_MAGIC) { + if (!(retained->magic == RETAIN_MAGIC)) { memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); s_ofmem_data.ofmem.ramsize = qemu_mem_size;

1 0

[commit] r769 - trunk/openbios-devel/arch/sparc64
by repository service 03 May '10

03 May '10

Author: mcayland Date: Mon May 3 01:00:21 2010 New Revision: 769 URL: http://tracker.coreboot.org/trac/openbios/changeset/769 Log: Create extra CPU properties required by OpenSolaris kernel. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun May 2 22:08:43 2010 (r768) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon May 3 01:00:21 2010 (r769) @@ -78,6 +78,17 @@ struct cpudef { unsigned long iu_version; const char *name; + unsigned long ecache_associativity; + unsigned long ecache_line_size; + unsigned long ecache_size; + unsigned long num_dtlb_entries; + unsigned long dcache_associativity; + unsigned long dcache_line_size; + unsigned long dcache_size; + unsigned long num_itlb_entries; + unsigned long icache_associativity; + unsigned long icache_line_size; + unsigned long icache_size; }; /* @@ -157,6 +168,61 @@ push_str("clock-frequency"); fword("property"); + PUSH(cpu->ecache_associativity); + fword("encode-int"); + push_str("ecache-associativity"); + fword("property"); + + PUSH(cpu->ecache_line_size); + fword("encode-int"); + push_str("ecache-line-size"); + fword("property"); + + PUSH(cpu->ecache_size); + fword("encode-int"); + push_str("ecache-size"); + fword("property"); + + PUSH(cpu->dcache_associativity); + fword("encode-int"); + push_str("dcache-associativity"); + fword("property"); + + PUSH(cpu->dcache_line_size); + fword("encode-int"); + push_str("dcache-line-size"); + fword("property"); + + PUSH(cpu->dcache_size); + fword("encode-int"); + push_str("dcache-size"); + fword("property"); + + PUSH(cpu->icache_associativity); + fword("encode-int"); + push_str("icache-associativity"); + fword("property"); + + PUSH(cpu->ecache_line_size); + fword("encode-int"); + push_str("icache-line-size"); + fword("property"); + + PUSH(cpu->ecache_size); + fword("encode-int"); + push_str("icache-size"); + fword("property"); + + PUSH(cpu->num_itlb_entries); + fword("encode-int"); + push_str("#itlb-entries"); + fword("property"); + + PUSH(cpu->num_dtlb_entries); + fword("encode-int"); + push_str("#dtlb-entries"); + fword("property"); + fword("finish-device"); // Trap table @@ -190,14 +256,26 @@ { .iu_version = (0x17ULL << 48) | (0x10ULL << 32), .name = "SUNW,UltraSPARC", + .ecache_associativity = 1, .ecache_line_size = 0x40, .ecache_size = 0x100000, + .dcache_associativity = 1, .dcache_line_size = 0x20, .dcache_size = 0x4000, + .icache_associativity = 2, .icache_line_size = 0x20, .icache_size = 0x4000, + .num_dtlb_entries = 0x40, .num_itlb_entries = 0x40, }, { .iu_version = (0x17ULL << 48) | (0x11ULL << 32), .name = "SUNW,UltraSPARC-II", + .ecache_associativity = 1, .ecache_line_size = 0x40, .ecache_size = 0x100000, + .dcache_associativity = 1, .dcache_line_size = 0x20, .dcache_size = 0x4000, + .icache_associativity = 2, .icache_line_size = 0x20, .icache_size = 0x4000, + .num_dtlb_entries = 0x40, .num_itlb_entries = 0x40, }, { .iu_version = (0x17ULL << 48) | (0x12ULL << 32), .name = "SUNW,UltraSPARC-IIi", + .ecache_associativity = 1, .ecache_line_size = 0x40, .ecache_size = 0x40000, + .dcache_associativity = 1, .dcache_line_size = 0x20, .dcache_size = 0x4000, + .icache_associativity = 2, .icache_line_size = 0x20, .icache_size = 0x4000, + .num_dtlb_entries = 0x40, .num_itlb_entries = 0x40, }, { .iu_version = (0x17ULL << 48) | (0x13ULL << 32),

1 0

[commit] r768 - in trunk/openbios-devel: arch/sparc64 drivers
by repository service 02 May '10

02 May '10

Author: blueswirl Date: Sun May 2 22:08:43 2010 New Revision: 768 URL: http://tracker.coreboot.org/trac/openbios/changeset/768 Log: Sparc64: add upa-portid properties Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun May 2 22:01:34 2010 (r767) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun May 2 22:08:43 2010 (r768) @@ -147,6 +147,11 @@ push_str("cpuid"); fword("property"); + PUSH(0); + fword("encode-int"); + push_str("upa-portid"); + fword("property"); + PUSH(clock_frequency); fword("encode-int"); push_str("clock-frequency"); Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun May 2 22:01:34 2010 (r767) +++ trunk/openbios-devel/drivers/pci.c Sun May 2 22:08:43 2010 (r768) @@ -446,6 +446,8 @@ props[2] = 0x000007ef; props[3] = 0x000007e5; set_property(dev, "interrupts", (char *)props, 4 * sizeof(props[0])); + props[0] = 0x0000001f; + set_property(dev, "upa-portid", (char *)props, 1 * sizeof(props[0])); return 0; }

3 2

[commit] r767 - trunk/openbios-devel/arch/sparc64
by repository service 02 May '10

02 May '10

Author: blueswirl Date: Sun May 2 22:01:34 2010 New Revision: 767 URL: http://tracker.coreboot.org/trac/openbios/changeset/767 Log: Sparc64: fix reset The zeroth I/D TLB entries weren't cleared. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/entry.S Modified: trunk/openbios-devel/arch/sparc64/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S Sun May 2 21:26:29 2010 (r766) +++ trunk/openbios-devel/arch/sparc64/entry.S Sun May 2 22:01:34 2010 (r767) @@ -85,14 +85,14 @@ mov 63 << 3, %g1 1: stxa %g0, [%g1] ASI_ITLB_DATA_ACCESS subcc %g1, 1 << 3, %g1 - bne 1b + bpos 1b nop ! Clear DTLB mov 63 << 3, %g1 1: stxa %g0, [%g1] ASI_DTLB_DATA_ACCESS subcc %g1, 1 << 3, %g1 - bne 1b + bpos 1b nop ! Get memory size from configuration device

1 0

[commit] r766 - in trunk/openbios-devel: arch/sparc64 include/libopenbios libopenbios
by repository service 02 May '10

02 May '10

Author: mcayland Date: Sun May 2 21:26:29 2010 New Revision: 766 URL: http://tracker.coreboot.org/trac/openbios/changeset/766 Log: Commit partial implementation of SUNW,retain for SPARC64 based upon the existing physical allocation routines. I've been unable to finish the code and test retention after a restart since the OpenBIOS words reset and reset-all don't seem to work at the moment. However, it enables OpenSolaris boot to get further in the meantime. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun May 2 21:26:29 2010 (r766) @@ -394,11 +394,35 @@ ofmem_release_phys(phys, size); } +/* ( name-cstr phys size align --- phys ) */ +static void +mem_retain ( void ) +{ + ucell phys=-1UL, size, align; + + align = POP(); + size = POP(); + if (!align) { + phys = POP(); + phys <<= 32; + phys |= POP(); + } + + /* Currently do nothing with the name */ + POP(); + + phys = ofmem_retain(phys, size, align); + + PUSH(phys & 0xffffffffUL); + PUSH(phys >> 32); +} + DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); NODE_METHODS( memory ) = { { "claim", mem_claim }, { "release", mem_release }, + { "SUNW,retain", mem_retain }, }; DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun May 2 21:26:29 2010 (r766) @@ -26,19 +26,19 @@ ofmem_t ofmem; } s_ofmem_data; -#define OFMEM (&s_ofmem_data.ofmem) -#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) +#define OFMEM (&s_ofmem_data.ofmem) +#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; -static ucell get_heap_top( void ) +static inline size_t ALIGN_SIZE(size_t x, size_t a) { - return (ucell)TOP_OF_RAM; + return (x + a - 1) & ~(a-1); } -static inline size_t ALIGN_SIZE(size_t x, size_t a) +static ucell get_heap_top( void ) { - return (x + a - 1) & ~(a-1); + return (ucell)(TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)); } ofmem_t* ofmem_arch_get_private(void) @@ -95,10 +95,27 @@ return 0; } +#define RETAIN_OFMEM (TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)) +#define RETAIN_MAGIC 0x1100220033004400 + void ofmem_init( void ) { - memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); - s_ofmem_data.ofmem.ramsize = qemu_mem_size; + retain_t *retained = (retain_t *)RETAIN_OFMEM; + + /* Clear all memory except any retained areas */ + if (!retained->magic == RETAIN_MAGIC) { + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; + + retained->magic = RETAIN_MAGIC; + } else { + /* TODO: walk retain_phys_range and add entries to phys_range to prevent + them being reused */ + OFMEM_TRACE("ofmem_init has detected retained magic but currently not implemented"); + + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; + } /* inherit translations set up by entry.S */ ofmem_walk_boot_map(remap_page_range); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun May 2 21:26:29 2010 (r766) @@ -46,10 +46,17 @@ range_t *phys_range; range_t *virt_range; + range_t *retain_phys_range; /* physical memory that should survive a warm reset */ translation_t *trans; /* this is really a translation_t */ } ofmem_t; +/* structure for retained data at the top of the heap */ +typedef struct { + ucell magic; + range_t *retain_phys_range; +} retain_t; + /* TODO: temporary migration interface */ extern ofmem_t* ofmem_arch_get_private(void); extern void* ofmem_arch_get_malloc_base(void); @@ -86,6 +93,8 @@ extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); +extern ucell ofmem_retain( ucell phys, ucell size, ucell align ); + extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun May 2 21:26:29 2010 (r766) @@ -449,6 +449,23 @@ get_ram_size(), ofmem_arch_get_virt_top(), 0 ); } +/* if align != 0, phys is ignored. Returns -1 on error */ +ucell ofmem_retain( ucell phys, ucell size, ucell align ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + ucell retain_phys; + + OFMEM_TRACE("ofmem_retain phys=" FMT_ucellx " size=" FMT_ucellx + " align=" FMT_ucellx "\n", + phys, size, align); + + retain_phys = ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); + + /* Also add to the retain_phys_range list */ + add_entry( phys, size, &ofmem->retain_phys_range ); + + return retain_phys; +} /* allocate both physical and virtual space and add a translation */ ucell ofmem_claim( ucell addr, ucell size, ucell align )

1 0

/packages/elf-loader is missing
by Andreas Färber 01 May '10

01 May '10

... is the message I get from QEMU's official ppc OpenBIOS blob. sparc and sparc64 blobs work better. Probably the ppc blob just needs updating. My cross-compilation is still running to confirm whether HEAD works better. Some notes: binutils 2.20.1 and 2.20 do not compile on Mac OS X v10.6. They error about lots of _("...") format strings that Ubuntu (gcc 4.4.1) just warns about. OSX default gcc is 4.2.1; CC=gcc-4.0 leads to /usr/lib/iconv.la not found during linking instead. Andreas

6 22

[commit] r765 - trunk/openbios-devel/forth/device
by repository service 01 May '10

01 May '10

Author: mcayland Date: Sat May 1 14:13:16 2010 New Revision: 765 URL: http://tracker.coreboot.org/trac/openbios/changeset/765 Log: Demote the 'byte-load: stack overflow' message so that it only appears when fcode-debug? is set to true. This is because the stack is automatically corrected anyway, and is triggered by a bug in older versions of the OpenSolaris boot blocks. See the following for more information: http://src.opensolaris.org/source/history/onnv/onnv-gate/usr/src/psm/stand/… (rev 9941:eb1c075cb0e4) http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6803195 Anyone developing new Fcode under OpenBIOS is extremely likely to want fcode-debug? enabled during development, so this seems like a reasonable compromise. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/device/feval.fs Modified: trunk/openbios-devel/forth/device/feval.fs ============================================================================== --- trunk/openbios-devel/forth/device/feval.fs Sat May 1 11:48:57 2010 (r764) +++ trunk/openbios-devel/forth/device/feval.fs Sat May 1 14:13:16 2010 (r765) @@ -76,8 +76,10 @@ cr ." byte-load: exception caught!" cr then - depth r@ <> if - cr ." byte-load: stack overflow, diff " depth r@ - . cr + s" fcode-debug?" evaluate if + depth r@ <> if + cr ." byte-load: warning stack overflow, diff " depth r@ - . cr + then then r> depth! 3drop 3drop

1 0

[commit] r764 - trunk/openbios-devel/libc
by repository service 01 May '10

01 May '10

Author: mcayland Date: Sat May 1 11:48:57 2010 New Revision: 764 URL: http://tracker.coreboot.org/trac/openbios/changeset/764 Log: Add checks to the read_io, seek_io and close_io routines to ensure that they do not perform any actions if an invalid file handle (-1) is passed. This resolves the issue with extra arguments being left on the Forth stack when an invalid device access is attempted. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libc/diskio.c Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Fri Apr 30 23:56:29 2010 (r763) +++ trunk/openbios-devel/libc/diskio.c Sat May 1 11:48:57 2010 (r764) @@ -164,27 +164,40 @@ int read_io( int fd, void *buf, size_t cnt ) { - priv_fd_t *fdp = file_descriptors[fd]; + priv_fd_t *fdp; ucell ret; - PUSH( (ucell)buf ); - PUSH( cnt ); - call_package( fdp->read_xt, fdp->ih ); - ret = POP(); + if (fd != -1) { + fdp = file_descriptors[fd]; - if( !ret && cnt ) + PUSH( (ucell)buf ); + PUSH( cnt ); + call_package( fdp->read_xt, fdp->ih ); + ret = POP(); + + if( !ret && cnt ) + ret = -1; + } else { ret = -1; + } + return ret; } int seek_io( int fd, llong offs ) { - priv_fd_t *fdp = file_descriptors[fd]; + priv_fd_t *fdp; - DPUSH( offs ); - call_package( fdp->seek_xt, fdp->ih ); - return ((((cell)POP()) >= 0)? 0 : -1); + if (fd != -1) { + fdp = file_descriptors[fd]; + + DPUSH( offs ); + call_package( fdp->seek_xt, fdp->ih ); + return ((((cell)POP()) >= 0)? 0 : -1); + } else { + return -1; + } } llong @@ -203,13 +216,17 @@ int close_io( int fd ) { - priv_fd_t *fdp = file_descriptors[fd]; + priv_fd_t *fdp; + + if (fd != -1) { + fdp = file_descriptors[fd]; - if( fdp->do_close ) - close_dev( fdp->ih ); - free( fdp ); + if( fdp->do_close ) + close_dev( fdp->ih ); + free( fdp ); - file_descriptors[fd]=NULL; + file_descriptors[fd]=NULL; + } return 0; }

1 0

[commit] r763 - trunk/openbios-devel/libopenbios
by repository service 30 Apr '10

30 Apr '10

Author: mcayland Date: Fri Apr 30 23:56:29 2010 New Revision: 763 URL: http://tracker.coreboot.org/trac/openbios/changeset/763 Log: Promote out of memory messages from debug level to standard console messages. This makes it possible to determine that you've not allocated enough memory in qemu without having to rebuild with CONFIG_DEBUG_OFMEM enabled. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Fri Apr 30 22:57:27 2010 (r762) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Fri Apr 30 23:56:29 2010 (r763) @@ -108,7 +108,7 @@ top = ofmem_arch_get_heap_top(); if( (ucell)ofmem->next_malloc + size > top ) { - OFMEM_TRACE("out of malloc memory (%x)!\n", size ); + printk("out of malloc memory (%x)!\n", size ); return NULL; } @@ -396,7 +396,7 @@ } phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); if( phys == -1 ) { - OFMEM_TRACE("ofmem_claim_phys - out of space\n"); + printk("ofmem_claim_phys - out of space (failed request for " FMT_ucellx " bytes)\n", size); return -1; } add_entry( phys, size, &ofmem->phys_range ); @@ -431,7 +431,7 @@ virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); if( virt == -1 ) { - OFMEM_TRACE("ofmem_claim_virt - out of space\n"); + printk("ofmem_claim_virt - out of space (failed request for " FMT_ucellx " bytes)\n", size); return -1; } add_entry( virt, size, &ofmem->virt_range );

1 0

[commit] r762 - trunk/openbios-devel/arch/ppc/qemu
by repository service 30 Apr '10

30 Apr '10

Author: mcayland Date: Fri Apr 30 22:57:27 2010 New Revision: 762 URL: http://tracker.coreboot.org/trac/openbios/changeset/762 Log: Fix for PPC bootloaders that force the output to the "screen" device when -nographic is used with qemu. Note that this isn't a complete fix in that the VGA device is still present within the device tree, but it at least allows the bootloader and kernel to execute far enough to prevent you from wondering why the console has apparently frozen. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Fri Apr 30 22:54:03 2010 (r761) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Fri Apr 30 22:57:27 2010 (r762) @@ -658,6 +658,17 @@ stdin_path = "sccb"; stdout_path = "sccb"; } + + /* Some bootloaders force the output to the screen device, so + let's create a screen alias for the serial device too */ + push_str("/aliases"); + fword("find-device"); + + push_str(stdout_path); + fword("pathres-resolve-aliases"); + fword("encode-string"); + push_str("screen"); + fword("property"); } else { stdin_path = "adb-keyboard"; stdout_path = "screen";

1 0

[commit] r761 - trunk/openbios-devel/forth/bootstrap
by repository service 30 Apr '10

30 Apr '10

Author: mcayland Date: Fri Apr 30 22:54:03 2010 New Revision: 761 URL: http://tracker.coreboot.org/trac/openbios/changeset/761 Log: Move the temporary compilation buffer into dictionary space. This prevent spurious dictionary overflow messages appearing due to setup-tmp-comp switching dictionaries to memory outside of the initial dictionary space. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Mon Apr 26 19:07:49 2010 (r760) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Fri Apr 30 22:54:03 2010 (r761) @@ -1542,7 +1542,7 @@ \ : init-tmp-comp - 200 alloc-mem tmp-comp-buf ! + here 200 allot tmp-comp-buf ! ; \ the end

1 0

Re: [OpenBIOS] Adding words to forth - the tutorial
by Programmingkid 27 Apr '10

27 Apr '10

On Apr 23, 2010, at 3:17 PM, openbios-request(a)openbios.org wrote: > Programmingkid wrote: > >> A while ago I posted a tutorial on how to add words to the dictionary. Has anyone done anything with it? I was hoping to see it on the OpenBIOS web site. > > Since the website is based on a wiki, I seem to recall that there was > the offer of a wiki account for people like yourself who were interested > in updating the documentation. > > I think it would be great to set up a page with programming hints, > including links to the various Forth tutorials around to help new people > get involved in the project. > > > ATB, > > Mark. I remember being offered an account, unfortunately I never received one. If you could offer one, I would definitely accept.

3 2

[commit] r760 - in trunk/fcode-utils-devel: detok toke
by repository service 26 Apr '10

26 Apr '10

Author: stepan Date: Mon Apr 26 19:07:49 2010 New Revision: 760 URL: http://tracker.coreboot.org/trac/openbios/changeset/760 Log: push version number. Modified: trunk/fcode-utils-devel/detok/detok.c trunk/fcode-utils-devel/toke/toke.c Modified: trunk/fcode-utils-devel/detok/detok.c ============================================================================== --- trunk/fcode-utils-devel/detok/detok.c Mon Apr 26 19:01:01 2010 (r759) +++ trunk/fcode-utils-devel/detok/detok.c Mon Apr 26 19:07:49 2010 (r760) @@ -45,9 +45,9 @@ #include "stream.h" #include "addfcodes.h" -#define DETOK_VERSION "1.0.2" +#define DETOK_VERSION "1.0.3" -#define CORE_COPYR "(C) Copyright 2001-2006 Stefan Reinauer.\n" \ +#define CORE_COPYR "(C) Copyright 2001-2010 Stefan Reinauer.\n" \ "(C) Copyright 2006 coresystems GmbH <info(a)coresystems.de>" #define IBM_COPYR "(C) Copyright 2005 IBM Corporation. All Rights Reserved." @@ -65,9 +65,9 @@ char buffr[512]; sprintf(buffr, - "Welcome to detok - OpenBIOS detokenizer v" DETOK_VERSION "\n" + "Welcome to detok - FCode detokenizer v" DETOK_VERSION "\n" CORE_COPYR "\n" IBM_COPYR "\n" - "Written by Stefan Reinauer, <stepan(a)openbios.org>\n" + "Written by Stefan Reinauer <stepan(a)openbios.org>\n" "This program is free software; you may redistribute it " "under the terms of\nthe GNU General Public License v2. " "This program has absolutely no warranty.\n\n"); Modified: trunk/fcode-utils-devel/toke/toke.c ============================================================================== --- trunk/fcode-utils-devel/toke/toke.c Mon Apr 26 19:01:01 2010 (r759) +++ trunk/fcode-utils-devel/toke/toke.c Mon Apr 26 19:07:49 2010 (r760) @@ -46,8 +46,7 @@ #include "stack.h" #include "emit.h" -#define TOKE_VERSION "1.0.2" -#define TOKE_COPYRIGHT_DATE "2001-2006" +#define TOKE_VERSION "1.0.3" #include "vocabfuncts.h" #include "scanner.h" @@ -56,7 +55,7 @@ #include "clflags.h" #include "tracesyms.h" -#define CORE_COPYR "(C) Copyright 2001-2006 Stefan Reinauer.\n" \ +#define CORE_COPYR "(C) Copyright 2001-2010 Stefan Reinauer.\n" \ "(C) Copyright 2006 coresystems GmbH <info(a)coresystems.de>" #define IBM_COPYR "(C) Copyright 2005 IBM Corporation. All Rights Reserved." @@ -100,7 +99,7 @@ **************************************************************************** */ static void print_copyright(void) { - printf( "Welcome to toke - OpenBIOS tokenizer v" TOKE_VERSION "\n" + printf( "Welcome to toke - FCode tokenizer v" TOKE_VERSION "\n" CORE_COPYR "\n" IBM_COPYR "\n" "This program is free software; you may redistribute it " "under the terms of\nthe GNU General Public License v2. "

1 0

[commit] r758 - in trunk/fcode-utils-devel: detok romheaders toke
by repository service 26 Apr '10

26 Apr '10

Author: stepan Date: Mon Apr 26 17:57:21 2010 New Revision: 758 URL: http://tracker.coreboot.org/trac/openbios/changeset/758 Log: update headers Modified: trunk/fcode-utils-devel/detok/Makefile trunk/fcode-utils-devel/detok/addfcodes.c trunk/fcode-utils-devel/detok/addfcodes.h trunk/fcode-utils-devel/detok/decode.c trunk/fcode-utils-devel/detok/detok.c trunk/fcode-utils-devel/detok/detok.h trunk/fcode-utils-devel/detok/dictionary.c trunk/fcode-utils-devel/detok/pcihdr.c trunk/fcode-utils-devel/detok/printformats.c trunk/fcode-utils-devel/detok/stream.c trunk/fcode-utils-devel/detok/stream.h trunk/fcode-utils-devel/romheaders/Makefile trunk/fcode-utils-devel/romheaders/romheaders.c trunk/fcode-utils-devel/toke/conditl.c trunk/fcode-utils-devel/toke/conditl.h trunk/fcode-utils-devel/toke/devnode.c trunk/fcode-utils-devel/toke/devnode.h trunk/fcode-utils-devel/toke/dictionary.c trunk/fcode-utils-devel/toke/dictionary.h trunk/fcode-utils-devel/toke/emit.h trunk/fcode-utils-devel/toke/errhandler.c trunk/fcode-utils-devel/toke/errhandler.h trunk/fcode-utils-devel/toke/flowcontrol.c trunk/fcode-utils-devel/toke/flowcontrol.h trunk/fcode-utils-devel/toke/macros.c trunk/fcode-utils-devel/toke/macros.h trunk/fcode-utils-devel/toke/nextfcode.c trunk/fcode-utils-devel/toke/nextfcode.h trunk/fcode-utils-devel/toke/parselocals.c trunk/fcode-utils-devel/toke/parselocals.h trunk/fcode-utils-devel/toke/scanner.c trunk/fcode-utils-devel/toke/scanner.h trunk/fcode-utils-devel/toke/stack.c trunk/fcode-utils-devel/toke/stack.h trunk/fcode-utils-devel/toke/stream.c trunk/fcode-utils-devel/toke/stream.h trunk/fcode-utils-devel/toke/strsubvocab.c trunk/fcode-utils-devel/toke/strsubvocab.h trunk/fcode-utils-devel/toke/ticvocab.c trunk/fcode-utils-devel/toke/ticvocab.h trunk/fcode-utils-devel/toke/toke.c trunk/fcode-utils-devel/toke/toke.h trunk/fcode-utils-devel/toke/tokzesc.c trunk/fcode-utils-devel/toke/tokzesc.h trunk/fcode-utils-devel/toke/tracesyms.c trunk/fcode-utils-devel/toke/tracesyms.h trunk/fcode-utils-devel/toke/usersymbols.c trunk/fcode-utils-devel/toke/usersymbols.h trunk/fcode-utils-devel/toke/vocabfuncts.h Modified: trunk/fcode-utils-devel/detok/Makefile ============================================================================== --- trunk/fcode-utils-devel/detok/Makefile Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/Makefile Mon Apr 26 17:57:21 2010 (r758) @@ -1,11 +1,11 @@ # # OpenBIOS - free your system! -# ( Utilities ) +# ( FCode detokenizer ) # # This program is part of a free implementation of the IEEE 1275-1994 # Standard for Boot (Initialization Configuration) Firmware. # -# Copyright (C) 2001-2006 Stefan Reinauer <stepan(a)openbios.org> +# Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> # Copyright (C) 2006-2009 coresystems GmbH <info(a)coresystems.de> # # This program is free software; you can redistribute it and/or modify Modified: trunk/fcode-utils-devel/detok/addfcodes.c ============================================================================== --- trunk/fcode-utils-devel/detok/addfcodes.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/addfcodes.c Mon Apr 26 17:57:21 2010 (r758) @@ -1,11 +1,11 @@ /* * OpenBIOS - free your system! - * ( FCode tokenizer ) + * ( FCode detokenizer ) * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/detok/addfcodes.h ============================================================================== --- trunk/fcode-utils-devel/detok/addfcodes.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/addfcodes.h Mon Apr 26 17:57:21 2010 (r758) @@ -1,14 +1,11 @@ -#ifndef _DETOK_VSFCODES_H -#define _DETOK_VSFCODES_H - /* * OpenBIOS - free your system! - * ( FCode tokenizer ) + * ( FCode detokenizer ) * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 @@ -35,6 +32,9 @@ * **************************************************************************** */ +#ifndef _DETOK_VSFCODES_H +#define _DETOK_VSFCODES_H + #include "types.h" /* ************************************************************************** * Modified: trunk/fcode-utils-devel/detok/decode.c ============================================================================== --- trunk/fcode-utils-devel/detok/decode.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/decode.c Mon Apr 26 17:57:21 2010 (r758) @@ -1,13 +1,13 @@ /* * OpenBIOS - free your system! - * ( detokenizer ) + * ( FCode detokenizer ) * * decode.c - contains output wrappers for fcode words. * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/detok/detok.c ============================================================================== --- trunk/fcode-utils-devel/detok/detok.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/detok.c Mon Apr 26 17:57:21 2010 (r758) @@ -1,13 +1,13 @@ /* * OpenBIOS - free your system! - * ( detokenizer ) + * ( FCode detokenizer ) * * detok.c parameter parsing and main detokenizer loop. * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2006 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de> * * This program is free software; you can redistribute it and/or modify Modified: trunk/fcode-utils-devel/detok/detok.h ============================================================================== --- trunk/fcode-utils-devel/detok/detok.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/detok.h Mon Apr 26 17:57:21 2010 (r758) @@ -3,14 +3,14 @@ /* * OpenBIOS - free your system! - * ( detokenizer ) + * ( FCode detokenizer ) * * detok.h - detokenizer base macros. * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/detok/dictionary.c ============================================================================== --- trunk/fcode-utils-devel/detok/dictionary.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/dictionary.c Mon Apr 26 17:57:21 2010 (r758) @@ -1,13 +1,13 @@ /* * OpenBIOS - free your system! - * ( detokenizer ) + * ( FCode detokenizer ) * * dictionary.c - dictionary initialization and functions. * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/detok/pcihdr.c ============================================================================== --- trunk/fcode-utils-devel/detok/pcihdr.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/pcihdr.c Mon Apr 26 17:57:21 2010 (r758) @@ -1,11 +1,11 @@ /* * OpenBIOS - free your system! - * ( FCode tokenizer ) + * ( FCode detokenizer ) * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/detok/printformats.c ============================================================================== --- trunk/fcode-utils-devel/detok/printformats.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/printformats.c Mon Apr 26 17:57:21 2010 (r758) @@ -1,11 +1,11 @@ /* * OpenBIOS - free your system! - * ( FCode tokenizer ) + * ( FCode detokenizer ) * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/detok/stream.c ============================================================================== --- trunk/fcode-utils-devel/detok/stream.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/stream.c Mon Apr 26 17:57:21 2010 (r758) @@ -1,13 +1,13 @@ /* * OpenBIOS - free your system! - * ( detokenizer ) + * ( FCode detokenizer ) * * stream.c - FCode program bytecode streaming from file. * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/detok/stream.h ============================================================================== --- trunk/fcode-utils-devel/detok/stream.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/detok/stream.h Mon Apr 26 17:57:21 2010 (r758) @@ -1,16 +1,13 @@ -#ifndef _UTILS_DETOK_STREAM_H -#define _UTILS_DETOK_STREAM_H - /* * OpenBIOS - free your system! - * ( detokenizer ) + * ( FCode detokenizer ) * * stream.h - prototypes for fcode streaming functions. * * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 @@ -33,6 +30,9 @@ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com **************************************************************************** */ +#ifndef _UTILS_DETOK_STREAM_H +#define _UTILS_DETOK_STREAM_H + #include "types.h" /* Prototypes for functions exported from stream.c */ Modified: trunk/fcode-utils-devel/romheaders/Makefile ============================================================================== --- trunk/fcode-utils-devel/romheaders/Makefile Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/romheaders/Makefile Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ # This program is part of a free implementation of the IEEE 1275-1994 # Standard for Boot (Initialization Configuration) Firmware. # -# Copyright (C) 2002 Stefan Reinauer, <stepan(a)openbios.org> +# Copyright (C) 2002-2010 Stefan Reinauer <stepan(a)openbios.org> # Copyright (C) 2009 coresystems GmbH <info(a)coresystems.de> # # This program is free software; you can redistribute it and/or modify Modified: trunk/fcode-utils-devel/romheaders/romheaders.c ============================================================================== --- trunk/fcode-utils-devel/romheaders/romheaders.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/romheaders/romheaders.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de> * * This program is free software; you can redistribute it and/or modify @@ -240,5 +240,4 @@ return 0; } - - + Modified: trunk/fcode-utils-devel/toke/conditl.c ============================================================================== --- trunk/fcode-utils-devel/toke/conditl.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/conditl.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/conditl.h ============================================================================== --- trunk/fcode-utils-devel/toke/conditl.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/conditl.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/devnode.c ============================================================================== --- trunk/fcode-utils-devel/toke/devnode.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/devnode.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/devnode.h ============================================================================== --- trunk/fcode-utils-devel/toke/devnode.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/devnode.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/dictionary.c ============================================================================== --- trunk/fcode-utils-devel/toke/dictionary.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/dictionary.c Mon Apr 26 17:57:21 2010 (r758) @@ -7,7 +7,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/dictionary.h ============================================================================== --- trunk/fcode-utils-devel/toke/dictionary.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/dictionary.h Mon Apr 26 17:57:21 2010 (r758) @@ -10,7 +10,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/emit.h ============================================================================== --- trunk/fcode-utils-devel/toke/emit.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/emit.h Mon Apr 26 17:57:21 2010 (r758) @@ -10,7 +10,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/errhandler.c ============================================================================== --- trunk/fcode-utils-devel/toke/errhandler.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/errhandler.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/errhandler.h ============================================================================== --- trunk/fcode-utils-devel/toke/errhandler.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/errhandler.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/flowcontrol.c ============================================================================== --- trunk/fcode-utils-devel/toke/flowcontrol.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/flowcontrol.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/flowcontrol.h ============================================================================== --- trunk/fcode-utils-devel/toke/flowcontrol.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/flowcontrol.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/macros.c ============================================================================== --- trunk/fcode-utils-devel/toke/macros.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/macros.c Mon Apr 26 17:57:21 2010 (r758) @@ -7,7 +7,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 by Stefan Reinauer <stepan(a)openbios.org> + * Copyright (C) 2001-2010 by Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/macros.h ============================================================================== --- trunk/fcode-utils-devel/toke/macros.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/macros.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/nextfcode.c ============================================================================== --- trunk/fcode-utils-devel/toke/nextfcode.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/nextfcode.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/nextfcode.h ============================================================================== --- trunk/fcode-utils-devel/toke/nextfcode.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/nextfcode.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/parselocals.c ============================================================================== --- trunk/fcode-utils-devel/toke/parselocals.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/parselocals.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/parselocals.h ============================================================================== --- trunk/fcode-utils-devel/toke/parselocals.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/parselocals.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/scanner.c ============================================================================== --- trunk/fcode-utils-devel/toke/scanner.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/scanner.c Mon Apr 26 17:57:21 2010 (r758) @@ -7,7 +7,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 by Stefan Reinauer <stepan(a)openbios.org> + * Copyright (C) 2001-2010 by Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/scanner.h ============================================================================== --- trunk/fcode-utils-devel/toke/scanner.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/scanner.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/stack.c ============================================================================== --- trunk/fcode-utils-devel/toke/stack.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/stack.c Mon Apr 26 17:57:21 2010 (r758) @@ -7,7 +7,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 by Stefan Reinauer <stepan(a)openbios.org> + * Copyright (C) 2001-2010 by Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/stack.h ============================================================================== --- trunk/fcode-utils-devel/toke/stack.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/stack.h Mon Apr 26 17:57:21 2010 (r758) @@ -10,7 +10,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/stream.c ============================================================================== --- trunk/fcode-utils-devel/toke/stream.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/stream.c Mon Apr 26 17:57:21 2010 (r758) @@ -7,7 +7,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 by Stefan Reinauer <stepan(a)openbios.org> + * Copyright (C) 2001-2010 by Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/stream.h ============================================================================== --- trunk/fcode-utils-devel/toke/stream.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/stream.h Mon Apr 26 17:57:21 2010 (r758) @@ -10,7 +10,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/strsubvocab.c ============================================================================== --- trunk/fcode-utils-devel/toke/strsubvocab.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/strsubvocab.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/strsubvocab.h ============================================================================== --- trunk/fcode-utils-devel/toke/strsubvocab.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/strsubvocab.h Mon Apr 26 17:57:21 2010 (r758) @@ -9,7 +9,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/ticvocab.c ============================================================================== --- trunk/fcode-utils-devel/toke/ticvocab.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/ticvocab.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/ticvocab.h ============================================================================== --- trunk/fcode-utils-devel/toke/ticvocab.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/ticvocab.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/toke.c ============================================================================== --- trunk/fcode-utils-devel/toke/toke.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/toke.c Mon Apr 26 17:57:21 2010 (r758) @@ -7,7 +7,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2006 by Stefan Reinauer <stepan(a)openbios.org> + * Copyright (C) 2001-2010 by Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/toke.h ============================================================================== --- trunk/fcode-utils-devel/toke/toke.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/toke.h Mon Apr 26 17:57:21 2010 (r758) @@ -10,7 +10,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/tokzesc.c ============================================================================== --- trunk/fcode-utils-devel/toke/tokzesc.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/tokzesc.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/tokzesc.h ============================================================================== --- trunk/fcode-utils-devel/toke/tokzesc.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/tokzesc.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/tracesyms.c ============================================================================== --- trunk/fcode-utils-devel/toke/tracesyms.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/tracesyms.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/tracesyms.h ============================================================================== --- trunk/fcode-utils-devel/toke/tracesyms.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/tracesyms.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/usersymbols.c ============================================================================== --- trunk/fcode-utils-devel/toke/usersymbols.c Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/usersymbols.c Mon Apr 26 17:57:21 2010 (r758) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/usersymbols.h ============================================================================== --- trunk/fcode-utils-devel/toke/usersymbols.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/usersymbols.h Mon Apr 26 17:57:21 2010 (r758) @@ -9,7 +9,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 Modified: trunk/fcode-utils-devel/toke/vocabfuncts.h ============================================================================== --- trunk/fcode-utils-devel/toke/vocabfuncts.h Mon Apr 26 17:43:25 2010 (r757) +++ trunk/fcode-utils-devel/toke/vocabfuncts.h Mon Apr 26 17:57:21 2010 (r758) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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

1 0

[commit] r757 - trunk/fcode-utils-devel/toke
by repository service 26 Apr '10

26 Apr '10

Author: stepan Date: Mon Apr 26 17:43:25 2010 New Revision: 757 URL: http://tracker.coreboot.org/trac/openbios/changeset/757 Log: SUN OPB on the SPARC (Enterprise) platforms (especially): M3000, M4000, M9000 expects a checksum algorithm that is not compliant with IEEE 1275-1994 section 5.2.2.5. Add flag "Sun-Style-Checksum" to switch to the other algorithm. Modified: trunk/fcode-utils-devel/toke/clflags.c trunk/fcode-utils-devel/toke/clflags.h trunk/fcode-utils-devel/toke/emit.c Modified: trunk/fcode-utils-devel/toke/clflags.c ============================================================================== --- trunk/fcode-utils-devel/toke/clflags.c Mon Apr 26 17:40:54 2010 (r756) +++ trunk/fcode-utils-devel/toke/clflags.c Mon Apr 26 17:43:25 2010 (r757) @@ -5,7 +5,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 @@ -94,6 +94,7 @@ bool ibm_legacy_separator_message = TRUE ; bool enable_abort_quote = TRUE ; bool sun_style_abort_quote = TRUE ; +bool sun_style_checksum = FALSE ; bool abort_quote_throw = TRUE ; bool string_remark_escape = TRUE ; bool hex_remark_escape = TRUE ; @@ -181,6 +182,11 @@ "\t", "Use -2 THROW in an Abort\" phrase, rather than ABORT" } , + { "Sun-Style-Checksum", + &sun_style_checksum, + "\t\t", + "Use this for SPARC (Enterprise) platforms (especially): M3000, M4000, M9000" } , + { "String-remark-escape", &string_remark_escape, "\t", @@ -640,7 +646,7 @@ for ( indx = 0 ; indx < number_of_cl_flags ; indx++ ) { - printf(" %s %s%s%s\n", + printf(" %s %s%s%s\n", *(cl_flags_list[indx].flag_var) ? " " : "no" , cl_flags_list[indx].clflag_name, cl_flags_list[indx].clflag_tabs, Modified: trunk/fcode-utils-devel/toke/clflags.h ============================================================================== --- trunk/fcode-utils-devel/toke/clflags.h Mon Apr 26 17:40:54 2010 (r756) +++ trunk/fcode-utils-devel/toke/clflags.h Mon Apr 26 17:43:25 2010 (r757) @@ -8,7 +8,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 @@ -56,6 +56,7 @@ * ibm_legacy_separator_message * enable_abort_quote * sun_style_abort_quote + * sun_style_checksum * string_remark_escape * hex_remark_escape * c_style_string_escape @@ -111,6 +112,7 @@ extern bool ibm_legacy_separator_message; extern bool enable_abort_quote; extern bool sun_style_abort_quote; +extern bool sun_style_checksum; extern bool abort_quote_throw; extern bool string_remark_escape; extern bool hex_remark_escape; Modified: trunk/fcode-utils-devel/toke/emit.c ============================================================================== --- trunk/fcode-utils-devel/toke/emit.c Mon Apr 26 17:40:54 2010 (r756) +++ trunk/fcode-utils-devel/toke/emit.c Mon Apr 26 17:43:25 2010 (r757) @@ -7,7 +7,7 @@ * This program is part of a free implementation of the IEEE 1275-1994 * Standard for Boot (Initialization Configuration) Firmware. * - * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org> + * Copyright (C) 2001-2010 Stefan Reinauer <stepan(a)openbios.org> * * 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 @@ -317,7 +317,7 @@ /* Calculate and place checksum and length, if haven't already */ if ( fcode_start_ob_off != -1 ) { - u16 checksum; + u32 checksum; int length; u8 *fcode_body = ostart+fcode_body_ob_off; @@ -331,13 +331,23 @@ fcode_body < ob_end ; checksum += *(fcode_body++) ) ; - BIG_ENDIAN_WORD_STORE(fcode_hdr->checksum , checksum); + if (sun_style_checksum) { + /* SUN OPB on the SPARC (Enterprise) platforms (especially): + * M3000, M4000, M9000 expects a checksum algorithm that is + * not compliant with IEEE 1275-1994 section 5.2.2.5. + */ + checksum = (checksum & 0xffff) + (checksum >> 16); + checksum = (checksum & 0xffff) + (checksum >> 16); + } + + BIG_ENDIAN_WORD_STORE(fcode_hdr->checksum, + (u16)(checksum & 0xffff)); BIG_ENDIAN_LONG_STORE(fcode_hdr->length , length); if (verbose) { printf( "toke: checksum is 0x%04x (%d bytes). ", - checksum, length); + (u16)checksum, length); list_fcode_ranges( TRUE); } }

1 0

[commit] r756 - trunk/fcode-utils-devel/romheaders
by repository service 26 Apr '10

26 Apr '10

Author: stepan Date: Mon Apr 26 17:40:54 2010 New Revision: 756 URL: http://tracker.coreboot.org/trac/openbios/changeset/756 Log: fcode-utils/romheaders: separate INCLUDES and CFLAGS Modified: trunk/fcode-utils-devel/romheaders/Makefile Modified: trunk/fcode-utils-devel/romheaders/Makefile ============================================================================== --- trunk/fcode-utils-devel/romheaders/Makefile Mon Apr 26 17:39:51 2010 (r755) +++ trunk/fcode-utils-devel/romheaders/Makefile Mon Apr 26 17:40:54 2010 (r756) @@ -22,9 +22,10 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA # -CC ?= gcc -STRIP = strip -CFLAGS = -O2 -Wall -W -ansi -I../shared +CC ?= gcc +STRIP = strip +CFLAGS = -O2 -Wall -W -ansi +INCLUDES = -I../shared SOURCES = romheaders.c ../shared/classcodes.c @@ -33,10 +34,9 @@ all: romheaders romheaders: $(SOURCES) - $(CC) $(CFLAGS) $(SOURCES) -o $@ + $(CC) $(CFLAGS) $(INCLUDES) $(SOURCES) -o $@ $(STRIP) romheaders - + clean: rm -f *~ rm -f romheaders -

1 0

[commit] r755 - trunk/fcode-utils-devel
by repository service 26 Apr '10

26 Apr '10

Author: stepan Date: Mon Apr 26 17:39:51 2010 New Revision: 755 URL: http://tracker.coreboot.org/trac/openbios/changeset/755 Log: fcode-utils: separate CFLAGS and INCLUDES so CFLAGS can be overridden Modified: trunk/fcode-utils-devel/Makefile Modified: trunk/fcode-utils-devel/Makefile ============================================================================== --- trunk/fcode-utils-devel/Makefile Mon Apr 26 17:39:20 2010 (r754) +++ trunk/fcode-utils-devel/Makefile Mon Apr 26 17:39:51 2010 (r755) @@ -21,7 +21,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA # -VERSION:=$(shell grep ^\#.*TOKE_VERSION < toke/toke.c |cut -f2 -d\" ) +VERSION:=$(shell grep "^\#.*TOKE_VERSION" < toke/toke.c |cut -f2 -d\" ) all: $(MAKE) -C toke

1 0

[commit] r753 - in trunk/fcode-utils-devel: . detok toke toke/examples toke/examples/scsi-sample
by repository service 26 Apr '10

26 Apr '10

Author: stepan Date: Mon Apr 26 15:06:48 2010 New Revision: 753 URL: http://tracker.coreboot.org/trac/openbios/changeset/753 Log: This is toke / detok update from Matthias Kapffer: - display-status is obsolete - fix the three broken examples under toke/examples - drop calls to non-existent distclean Modified: trunk/fcode-utils-devel/Makefile trunk/fcode-utils-devel/detok/Makefile trunk/fcode-utils-devel/detok/dictionary.c trunk/fcode-utils-devel/toke/Makefile trunk/fcode-utils-devel/toke/dictionary.c trunk/fcode-utils-devel/toke/examples/date.fs trunk/fcode-utils-devel/toke/examples/scsi-sample/overall.fs trunk/fcode-utils-devel/toke/examples/scsi-sample/scsitape.fs Modified: trunk/fcode-utils-devel/Makefile ============================================================================== --- trunk/fcode-utils-devel/Makefile Sun Apr 25 14:53:39 2010 (r752) +++ trunk/fcode-utils-devel/Makefile Mon Apr 26 15:06:48 2010 (r753) @@ -40,9 +40,6 @@ $(MAKE) -C testsuite clean distclean: clean - $(MAKE) -C toke distclean - $(MAKE) -C detok distclean - $(MAKE) -C romheaders distclean $(MAKE) -C testsuite distclean find . -name "*.gcda" -exec rm -f \{\} \; find . -name "*.gcno" -exec rm -f \{\} \; Modified: trunk/fcode-utils-devel/detok/Makefile ============================================================================== --- trunk/fcode-utils-devel/detok/Makefile Sun Apr 25 14:53:39 2010 (r752) +++ trunk/fcode-utils-devel/detok/Makefile Mon Apr 26 15:06:48 2010 (r753) @@ -52,11 +52,11 @@ clean: rm -f $(OBJS) *~ rm -f $(PROGRAM) .dependencies - + .dependencies: *.c @$(CC) $(CFLAGS) $(INCLUDES) -MM *.c > .dependencies -.PHONY: all clean distclean +.PHONY: all clean -include .dependencies Modified: trunk/fcode-utils-devel/detok/dictionary.c ============================================================================== --- trunk/fcode-utils-devel/detok/dictionary.c Sun Apr 25 14:53:39 2010 (r752) +++ trunk/fcode-utils-devel/detok/dictionary.c Mon Apr 26 15:06:48 2010 (r753) @@ -361,7 +361,7 @@ TOKEN_ENTRY(0x0da, "get-token"), TOKEN_ENTRY(0x0db, "set-token"), TOKEN_ENTRY(0x0dc, "state"), - TOKEN_ENTRY(0x0dd, "compile"), + TOKEN_ENTRY(0x0dd, "compile,"), TOKEN_ENTRY(0x0de, "behavior"), TOKEN_ENTRY(0x0f0, "start0"), TOKEN_ENTRY(0x0f1, "start1"), Modified: trunk/fcode-utils-devel/toke/Makefile ============================================================================== --- trunk/fcode-utils-devel/toke/Makefile Sun Apr 25 14:53:39 2010 (r752) +++ trunk/fcode-utils-devel/toke/Makefile Mon Apr 26 15:06:48 2010 (r753) @@ -60,7 +60,7 @@ documentation:: *.c *.h toke.doxygen @doxygen toke.doxygen -.PHONY: all clean distclean +.PHONY: all clean -include .dependencies Modified: trunk/fcode-utils-devel/toke/dictionary.c ============================================================================== --- trunk/fcode-utils-devel/toke/dictionary.c Sun Apr 25 14:53:39 2010 (r752) +++ trunk/fcode-utils-devel/toke/dictionary.c Mon Apr 26 15:06:48 2010 (r753) @@ -1119,7 +1119,7 @@ BUILTIN_FCODE( 0x0da, "get-token" ) , BUILTIN_FCODE( 0x0db, "set-token" ) , BI_FCODE_VRBLE( 0x0dc, "state" ) , - BUILTIN_FCODE( 0x0dd, "compile" ) , + BUILTIN_FCODE( 0x0dd, "compile," ) , BUILTIN_FCODE( 0x0de, "behavior" ) , BUILTIN_FCODE( 0x0f0, "start0" ) , BUILTIN_FCODE( 0x0f1, "start1" ) , @@ -1160,7 +1160,7 @@ BUILTIN_FCODE( 0x11e, "is-selftest" ) , BUILTIN_FCODE( 0x11f, "new-device" ) , BUILTIN_FCODE( 0x120, "diagnostic-mode?" ) , - BUILTIN_FCODE( 0x121, "display-status" ) , + OBSOLETE_FCODE( 0x121, "display-status" ) , BUILTIN_FCODE( 0x122, "memory-test-issue" ) , OBSOLETE_FCODE( 0x123, "group-code" ) , BI_FCODE_VRBLE( 0x124, "mask" ) , Modified: trunk/fcode-utils-devel/toke/examples/date.fs ============================================================================== --- trunk/fcode-utils-devel/toke/examples/date.fs Sun Apr 25 14:53:39 2010 (r752) +++ trunk/fcode-utils-devel/toke/examples/date.fs Mon Apr 26 15:06:48 2010 (r753) @@ -2,8 +2,8 @@ fcode-version2 ." This program was tokenized on " - fcode-date type + [fcode-date] type ." at " - fcode-time type + [fcode-time] type fcode-end Modified: trunk/fcode-utils-devel/toke/examples/scsi-sample/overall.fs ============================================================================== --- trunk/fcode-utils-devel/toke/examples/scsi-sample/overall.fs Sun Apr 25 14:53:39 2010 (r752) +++ trunk/fcode-utils-devel/toke/examples/scsi-sample/overall.fs Mon Apr 26 15:06:48 2010 (r753) @@ -1,5 +1,6 @@ \ FCode driver for hypothetical SCSI host adapter +fcode-version2 hex " XYZI,scsi" name \ Name of device node " XYZI,12346-01" model \ Manufacturer's model number Modified: trunk/fcode-utils-devel/toke/examples/scsi-sample/scsitape.fs ============================================================================== --- trunk/fcode-utils-devel/toke/examples/scsi-sample/scsitape.fs Sun Apr 25 14:53:39 2010 (r752) +++ trunk/fcode-utils-devel/toke/examples/scsi-sample/scsitape.fs Mon Apr 26 15:06:48 2010 (r753) @@ -111,9 +111,9 @@ 0 false ( 0 false ) else \ Decode status buffer ( xstatbuf ) >r #requested ( #requested ) ( r: xstatbuf ) - r@ ili? r@ eof? or if ( #requested ) ( r: xstatbuf - r@ residue - ( #xfered ) ( r: xstatbuf - then ( #xfered ) ( r: xstatbuf + r@ ili? r@ eof? or if ( #requested ) ( r: xstatbuf ) + r@ residue - ( #xfered ) ( r: xstatbuf ) + then ( #xfered ) ( r: xstatbuf ) r> eof? ( #xfered flag ) then else \ no error, #request = #xfered ( )

3 3

[commit] r752 - in trunk/openbios-devel: libopenbios packages
by repository service 25 Apr '10

25 Apr '10

Author: blueswirl Date: Sun Apr 25 14:53:39 2010 New Revision: 752 URL: http://tracker.coreboot.org/trac/openbios/changeset/752 Log: Fix NULL pointer dereferences, spotted by clang analyzer Fix clang warnings: ../packages/disk-label.c:83:6: warning: Dereference of null pointer if( *s == '-' || isdigit(*s) || ../libopenbios/elf_load.c:267:5: warning: Null pointer passed as an argument to a 'nonnull' parameter memcpy(addr, name, nhdr.n_namesz); Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/packages/disk-label.c Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Sun Apr 25 14:53:37 2010 (r751) +++ trunk/openbios-devel/libopenbios/elf_load.c Sun Apr 25 14:53:39 2010 (r752) @@ -264,11 +264,13 @@ memcpy(addr, &nhdr, sizeof(nhdr)); addr += sizeof(nhdr); - memcpy(addr, name, nhdr.n_namesz); - addr += nhdr.n_namesz; - pad = padded(nhdr.n_namesz) - nhdr.n_namesz; - memset(addr, 0, pad); - addr += pad; + if (name && nhdr.n_namesz) { + memcpy(addr, name, nhdr.n_namesz); + addr += nhdr.n_namesz; + pad = padded(nhdr.n_namesz) - nhdr.n_namesz; + memset(addr, 0, pad); + addr += pad; + } memcpy(addr, desc, nhdr.n_descsz); addr += nhdr.n_descsz; Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Apr 25 14:53:37 2010 (r751) +++ trunk/openbios-devel/packages/disk-label.c Sun Apr 25 14:53:39 2010 (r752) @@ -68,6 +68,9 @@ if (!path) { path = strdup(""); } + if (!path) { + goto out; + } DPRINTF("dlabel-open '%s'\n", path ); /* open disk interface */

1 0

[commit] r751 - in trunk/openbios-devel: drivers fs/hfsplus kernel libopenbios packages
by repository service 25 Apr '10

25 Apr '10

Author: blueswirl Date: Sun Apr 25 14:53:37 2010 New Revision: 751 URL: http://tracker.coreboot.org/trac/openbios/changeset/751 Log: Fix dead variable assignment, spotted by clang analyzer Fix clang warnings: ../kernel/dict.c:289:2: warning: Value stored to 'len' is never read len -= sizeof(dictionary_header_t); ../packages/cmdline.c:181:8: warning: Value stored to 'buf' during its initialization is never read char *buf = ci->buf; ../libopenbios/elf_info.c:126:2: warning: Value stored to 'name' is never read name = addr; ../libopenbios/elf_load.c:277:5: warning: Value stored to 'addr' is never read addr += pad; ../drivers/ide.c:209:3: warning: Value stored to 'err' is never read err = ob_ide_pio_readb(drive, IDEREG_ERROR); ../drivers/ide.c:219:17: warning: Value stored to 'old_cdb' during its initialization is never read unsigned char old_cdb = cmd->cdb[0]; ../drivers/ide.c:222:4: warning: Value stored to 'old_cdb' is never read old_cdb = cmd->old_cdb; ../drivers/pci.c:103:2: warning: Value stored to 'ss' is never read ss = 0; ../drivers/pci.c:100:2: warning: Value stored to 'dev' is never read dev = 0; ../drivers/pci.c:212:2: warning: Value stored to 'bus' is never read bus = (hi >> 16) & 0xFF; ../drivers/pci.c:953:4: warning: Value stored to 'rev' is never read rev = pci_config_read8(addr, PCI_REVISION_ID); ../packages/video.c:331:2: warning: Value stored to 's' is never read s = video.fb.mphys - s; ../packages/video.c:330:2: warning: Value stored to 'size' is never read size = ((video.fb.h * video.fb.rb + s) + 0xfff) & ~0xfff; ../fs/hfsplus/btree.c:229:5: warning: Value stored to 'p' is never read p = btree_readhead(&bt->head, p); ../fs/hfsplus/volume.c:149:2: warning: Value stored to 'p' is never read p = volume_readfork(p, &vh->start_file ); Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/fs/hfsplus/btree.c trunk/openbios-devel/fs/hfsplus/volume.c trunk/openbios-devel/kernel/dict.c trunk/openbios-devel/libopenbios/elf_info.c trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/packages/cmdline.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Apr 25 14:53:32 2010 (r750) +++ trunk/openbios-devel/drivers/ide.c Sun Apr 25 14:53:37 2010 (r751) @@ -196,8 +196,10 @@ static void ob_ide_error(struct ide_drive *drive, unsigned char stat, const char *msg) { +#ifdef CONFIG_DEBUG_IDE struct ide_channel *chan = drive->channel; unsigned char err; +#endif if (!stat) stat = ob_ide_pio_readb(drive, IDEREG_STATUS); @@ -206,11 +208,15 @@ IDE_DPRINTF(" cmd=%x, stat=%x", chan->ata_cmd.command, stat); if ((stat & (BUSY_STAT | ERR_STAT)) == ERR_STAT) { - err = ob_ide_pio_readb(drive, IDEREG_ERROR); +#ifdef CONFIG_DEBUG_IDE + err = +#endif + ob_ide_pio_readb(drive, IDEREG_ERROR); IDE_DPRINTF(", err=%x", err); } IDE_DPRINTF("\n"); +#ifdef CONFIG_DEBUG_IDE /* * see if sense is valid and dump that */ @@ -237,6 +243,7 @@ IDE_DPRINTF(", no sense"); IDE_DPRINTF("\n"); } +#endif } /* Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Apr 25 14:53:32 2010 (r750) +++ trunk/openbios-devel/drivers/pci.c Sun Apr 25 14:53:37 2010 (r751) @@ -97,10 +97,8 @@ int bus = 0; /* no information */ char *ptr; - dev = 0; fn = 0; reg = 0; - ss = 0; n = 0; p = 0; t = 0; @@ -202,14 +200,13 @@ cell hi = POP(); cell mid = POP(); cell lo = POP(); - int n, p, t, ss, bus, dev, fn, reg; + int n, p, t, ss, dev, fn, reg; n = hi & IS_NOT_RELOCATABLE; p = hi & IS_PREFETCHABLE; t = hi & IS_ALIASED; ss = (hi >> 24) & 0x03; - bus = (hi >> 16) & 0xFF; dev = (hi >> 11) & 0x1F; fn = (hi >> 8) & 0x07; reg = hi & 0xFF; @@ -928,7 +925,7 @@ pci_config_t config; const pci_dev_t *pci_dev; uint32_t ccode; - uint8_t class, subclass, iface, rev; + uint8_t class, subclass, iface; int num_bars, rom_bar; activate_device("/"); @@ -950,7 +947,6 @@ class = ccode >> 8; subclass = ccode; iface = pci_config_read8(addr, PCI_CLASS_PROG); - rev = pci_config_read8(addr, PCI_REVISION_ID); pci_dev = pci_find_device(class, subclass, iface, vid, did); Modified: trunk/openbios-devel/fs/hfsplus/btree.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/btree.c Sun Apr 25 14:53:32 2010 (r750) +++ trunk/openbios-devel/fs/hfsplus/btree.c Sun Apr 25 14:53:37 2010 (r751) @@ -226,7 +226,7 @@ p = btree_readnode(&node, p); if (node.kind != HFSP_NODE_HEAD) return -1; // should not happen ? - p = btree_readhead(&bt->head, p); + btree_readhead(&bt->head, p); node_size = bt->head.node_size; bt->blkpernode = node_size / vol->blksize; Modified: trunk/openbios-devel/fs/hfsplus/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/volume.c Sun Apr 25 14:53:32 2010 (r750) +++ trunk/openbios-devel/fs/hfsplus/volume.c Sun Apr 25 14:53:37 2010 (r751) @@ -146,7 +146,7 @@ p = volume_readfork(p, &vh->ext_file ); p = volume_readfork(p, &vh->cat_file ); p = volume_readfork(p, &vh->attr_file ); - p = volume_readfork(p, &vh->start_file ); + volume_readfork(p, &vh->start_file ); return 0; fail: return -1; Modified: trunk/openbios-devel/kernel/dict.c ============================================================================== --- trunk/openbios-devel/kernel/dict.c Sun Apr 25 14:53:32 2010 (r750) +++ trunk/openbios-devel/kernel/dict.c Sun Apr 25 14:53:37 2010 (r751) @@ -286,7 +286,6 @@ } data += sizeof(dictionary_header_t); - len -= sizeof(dictionary_header_t); dicthead = target_long(header->length); Modified: trunk/openbios-devel/libopenbios/elf_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_info.c Sun Apr 25 14:53:32 2010 (r750) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Apr 25 14:53:37 2010 (r751) @@ -103,7 +103,7 @@ Elf_Bhdr *hdr = NULL; char *addr, *end; Elf_Nhdr *nhdr; - char *name, *desc; + char *desc; if (info->boot_type == ELF_BHDR_MAGIC) hdr = phys_to_virt(info->boot_data); @@ -123,7 +123,6 @@ while (addr < end) { nhdr = (Elf_Nhdr *) addr; addr += sizeof(Elf_Nhdr); - name = addr; addr += (nhdr->n_namesz + 3) & ~3; desc = addr; addr += (nhdr->n_descsz + 3) & ~3; Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Sun Apr 25 14:53:32 2010 (r750) +++ trunk/openbios-devel/libopenbios/elf_load.c Sun Apr 25 14:53:37 2010 (r751) @@ -274,7 +274,6 @@ addr += nhdr.n_descsz; pad = padded(nhdr.n_descsz) - nhdr.n_descsz; memset(addr, 0, pad); - addr += pad; bhdr->b_size += ent_size; bhdr->b_records++; Modified: trunk/openbios-devel/packages/cmdline.c ============================================================================== --- trunk/openbios-devel/packages/cmdline.c Sun Apr 25 14:53:32 2010 (r750) +++ trunk/openbios-devel/packages/cmdline.c Sun Apr 25 14:53:37 2010 (r751) @@ -178,7 +178,7 @@ cmdline_prompt( cmdline_info_t *ci ) { int cur_added=0, histind=0, ch, i, pos=0, n=0, prompt=1; - char *buf = ci->buf; + char *buf; int terminate = 0; buf = ci->buf; Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Apr 25 14:53:32 2010 (r750) +++ trunk/openbios-devel/packages/video.c Sun Apr 25 14:53:37 2010 (r751) @@ -308,7 +308,10 @@ void init_video( unsigned long fb, int width, int height, int depth, int rb ) { - int i, s, size; + int i; +#ifdef CONFIG_PPC + int s, size; +#endif phandle_t ph=0; video.fb.mphys = fb; @@ -326,11 +329,10 @@ video.has_video = 1; video.pal = malloc( 256 * sizeof(ulong) ); - s = (video.fb.mphys & 0xfff); - size = ((video.fb.h * video.fb.rb + s) + 0xfff) & ~0xfff; - s = video.fb.mphys - s; - #ifdef CONFIG_PPC + s = (video.fb.mphys & 0xfff); + size = ((video.fb.h * video.fb.rb + s) + 0xfff) & ~0xfff; + ofmem_claim_phys( video.fb.mphys, size, 0 ); ofmem_claim_virt( video.fb.mphys, size, 0 ); ofmem_map( video.fb.mphys, video.fb.mphys, size, -1 );

1 0

[commit] r750 - trunk/openbios-devel/include
by repository service 25 Apr '10

25 Apr '10

Author: blueswirl Date: Sun Apr 25 14:53:32 2010 New Revision: 750 URL: http://tracker.coreboot.org/trac/openbios/changeset/750 Log: Fix clang errors about undefined llong etc. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/config.h Modified: trunk/openbios-devel/include/config.h ============================================================================== --- trunk/openbios-devel/include/config.h Fri Apr 16 12:20:06 2010 (r749) +++ trunk/openbios-devel/include/config.h Sun Apr 25 14:53:32 2010 (r750) @@ -23,25 +23,25 @@ #define PROGRAM_NAME "OpenBIOS" +typedef unsigned long ulong; +typedef unsigned int uint; +typedef unsigned short ushort; +typedef unsigned char uchar; + +typedef unsigned long long ullong; +typedef long long llong; + #ifndef BOOTSTRAP #ifndef NULL #define NULL ((void*)0) #endif -typedef unsigned long ulong; -typedef unsigned int uint; -typedef unsigned short ushort; -typedef unsigned char uchar; - typedef unsigned int size_t; typedef unsigned int usize_t; typedef signed int ssize_t; typedef signed int off_t; -typedef unsigned long long ullong; -typedef long long llong; - typedef unsigned int time_t; #define UINT_MAX ((uint)-1)

1 0

Re: [OpenBIOS] [RFC] cross-compiler detection does not work with dash
by Blue Swirl 23 Apr '10

23 Apr '10

On 4/23/10, Andreas Färber <andreas.faerber(a)web.de> wrote: > Am 23.04.2010 um 14:44 schrieb Andreas Färber: > > > > On Ubuntu Karmic `./config/scripts/switch-arch cross-ppc` did not > recognize my powerpc-elf-gcc. The GNOME Terminal appears to use bash, where > `type -p powerpc-elf-gcc && echo yah` works, but /bin/sh is dash, where it > does not: > > echo "type -p powerpc-elf-gcc && echo yah" | /bin/sh > > > > ...and if we actually do it like that, without 2>/dev/null, we see: > -p: not found > > So dash's `type` does not seem to support the -p parameter, whatever that > does. Without -p it works, too. -p makes the output either the path or nothing if not found. Without -p there may be messages to stderr, so the patch should also add 2>&1. > Andreas > > diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch > index c145e86..b7511e7 100755 > --- a/config/scripts/switch-arch > +++ b/config/scripts/switch-arch > @@ -88,7 +88,7 @@ select_prefix() > { > for TARGET in ${1}-linux-gnu- ${1}-elf- ${1}-eabi- > do > - if type -p ${TARGET}gcc > /dev/null > + if type ${TARGET}gcc > /dev/null > > then > return > fi > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: > http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you >

1 0

[RFC] cross-compiler detection does not work with dash
by Andreas Färber 23 Apr '10

23 Apr '10

Hello, On Ubuntu Karmic `./config/scripts/switch-arch cross-ppc` did not recognize my powerpc-elf-gcc. The GNOME Terminal appears to use bash, where `type -p powerpc-elf-gcc && echo yah` works, but /bin/sh is dash, where it does not: echo "type -p powerpc-elf-gcc && echo yah" | /bin/sh The following change made it work. Andreas diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index c145e86..19dd877 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -88,7 +88,7 @@ select_prefix() { for TARGET in ${1}-linux-gnu- ${1}-elf- ${1}-eabi- do - if type -p ${TARGET}gcc > /dev/null + if which ${TARGET}gcc > /dev/null then return fi

2 3

Adding words to forth - the tutorial
by Programmingkid 23 Apr '10

23 Apr '10

A while ago I posted a tutorial on how to add words to the dictionary. Has anyone done anything with it? I was hoping to see it on the OpenBIOS web site.

2 1

Re: [OpenBIOS] Possible MMU translation bug?
by Mark Cave-Ayland 16 Apr '10

16 Apr '10

Tarl Neustaedter wrote: > My recollection (I don't have time to pursue it right now, alligators at > work) is that OpenBoot switches register sets when called by Solaris, > thus using a different set of globals. I'll try to check later. Oh wait - I think I see what it is now. On closer inspection, it seems that translate was being invoked through CIF after all (I think now the Qemu output only shows blocks being translated and not executed?). Tracing through the code, it seems like there's an off-by-one bug in the CIF parameter code which means that a subsequent stack push will overwrite the last saved parameter (which is %g7). I think I've fixed it and am testing a patch now. 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

3 4

[commit] r749 - trunk/openbios-devel/arch/sparc64
by repository service 16 Apr '10

16 Apr '10

Author: mcayland Date: Fri Apr 16 12:20:06 2010 New Revision: 749 URL: http://tracker.coreboot.org/trac/openbios/changeset/749 Log: Fix a mistake in call-client.S whereby the stack offsets were out by one item. When saving registers upon a client's entry into the CIF, we were using space for one more stack item than we had allocated. Hence a subsequent stack push would corrupt the topmost item (in this case register %g7) causing it to be restored with a random value before returning to the client. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/call-client.S Modified: trunk/openbios-devel/arch/sparc64/call-client.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Fri Apr 16 12:01:42 2010 (r748) +++ trunk/openbios-devel/arch/sparc64/call-client.S Fri Apr 16 12:20:06 2010 (r749) @@ -21,24 +21,24 @@ flushw save %sp, -248, %sp stx %g1, [%sp + 2047 + 192 + 0] - stx %g2, [%sp + 2047 + 192 + 16] - stx %g3, [%sp + 2047 + 192 + 24] - stx %g4, [%sp + 2047 + 192 + 32] - stx %g5, [%sp + 2047 + 192 + 40] - stx %g6, [%sp + 2047 + 192 + 48] - stx %g7, [%sp + 2047 + 192 + 56] + stx %g2, [%sp + 2047 + 192 + 8] + stx %g3, [%sp + 2047 + 192 + 16] + stx %g4, [%sp + 2047 + 192 + 24] + stx %g5, [%sp + 2047 + 192 + 32] + stx %g6, [%sp + 2047 + 192 + 40] + stx %g7, [%sp + 2047 + 192 + 48] call of_client_interface mov %i0, %o0 mov %o0, %i0 ldx [%sp + 2047 + 192 + 0], %g1 - ldx [%sp + 2047 + 192 + 16], %g2 - ldx [%sp + 2047 + 192 + 24], %g3 - ldx [%sp + 2047 + 192 + 32], %g4 - ldx [%sp + 2047 + 192 + 40], %g5 - ldx [%sp + 2047 + 192 + 48], %g6 - ldx [%sp + 2047 + 192 + 56], %g7 + ldx [%sp + 2047 + 192 + 8], %g2 + ldx [%sp + 2047 + 192 + 16], %g3 + ldx [%sp + 2047 + 192 + 24], %g4 + ldx [%sp + 2047 + 192 + 32], %g5 + ldx [%sp + 2047 + 192 + 40], %g6 + ldx [%sp + 2047 + 192 + 48], %g7 return %i7+8 nop

1 0

[commit] r748 - trunk/openbios-devel/arch/sparc64
by repository service 16 Apr '10

16 Apr '10

Author: mcayland Date: Fri Apr 16 12:01:42 2010 New Revision: 748 URL: http://tracker.coreboot.org/trac/openbios/changeset/748 Log: Increase dictionary size from 256K to 512K on SPARC64 as it is clear that on OpenSolaris we are overflowing the dictionary at runtime and corrupting OpenBIOS memory. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Thu Apr 15 18:43:01 2010 (r747) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Fri Apr 16 12:01:42 2010 (r748) @@ -20,7 +20,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE ((128 + 256 + 512) * 1024) +#define MEMSIZE ((128 + 512 + 512) * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Thu Apr 15 18:43:01 2010 (r747) +++ trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 16 12:01:42 2010 (r748) @@ -33,7 +33,7 @@ #define APB_MEM_BASE 0x1ff00000000ULL #define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ +#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ static ucell *memory;

1 0

Possible MMU translation bug?
by Mark Cave-Ayland 15 Apr '10

15 Apr '10

Hi all, So far Milax crashes a few seconds into executing the OpenSolaris kernel and I'm wondering if the bug is related to not preserving registers in the MMU routines. The instruction causing the crash is the following: 0x0000000001047444: ldx [ %g7 + 0xa8 ], %o2 Given that there were several instances of this exact instruction in previous nearby blocks of code, I used the qemu debugging output to see what was happening in this particular case. Comments are denoted with a ^. IN: 0x0000000001050860: call 0x1050ee8 0x0000000001050864: add %fp, 0x7a7, %o0 ^ Looks like a standard branch. %g7 is currently set to 0x180e000 -------------- IN: mmu_translate 0x00000000ffd0a788: save %sp, -224, %sp 0x00000000ffd0a78c: call 0xffd0a830 0x00000000ffd0a790: nop ^ Hmmm. But we've now invoked mmu_translate in OpenBIOS? -------------- IN: mmu_translate 0x00000000ffd0a794: mov %o0, %g1 0x00000000ffd0a798: stx %g1, [ %fp + 0x7df ] 0x00000000ffd0a79c: add %fp, 0x7d7, %g1 0x00000000ffd0a7a0: ldx [ %fp + 0x7df ], %o0 0x00000000ffd0a7a4: mov %g1, %o1 0x00000000ffd0a7a8: call 0xffd1e134 0x00000000ffd0a7ac: nop -------------- IN: ofmem_translate 0x00000000ffd1e134: save %sp, -240, %sp 0x00000000ffd1e138: stx %i0, [ %fp + 0x87f ] 0x00000000ffd1e13c: stx %i1, [ %fp + 0x887 ] 0x00000000ffd1e140: call 0xffd0e37c 0x00000000ffd1e144: nop -------------- IN: ofmem_translate 0x00000000ffd1e148: mov %o0, %g1 0x00000000ffd1e14c: stx %g1, [ %fp + 0x7d7 ] 0x00000000ffd1e150: ldx [ %fp + 0x7d7 ], %g1 0x00000000ffd1e154: ldx [ %g1 + 0x28 ], %g1 0x00000000ffd1e158: stx %g1, [ %fp + 0x7df ] 0x00000000ffd1e15c: b %xcc, 0xffd1e1d8 0x00000000ffd1e160: nop -------------- IN: ofmem_translate 0x00000000ffd1e1d8: ldx [ %fp + 0x7df ], %g1 0x00000000ffd1e1dc: brz %g1, 0xffd1e1fc 0x00000000ffd1e1e0: nop -------------- IN: ofmem_translate 0x00000000ffd1e1e4: ldx [ %fp + 0x7df ], %g1 0x00000000ffd1e1e8: ldx [ %g1 + 8 ], %g2 0x00000000ffd1e1ec: ldx [ %fp + 0x87f ], %g1 0x00000000ffd1e1f0: cmp %g2, %g1 0x00000000ffd1e1f4: bleu %xcc, 0xffd1e164 0x00000000ffd1e1f8: nop -------------- IN: ofmem_translate 0x00000000ffd1e164: ldx [ %fp + 0x7df ], %g1 0x00000000ffd1e168: ldx [ %g1 + 8 ], %g2 0x00000000ffd1e16c: ldx [ %fp + 0x7df ], %g1 0x00000000ffd1e170: ldx [ %g1 + 0x10 ], %g1 0x00000000ffd1e174: add %g2, %g1, %g1 0x00000000ffd1e178: add %g1, -1, %g2 0x00000000ffd1e17c: ldx [ %fp + 0x87f ], %g1 0x00000000ffd1e180: cmp %g2, %g1 0x00000000ffd1e184: bcs %xcc, 0xffd1e1cc 0x00000000ffd1e188: nop -------------- IN: ofmem_translate 0x00000000ffd1e1cc: ldx [ %fp + 0x7df ], %g1 0x00000000ffd1e1d0: ldx [ %g1 ], %g1 0x00000000ffd1e1d4: stx %g1, [ %fp + 0x7df ] 0x00000000ffd1e1d8: ldx [ %fp + 0x7df ], %g1 0x00000000ffd1e1dc: brz %g1, 0xffd1e1fc 0x00000000ffd1e1e0: nop -------------- IN: ofmem_translate 0x00000000ffd1e18c: ldx [ %fp + 0x7df ], %g1 0x00000000ffd1e190: ldx [ %g1 + 8 ], %g2 0x00000000ffd1e194: ldx [ %fp + 0x87f ], %g1 0x00000000ffd1e198: sub %g1, %g2, %g1 0x00000000ffd1e19c: stx %g1, [ %fp + 0x7e7 ] 0x00000000ffd1e1a0: ldx [ %fp + 0x7df ], %g1 0x00000000ffd1e1a4: ldx [ %g1 + 0x20 ], %g2 0x00000000ffd1e1a8: ldx [ %fp + 0x887 ], %g1 0x00000000ffd1e1ac: stx %g2, [ %g1 ] 0x00000000ffd1e1b0: ldx [ %fp + 0x7df ], %g1 0x00000000ffd1e1b4: ldx [ %g1 + 0x18 ], %g2 0x00000000ffd1e1b8: ldx [ %fp + 0x7e7 ], %g1 0x00000000ffd1e1bc: add %g2, %g1, %g1 0x00000000ffd1e1c0: stx %g1, [ %fp + 0x7c7 ] 0x00000000ffd1e1c4: b %xcc, 0xffd1e204 0x00000000ffd1e1c8: nop -------------- IN: ofmem_translate 0x00000000ffd1e204: ldx [ %fp + 0x7c7 ], %g1 0x00000000ffd1e208: mov %g1, %i0 0x00000000ffd1e20c: rett %i7 + 8 0x00000000ffd1e210: nop -------------- IN: mmu_translate 0x00000000ffd0a7b0: mov %o0, %g1 0x00000000ffd0a7b4: stx %g1, [ %fp + 0x7e7 ] 0x00000000ffd0a7b8: ldx [ %fp + 0x7e7 ], %g1 0x00000000ffd0a7bc: cmp %g1, -1 0x00000000ffd0a7c0: be %xcc, 0xffd0a81c 0x00000000ffd0a7c4: nop -------------- IN: mmu_translate 0x00000000ffd0a7c8: ldx [ %fp + 0x7e7 ], %g2 0x00000000ffd0a7cc: mov -1, %g1 0x00000000ffd0a7d0: srlx %g1, 0x20, %g1 0x00000000ffd0a7d4: and %g2, %g1, %g1 0x00000000ffd0a7d8: mov %g1, %o0 0x00000000ffd0a7dc: call 0xffd0a4f8 0x00000000ffd0a7e0: nop -------------- IN: mmu_translate 0x00000000ffd0a7e4: ldx [ %fp + 0x7e7 ], %g1 0x00000000ffd0a7e8: srlx %g1, 0x20, %g1 0x00000000ffd0a7ec: mov %g1, %o0 0x00000000ffd0a7f0: call 0xffd0a4f8 0x00000000ffd0a7f4: nop -------------- IN: mmu_translate 0x00000000ffd0a7f8: ldx [ %fp + 0x7d7 ], %g1 0x00000000ffd0a7fc: mov %g1, %o0 0x00000000ffd0a800: call 0xffd0a4f8 0x00000000ffd0a804: nop -------------- IN: mmu_translate 0x00000000ffd0a808: mov -1, %o0 ! 0xffffffffffffffff 0x00000000ffd0a80c: call 0xffd0a4f8 0x00000000ffd0a810: nop -------------- IN: mmu_translate 0x00000000ffd0a814: b %xcc, 0xffd0a828 0x00000000ffd0a818: nop -------------- IN: mmu_translate 0x00000000ffd0a828: rett %i7 + 8 0x00000000ffd0a82c: nop -------------- IN: 0x0000000001007d54: restore %o0, %g0, %o0 -------------- IN: 0x0000000001050868: call 0x104cf7c 0x000000000105086c: mov %o0, %i5 ^ Return from mmu_translate block. %g7 is now 0x4c23549c. -------------- IN: 0x0000000001014c84: sethi %hi(0x181c800), %o5 0x0000000001014c88: mov %o7, %g1 0x0000000001014c8c: ld [ %o5 + 0x10 ], %o5 0x0000000001014c90: sra %o5, 0, %o0 0x0000000001014c94: call 0x104743c 0x0000000001014c98: mov %g1, %o7 -------------- IN: 0x000000000104743c: rdpr %pil, %o1 0x0000000001047440: wrpr 0xf, %pil 0x0000000001047444: ldx [ %g7 + 0xa8 ], %o2 0x0000000001047448: ld [ %o2 + 0x10c ], %o2 0x000000000104744c: cmp %o2, %o0 0x0000000001047450: movl %xcc, %o0, %o2 0x0000000001047454: wrpr %g0, %o2, %pil 0x0000000001047458: retl 0x000000000104745c: mov %o1, %o0 Search PC... Search PC... Search PC... Search PC... Search PC... Search PC... Search PC... Search PC... Search PC... -------------- IN: 0x000000000104743c: rdpr %pil, %o1 0x0000000001047440: wrpr 0xf, %pil 0x0000000001047444: ldx [ %g7 + 0xa8 ], %o2 ^ %g7 + 0xa8 = 0x4c235544 (throws alignment exception) I'm wondering if the issue here is that the "call 0x1050ee8" instruction is causing an MMU fault which is calling OpenBIOS's mmu_translate via a trap. Since the mmu_translate function fails to preserve the global registers (compared to the CIF interface calls) then subsequent global register access is doomed to cause failure. 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] r747 - in trunk/openbios-devel: include/libc libc
by repository service 15 Apr '10

15 Apr '10

Author: blueswirl Date: Thu Apr 15 18:43:01 2010 New Revision: 747 URL: http://tracker.coreboot.org/trac/openbios/changeset/747 Log: Remove unused memchr() Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/string.c Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:59 2010 (r746) +++ trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:43:01 2010 (r747) @@ -43,7 +43,6 @@ extern void *memcpy(void * dest,const void *src,size_t count); extern void *memmove(void * dest,const void *src,size_t count); extern int memcmp(const void * cs,const void * ct,size_t count); -extern void *memchr(const void *s, int c, size_t n); extern char *strdup( const char *str ); extern int strcasecmp( const char *cs, const char *ct ); Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:59 2010 (r746) +++ trunk/openbios-devel/libc/string.c Thu Apr 15 18:43:01 2010 (r747) @@ -346,27 +346,6 @@ return res; } -/** - * memchr - Find a character in an area of memory. - * @s: The memory area - * @c: The byte to search for - * @n: The size of the area. - * - * returns the address of the first occurrence of @c, or %NULL - * if @c is not found - */ -void *memchr(const void *s, int c, size_t n) -{ - const unsigned char *p = s; - while (n-- != 0) { - if ((unsigned char)c == *p++) { - return (void *)(p-1); - } - } - return NULL; -} - - char * strdup( const char *str ) {

1 0

[commit] r746 - in trunk/openbios-devel: include/libc libc
by repository service 15 Apr '10

15 Apr '10

Author: blueswirl Date: Thu Apr 15 18:42:59 2010 New Revision: 746 URL: http://tracker.coreboot.org/trac/openbios/changeset/746 Log: Remove unused strstr() Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/string.c Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:56 2010 (r745) +++ trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:59 2010 (r746) @@ -43,7 +43,6 @@ extern void *memcpy(void * dest,const void *src,size_t count); extern void *memmove(void * dest,const void *src,size_t count); extern int memcmp(const void * cs,const void * ct,size_t count); -extern char *strstr(const char * s1,const char * s2); extern void *memchr(const void *s, int c, size_t n); extern char *strdup( const char *str ); Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:56 2010 (r745) +++ trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:59 2010 (r746) @@ -347,28 +347,6 @@ } /** - * strstr - Find the first substring in a %NUL terminated string - * @s1: The string to be searched - * @s2: The string to search for - */ -char * strstr(const char * s1,const char * s2) -{ - int l1, l2; - - l2 = strlen(s2); - if (!l2) - return (char *) s1; - l1 = strlen(s1); - while (l1 >= l2) { - l1--; - if (!memcmp(s1,s2,l2)) - return (char *) s1; - s1++; - } - return NULL; -} - -/** * memchr - Find a character in an area of memory. * @s: The memory area * @c: The byte to search for

1 0

[commit] r745 - in trunk/openbios-devel: include/libc libc
by repository service 15 Apr '10

15 Apr '10

Author: blueswirl Date: Thu Apr 15 18:42:56 2010 New Revision: 745 URL: http://tracker.coreboot.org/trac/openbios/changeset/745 Log: Remove unused memscan() Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/string.c Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:54 2010 (r744) +++ trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:56 2010 (r745) @@ -43,7 +43,6 @@ extern void *memcpy(void * dest,const void *src,size_t count); extern void *memmove(void * dest,const void *src,size_t count); extern int memcmp(const void * cs,const void * ct,size_t count); -extern void *memscan(void * addr, int c, size_t size); extern char *strstr(const char * s1,const char * s2); extern void *memchr(const void *s, int c, size_t n); Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:54 2010 (r744) +++ trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:56 2010 (r745) @@ -347,28 +347,6 @@ } /** - * memscan - Find a character in an area of memory. - * @addr: The memory area - * @c: The byte to search for - * @size: The size of the area. - * - * returns the address of the first occurrence of @c, or 1 byte past - * the area if @c is not found - */ -void * memscan(void * addr, int c, size_t size) -{ - unsigned char * p = (unsigned char *) addr; - - while (size) { - if (*p == c) - return (void *) p; - p++; - size--; - } - return (void *) p; -} - -/** * strstr - Find the first substring in a %NUL terminated string * @s1: The string to be searched * @s2: The string to search for

1 0

[commit] r744 - in trunk/openbios-devel: include/libc libc
by repository service 15 Apr '10

15 Apr '10

Author: blueswirl Date: Thu Apr 15 18:42:54 2010 New Revision: 744 URL: http://tracker.coreboot.org/trac/openbios/changeset/744 Log: Remove unused bcopy() Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/string.c Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:51 2010 (r743) +++ trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:54 2010 (r744) @@ -40,7 +40,6 @@ extern char *strpbrk(const char * cs,const char * ct); extern char *strsep(char **s, const char *ct); extern void *memset(void * s,int c,size_t count); -extern char *bcopy(const char * src, char * dest, int count); extern void *memcpy(void * dest,const void *src,size_t count); extern void *memmove(void * dest,const void *src,size_t count); extern int memcmp(const void * cs,const void * ct,size_t count); Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:51 2010 (r743) +++ trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:54 2010 (r744) @@ -283,28 +283,6 @@ } /** - * bcopy - Copy one area of memory to another - * @src: Where to copy from - * @dest: Where to copy to - * @count: The size of the area. - * - * Note that this is the same as memcpy(), with the arguments reversed. - * memcpy() is the standard, bcopy() is a legacy BSD function. - * - * You should not use this function to access IO space, use memcpy_toio() - * or memcpy_fromio() instead. - */ -char * bcopy(const char * src, char * dest, int count) -{ - char *tmp = dest; - - while (count--) - *tmp++ = *src++; - - return dest; -} - -/** * memcpy - Copy one area of memory to another * @dest: Where to copy to * @src: Where to copy from

1 0

[commit] r743 - in trunk/openbios-devel: include/libc libc
by repository service 15 Apr '10

15 Apr '10

Author: blueswirl Date: Thu Apr 15 18:42:51 2010 New Revision: 743 URL: http://tracker.coreboot.org/trac/openbios/changeset/743 Log: Remove unused strspn() Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/string.c Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:49 2010 (r742) +++ trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:51 2010 (r743) @@ -37,7 +37,6 @@ extern char *strrchr(const char * s, int c); extern size_t strlen(const char * s); extern size_t strnlen(const char * s, size_t count); -extern size_t strspn(const char *s, const char *accept); extern char *strpbrk(const char * cs,const char * ct); extern char *strsep(char **s, const char *ct); extern void *memset(void * s,int c,size_t count); Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:49 2010 (r742) +++ trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:51 2010 (r743) @@ -221,31 +221,6 @@ } /** - * strspn - Calculate the length of the initial substring of @s which only - * contain letters in @accept - * @s: The string to be searched - * @accept: The string to search for - */ -size_t strspn(const char *s, const char *accept) -{ - const char *p; - const char *a; - size_t count = 0; - - for (p = s; *p != '\0'; ++p) { - for (a = accept; *a != '\0'; ++a) { - if (*p == *a) - break; - } - if (*a == '\0') - return count; - ++count; - } - - return count; -} - -/** * strpbrk - Find the first occurrence of a set of characters * @cs: The string to be searched * @ct: The characters to search for

1 0

[commit] r742 - in trunk/openbios-devel: include/libc libc
by repository service 15 Apr '10

15 Apr '10

Author: blueswirl Date: Thu Apr 15 18:42:49 2010 New Revision: 742 URL: http://tracker.coreboot.org/trac/openbios/changeset/742 Log: Remove unused strtok() Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/string.c Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Mon Apr 12 22:02:53 2010 (r741) +++ trunk/openbios-devel/include/libc/string.h Thu Apr 15 18:42:49 2010 (r742) @@ -39,7 +39,6 @@ extern size_t strnlen(const char * s, size_t count); extern size_t strspn(const char *s, const char *accept); extern char *strpbrk(const char * cs,const char * ct); -extern char *strtok(char * s,const char * ct); extern char *strsep(char **s, const char *ct); extern void *memset(void * s,int c,size_t count); extern char *bcopy(const char * src, char * dest, int count); Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Mon Apr 12 22:02:53 2010 (r741) +++ trunk/openbios-devel/libc/string.c Thu Apr 15 18:42:49 2010 (r742) @@ -50,8 +50,6 @@ return (int)c1 - (int)c2; } -static char * ___strtok; - /** * strcpy - Copy a %NUL terminated string * @dest: Where to copy the string to @@ -266,33 +264,6 @@ } /** - * strtok - Split a string into tokens - * @s: The string to be searched - * @ct: The characters to search for - * - * WARNING: strtok is deprecated, use strsep instead. - */ -char * strtok(char * s,const char * ct) -{ - char *sbegin, *send; - - sbegin = s ? s : ___strtok; - if (!sbegin) { - return NULL; - } - sbegin += strspn(sbegin,ct); - if (*sbegin == '\0') { - ___strtok = NULL; - return( NULL ); - } - send = strpbrk( sbegin, ct); - if (send && *send != '\0') - *send++ = '\0'; - ___strtok = send; - return (sbegin); -} - -/** * strsep - Split a string into tokens * @s: The string to be searched * @ct: The characters to search for

1 0

[PATCH] RFC: Increase dictionary size on SPARC64
by Mark Cave-Ayland 15 Apr '10

15 Apr '10

Hi all, Thanks to some great work by Igor, the reason for my random debugger crashes has been found. It appears that the default dictionary size is too small on SPARC64 and repeatedly updating the translations property is enough to cause the forth dictionary to overflow the memory allocated for it. I'd like to propose the attached patch which doubles the dictionary memory from 256k to 512k as currently used by PPC. My concern about applying the patch directly is that I'm not sure whether or not any corresponding changes to entry.S also need to be made. AFAICT the initialisation code handles 19 x 512k pages when setting up the MMU (which should be more than enough) but thought I should get a second opinion first. 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

6 17

OBP under qemu-system-sparc64
by Artyom Tarasenko 14 Apr '10

14 Apr '10

2010/4/3 Blue Swirl <blauwirbel(a)gmail.com>: > could be interesting to see what OBP > from a real machine would think of the QEMU machine. it doesn't live long enough to think something (must be something trivial): $ sparc64-softmmu/qemu-system-sparc64 -bios u1_v3.11.1.bin -nographic -cpu 'TI UltraSparc I' -d in_asm,int,cpu -------------- IN: 0x000001fff0000020: ldxa [ %g0 ] (69), %g2 0x000001fff0000024: stxa %g0, [ %g0 ] (69) 0x000001fff0000028: b,a 0x1fff0001d88 -------------- IN: 0x000001fff0001d88: rdpr %cwp, %g1 0x000001fff0001d8c: wrpr 0, %cwp 0x000001fff0001d90: wrpr %g1, 0, %cwp 0x000001fff0001d94: call 0x1fff0000210 0x000001fff0001d98: add %g0, %g0, %o0 -------------- IN: 0x000001fff0000210: mov 0x1ff, %o1 ! 0x1ff 0x000001fff0000214: sllx %o1, 0x20, %o1 0x000001fff0000218: sethi %hi(0xf1300000), %o2 0x000001fff000021c: or %o2, %o1, %o2 0x000001fff0000220: stba %o0, [ %o2 ] (21) 0x000001fff0000224: add %o2, 4, %o2 0x000001fff0000228: lduba [ %o2 ] (21), %o1 0x000001fff000022c: sllx %o1, 8, %o0 0x000001fff0000230: inc %o2 0x000001fff0000234: lduba [ %o2 ] (21), %o1 0x000001fff0000238: or %o0, %o1, %o0 0x000001fff000023c: sllx %o0, 8, %o0 0x000001fff0000240: inc %o2 0x000001fff0000244: lduba [ %o2 ] (21), %o1 0x000001fff0000248: or %o0, %o1, %o0 0x000001fff000024c: sllx %o0, 8, %o0 0x000001fff0000250: inc %o2 0x000001fff0000254: lduba [ %o2 ] (21), %o1 0x000001fff0000258: or %o0, %o1, %o0 0x000001fff000025c: retl 0x000001fff0000260: nop qemu: fatal: Trap 0x0032 while trap level (5) >= MAXTL (5), Error state pc: 000001fff0000220 npc: 000001fff0000224 General Registers: %g0-3: 0000000000000000 0000000000000007 0000000000000000 0000000000000000 %g4-7: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 Current Register Window: %o0-3: 0000000000000000 000001ff00000000 000001fff1300000 0000000000000000 %o4-7: 0000000000000000 0000000000000000 0000000000000000 000001fff0001d94 %l0-3: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 %l4-7: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 %i0-3: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 %i4-7: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 Floating Point Registers: %f00: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f04: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f08: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f12: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f16: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f20: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f24: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f28: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f32: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f36: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f40: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f44: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f48: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f52: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f56: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f60: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 pstate: 00000035 ccr: 00 (icc: ---- xcc: ----) asi: 00 tl: 5 pil: 0 cansave: 0 canrestore: 0 otherwin: 0 wstate: 0 cleanwin: 0 cwp: 7 fsr: 0000000000000000 y: 0000000000000000 fprs: 0000000000000000 Just in case, the properties of the real machine: ok cd / ok .properties breakpoint-trap 0000007f #size-cells 00000002 energystar-v2 model SUNW,501-2486 name SUNW,Ultra-1 clock-frequency 04f9f54d banner-name Sun Ultra 1 UPA/SBus (UltraSPARC 167MHz) device_type upa ok cd /SUNW,UltraSPARC ok .properties manufacturer# 00 00 00 17 implementation# 00 00 00 10 mask# 00 00 00 40 sparc-version 00 00 00 09 ecache-associativity 00 00 00 01 ecache-line-size 00 00 00 40 ecache-size 00 08 00 00 #dtlb-entries 00 00 00 40 dcache-associativity 00 00 00 01 dcache-line-size 00 00 00 20 dcache-size 00 00 40 00 #itlb-entries 00 00 00 40 icache-associativity 00 00 00 02 icache-line-size 00 00 00 20 icache-size 00 00 40 00 upa-portid 00000000 clock-frequency 09f3ea9a reg 000001c0 00000000 00000000 00000008 device_type cpu name SUNW,UltraSPARC -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/

1 1

[PATCH] herewrite: check for dictionary overflow
by Igor V. Kovalenko 12 Apr '10

12 Apr '10

From: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> - add dictlimit variable to store dictionary memory size - change herewrite() to check for overflow if dictlimit is set - sparc64: set dictlimit to allocated amount Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> --- arch/sparc64/openbios.c | 2 ++ kernel/dict.c | 1 + kernel/forth.c | 8 ++++++++ kernel/include/dict.h | 1 + 4 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c index 2f1a955..67849e1 100644 --- a/arch/sparc64/openbios.c +++ b/arch/sparc64/openbios.c @@ -519,6 +519,8 @@ int openbios(void) collect_sys_info(&sys_info); dict = malloc(DICTIONARY_SIZE); + dictlimit = DICTIONARY_SIZE; + load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); diff --git a/kernel/dict.c b/kernel/dict.c index 34b97f3..822c923 100644 --- a/kernel/dict.c +++ b/kernel/dict.c @@ -21,6 +21,7 @@ unsigned char *dict = NULL; ucell *last; cell dicthead = 0; +ucell dictlimit = 0; /* lfa2nfa * converts a link field address to a name field address, diff --git a/kernel/forth.c b/kernel/forth.c index 5fc53d3..2876709 100644 --- a/kernel/forth.c +++ b/kernel/forth.c @@ -851,6 +851,14 @@ static void herewrite(void) #ifdef CONFIG_DEBUG_INTERNAL printk("here!: new value: %x\n", tmp); #endif + + if (dictlimit && dicthead >= dictlimit) { + printk("Dictionary space overflow:" + " dicthead=" FMT_ucellx + " dictlimit=" FMT_ucellx + "\n", + dicthead, dictlimit); + } } diff --git a/kernel/include/dict.h b/kernel/include/dict.h index 7e8c320..cc30f99 100644 --- a/kernel/include/dict.h +++ b/kernel/include/dict.h @@ -50,6 +50,7 @@ extern ucell PC; extern unsigned char *dict; extern cell dicthead; +extern ucell dictlimit; extern ucell *last; #ifdef FCOMPILER extern ucell *trampoline;

3 3

[commit] r741 - in trunk/openbios-devel: arch/amd64 arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 include/arch/amd64 kernel kernel/include
by repository service 12 Apr '10

12 Apr '10

Author: mcayland Date: Mon Apr 12 22:02:53 2010 New Revision: 741 URL: http://tracker.coreboot.org/trac/openbios/changeset/741 Log: Commit revised version of Igor Kovalenko's patch for detecting whether dictionary allocations have overrun the memory buffer allocated for them. Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> 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/ppc/qemu/kernel.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/include/arch/amd64/types.h trunk/openbios-devel/kernel/dict.c trunk/openbios-devel/kernel/forth.c trunk/openbios-devel/kernel/include/dict.h Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/arch/amd64/openbios.c Mon Apr 12 22:02:53 2010 (r741) @@ -19,7 +19,8 @@ void boot(void); -static char intdict[256 * 1024]; +#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ +static char intdict[DICTIONARY_SIZE]; static void init_memory(void) { @@ -63,6 +64,8 @@ collect_sys_info(&sys_info); dict=intdict; + dictlimit = DICTIONARY_SIZE; + load_dictionary((char *)sys_info.dict_start, sys_info.dict_end-sys_info.dict_start); Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Mon Apr 12 22:02:53 2010 (r741) @@ -83,6 +83,8 @@ initialize_forth( void ) { dict = malloc(DICTIONARY_SIZE); + dictlimit = DICTIONARY_SIZE; + load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); PUSH_xt( bind_noname_func(arch_of_init) ); Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/arch/sparc32/openbios.c Mon Apr 12 22:02:53 2010 (r741) @@ -185,6 +185,8 @@ collect_sys_info(&sys_info); dict = malloc(DICTIONARY_SIZE); + dictlimit = DICTIONARY_SIZE; + load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon Apr 12 22:02:53 2010 (r741) @@ -519,6 +519,8 @@ collect_sys_info(&sys_info); dict = malloc(DICTIONARY_SIZE); + dictlimit = DICTIONARY_SIZE; + load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/arch/unix/unix.c Mon Apr 12 22:02:53 2010 (r741) @@ -485,6 +485,7 @@ return 1; } + dictlimit = DICTIONARY_SIZE; memset(dict, 0, DICTIONARY_SIZE); if (!segfault) { Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/arch/x86/openbios.c Mon Apr 12 22:02:53 2010 (r741) @@ -22,7 +22,8 @@ void boot(void); void collect_sys_info(struct sys_info *info); -static unsigned char intdict[256 * 1024]; +#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ +static unsigned char intdict[DICTIONARY_SIZE]; #ifdef CONFIG_DRIVER_PCI static const pci_arch_t default_pci_host = { @@ -86,6 +87,8 @@ collect_sys_info(&sys_info); dict=intdict; + dictlimit = DICTIONARY_SIZE; + load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/include/arch/amd64/types.h Mon Apr 12 22:02:53 2010 (r741) @@ -23,6 +23,8 @@ typedef __int128_t dcell; typedef __uint128_t ducell; +#define FMT_ucellx "%016llx" + #define FMT_elf "%#x" #define bitspercell (sizeof(cell)<<3) Modified: trunk/openbios-devel/kernel/dict.c ============================================================================== --- trunk/openbios-devel/kernel/dict.c Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/kernel/dict.c Mon Apr 12 22:02:53 2010 (r741) @@ -21,6 +21,7 @@ unsigned char *dict = NULL; ucell *last; cell dicthead = 0; +cell dictlimit = 0; /* lfa2nfa * converts a link field address to a name field address, Modified: trunk/openbios-devel/kernel/forth.c ============================================================================== --- trunk/openbios-devel/kernel/forth.c Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/kernel/forth.c Mon Apr 12 22:02:53 2010 (r741) @@ -851,6 +851,14 @@ #ifdef CONFIG_DEBUG_INTERNAL printk("here!: new value: %x\n", tmp); #endif + + if (dictlimit && dicthead >= dictlimit) { + printk("Dictionary space overflow:" + " dicthead=" FMT_ucellx + " dictlimit=" FMT_ucellx + "\n", + dicthead, dictlimit); + } } Modified: trunk/openbios-devel/kernel/include/dict.h ============================================================================== --- trunk/openbios-devel/kernel/include/dict.h Mon Apr 12 12:03:05 2010 (r740) +++ trunk/openbios-devel/kernel/include/dict.h Mon Apr 12 22:02:53 2010 (r741) @@ -50,6 +50,7 @@ extern unsigned char *dict; extern cell dicthead; +extern cell dictlimit; extern ucell *last; #ifdef FCOMPILER extern ucell *trampoline;

1 0

[commit] r740 - trunk/openbios-devel/libopenbios
by repository service 12 Apr '10

12 Apr '10

Author: mcayland Date: Mon Apr 12 12:03:05 2010 New Revision: 740 URL: http://tracker.coreboot.org/trac/openbios/changeset/740 Log: Revert r739 since the update translations code only updates the OpenBIOS properties and not the real MMU translations. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sat Apr 10 13:08:57 2010 (r739) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Mon Apr 12 12:03:05 2010 (r740) @@ -401,6 +401,8 @@ } add_entry( phys, size, &ofmem->phys_range ); + ofmem_update_translations(); + return phys; }

1 0

memory corruption with "read" $call-method (sparc32)
by Artyom Tarasenko 11 Apr '10

11 Apr '10

Breakpoint 4, obp_devread (dev_desc=-2400864, buf=0xf00a30ec "\240", nbytes=8192) at ../arch/sparc32/romvec.c:314 314 PUSH((int)buf); (gdb) next 315 PUSH(nbytes); (gdb) next 316 push_str("read"); (gdb) next 317 PUSH(dev_desc); (gdb) next 318 fword("$call-method"); // just in case (gdb) info registers g0 0x0 0 g1 0x4c 76 g2 0xffd4f1b0 -2821712 g3 0x13 19 g4 0xffdb5da0 -2400864 g5 0x0 0 g6 0x0 0 g7 0x0 0 o0 0xffdb5da0 -2400864 o1 0x0 0 o2 0xf00a30ec -267767572 o3 0x20 32 o4 0x10 16 o5 0x0 0 sp 0x125fb0 0x125fb0 o7 0xffd05eb0 -3121488 l0 0x4401dc4 71310788 l1 0x10e6dc 1107676 l2 0x107388 1078152 l3 0x40 64 l4 0x80 128 l5 0x0 0 l6 0x0 0 l7 0x0 0 i0 0xffdb5da0 -2400864 i1 0xf00a30ec -267767572 i2 0x2000 8192 i3 0xfffffffc -4 i4 0x20 32 i5 0x10f444 1111108 fp 0x126020 0x126020 i7 0x10e88c 1108108 y 0x800 2048 psr 0x4401de4 [ #2 ET PS S #8 #10 #11 EF #22 #26 ] wim 0x40 64 tbr 0xffd00060 -3145632 pc 0xffd05eb8 0xffd05eb8 <obp_devread+80> npc 0xffd05ebc 0xffd05ebc <obp_devread+84> fsr 0x80000 [ #19 ] csr 0x0 0 // here resides Solaris's printf: (gdb) disas 0x00104798, 0x001047c0 Dump of assembler code from 0x104798 to 0x1047c0: 0x00104798: save %sp, -96, %sp 0x0010479c: st %i1, [ %fp + 0x48 ] 0x001047a0: mov %i0, %o0 0x001047a4: st %i2, [ %fp + 0x4c ] 0x001047a8: add %fp, 0x48, %o1 0x001047ac: st %i3, [ %fp + 0x50 ] 0x001047b0: st %i4, [ %fp + 0x54 ] 0x001047b4: call 0x10f4a8 0x001047b8: st %i5, [ %fp + 0x58 ] 0x001047bc: ret End of assembler dump. (gdb) next 319 ret = POP(); // Oooops, not anymore (gdb) disas 0x00104798, 0x001047c0 Dump of assembler code from 0x104798 to 0x1047c0: 0x00104798: bne,a 0x1046bc 0x0010479c: ld [ %i0 + 0x14 ], %o0 0x001047a0: ld [ %i1 + 0x10 ], %i4 0x001047a4: cmp %i4, %i2 0x001047a8: be 0x104894 0x001047ac: nop 0x001047b0: ld [ %i4 + 0x10 ], %o0 0x001047b4: call 0x1048fc 0x001047b8: nop 0x001047bc: mov %o0, %i1 End of assembler dump. reading 8192 bytes into the address 0xf00a30ec corrupts 0x00104798. Is there an easy way to see from gdb where the both addresses are mapped to? "map?" seems to be not implemented in the OpenBIOS. -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/

4 10

[commit] r739 - trunk/openbios-devel/libopenbios
by repository service 10 Apr '10

10 Apr '10

Author: mcayland Date: Sat Apr 10 13:08:57 2010 New Revision: 739 URL: http://tracker.coreboot.org/trac/openbios/changeset/739 Log: Don't try and update the MMU mappings when claiming physical memory. This is probably related to r737 and seems to solve an issue whereby Forth starts doing strange things just after attemping a claim on physical memory resource. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Thu Apr 8 23:31:44 2010 (r738) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sat Apr 10 13:08:57 2010 (r739) @@ -401,8 +401,6 @@ } add_entry( phys, size, &ofmem->phys_range ); - ofmem_update_translations(); - return phys; }

3 4

[commit] r738 - trunk/openbios-devel/libopenbios
by repository service 08 Apr '10

08 Apr '10

Author: mcayland Date: Thu Apr 8 23:31:44 2010 New Revision: 738 URL: http://tracker.coreboot.org/trac/openbios/changeset/738 Log: Slight correct to r736 so that the number of getprop arguments is correctly displayed. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Thu Apr 8 23:22:39 2010 (r737) +++ trunk/openbios-devel/libopenbios/client.c Thu Apr 8 23:31:44 2010 (r738) @@ -170,7 +170,7 @@ } else if (strcmp(pb->service, "getproplen") == 0) { printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "getprop") == 0) { - printk("%ld\n", pb->args[pb->nargs]); + printk("%ld\n", pb->args[3]); memdump((char*)pb->args[2], pb->args[3]); } else if (strcmp(pb->service, "nextprop") == 0) { printk("%ld\n", pb->args[pb->nargs]);

1 0

[commit] r737 - trunk/openbios-devel/arch/sparc64
by repository service 08 Apr '10

08 Apr '10

Author: mcayland Date: Thu Apr 8 23:22:39 2010 New Revision: 737 URL: http://tracker.coreboot.org/trac/openbios/changeset/737 Log: According to the OF spec, any calls to claim made through the /memory node should not attempt to add a memory translation. This solves a problem in Milax boot whereby the boot loader was attempting to map the address after it had already been done. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/lib.c Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Thu Apr 8 23:19:09 2010 (r736) +++ trunk/openbios-devel/arch/sparc64/lib.c Thu Apr 8 23:22:39 2010 (r737) @@ -376,8 +376,6 @@ phys = ofmem_claim_phys(phys, size, align); - ofmem_map(phys, phys, size, -1); - PUSH(phys & 0xffffffffUL); PUSH(phys >> 32); }

1 0

[commit] r736 - trunk/openbios-devel/libopenbios
by repository service 08 Apr '10

08 Apr '10

Author: mcayland Date: Thu Apr 8 23:19:09 2010 New Revision: 736 URL: http://tracker.coreboot.org/trac/openbios/changeset/736 Log: Fix bug when DEBUG_CIF is enabled and getprop is called with nret set to zero. Originally the code tried to use the size returned from the CIF, but with nret set to zero then the size argument is never pushed onto the stack and so the size would be set to whatever junk was left in the argument block. Change the code to use the size expected by the client instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Mon Apr 5 21:19:37 2010 (r735) +++ trunk/openbios-devel/libopenbios/client.c Thu Apr 8 23:19:09 2010 (r736) @@ -171,7 +171,7 @@ printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "getprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[2], pb->args[pb->nargs]); + memdump((char*)pb->args[2], pb->args[3]); } else if (strcmp(pb->service, "nextprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); memdump((char*)pb->args[2], pb->args[pb->nargs]);

1 0

OpenSolaris starts to live on SPARC64
by Mark Cave-Ayland 06 Apr '10

06 Apr '10

Hi all, After all the refactoring work, I got around to re-working the init-program and go words and plugging the new unified ELF loader into the SPARC64 build. And the result? As of SVN r730, I'm pleased to report that the Solaris kernel starts to execute on my Milax test ISO. After typing "go" to execute the loaded ELF image manually, I see a twirly baton rotating on the console for about 0.5s before the inevitable segfault. So it's a small step, but still a great milestone for the OpenBIOS project :D Happy holidays, 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

7 34

[commit] r732 - in trunk/openbios-devel: forth/system libopenbios
by repository service 05 Apr '10

05 Apr '10

Author: mcayland Date: Sat Apr 3 10:25:47 2010 New Revision: 732 URL: http://tracker.coreboot.org/trac/openbios/changeset/732 Log: Fix two errors related to argument passing in the client interface: i) client-call-iface did not set a return value of 0 on success; hence the top stack argument was dropped as part of the status check causing an off-by-one error. ii) instead of setting pb->nret to be the number of arguments returned, the (random) value being passed in was being used to control the number of arguments being returned. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/system/ciface.fs trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Fri Apr 2 16:25:37 2010 (r731) +++ trunk/openbios-devel/forth/system/ciface.fs Sat Apr 3 10:25:47 2010 (r732) @@ -341,4 +341,5 @@ : client-call-iface ( [args] name len -- [args] -1 | [rets] 0 ) ciface-ph find-method 0= if -1 exit then execute + 0 ; Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Fri Apr 2 16:25:37 2010 (r731) +++ trunk/openbios-devel/libopenbios/client.c Sat Apr 3 10:25:47 2010 (r732) @@ -302,11 +302,11 @@ return -1; } - for( i=0; i<pb->nret && dstackcnt > dstacksave ; i++ ) - pb->args[pb->nargs + i] = POP(); + for( pb->nret=0; dstackcnt > dstacksave ; pb->nret++ ) + pb->args[pb->nargs + pb->nret] = POP(); #ifdef DEBUG_CIF - if( i != pb->nret || dstackcnt != dstacksave ) { + if( dstackcnt != dstacksave ) { printk("service %s: argument count error (%d %d)\n", pb->service, i, dstackcnt - dstacksave ); dstackcnt = dstacksave;

3 2

[commit] r735 - trunk/openbios-devel/forth/system
by repository service 05 Apr '10

05 Apr '10

Author: mcayland Date: Mon Apr 5 21:19:37 2010 New Revision: 735 URL: http://tracker.coreboot.org/trac/openbios/changeset/735 Log: Fix incorrect stack (dropping one too many items) when a phandle of 0 is passed into getprop CIF. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Mon Apr 5 20:41:11 2010 (r734) +++ trunk/openbios-devel/forth/system/ciface.fs Mon Apr 5 21:19:37 2010 (r735) @@ -92,7 +92,7 @@ then \ return -1 if phandle is 0 (MacOS actually does this) - ?dup 0= if 2drop 2drop -1 exit then + ?dup 0= if drop 2drop -1 exit then over cstrlen swap ?phandle get-package-property if 2drop -1 exit then

1 0

[commit] r734 - in trunk/openbios-devel: arch/ppc/qemu config/examples include/arch/ppc
by repository service 05 Apr '10

05 Apr '10

Author: mcayland Date: Mon Apr 5 20:41:11 2010 New Revision: 734 URL: http://tracker.coreboot.org/trac/openbios/changeset/734 Log: Partially fix up the OpenBIOS PPC build. While the code technically works, even with this fix in place the PPC console output disappears when booting a FC12 test ISO directly. Interestingly enough, if the equivalent "load" and "go" commands are entered manually then the console output works fine and the ISO can boot?! So there is still an issue with the console not being initialised correctly somewhere. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/include/arch/ppc/io.h trunk/openbios-devel/include/arch/ppc/types.h Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Apr 5 20:41:11 2010 (r734) @@ -472,6 +472,7 @@ { ucell addr; + feval("saved-program-state >sps.entry @"); addr = POP(); call_elf( 0, 0, addr); Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon Apr 5 20:41:11 2010 (r734) @@ -162,8 +162,6 @@ /* misc */ /************************************************************************/ -extern char _start[], _end[]; - ucell ofmem_arch_default_translation_mode( ucell phys ) { /* XXX: Guard bit not set as it should! */ Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml Mon Apr 5 20:41:11 2010 (r734) @@ -42,7 +42,7 @@ <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> - <option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> <option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/config/examples/ppc_config.xml Mon Apr 5 20:41:11 2010 (r734) @@ -42,7 +42,7 @@ <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> - <option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> <option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/> Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/include/arch/ppc/io.h Mon Apr 5 20:41:11 2010 (r734) @@ -6,6 +6,7 @@ #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" +extern char _start, _end; extern unsigned long virt_offset; #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/include/arch/ppc/types.h Mon Apr 5 20:41:11 2010 (r734) @@ -40,6 +40,10 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +#define FMT_elf "%#x" +#define FMT_sizet "%lx" +#define FMT_aout_ehdr "%lx" + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3)

1 0

[commit] r733 - trunk/openbios-devel/libopenbios
by repository service 05 Apr '10

05 Apr '10

Author: mcayland Date: Sat Apr 3 15:03:39 2010 New Revision: 733 URL: http://tracker.coreboot.org/trac/openbios/changeset/733 Log: Another couple of client interface fixes: i) Ensure that the CIF caller's idea of pb->nret is always respected, but if there is a mismatch then log a warning if DEBUG_CIF is enabled, then correct the stack and continue. ii) Correct the code path for call-method and interpret to ensure they ignore the extra status variable pushed onto the stack by client-call-iface. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sat Apr 3 10:25:47 2010 (r732) +++ trunk/openbios-devel/libopenbios/client.c Sat Apr 3 15:03:39 2010 (r733) @@ -245,7 +245,11 @@ push_str( pb->service ); fword("client-call-iface"); - for( i=0; i<pb->nret && dstackcnt > dstacksave; i++ ) { + /* Drop the return code from client-call-iface (status is handled by the + catch result which is the first parameter below) */ + POP(); + + for( i=0; i<pb->nret; i++ ) { val = POP(); pb->args[pb->nargs + i] = val; @@ -253,9 +257,10 @@ if( !i && val ) break; } + #ifdef DEBUG_CIF /* useful for debug but not necessarily an error */ - if( i != pb->nret || dstacksave != dstacksave ) { + if( i != pb->nret || dstackcnt != dstacksave ) { printk("%s '%s': possible argument error (%ld--%ld) got %d\n", pb->service, (char*)pb->args[0], pb->nargs-2, pb->nret, i ); } @@ -266,6 +271,7 @@ } printk("\n"); #endif + dstackcnt = dstacksave; return 0; } @@ -279,6 +285,7 @@ if( pb->nargs < 0 || pb->nret < 0 || pb->nargs + pb->nret > PROM_MAX_ARGS) return -1; + #ifdef DEBUG_CIF dump_service(pb); #endif @@ -302,16 +309,21 @@ return -1; } - for( pb->nret=0; dstackcnt > dstacksave ; pb->nret++ ) - pb->args[pb->nargs + pb->nret] = POP(); + for( i=0; i<pb->nret ; i++ ) + pb->args[pb->nargs + i] = POP(); -#ifdef DEBUG_CIF if( dstackcnt != dstacksave ) { - printk("service %s: argument count error (%d %d)\n", +#ifdef DEBUG_CIF + printk("service %s: possible argument error (%d %d)\n", pb->service, i, dstackcnt - dstacksave ); +#endif + /* Some clients request less parameters than the CIF method + returns, e.g. getprop with OpenSolaris. Hence we drop any + stack parameters after issuing a warning above */ dstackcnt = dstacksave; } +#ifdef DEBUG_CIF dump_return(pb); #endif return 0;

4 5

Problem solved
by Programmingkid 03 Apr '10

03 Apr '10

I finally figured out how to make my '{' word work the they I wanted it to. Here is my last update on this word: : { copyWordName postpone currentWordName begin parse-word dup 0> while 2dup drop " }" comp 0= if exit then 2dup drop " ;" comp 0= if false useTopStackValue ! else currentWordAddr @ currentWordLen @ loadLocalVariable then repeat ; immediate

1 0

Update
by Programmingkid 03 Apr '10

03 Apr '10

Here is a better version of '{' with another word added. : currentWordName ( -- addr len ) currentWordAddr @ currentWordLen @ ; : { copyWordName begin parse-word dup 0> while 2dup drop " }" comp 0= if exit then 2dup drop " ;" comp 0= if false useTopStackValue ! else currentWordAddr @ currentWordLen @ loadLocalVariable then repeat postpone currentWordName ; immediate

1 0

name of current word
by Programmingkid 02 Apr '10

02 Apr '10

> Programmingkid wrote: > >>> Is there a reason that you're not using the in-built debugger for this? >>> I'm fairly sure it would make your life much easier. >> >> I'm making code that will associate a value with a function name and will store both in a table. Thank you Mark and Stefan for helping. > > It sounds as if you're working with Forth at quite a low level. Perhaps > you should consider breaking the task down into small chunks and then > posting patches to the list for feedback? Then people can offer more > guidance to help you. > > > ATB, > > Mark. This is what I am trying to do. I am making a word called '{' that will read each symbol after it and load it into memory. Here is my code so far: variable currentWordAddr variable currentWordLen / copies the current words name / must be called at beginning of '{' word : copyWordName ( - addr len) ib >in @ dup alloc-mem swap 2dup >r >r move r> r> currentWordLen ! currentWordAddr ! ; : { copyWordName begin parse-word dup 0> while 2dup drop " }" comp 0= if exit then 2dup drop " ;" comp 0= if false useTopStackValue ! else currentWordAddr @ currentWordLen @ loadLocalVariable then repeat does> copyWordName ; immediate copyWordName simply copies the word name that comes before the '{' and after the ':'. I am trying to make the '{' word have a compile-time behavior of loading each symbol after the '{'. It stops when '}' is encountered. So if this word is being compiled : hi { dog cat hamster } the '{' word will send dog, cat, and hamster to loadLocalVariable. At run-time, it should only call copyWordName to load the current word being ran. I simply don't know how to do both compile and run-time behaviors that I want. Anyone know how to do this? This is my starting point for local variable support in OpenBIOS.

1 0

[commit] r731 - trunk/openbios-devel/libc
by repository service 02 Apr '10

02 Apr '10

Author: blueswirl Date: Fri Apr 2 16:25:37 2010 New Revision: 731 URL: http://tracker.coreboot.org/trac/openbios/changeset/731 Log: Fix build CC target/libc/vsprintf.o cc1: warnings being treated as errors ../libc/string.c: In function 'strncasecmp': ../libc/string.c:518: warning: '__res' may be used uninitialized in this function Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libc/string.c Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Fri Apr 2 16:17:45 2010 (r730) +++ trunk/openbios-devel/libc/string.c Fri Apr 2 16:25:37 2010 (r731) @@ -515,7 +515,7 @@ int strncasecmp( const char *cs, const char *ct, size_t count ) { - register signed char __res; + register signed char __res = 0; while (count--) { char ch1 = toupper(*cs), ch2 = toupper(*ct);

1 0

[commit] r730 - in trunk/openbios-devel/arch: sparc32 sparc64 x86
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 16:17:45 2010 New Revision: 730 URL: http://tracker.coreboot.org/trac/openbios/changeset/730 Log: Add an extra linefeed in front of the jump message in (go) to make the debug output a bit tidier. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/x86/boot.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 16:14:34 2010 (r729) +++ trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 16:17:45 2010 (r730) @@ -97,7 +97,7 @@ feval("saved-program-state >sps.file-size @"); size = POP(); - printk("Jumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); + printk("\nJumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); switch (type) { case 0x0: Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 16:14:34 2010 (r729) +++ trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 16:17:45 2010 (r730) @@ -89,7 +89,7 @@ feval("saved-program-state >sps.file-size @"); size = POP(); - printk("Jumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); + printk("\nJumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); switch (type) { case 0x0: Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 16:14:34 2010 (r729) +++ trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 16:17:45 2010 (r730) @@ -86,7 +86,7 @@ feval("saved-program-state >sps.file-size @"); size = POP(); - printk("Jumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); + printk("\nJumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); switch (type) { case 0x0:

1 0

[commit] r729 - trunk/openbios-devel/arch/sparc64
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 16:14:34 2010 New Revision: 729 URL: http://tracker.coreboot.org/trac/openbios/changeset/729 Log: Enable (go) for SPARC64 and also force register o0 to be 0 as detailed in the OF specification. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Fri Apr 2 16:03:38 2010 (r728) +++ trunk/openbios-devel/arch/sparc64/context.c Fri Apr 2 16:14:34 2010 (r729) @@ -125,6 +125,7 @@ ctx = init_context(image_stack, sizeof image_stack, 0); ctx->pc = entry_point; ctx->npc = entry_point+4; + ctx->regs[REG_O0] = 0; ctx->regs[REG_O0+4] = cif_handler; ctx = switch_to(ctx); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 2 16:03:38 2010 (r728) +++ trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 2 16:14:34 2010 (r729) @@ -480,6 +480,7 @@ device_end(); bind_func("platform-boot", boot ); + bind_func("(go)", go); } unsigned long isa_io_base;

1 0

[commit] r728 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 arch/x86 forth/debugging
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 16:03:38 2010 New Revision: 728 URL: http://tracker.coreboot.org/trac/openbios/changeset/728 Log: Now that we have a C version of go available, rework client.fs so that it will automatically detect if a platform has execution capability based upon the existence of the lower level (go) word. Also add standard ELF image support to (go) for SPARC32, SPARC64 and x86. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/forth/debugging/client.fs Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 15:29:12 2010 (r727) +++ trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 16:03:38 2010 (r728) @@ -107,6 +107,13 @@ break; + case 0x1: + /* Start ELF image */ + entry = (void *) address; + image_retval = entry(romvec, 0, 0, 0, 0); + + break; + case 0x5: /* Start a.out image */ entry = (void *) address; Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 15:29:12 2010 (r727) +++ trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 16:03:38 2010 (r728) @@ -20,12 +20,12 @@ uint64_t qemu_cmdline; uint64_t cmdline_size; char boot_device; +void *boot_notes = NULL; extern int sparc64_of_client_interface( int *params ); static int try_path(const char *path, char *param) { - void *boot_notes = NULL; ucell valid; #ifdef CONFIG_LOADER_ELF @@ -94,7 +94,12 @@ switch (type) { case 0x0: /* Start ELF boot image */ - image_retval = start_elf(address, (uint64_t)NULL); + image_retval = start_elf(address, (uint64_t)&boot_notes); + break; + + case 0x1: + /* Start ELF image */ + image_retval = start_client_image(address, (uint64_t)&sparc64_of_client_interface); break; case 0x5: Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 15:29:12 2010 (r727) +++ trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 16:03:38 2010 (r728) @@ -19,10 +19,10 @@ #include "boot.h" struct sys_info sys_info; +void *boot_notes = NULL; static int try_path(const char *path, char *param) { - void *boot_notes = NULL; ucell valid; #ifdef CONFIG_LOADER_ELF @@ -91,6 +91,11 @@ switch (type) { case 0x0: /* Start ELF boot image */ + image_retval = start_elf(address, (uint32_t)&boot_notes); + break; + + case 0x1: + /* Start ELF image */ image_retval = start_elf(address, (uint32_t)NULL); break; Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Fri Apr 2 15:29:12 2010 (r727) +++ trunk/openbios-devel/forth/debugging/client.fs Fri Apr 2 16:03:38 2010 (r728) @@ -97,23 +97,17 @@ ; : go ( -- ) - state-valid @ not if exit then - elf saved-program-state >sps.file-type @ = if -[IFDEF] CONFIG_PPC - saved-program-state >sps.entry @ " (go)" evaluate -[ELSE] - ." go is not yet implemented" -[THEN] + state-valid @ not if + s" No valid state has been set by load or init-program" type cr + exit + then + + \ Call the architecture-specific code to launch the client image + s" (go)" $find if + execute else - xcoff saved-program-state >sps.file-type @ = if -[IFDEF] CONFIG_PPC - saved-program-state >sps.entry @ " (go)" evaluate -[ELSE] - ." go is not yet implemented" -[THEN] - else - ." go is not yet implemented" - then + ." go is not yet implemented" + 2drop then ;

1 0

[commit] r727 - in trunk/openbios-devel/arch: sparc32 sparc64 x86
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 15:29:12 2010 New Revision: 727 URL: http://tracker.coreboot.org/trac/openbios/changeset/727 Log: Since the original boot code had been previously refactored to make use of saved-program-state, we can take the existing code and with only slight modification use it as a C implementation of the go word. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/boot.h Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 15:29:12 2010 (r727) @@ -22,13 +22,14 @@ uint32_t qemu_cmdline; uint32_t cmdline_size; char boot_device; +static const void *romvec; static int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); -static int try_path(const char *path, char *param, const void *romvec) + +static int try_path(const char *path, char *param) { void *boot_notes = NULL; - ucell valid, address, type, size; - int image_retval = 0; + ucell valid; push_str(path); fword("pathres-resolve-aliases"); @@ -78,6 +79,16 @@ start_image: + go(); + return -1; +} + + +void go(void) +{ + ucell address, type, size; + int image_retval = 0; + /* Get the entry point and the type (see forth/debugging/client.fs) */ feval("saved-program-state >sps.entry @"); address = POP(); @@ -122,8 +133,6 @@ } printk("Image returned with return value %#x\n", image_retval); - - return -1; } @@ -132,7 +141,6 @@ char *path = pop_fstr_copy(), *param, altpath[256]; const char *oldpath = path; int unit = 0; - const void *romvec; int result; if(!path) { @@ -209,7 +217,7 @@ else printk("without parameters.\n"); - result = try_path(path, param, romvec); + result = try_path(path, param); if (!result) { push_str(path); PUSH(':'); @@ -218,7 +226,7 @@ POP(); POP(); - try_path(altpath, param, romvec); + try_path(altpath, param); } printk("Unsupported image format\n"); Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/sparc32/boot.h Fri Apr 2 15:29:12 2010 (r727) @@ -19,7 +19,8 @@ // boot.c extern struct sys_info sys_info; extern const char *bootpath; -void boot(void); +extern void boot(void); +extern void go(void); // sys_info.c extern unsigned int qemu_mem_size; Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 15:29:12 2010 (r727) @@ -26,8 +26,7 @@ static int try_path(const char *path, char *param) { void *boot_notes = NULL; - ucell valid, address, type, size; - int image_retval = 0; + ucell valid; #ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ @@ -72,6 +71,16 @@ start_image: + go(); + return -1; +} + + +void go(void) +{ + ucell address, type, size; + int image_retval = 0; + /* Get the entry point and the type (see forth/debugging/client.fs) */ feval("saved-program-state >sps.entry @"); address = POP(); @@ -85,7 +94,7 @@ switch (type) { case 0x0: /* Start ELF boot image */ - image_retval = start_elf(address, (uint64_t)boot_notes); + image_retval = start_elf(address, (uint64_t)NULL); break; case 0x5: @@ -112,10 +121,9 @@ } printk("Image returned with return value %#x\n", image_retval); - - return -1; } + void boot(void) { char *path=pop_fstr_copy(), *param; Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/sparc64/boot.h Fri Apr 2 15:29:12 2010 (r727) @@ -21,7 +21,8 @@ extern uint64_t qemu_cmdline; extern uint64_t cmdline_size; extern char boot_device; -void boot(void); +extern void boot(void); +extern void go(void); // sys_info.c extern uint64_t qemu_mem_size; Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 15:29:12 2010 (r727) @@ -23,8 +23,7 @@ static int try_path(const char *path, char *param) { void *boot_notes = NULL; - ucell valid, address, type, size; - int image_retval = 0;; + ucell valid; #ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ @@ -69,6 +68,16 @@ start_image: + go(); + return -1; +} + + +void go(void) +{ + ucell address, type, size; + int image_retval = 0; + /* Get the entry point and the type (see forth/debugging/client.fs) */ feval("saved-program-state >sps.entry @"); address = POP(); @@ -109,10 +118,9 @@ } printk("Image returned with return value %#x\n", image_retval); - - return -1; } + void boot(void) { char *path=pop_fstr_copy(), *param; Modified: trunk/openbios-devel/arch/x86/boot.h ============================================================================== --- trunk/openbios-devel/arch/x86/boot.h Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/x86/boot.h Fri Apr 2 15:29:12 2010 (r727) @@ -15,4 +15,5 @@ /* boot.c */ extern struct sys_info sys_info; -void boot(void); +extern void boot(void); +extern void go(void);

1 0

[commit] r726 - in trunk/openbios-devel: forth/debugging include/libopenbios libopenbios
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 15:01:10 2010 New Revision: 726 URL: http://tracker.coreboot.org/trac/openbios/changeset/726 Log: The new loader APIs in libopenbios already have routines to detect the type of executable at a given address and react accordingly. Hence since the loaders are currently written in C, it makes more sense to drop down into C and re-use the same code rather than have a second implementation in Forth. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/initprogram.h trunk/openbios-devel/libopenbios/initprogram.c Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/libopenbios/aout_load.c trunk/openbios-devel/libopenbios/build.xml trunk/openbios-devel/libopenbios/init.c Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Fri Apr 2 13:41:35 2010 (r725) +++ trunk/openbios-devel/forth/debugging/client.fs Fri Apr 2 15:01:10 2010 (r726) @@ -16,6 +16,7 @@ \ 7.6.2 Program download and execute + struct ( saved-program-state ) /n field >sps.entry /n field >sps.file-size @@ -32,7 +33,8 @@ : load-size file-size @ ; -variable file-type + +\ File types identified by (init-program) 0 constant elf-boot 1 constant elf @@ -43,289 +45,13 @@ 10 constant fcode 11 constant forth -\ Array indexes and values for e_type - -d# 16 constant EI_NIDENT - -0 constant EI_MAG0 - h# 7f constant ELFMAG0 - -1 constant EI_MAG1 - [CHAR] E constant ELFMAG1 - -2 constant EI_MAG2 - [CHAR] L constant ELFMAG2 - -3 constant EI_MAG3 - [CHAR] F constant ELFMAG3 - -4 constant EI_CLASS - 0 constant ELFCLASSNONE - 1 constant ELFCLASS32 - 2 constant ELFCLASS64 - -5 constant EI_DATA - 0 constant ELFDATANONE - 1 constant ELFDATA2LSB - 2 constant ELFDATA2MSB - -6 constant EI_VERSION - 0 constant EV_NONE - 1 constant EV_CURRENT - -\ Values for e_type - -0 constant ET_NONE -1 constant ET_REL -2 constant ET_EXEC -3 constant ET_DYN -4 constant ET_CORE - -\ Values for e_machine - -d# 2 constant EM_SPARC -d# 3 constant EM_386 -d# 6 constant EM_486 -d# 18 constant EM_SPARC32PLUS -d# 20 constant EM_PPC -d# 43 constant EM_SPARCV9 - -/l constant Elf32_Addr -/w constant Elf32_Half -/l constant Elf32_Off -/l constant Elf32_Sword -/l constant Elf32_Word -/l constant Elf32_Size - -struct ( ELF header ) - EI_NIDENT field >Elf32_Ehdr.e_ident ( File identification ) - Elf32_Half field >Elf32_Ehdr.e_type ( File type ) - Elf32_Half field >Elf32_Ehdr.e_machine ( Machine archicture ) - Elf32_Word field >Elf32_Ehdr.e_version ( ELF format version ) - Elf32_Addr field >Elf32_Ehdr.e_entry ( Entry point ) - Elf32_Off field >Elf32_Ehdr.e_phoff ( Program header file offset ) - Elf32_Off field >Elf32_Ehdr.e_shoff ( Section header file offset ) - Elf32_Word field >Elf32_Ehdr.e_flags ( Architecture specific flags ) - Elf32_Half field >Elf32_Ehdr.e_ehsize ( Size of ELF header in bytes ) - Elf32_Half field >Elf32_Ehdr.e_phentsize ( Size of program header entries ) - Elf32_Half field >Elf32_Ehdr.e_phnum ( Number of program header entry ) - Elf32_Half field >Elf32_Ehdr.e_shentsize ( Size of section header entry ) - Elf32_Half field >Elf32_Ehdr.e_shnum ( Number of section header entries ) - Elf32_Half field >Elf32_Ehdr.e_shstrndx ( Section name strings section ) -constant /Elf32_Ehdr - -: @e_ident ( base index -- byte ) - swap >Elf32_Ehdr.e_ident + c@ -; - -: @e_type ( base -- type ) - >Elf32_Ehdr.e_type w@ -; - -: @e_machine ( base -- type ) - >Elf32_Ehdr.e_machine w@ -; - -: @e_entry ( base -- entry ) - >Elf32_Ehdr.e_entry l@ -; - -: @e_phoff ( base -- poffset ) - >Elf32_Ehdr.e_phoff l@ -; - -: @e_phnum ( base -- pnum ) - >Elf32_Ehdr.e_phnum w@ -; - -: elf? - " load-base" evaluate - dup EI_MAG0 @e_ident - ELFMAG0 <> if drop false exit then - dup EI_MAG1 @e_ident - ELFMAG1 <> if drop false exit then - dup EI_MAG2 @e_ident - ELFMAG2 <> if drop false exit then - dup EI_MAG3 @e_ident - ELFMAG3 <> if drop false exit then - dup EI_CLASS @e_ident -[IFDEF] CONFIG_SPARC64 - ELFCLASS64 <> if drop false exit then -[ELSE] - ELFCLASS32 <> if drop false exit then -[THEN] - dup EI_DATA @e_ident - " little-endian?" evaluate if - ELFDATA2LSB <> if drop false exit then - else - ELFDATA2MSB <> if drop false exit then - then - dup @e_type - ET_EXEC <> if drop false exit then ( not executable ) - @e_machine -[IFDEF] CONFIG_PPC - EM_PPC <> if false exit then -[THEN] -[IFDEF] CONFIG_X86 - dup - EM_386 <> if - EM_486 <> if - false exit - then - else - drop - then -[THEN] -[IFDEF] CONFIG_SPARC32 - dup - EM_SPARC <> if - EM_SPARC32PLUS <> if - false exit - then - else - drop - then -[THEN] -[IFDEF] CONFIG_SPARC64 - EM_SPARCV9 <> if false exit then -[THEN] - true - ; - -variable elf-entry -variable xcoff-entry -variable bootinfo-entry -variable bootinfo-size - -: init-program-elf - elf file-type ! - " /packages/elf-loader" open-dev dup if - dup - " init-program" rot $call-method - close-dev - else - drop - ." /packages/elf-loader is missing" cr - then -; - -: xcoff? - " load-base" evaluate w@ - h# 1df <> if - false - exit - then - true - ; - -: init-program-xcoff - xcoff file-type ! - " /packages/xcoff-loader" open-dev dup if - dup - " init-program" rot $call-method - close-dev - else - drop - ." /packages/xcoff-loader is missing" cr - then - ; - -: pe? - false -; - -: init-program-pe - pe file-type ! - " /packages/pe-loader" open-dev dup if - dup - " init-program" rot $call-method - close-dev - else - drop - ." /packages/pe-loader is missing" cr - then - ; - -: bootinfo? - " load-base" evaluate dup - " <CHRP-BOOT>" comp 0= if - drop - true - exit - then - " <chrp-boot>" comp 0= if - true - exit - then - false - ; - -: init-program-bootinfo - bootinfo file-type ! - " /packages/bootinfo-loader" open-dev dup if - dup - " init-program" rot $call-method - close-dev - else - drop - ." /packages/bootinfo-loader is missing" cr - then - ; - -: fcode? - " load-base" evaluate c@ - dup h# f0 = if \ start0 - drop - true - exit - then - dup h# f1 = if \ start1 - drop - true - exit - then - dup h# f2 = if \ start2 - drop - true - exit - then - dup h# f3 = if \ start4 - drop - true - exit - then - h# fd = if \ version1 - true - exit - then - false - ; - -: init-program-fcode - " load-base" evaluate 8 + - 1 byte-load - ; : init-program ( -- ) - elf? if - init-program-elf - exit - then - xcoff? if - init-program-xcoff - exit - then - pe? if - init-program-pe - exit - then - bootinfo? if - init-program-bootinfo - exit - then - fcode? if - init-program-fcode - exit + \ Call down to the lower level for relocation etc. + s" (init-program)" $find if + execute + else + s" Unable to locate (init-program)!" type cr then ; @@ -372,29 +98,21 @@ : go ( -- ) state-valid @ not if exit then - elf file-type @ = if + elf saved-program-state >sps.file-type @ = if [IFDEF] CONFIG_PPC - elf-entry @ " (go)" evaluate + saved-program-state >sps.entry @ " (go)" evaluate [ELSE] ." go is not yet implemented" [THEN] else - xcoff file-type @ = if + xcoff saved-program-state >sps.file-type @ = if [IFDEF] CONFIG_PPC - xcoff-entry @ " (go)" evaluate + saved-program-state >sps.entry @ " (go)" evaluate [ELSE] ." go is not yet implemented" [THEN] else - bootinfo file-type @ = if -[IFDEF] CONFIG_PPC - bootinfo-entry @ bootinfo-size @ evaluate -[ELSE] - ." go is not yet implemented" -[THEN] - else - ." go is not yet implemented" - then + ." go is not yet implemented" then then ; Added: trunk/openbios-devel/include/libopenbios/initprogram.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/initprogram.h Fri Apr 2 15:01:10 2010 (r726) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2010/04/02 13:00:00 mcayland> + * Time-stamp: <2010/04/02 13:00:00 mcayland> + * + * <initprogram.h> + * + * C implementation of (init-program) word + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * 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_INITPROGRAM +#define _H_INITPROGRAM + +extern void init_program(void); + +#endif /* _H_INITPROGRAM */ Modified: trunk/openbios-devel/libopenbios/aout_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/aout_load.c Fri Apr 2 13:41:35 2010 (r725) +++ trunk/openbios-devel/libopenbios/aout_load.c Fri Apr 2 15:01:10 2010 (r726) @@ -10,7 +10,6 @@ #define CONFIG_SPARC64_PAGE_SIZE_8KB #endif -#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "libopenbios/bindings.h" #include "libopenbios/aout_load.h" Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 13:41:35 2010 (r725) +++ trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 15:01:10 2010 (r726) @@ -13,6 +13,7 @@ <object source="fcode_load.c" condition="LOADER_FCODE"/> <object source="forth_load.c" condition="LOADER_FORTH"/> <object source="init.c"/> + <object source="initprogram.c"/> <object source="ipchecksum.c"/> <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> Modified: trunk/openbios-devel/libopenbios/init.c ============================================================================== --- trunk/openbios-devel/libopenbios/init.c Fri Apr 2 13:41:35 2010 (r725) +++ trunk/openbios-devel/libopenbios/init.c Fri Apr 2 15:01:10 2010 (r726) @@ -16,9 +16,12 @@ #include "config.h" #include "libopenbios/openbios.h" +#include "libopenbios/bindings.h" +#include "libopenbios/initprogram.h" void openbios_init( void ) { - // TODO + // Bind the C implementation of (init-program) into Forth + bind_func("(init-program)", init_program); } Added: trunk/openbios-devel/libopenbios/initprogram.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/initprogram.c Fri Apr 2 15:01:10 2010 (r726) @@ -0,0 +1,85 @@ +/* + * Creation Date: <2010/04/02 13:00:00 mcayland> + * Time-stamp: <2010/04/02 13:00:00 mcayland> + * + * <initprogram.c> + * + * C implementation of (init-program) word + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "config.h" +#include "kernel/kernel.h" +#include "libopenbios/bindings.h" +#include "libopenbios/initprogram.h" + +/* Because the a.out loader requires platform-specific headers */ +#ifdef CONFIG_LOADER_AOUT +#include "libopenbios/aout_load.h" +#endif + +#include "libopenbios/bootinfo_load.h" +#include "libopenbios/elf_load.h" +#include "libopenbios/fcode_load.h" +#include "libopenbios/forth_load.h" +#include "libopenbios/xcoff_load.h" + + +void init_program(void) +{ + /* Get the value of load-base and use it to determine the correct loader + to use */ + ucell addr; + + feval("load-base"); + addr = POP(); + +#ifdef CONFIG_LOADER_AOUT + if (is_aout((struct exec *)addr)) { + aout_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_BOOTINFO + if (is_bootinfo((char *)addr)) { + bootinfo_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_ELF + if (is_elf((Elf_ehdr *)addr)) { + elf_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_FCODE + if (is_fcode((unsigned char *)addr)) { + fcode_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_FORTH + if (is_forth((char *)addr)) { + forth_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_XCOFF + if (is_xcoff((COFF_filehdr_t *)addr)) { + xcoff_init_program(); + return; + } +#endif + +}

1 0

[commit] r725 - 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 include/libopenbios libopenbios
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 13:41:35 2010 New Revision: 725 URL: http://tracker.coreboot.org/trac/openbios/changeset/725 Log: Create an initialisation function called openbios_init(), similar to modules_init(), for use by libopenbios and make sure all architectures are updated to use it. This is required to allow binding of C functions into Forth by libopenbios (i.e. cross architecture) rather than having to update everything in every arch/*/ initialisation file. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/openbios.h trunk/openbios-devel/libopenbios/init.c Modified: trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/amd64/openbios.c Fri Apr 2 13:41:35 2010 (r725) @@ -7,6 +7,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" @@ -38,6 +39,7 @@ { void setup_timers(void); + openbios_init(); modules_init(); #ifdef CONFIG_DRIVER_IDE setup_timers(); Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/ppc/briq/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -20,6 +20,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "arch/common/nvram.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/ppc/mol/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -16,6 +16,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "arch/common/nvram.h" #include "mol/mol.h" @@ -86,6 +87,7 @@ devtree_init(); node_methods_init(); nvram_init("/pci/mac-io/nvram"); + openbios_init(); modules_init(); pseudodisk_init(); osiblk_init(); Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -21,6 +21,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "arch/common/nvram.h" #include "pearpc/pearpc.h" @@ -94,6 +95,7 @@ devtree_init(); nvram_init("/pci/mac-io/nvram"); + openbios_init(); modules_init(); setup_timers(); #ifdef CONFIG_DRIVER_PCI Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -21,6 +21,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" #include "arch/common/nvram.h" @@ -490,6 +491,7 @@ ofmem_t *ofmem = ofmem_arch_get_private(); + openbios_init(); modules_init(); setup_timers(); #ifdef CONFIG_DRIVER_PCI Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/sparc32/openbios.c Fri Apr 2 13:41:35 2010 (r725) @@ -7,6 +7,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "asm/types.h" @@ -130,6 +131,7 @@ static void arch_init( void ) { + openbios_init(); modules_init(); ob_init_mmu(); ob_init_iommu(hwdef->iommu_base); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 2 13:41:35 2010 (r725) @@ -7,6 +7,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "dict.h" @@ -470,6 +471,7 @@ static void arch_init( void ) { + openbios_init(); modules_init(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/unix/unix.c Fri Apr 2 13:41:35 2010 (r725) @@ -32,6 +32,7 @@ #include "kernel/stack.h" #include "arch/unix/plugins.h" #include "libopenbios/bindings.h" +#include "libopenbios/openbios.h" #include "openbios-version.h" #include "blk.h" @@ -358,6 +359,7 @@ static void arch_init( void ) { + openbios_init(); modules_init(); if(diskemu!=-1) blk_init(); Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/x86/openbios.c Fri Apr 2 13:41:35 2010 (r725) @@ -7,6 +7,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" @@ -50,6 +51,7 @@ { void setup_timers(void); + openbios_init(); modules_init(); #ifdef CONFIG_DRIVER_PCI arch = &default_pci_host; Added: trunk/openbios-devel/include/libopenbios/openbios.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/openbios.h Fri Apr 2 13:41:35 2010 (r725) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2010/04/02 12:00:00 mcayland> + * Time-stamp: <2010/04/02 12:00:00 mcayland> + * + * <openbios.h> + * + * General OpenBIOS initialization + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * 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_LIBOPENBIOS +#define _H_LIBOPENBIOS + +extern void openbios_init( void ); + +#endif /* _H_LIBOPENBIOS */ Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 13:41:35 2010 (r725) @@ -12,6 +12,7 @@ <object source="font_8x16.c" condition="FONT_8X16"/> <object source="fcode_load.c" condition="LOADER_FCODE"/> <object source="forth_load.c" condition="LOADER_FORTH"/> + <object source="init.c"/> <object source="ipchecksum.c"/> <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> Added: trunk/openbios-devel/libopenbios/init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -0,0 +1,24 @@ +/* + * Creation Date: <2010/04/02 12:00:00 mcayland> + * Time-stamp: <2010/04/02 12:00:00 mcayland> + * + * <init.c> + * + * OpenBIOS intialization + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "config.h" +#include "libopenbios/openbios.h" + +void +openbios_init( void ) +{ + // TODO +}

1 0

input length
by Artyom Tarasenko 02 Apr '10

02 Apr '10

Meanwhile qemu-system-sparc is good enough to boot most Solaris versions with OBP. ( http://tyom.blogspot.com/2009/12/solaris-under-qemu-how-to.html ) I'm trying to find out what is missing in OpenBIOS to do the same. Currently the boot just hangs. I did a wild guess: $ strings sun4m/ufsboot ... ['] find-device catch if 2drop true else current-device device-end then swap l! ... It looks like all the keywords are known to the OpenBIOS, but I can't input the test string: " /options" ['] find-device catch if 2drop true else current-device device-end then swap l! it is longer than 80 characters, and OpenBIOS lets me enter only the part of the string up to "device-end t". The questions are: - is it just an interactive command line limitation, or an api limitation? - where is it defined? I couldn't find anything useful with grep -r 80 . - is there a forth debugger in OpenBIOS? -- Regards, Artyom Tarasenko solaris/sparc under qemu progress: http://tyom.blogspot.com/

3 6

Re: [OpenBIOS] name of current word
by Programmingkid 02 Apr '10

02 Apr '10

>> Is there a word that can tell me the name of the current word that is executing? >> >> I want something like this: >> >> : myword >> obtainWord >> ; >> >> obtainWord would somehow return "myword". Any tips would be great. > > No, I don't think this is really possible because of the way in which > Forth works (at least I ended up using a different solution for the > debugger anyway). > > Is there a reason that you're not using the in-built debugger for this? > I'm fairly sure it would make your life much easier. I'm making code that will associate a value with a function name and will store both in a table. Thank you Mark and Stefan for helping.

2 1

[commit] r724 - trunk/openbios-devel/libopenbios
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 12:28:48 2010 New Revision: 724 URL: http://tracker.coreboot.org/trac/openbios/changeset/724 Log: Finish the use of saved-program-state within the loaders. This involves 2 changes: firstly ensure that the saved-program-state is being set correctly in all of the loaders, and secondly we change the bootinfo loader so that the bootscript is executed as part of init-program and not go. This seems to reflect the idea of execute-buffer in OpenBOOT that any Forth code is executed directly during init-program, rather than being deferred to go. Note: the latter change is fairly simple, but I have been unable to test it myself other than verifying it compiles. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/libopenbios/fcode_load.c trunk/openbios-devel/libopenbios/xcoff_load.c Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/bootinfo_load.c Fri Apr 2 11:18:51 2010 (r723) +++ trunk/openbios-devel/libopenbios/bootinfo_load.c Fri Apr 2 12:28:48 2010 (r724) @@ -126,7 +126,7 @@ char *base; int proplen; phandle_t chosen; - int tag, taglen, script, scriptlen, entity, chrp; + int tag, taglen, script, scriptlen, scriptvalid, entity, chrp; char tagbuf[128], c; char *device, *filename, *directory; int partition; @@ -135,7 +135,7 @@ char *tmp; char bootpath[1024]; - feval("0 state-valid !"); + /* Parse the boot script */ chosen = find_dev("/chosen"); tmp = get_property(chosen, "bootpath", &proplen); @@ -169,6 +169,7 @@ tag = 0; taglen = 0; script = 0; + scriptvalid = 0; scriptlen = 0; entity = 0; current = 0; @@ -197,7 +198,7 @@ DPRINTF("got bootscript %s\n", bootscript); - feval("-1 state-valid !"); + scriptvalid = -1; break; } else if (strncasecmp(tagbuf, "/chrp-boot", 10) == 0) @@ -246,7 +247,10 @@ bootscript[scriptlen++] = c; } } - /* FIXME: should initialize saved-program-state. */ - push_str(bootscript); - feval("bootinfo-size ! bootinfo-entry !"); + + /* If the payload is bootinfo then we execute it immediately */ + if (scriptvalid) + feval(bootscript); + else + DPRINTF("Unable to parse bootinfo bootscript\n"); } Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Fri Apr 2 11:18:51 2010 (r723) +++ trunk/openbios-devel/libopenbios/elf_load.c Fri Apr 2 12:28:48 2010 (r724) @@ -473,7 +473,7 @@ int i; Elf_ehdr *ehdr; Elf_phdr *phdr; - size_t size; + size_t size, total_size = 0; char *addr; cell tmp; @@ -483,6 +483,12 @@ base = (char*)POP(); ehdr = (Elf_ehdr *)base; + + if (!is_elf(ehdr)) { + debug("Not a valid ELF memory image\n"); + return; + } + phdr = (Elf_phdr *)(base + ehdr->e_phoff); for (i = 0; i < ehdr->e_phnum; i++) { @@ -508,12 +514,20 @@ addr = (char *)tmp; memcpy(addr, base + phdr[i].p_offset, size); + + total_size += size; + #ifdef CONFIG_PPC flush_icache_range( addr, addr + size ); #endif } - /* FIXME: should initialize saved-program-state. */ + + // Initialise saved-program-state PUSH(ehdr->e_entry); - feval("elf-entry !"); + feval("saved-program-state >sps.entry !"); + PUSH(total_size); + feval("saved-program-state >sps.file-size !"); + feval("elf saved-program-state >sps.file-type !"); + feval("-1 state-valid !"); } Modified: trunk/openbios-devel/libopenbios/fcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/fcode_load.c Fri Apr 2 11:18:51 2010 (r723) +++ trunk/openbios-devel/libopenbios/fcode_load.c Fri Apr 2 12:28:48 2010 (r724) @@ -95,6 +95,12 @@ fword("load-base"); address = POP(); + + if (!is_fcode((unsigned char *)address)) { + debug("Not a valid Fcode memory image\n"); + return; + } + PUSH(address); PUSH(1); fword("byte-load"); Modified: trunk/openbios-devel/libopenbios/xcoff_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/xcoff_load.c Fri Apr 2 11:18:51 2010 (r723) +++ trunk/openbios-devel/libopenbios/xcoff_load.c Fri Apr 2 12:28:48 2010 (r724) @@ -58,6 +58,7 @@ COFF_aouthdr_t *ahdr; COFF_scnhdr_t *shdr; uint32_t offset; + size_t total_size = 0; int i; feval("0 state-valid !"); @@ -112,6 +113,7 @@ memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, shdr->s_size); + total_size += shdr->s_size; #ifdef CONFIG_PPC flush_icache_range((char*)shdr->s_vaddr, (char*)(shdr->s_vaddr + shdr->s_size)); @@ -120,22 +122,26 @@ memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, shdr->s_size); + total_size += shdr->s_size; } else if (strcmp(shdr->s_name, ".bss") == 0) { memset((void *)shdr->s_vaddr, 0, shdr->s_size); - + total_size += shdr->s_size; } else { DPRINTF(" Skip '%s' section\n", shdr->s_name); } offset += sizeof(COFF_scnhdr_t); } - /* FIXME: should initialize saved-program-state. */ - DPRINTF("XCOFF entry point: %x\n", *(uint32_t*)ahdr->entry); + + // Initialise saved-program-state PUSH(*(uint32_t*)ahdr->entry); - feval("xcoff-entry !"); + feval("saved-program-state >sps.entry !"); + PUSH(total_size); + feval("saved-program-state >sps.file-size !"); + feval("xcoff saved-program-state >sps.file-type !"); feval("-1 state-valid !"); }

1 0

[commit] r723 - in trunk/openbios-devel: config/examples include/libopenbios libopenbios packages
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 11:18:51 2010 New Revision: 723 URL: http://tracker.coreboot.org/trac/openbios/changeset/723 Log: Move the bootinfo loader into libopenbios, refactoring and adding the new CONFIG_LOADER_BOOTINFO as appropriate. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/bootinfo_load.h trunk/openbios-devel/libopenbios/bootinfo_load.c Modified: trunk/openbios-devel/config/examples/amd64_config.xml trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/cross-sparc32_config.xml trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/config/examples/cross-x86_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/examples/sparc32_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml trunk/openbios-devel/config/examples/x86_config.xml trunk/openbios-devel/libopenbios/build.xml trunk/openbios-devel/packages/bootinfo-loader.c trunk/openbios-devel/packages/build.xml Modified: trunk/openbios-devel/config/examples/amd64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/amd64_config.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/config/examples/amd64_config.xml Fri Apr 2 11:18:51 2010 (r723) @@ -36,6 +36,7 @@ <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml Fri Apr 2 11:18:51 2010 (r723) @@ -41,6 +41,7 @@ <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/cross-sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-sparc32_config.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/config/examples/cross-sparc32_config.xml Fri Apr 2 11:18:51 2010 (r723) @@ -42,6 +42,7 @@ <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml Fri Apr 2 11:18:51 2010 (r723) @@ -42,6 +42,7 @@ <option name="CONFIG_OFMEM" type="boolean" value="true"/> <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="true"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/cross-x86_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-x86_config.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/config/examples/cross-x86_config.xml Fri Apr 2 11:18:51 2010 (r723) @@ -37,6 +37,7 @@ <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/config/examples/ppc_config.xml Fri Apr 2 11:18:51 2010 (r723) @@ -41,6 +41,7 @@ <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/config/examples/sparc32_config.xml Fri Apr 2 11:18:51 2010 (r723) @@ -42,6 +42,7 @@ <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/sparc64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/config/examples/sparc64_config.xml Fri Apr 2 11:18:51 2010 (r723) @@ -42,6 +42,7 @@ <option name="CONFIG_OFMEM" type="boolean" value="true"/> <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="true"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/x86_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/x86_config.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/config/examples/x86_config.xml Fri Apr 2 11:18:51 2010 (r723) @@ -37,6 +37,7 @@ <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="true"/> Added: trunk/openbios-devel/include/libopenbios/bootinfo_load.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/bootinfo_load.h Fri Apr 2 11:18:51 2010 (r723) @@ -0,0 +1,26 @@ +/* + * Creation Date: <2010/03/22 18:00:00 mcayland> + * Time-stamp: <2010/03/22 18:00:00 mcayland> + * + * <bootinfo_load.h> + * + * CHRP boot info loader + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * 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 + * + */ + +#ifndef _H_BOOTINFOLOAD +#define _H_BOOTINFOLOAD + +#include "libopenbios/sys_info.h" + +extern int is_bootinfo(char *bootinfo); +extern int bootinfo_load(struct sys_info *info, const char *filename); +extern void bootinfo_init_program(void); + +#endif /* _H_BOOTINFOLOAD */ Added: trunk/openbios-devel/libopenbios/bootinfo_load.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/bootinfo_load.c Fri Apr 2 11:18:51 2010 (r723) @@ -0,0 +1,252 @@ +/* + * + * <bootinfo_load.c> + * + * bootinfo file loader + * + * Copyright (C) 2009 Laurent Vivier (Laurent(a)vivier.eu) + * + * Original XML parser by Blue Swirl <blauwirbel(a)gmail.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "config.h" +#include "libopenbios/bindings.h" +#include "libopenbios/bootinfo_load.h" +#include "libopenbios/ofmem.h" +#include "libc/vsprintf.h" + +//#define DEBUG_BOOTINFO + +#ifdef DEBUG_BOOTINFO +#define DPRINTF(fmt, args...) \ + do { printk("%s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) \ + do { } while (0) +#endif + +static char * +get_device( const char *path ) +{ + int i; + static char buf[1024]; + + for (i = 0; i < sizeof(buf) && path[i] && path[i] != ':'; i++) + buf[i] = path[i]; + buf[i] = 0; + + return buf; +} + +static int +get_partition( const char *path ) +{ + while ( *path && *path != ':' ) + path++; + + if (!*path) + return -1; + path++; + + if (!strchr(path, ',')) /* check if there is a ',' */ + return -1; + + return atol(path); +} + +static char * +get_filename( const char * path , char **dirname) +{ + static char buf[1024]; + char *filename; + + while ( *path && *path != ':' ) + path++; + + if (!*path) { + *dirname = NULL; + return NULL; + } + path++; + + while ( *path && isdigit(*path) ) + path++; + + if (*path == ',') + path++; + + strncpy(buf, path, sizeof(buf)); + buf[sizeof(buf) - 1] = 0; + + filename = strrchr(buf, '\\'); + if (filename) { + *dirname = buf; + (*filename++) = 0; + } else { + *dirname = NULL; + filename = buf; + } + + return filename; +} + +int +is_bootinfo(char *bootinfo) +{ + return (strncasecmp(bootinfo, "<chrp-boot", 10) ? 0 : -1); +} + +int +bootinfo_load(struct sys_info *info, const char *filename) +{ + // Currently not implemented + return LOADER_NOT_SUPPORT; +} + +/* + Parse SGML structure like: + <chrp-boot> + <description>Debian/GNU Linux Installation on IBM CHRP hardware</description> + <os-name>Debian/GNU Linux for PowerPC</os-name> + <boot-script>boot &device;:\install\yaboot</boot-script> + <icon size=64,64 color-space=3,3,2> + + CHRP system bindings are described at: + http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps +*/ + +void +bootinfo_init_program(void) +{ + char *base; + int proplen; + phandle_t chosen; + int tag, taglen, script, scriptlen, entity, chrp; + char tagbuf[128], c; + char *device, *filename, *directory; + int partition; + int current, size; + char *bootscript; + char *tmp; + char bootpath[1024]; + + feval("0 state-valid !"); + + chosen = find_dev("/chosen"); + tmp = get_property(chosen, "bootpath", &proplen); + memcpy(bootpath, tmp, proplen); + bootpath[proplen] = 0; + + DPRINTF("bootpath %s\n", bootpath); + + device = get_device(bootpath); + partition = get_partition(bootpath); + filename = get_filename(bootpath, &directory); + + feval("load-base"); + base = (char*)POP(); + + feval("load-size"); + size = POP(); + + bootscript = malloc(size); + if (bootscript == NULL) { + DPRINTF("Can't malloc %d bytes\n", size); + return; + } + + if (!is_bootinfo(base)) { + DPRINTF("Not a valid bootinfo memory image\n"); + return; + } + + chrp = 0; + tag = 0; + taglen = 0; + script = 0; + scriptlen = 0; + entity = 0; + current = 0; + while (current < size) { + + c = base[current++]; + + if (c == '<') { + script = 0; + tag = 1; + taglen = 0; + } else if (c == '>') { + tag = 0; + tagbuf[taglen] = '\0'; + if (strncasecmp(tagbuf, "chrp-boot", 9) == 0) { + chrp = 1; + } else if (chrp == 1) { + if (strncasecmp(tagbuf, "boot-script", 11) == 0) { + script = 1; + scriptlen = 0; + } else if (strncasecmp(tagbuf, "/boot-script", 12) == 0) { + + script = 0; + bootscript[scriptlen] = '\0'; + + DPRINTF("got bootscript %s\n", + bootscript); + + feval("-1 state-valid !"); + + break; + } else if (strncasecmp(tagbuf, "/chrp-boot", 10) == 0) + break; + } + } else if (tag && taglen < sizeof(tagbuf)) { + tagbuf[taglen++] = c; + } else if (script && c == '&') { + entity = 1; + taglen = 0; + } else if (entity && c ==';') { + entity = 0; + tagbuf[taglen] = '\0'; + if (strncasecmp(tagbuf, "lt", 2) == 0) { + bootscript[scriptlen++] = '<'; + } else if (strncasecmp(tagbuf, "gt", 2) == 0) { + bootscript[scriptlen++] = '>'; + } else if (strncasecmp(tagbuf, "device", 6) == 0) { + strcpy(bootscript + scriptlen, device); + scriptlen += strlen(device); + } else if (strncasecmp(tagbuf, "partition", 9) == 0) { + if (partition != -1) + sprintf(bootscript + scriptlen, "%d", partition); + else + *(bootscript + scriptlen) = 0; + scriptlen = strlen(bootscript); + } else if (strncasecmp(tagbuf, "directory", 9) == 0) { + strcpy(bootscript + scriptlen, directory); + scriptlen += strlen(directory); + } else if (strncasecmp(tagbuf, "filename", 8) == 0) { + strcpy(bootscript + scriptlen, filename); + scriptlen += strlen(filename); + } else if (strncasecmp(tagbuf, "full-path", 9) == 0) { + strcpy(bootscript + scriptlen, bootpath); + scriptlen += strlen(bootpath); + } else { /* unknown, keep it */ + bootscript[scriptlen] = '&'; + strcpy(bootscript + scriptlen + 1, tagbuf); + scriptlen += taglen + 1; + bootscript[scriptlen] = ';'; + scriptlen++; + } + } else if (entity && taglen < sizeof(tagbuf)) { + tagbuf[taglen++] = c; + } else if (script && scriptlen < size) { + bootscript[scriptlen++] = c; + } + } + /* FIXME: should initialize saved-program-state. */ + push_str(bootscript); + feval("bootinfo-size ! bootinfo-entry !"); +} Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 11:18:51 2010 (r723) @@ -3,6 +3,7 @@ <library name="openbios" type="static" target="target"> <object source="aout_load.c" condition="LOADER_AOUT"/> <object source="bindings.c"/> + <object source="bootinfo_load.c" condition="LOADER_BOOTINFO"/> <object source="client.c"/> <object source="console_common.c"/> <object source="elf_info.c" /> Modified: trunk/openbios-devel/packages/bootinfo-loader.c ============================================================================== --- trunk/openbios-devel/packages/bootinfo-loader.c Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/packages/bootinfo-loader.c Fri Apr 2 11:18:51 2010 (r723) @@ -6,8 +6,6 @@ * * Copyright (C) 2009 Laurent Vivier (Laurent(a)vivier.eu) * - * Original XML parser by Blue Swirl <blauwirbel(a)gmail.com> - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 @@ -16,227 +14,13 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/bootinfo_load.h" #include "packages.h" -#include "libopenbios/ofmem.h" -#include "libc/vsprintf.h" - -//#define DEBUG_BOOTINFO - -#ifdef DEBUG_BOOTINFO -#define DPRINTF(fmt, args...) \ - do { printk("%s: " fmt, __func__ , ##args); } while (0) -#else -#define DPRINTF(fmt, args...) \ - do { } while (0) -#endif DECLARE_NODE(bootinfo_loader, INSTALL_OPEN, 0, "+/packages/bootinfo-loader" ); -static char * -get_device( const char *path ) -{ - int i; - static char buf[1024]; - - for (i = 0; i < sizeof(buf) && path[i] && path[i] != ':'; i++) - buf[i] = path[i]; - buf[i] = 0; - - return buf; -} - -static int -get_partition( const char *path ) -{ - while ( *path && *path != ':' ) - path++; - - if (!*path) - return -1; - path++; - - if (!strchr(path, ',')) /* check if there is a ',' */ - return -1; - - return atol(path); -} - -static char * -get_filename( const char * path , char **dirname) -{ - static char buf[1024]; - char *filename; - - while ( *path && *path != ':' ) - path++; - - if (!*path) { - *dirname = NULL; - return NULL; - } - path++; - - while ( *path && isdigit(*path) ) - path++; - - if (*path == ',') - path++; - - strncpy(buf, path, sizeof(buf)); - buf[sizeof(buf) - 1] = 0; - - filename = strrchr(buf, '\\'); - if (filename) { - *dirname = buf; - (*filename++) = 0; - } else { - *dirname = NULL; - filename = buf; - } - - return filename; -} - -/* - Parse SGML structure like: - <chrp-boot> - <description>Debian/GNU Linux Installation on IBM CHRP hardware</description> - <os-name>Debian/GNU Linux for PowerPC</os-name> - <boot-script>boot &device;:\install\yaboot</boot-script> - <icon size=64,64 color-space=3,3,2> - - CHRP system bindings are described at: - http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps -*/ - -static void -bootinfo_loader_init_program( void *dummy ) -{ - char *base; - int proplen; - phandle_t chosen; - int tag, taglen, script, scriptlen, entity, chrp; - char tagbuf[128], c; - char *device, *filename, *directory; - int partition; - int current, size; - char *bootscript; - char *tmp; - char bootpath[1024]; - - feval("0 state-valid !"); - - chosen = find_dev("/chosen"); - tmp = get_property(chosen, "bootpath", &proplen); - memcpy(bootpath, tmp, proplen); - bootpath[proplen] = 0; - - DPRINTF("bootpath %s\n", bootpath); - - device = get_device(bootpath); - partition = get_partition(bootpath); - filename = get_filename(bootpath, &directory); - - feval("load-base"); - base = (char*)POP(); - - feval("load-size"); - size = POP(); - - bootscript = malloc(size); - if (bootscript == NULL) { - DPRINTF("Can't malloc %d bytes\n", size); - return; - } - - chrp = 0; - tag = 0; - taglen = 0; - script = 0; - scriptlen = 0; - entity = 0; - current = 0; - while (current < size) { - - c = base[current++]; - - if (c == '<') { - script = 0; - tag = 1; - taglen = 0; - } else if (c == '>') { - tag = 0; - tagbuf[taglen] = '\0'; - if (strncasecmp(tagbuf, "chrp-boot", 9) == 0) { - chrp = 1; - } else if (chrp == 1) { - if (strncasecmp(tagbuf, "boot-script", 11) == 0) { - script = 1; - scriptlen = 0; - } else if (strncasecmp(tagbuf, "/boot-script", 12) == 0) { - - script = 0; - bootscript[scriptlen] = '\0'; - - DPRINTF("got bootscript %s\n", - bootscript); - - feval("-1 state-valid !"); - - break; - } else if (strncasecmp(tagbuf, "/chrp-boot", 10) == 0) - break; - } - } else if (tag && taglen < sizeof(tagbuf)) { - tagbuf[taglen++] = c; - } else if (script && c == '&') { - entity = 1; - taglen = 0; - } else if (entity && c ==';') { - entity = 0; - tagbuf[taglen] = '\0'; - if (strncasecmp(tagbuf, "lt", 2) == 0) { - bootscript[scriptlen++] = '<'; - } else if (strncasecmp(tagbuf, "gt", 2) == 0) { - bootscript[scriptlen++] = '>'; - } else if (strncasecmp(tagbuf, "device", 6) == 0) { - strcpy(bootscript + scriptlen, device); - scriptlen += strlen(device); - } else if (strncasecmp(tagbuf, "partition", 9) == 0) { - if (partition != -1) - sprintf(bootscript + scriptlen, "%d", partition); - else - *(bootscript + scriptlen) = 0; - scriptlen = strlen(bootscript); - } else if (strncasecmp(tagbuf, "directory", 9) == 0) { - strcpy(bootscript + scriptlen, directory); - scriptlen += strlen(directory); - } else if (strncasecmp(tagbuf, "filename", 8) == 0) { - strcpy(bootscript + scriptlen, filename); - scriptlen += strlen(filename); - } else if (strncasecmp(tagbuf, "full-path", 9) == 0) { - strcpy(bootscript + scriptlen, bootpath); - scriptlen += strlen(bootpath); - } else { /* unknown, keep it */ - bootscript[scriptlen] = '&'; - strcpy(bootscript + scriptlen + 1, tagbuf); - scriptlen += taglen + 1; - bootscript[scriptlen] = ';'; - scriptlen++; - } - } else if (entity && taglen < sizeof(tagbuf)) { - tagbuf[taglen++] = c; - } else if (script && scriptlen < size) { - bootscript[scriptlen++] = c; - } - } - /* FIXME: should initialize saved-program-state. */ - push_str(bootscript); - feval("bootinfo-size ! bootinfo-entry !"); -} - NODE_METHODS( bootinfo_loader ) = { - { "init-program", bootinfo_loader_init_program }, + { "init-program", bootinfo_init_program }, }; void bootinfo_loader_init( void ) Modified: trunk/openbios-devel/packages/build.xml ============================================================================== --- trunk/openbios-devel/packages/build.xml Fri Apr 2 10:33:07 2010 (r722) +++ trunk/openbios-devel/packages/build.xml Fri Apr 2 11:18:51 2010 (r723) @@ -1,7 +1,7 @@ <build> <library name="packages" type="static" target="target"> - <object source="bootinfo-loader.c" condition="PPC"/> + <object source="bootinfo-loader.c" condition="LOADER_BOOTINFO"/> <object source="cmdline.c" condition="CMDLINE"/> <object source="deblocker.c" condition="DEBLOCKER"/> <object source="disk-label.c" condition="DISK_LABEL"/>

1 0

[commit] r722 - in trunk/openbios-devel: include/libc libc packages
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 10:33:07 2010 New Revision: 722 URL: http://tracker.coreboot.org/trac/openbios/changeset/722 Log: Switch the bootinfo-loader over to using strncasecmp rather than strcasecmp which should be much safer on binary buffersi of unknown content/length. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/string.c trunk/openbios-devel/packages/bootinfo-loader.c Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Fri Apr 2 01:40:21 2010 (r721) +++ trunk/openbios-devel/include/libc/string.h Fri Apr 2 10:33:07 2010 (r722) @@ -52,6 +52,7 @@ extern char *strdup( const char *str ); extern int strcasecmp( const char *cs, const char *ct ); +extern int strncasecmp( const char *cs, const char *ct, size_t count ); extern char *strncpy_nopad( char *dest, const char *src, size_t n ); Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Fri Apr 2 01:40:21 2010 (r721) +++ trunk/openbios-devel/libc/string.c Fri Apr 2 10:33:07 2010 (r722) @@ -511,3 +511,18 @@ } return __res; } + +int +strncasecmp( const char *cs, const char *ct, size_t count ) +{ + register signed char __res; + + while (count--) { + char ch1 = toupper(*cs), ch2 = toupper(*ct); + ct++; + if ((__res = ch1 - ch2) != 0 || !*cs++) + break; + } + return __res; +} + Modified: trunk/openbios-devel/packages/bootinfo-loader.c ============================================================================== --- trunk/openbios-devel/packages/bootinfo-loader.c Fri Apr 2 01:40:21 2010 (r721) +++ trunk/openbios-devel/packages/bootinfo-loader.c Fri Apr 2 10:33:07 2010 (r722) @@ -167,13 +167,13 @@ } else if (c == '>') { tag = 0; tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "chrp-boot") == 0) { + if (strncasecmp(tagbuf, "chrp-boot", 9) == 0) { chrp = 1; } else if (chrp == 1) { - if (strcasecmp(tagbuf, "boot-script") == 0) { + if (strncasecmp(tagbuf, "boot-script", 11) == 0) { script = 1; scriptlen = 0; - } else if (strcasecmp(tagbuf, "/boot-script") == 0) { + } else if (strncasecmp(tagbuf, "/boot-script", 12) == 0) { script = 0; bootscript[scriptlen] = '\0'; @@ -184,7 +184,7 @@ feval("-1 state-valid !"); break; - } else if (strcasecmp(tagbuf, "/chrp-boot") == 0) + } else if (strncasecmp(tagbuf, "/chrp-boot", 10) == 0) break; } } else if (tag && taglen < sizeof(tagbuf)) { @@ -195,26 +195,26 @@ } else if (entity && c ==';') { entity = 0; tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "lt") == 0) { + if (strncasecmp(tagbuf, "lt", 2) == 0) { bootscript[scriptlen++] = '<'; - } else if (strcasecmp(tagbuf, "gt") == 0) { + } else if (strncasecmp(tagbuf, "gt", 2) == 0) { bootscript[scriptlen++] = '>'; - } else if (strcasecmp(tagbuf, "device") == 0) { + } else if (strncasecmp(tagbuf, "device", 6) == 0) { strcpy(bootscript + scriptlen, device); scriptlen += strlen(device); - } else if (strcasecmp(tagbuf, "partition") == 0) { + } else if (strncasecmp(tagbuf, "partition", 9) == 0) { if (partition != -1) sprintf(bootscript + scriptlen, "%d", partition); else *(bootscript + scriptlen) = 0; scriptlen = strlen(bootscript); - } else if (strcasecmp(tagbuf, "directory") == 0) { + } else if (strncasecmp(tagbuf, "directory", 9) == 0) { strcpy(bootscript + scriptlen, directory); scriptlen += strlen(directory); - } else if (strcasecmp(tagbuf, "filename") == 0) { + } else if (strncasecmp(tagbuf, "filename", 8) == 0) { strcpy(bootscript + scriptlen, filename); scriptlen += strlen(filename); - } else if (strcasecmp(tagbuf, "full-path") == 0) { + } else if (strncasecmp(tagbuf, "full-path", 9) == 0) { strcpy(bootscript + scriptlen, bootpath); scriptlen += strlen(bootpath); } else { /* unknown, keep it */

1 0

[commit] r721 - trunk/openbios-devel/drivers
by repository service 02 Apr '10

02 Apr '10

Author: agraf Date: Fri Apr 2 01:40:21 2010 New Revision: 721 URL: http://tracker.coreboot.org/trac/openbios/changeset/721 Log: [PPC] Make mac-io ata interrupts depend on local, not global index In commit r680 I incorrectly made the interrupt number of the mac-io ata device depend on its global index. Of course the interrupt only depends on its index inside the mac-io chip. So let's fix that up and make Qemu's oldworld emulation work again! Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/ide.c Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Mon Mar 29 01:47:36 2010 (r720) +++ trunk/openbios-devel/drivers/ide.c Fri Apr 2 01:40:21 2010 (r721) @@ -1582,16 +1582,16 @@ /* The first interrupt entry is the ide interrupt, the second the dbdma interrupt */ - switch (current_channel) { - case 1: + switch (i) { + case 0: props[0] = 0x0000000d; props[2] = 0x00000002; break; - case 2: + case 1: props[0] = 0x0000000e; props[2] = 0x00000003; break; - case 3: + case 2: props[0] = 0x0000000f; props[2] = 0x00000004; break;

1 0

Re: [OpenBIOS] compile vs runtime
by Programmingkid 01 Apr '10

01 Apr '10

On Apr 1, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: >> I am trying to make a word that does one thing at compile time, and does another thing at runtime. I think this is how you do it: >> >> : myword >> ." one" >> does> ." two" >> cr ; >> >> When I first use this word, I see "one". Then when I use this word again, I see "two", but it causes OpenBIOS to panic because of a segmentation violation at 3. Is this an OpenBIOS bug, or did I do something wrong? >> > you can also do > > : mywork > state @ if > ." compile" > else > ." interpret" > then > ; immediate > > or so I have tried using this way, but when I use mywork in another word, it disappears from the definition after being compiled. This is what happens : doSomething mywork ; see doSomething : doSomething ; ok 0 > The immediate word appears to make the word mywork only be available at compile time. Is there a way to make a word both run at compile-time, and still be available at run-time? My word has to start running immediately at compile-time.

1 0

compile vs runtime
by Programmingkid 01 Apr '10

01 Apr '10

I am trying to make a word that does one thing at compile time, and does another thing at runtime. I think this is how you do it: : myword ." one" does> ." two" cr ; When I first use this word, I see "one". Then when I use this word again, I see "two", but it causes OpenBIOS to panic because of a segmentation violation at 3. Is this an OpenBIOS bug, or did I do something wrong?

4 3

name of current word
by Programmingkid 31 Mar '10

31 Mar '10

Is there a word that can tell me the name of the current word that is executing? I want something like this: : myword obtainWord ; obtainWord would somehow return "myword". Any tips would be great.

3 3

[commit] r720 - in trunk/openbios-devel: arch/unix include/libopenbios libopenbios packages
by repository service 29 Mar '10

29 Mar '10

Author: mcayland Date: Mon Mar 29 01:47:36 2010 New Revision: 720 URL: http://tracker.coreboot.org/trac/openbios/changeset/720 Log: Move the *_init_program() functions into the main loader source files so that everything is in one place. Part of this involves taking the existing parts of the XCOFF loader and putting them into a new loader file xcoff_load.c. Also fix a dependency order change these changes introduce when building openbios-unix. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/xcoff_load.h trunk/openbios-devel/libopenbios/xcoff_load.c Modified: trunk/openbios-devel/arch/unix/build.xml trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/include/libopenbios/aout_load.h trunk/openbios-devel/include/libopenbios/elf_load.h trunk/openbios-devel/include/libopenbios/fcode_load.h trunk/openbios-devel/include/libopenbios/forth_load.h trunk/openbios-devel/libopenbios/aout_load.c trunk/openbios-devel/libopenbios/build.xml trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/libopenbios/fcode_load.c trunk/openbios-devel/libopenbios/forth_load.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/unix/build.xml ============================================================================== --- trunk/openbios-devel/arch/unix/build.xml Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/arch/unix/build.xml Mon Mar 29 01:47:36 2010 (r720) @@ -13,8 +13,8 @@ <object source="blk.c" flags="-DBOOTSTRAP"/> <object source="plugins.c" flags="-DBOOTSTRAP" condition="PLUGINS"/> <external-object source="libbootstrap.a"/> - <external-object source="libopenbios.a"/> <external-object source="libpackages.a"/> + <external-object source="libopenbios.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/arch/unix/unix.c Mon Mar 29 01:47:36 2010 (r720) @@ -51,6 +51,8 @@ static void exit_terminal(void); void boot(void); +unsigned long virt_offset = 0; + /* local variables */ static ucell *memory; Modified: trunk/openbios-devel/include/libopenbios/aout_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/aout_load.h Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/include/libopenbios/aout_load.h Mon Mar 29 01:47:36 2010 (r720) @@ -22,5 +22,6 @@ extern int is_aout(struct exec *ehdr); extern int aout_load(struct sys_info *info, const char *filename); +extern void aout_init_program(void); #endif /* _H_AOUTLOAD */ Modified: trunk/openbios-devel/include/libopenbios/elf_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/elf_load.h Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/include/libopenbios/elf_load.h Mon Mar 29 01:47:36 2010 (r720) @@ -22,6 +22,7 @@ #include "libopenbios/sys_info.h" extern int elf_load(struct sys_info *info, const char *filename, const char *cmdline, void **boot_notes); +extern void elf_init_program(void); extern int is_elf(Elf_ehdr *ehdr); extern int find_elf(Elf_ehdr *ehdr); Modified: trunk/openbios-devel/include/libopenbios/fcode_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/fcode_load.h Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/include/libopenbios/fcode_load.h Mon Mar 29 01:47:36 2010 (r720) @@ -19,5 +19,6 @@ extern int is_fcode(unsigned char *fcode); extern int fcode_load(const char *filename); +extern void fcode_init_program(void); #endif /* _H_FCODELOAD */ Modified: trunk/openbios-devel/include/libopenbios/forth_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/forth_load.h Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/include/libopenbios/forth_load.h Mon Mar 29 01:47:36 2010 (r720) @@ -19,5 +19,6 @@ extern int is_forth(char *forth); extern int forth_load(const char *filename); +extern void forth_init_program(void); #endif /* _H_FORTHLOAD */ Added: trunk/openbios-devel/include/libopenbios/xcoff_load.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/xcoff_load.h Mon Mar 29 01:47:36 2010 (r720) @@ -0,0 +1,27 @@ +/* + * Creation Date: <2010/03/22 18:00:00 mcayland> + * Time-stamp: <2010/03/22 18:00:00 mcayland> + * + * <xcoff_load.h> + * + * XCOFF loader + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * 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 + * + */ + +#ifndef _H_XCOFFLOAD +#define _H_XCOFFLOAD + +#include "arch/common/xcoff.h" +#include "libopenbios/sys_info.h" + +extern int is_xcoff(COFF_filehdr_t *fhdr); +extern int xcoff_load(struct sys_info *info, const char *filename); +extern void xcoff_init_program(void); + +#endif /* _H_XCOFFLOAD */ Modified: trunk/openbios-devel/libopenbios/aout_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/aout_load.c Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/libopenbios/aout_load.c Mon Mar 29 01:47:36 2010 (r720) @@ -23,7 +23,8 @@ static char *image_name, *image_version; static int fd; -static int check_mem_ranges(struct sys_info *info, +static int +check_mem_ranges(struct sys_info *info, unsigned long start, unsigned long size) { @@ -58,16 +59,17 @@ return 0; } -int is_aout(struct exec *ehdr) +int +is_aout(struct exec *ehdr) { return ((ehdr->a_info & 0xffff) == OMAGIC || (ehdr->a_info & 0xffff) == NMAGIC || (ehdr->a_info & 0xffff) == ZMAGIC || (ehdr->a_info & 0xffff) == QMAGIC); - } -int aout_load(struct sys_info *info, const char *filename) +int +aout_load(struct sys_info *info, const char *filename) { int retval = -1; struct exec ehdr; @@ -154,3 +156,10 @@ close_io(fd); return retval; } + +void +aout_init_program(void) +{ + // Currently not implemented + feval("0 state-valid !"); +} Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/libopenbios/build.xml Mon Mar 29 01:47:36 2010 (r720) @@ -14,6 +14,7 @@ <object source="ipchecksum.c"/> <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> + <object source="xcoff_load.c" condition="LOADER_XCOFF"/> </library> <dictionary name="openbios" target="forth"> Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/libopenbios/elf_load.c Mon Mar 29 01:47:36 2010 (r720) @@ -19,6 +19,10 @@ #define MAX_HEADERS 0x20 #define BS 0x100 /* smallest step used when looking for the ELF header */ +#ifdef CONFIG_PPC +extern void flush_icache_range( char *start, char *stop ); +#endif + /* FreeBSD and possibly others mask the high 8 bits */ #define addr_fixup(addr) ((addr) & 0x00ffffff) @@ -362,7 +366,8 @@ return phdr; } -int elf_load(struct sys_info *info, const char *filename, const char *cmdline, void **boot_notes) +int +elf_load(struct sys_info *info, const char *filename, const char *cmdline, void **boot_notes) { Elf_ehdr ehdr; Elf_phdr *phdr = NULL; @@ -460,3 +465,55 @@ free(image_version); return retval; } + +void +elf_init_program(void) +{ + char *base; + int i; + Elf_ehdr *ehdr; + Elf_phdr *phdr; + size_t size; + char *addr; + cell tmp; + + /* TODO: manage ELF notes section */ + feval("0 state-valid !"); + feval("load-base"); + base = (char*)POP(); + + ehdr = (Elf_ehdr *)base; + phdr = (Elf_phdr *)(base + ehdr->e_phoff); + + for (i = 0; i < ehdr->e_phnum; i++) { + +#if DEBUG + debug("filesz: %08lX memsz: %08lX p_offset: %08lX " + "p_vaddr %08lX\n", + (ulong)phdr[i].p_filesz, (ulong)phdr[i].p_memsz, + (ulong)phdr[i].p_offset, (ulong)phdr[i].p_vaddr ); +#endif + + size = MIN(phdr[i].p_filesz, phdr[i].p_memsz); + if (!size) + continue; +#if 0 + if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) { + printk("Claim failed!\n"); + return; + } +#endif + /* Workaround for archs where sizeof(int) != pointer size */ + tmp = phdr[i].p_vaddr; + addr = (char *)tmp; + + memcpy(addr, base + phdr[i].p_offset, size); +#ifdef CONFIG_PPC + flush_icache_range( addr, addr + size ); +#endif + } + /* FIXME: should initialize saved-program-state. */ + PUSH(ehdr->e_entry); + feval("elf-entry !"); + feval("-1 state-valid !"); +} Modified: trunk/openbios-devel/libopenbios/fcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/fcode_load.c Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/libopenbios/fcode_load.c Mon Mar 29 01:47:36 2010 (r720) @@ -13,16 +13,18 @@ static int fd; -int is_fcode(unsigned char *fcode) +int +is_fcode(unsigned char *fcode) { - return (fcode[0] == 0xf0 // start0 + return (fcode[0] == 0xf0 // start0 || fcode[0] == 0xf1 // start1 || fcode[0] == 0xf2 // start2 || fcode[0] == 0xf3 // start4 || fcode[0] == 0xfd); // version1 } -int fcode_load(const char *filename) +int +fcode_load(const char *filename) { int retval = -1; uint8_t fcode_header[8]; @@ -84,3 +86,16 @@ close_io(fd); return retval; } + +void +fcode_init_program(void) +{ + /* If the payload is Fcode then we execute it immediately */ + ucell address; + + fword("load-base"); + address = POP(); + PUSH(address); + PUSH(1); + fword("byte-load"); +} Modified: trunk/openbios-devel/libopenbios/forth_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/forth_load.c Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/libopenbios/forth_load.c Mon Mar 29 01:47:36 2010 (r720) @@ -78,3 +78,10 @@ // free(forthtext); return retval; } + +void +forth_init_program(void) +{ + // Currently not implemented + feval("0 state-valid !"); +} Added: trunk/openbios-devel/libopenbios/xcoff_load.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/xcoff_load.c Mon Mar 29 01:47:36 2010 (r720) @@ -0,0 +1,141 @@ +/* + * + * <xcoff_load.c> + * + * XCOFF file loader + * + * Copyright (C) 2009 Laurent Vivier (Laurent(a)vivier.eu) + * + * from original XCOFF loader by Steven Noonan <steven(a)uplinklabs.net> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "config.h" +#include "libopenbios/bindings.h" +#include "libopenbios/xcoff_load.h" + +#include "arch/common/xcoff.h" + +#ifdef CONFIG_PPC +extern void flush_icache_range( char *start, char *stop ); +#endif + +//#define DEBUG_XCOFF + +#ifdef DEBUG_XCOFF +#define DPRINTF(fmt, args...) \ + do { printk("%s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) \ + do { } while (0) +#endif + +int +is_xcoff(COFF_filehdr_t *fhdr) +{ + return (fhdr->f_magic == U802WRMAGIC + || fhdr->f_magic == U802ROMAGIC + || fhdr->f_magic == U802TOCMAGIC + || fhdr->f_magic == U802TOMAGIC); +} + +int +xcoff_load(struct sys_info *info, const char *filename) +{ + // Currently not implemented + return LOADER_NOT_SUPPORT; +} + +void +xcoff_init_program(void) +{ + char *base; + COFF_filehdr_t *fhdr; + COFF_aouthdr_t *ahdr; + COFF_scnhdr_t *shdr; + uint32_t offset; + int i; + + feval("0 state-valid !"); + + feval("load-base"); + base = (char*)POP(); + + fhdr = (COFF_filehdr_t*)base; + + /* Is it an XCOFF file ? */ + if (!is_xcoff(fhdr)) { + DPRINTF("Not a XCOFF file %02x\n", fhdr->f_magic); + return; + } + + /* Is it executable ? */ + if (fhdr->f_magic != 0x01DF && + (fhdr->f_flags & COFF_F_EXEC) == 0) { + DPRINTF("Not an executable XCOFF file %02x\n", fhdr->f_flags); + return; + } + + /* Optional header is a.out ? */ + if (fhdr->f_opthdr != sizeof(COFF_aouthdr_t)) { + DPRINTF("AOUT optional error size mismatch in XCOFF file\n"); + return; + } + + ahdr = (COFF_aouthdr_t*)(base + sizeof(COFF_filehdr_t)); + + /* check a.out magic number */ + if (ahdr->magic != AOUT_MAGIC) { + DPRINTF("Invalid AOUT optional header\n"); + return; + } + + offset = sizeof(COFF_filehdr_t) + sizeof(COFF_aouthdr_t); + + DPRINTF("XCOFF file with %d sections\n", fhdr->f_nscns); + + for (i = 0; i < fhdr->f_nscns; i++) { + + DPRINTF("Read header at offset %0x\n", offset); + + shdr = (COFF_scnhdr_t*)(base + offset); + + DPRINTF("Initializing '%s' section from %0x %0x to %0x (%0x)\n", + shdr->s_name, offset, shdr->s_scnptr, + shdr->s_vaddr, shdr->s_size); + + if (strcmp(shdr->s_name, ".text") == 0) { + + memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, + shdr->s_size); +#ifdef CONFIG_PPC + flush_icache_range((char*)shdr->s_vaddr, + (char*)(shdr->s_vaddr + shdr->s_size)); +#endif + } else if (strcmp(shdr->s_name, ".data") == 0) { + + memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, + shdr->s_size); + + } else if (strcmp(shdr->s_name, ".bss") == 0) { + + memset((void *)shdr->s_vaddr, 0, shdr->s_size); + + } else { + DPRINTF(" Skip '%s' section\n", shdr->s_name); + } + offset += sizeof(COFF_scnhdr_t); + } + + /* FIXME: should initialize saved-program-state. */ + + DPRINTF("XCOFF entry point: %x\n", *(uint32_t*)ahdr->entry); + PUSH(*(uint32_t*)ahdr->entry); + feval("xcoff-entry !"); + + feval("-1 state-valid !"); +} Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/packages/elf-loader.c Mon Mar 29 01:47:36 2010 (r720) @@ -16,81 +16,13 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/elf_load.h" #include "packages.h" -#include "libopenbios/ofmem.h" - -#include "arch/common/elf.h" -#include "asm/elf.h" - -/* TODO: manage ELF notes section */ - -//#define DEBUG_ELF - -#ifdef DEBUG_ELF -#define DPRINTF(fmt, args...) \ - do { printk("%s: " fmt, __func__ , ##args); } while (0) -#else -#define DPRINTF(fmt, args...) \ - do { } while (0) -#endif DECLARE_NODE(elf_loader, INSTALL_OPEN, 0, "+/packages/elf-loader" ); -#ifdef CONFIG_PPC -extern void flush_icache_range( char *start, char *stop ); -#endif - -static void -elf_loader_init_program( void *dummy ) -{ - char *base; - int i; - Elf_ehdr *ehdr; - Elf_phdr *phdr; - size_t size; - char *addr; - cell tmp; - - feval("0 state-valid !"); - - feval("load-base"); - base = (char*)POP(); - - ehdr = (Elf_ehdr *)base; - phdr = (Elf_phdr *)(base + ehdr->e_phoff); - - for (i = 0; i < ehdr->e_phnum; i++) { - DPRINTF("filesz: %08lX memsz: %08lX p_offset: %08lX " - "p_vaddr %08lX\n", - (ulong)phdr[i].p_filesz, (ulong)phdr[i].p_memsz, - (ulong)phdr[i].p_offset, (ulong)phdr[i].p_vaddr ); - - size = MIN(phdr[i].p_filesz, phdr[i].p_memsz); - if (!size) - continue; -#if 0 - if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) { - printk("Claim failed!\n"); - return; - } -#endif - /* Workaround for archs where sizeof(int) != pointer size */ - tmp = phdr[i].p_vaddr; - addr = (char *)tmp; - - memcpy(addr, base + phdr[i].p_offset, size); -#ifdef CONFIG_PPC - flush_icache_range( addr, addr + size ); -#endif - } - /* FIXME: should initialize saved-program-state. */ - PUSH(ehdr->e_entry); - feval("elf-entry !"); - feval("-1 state-valid !"); -} - NODE_METHODS( elf_loader ) = { - { "init-program", elf_loader_init_program }, + { "init-program", elf_init_program }, }; void elf_loader_init( void ) Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 28 22:55:10 2010 (r719) +++ trunk/openbios-devel/packages/xcoff-loader.c Mon Mar 29 01:47:36 2010 (r720) @@ -16,126 +16,13 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/xcoff_load.h" #include "packages.h" -#include "libopenbios/ofmem.h" - -#include "arch/common/xcoff.h" - -//#define DEBUG_XCOFF - -#ifdef DEBUG_XCOFF -#define DPRINTF(fmt, args...) \ - do { printk("%s: " fmt, __func__ , ##args); } while (0) -#else -#define DPRINTF(fmt, args...) \ - do { } while (0) -#endif DECLARE_NODE(xcoff_loader, INSTALL_OPEN, 0, "+/packages/xcoff-loader" ); -#ifdef CONFIG_PPC -extern void flush_icache_range( char *start, char *stop ); -#endif - -static void -xcoff_loader_init_program( void *dummy ) -{ - char *base; - COFF_filehdr_t *fhdr; - COFF_aouthdr_t *ahdr; - COFF_scnhdr_t *shdr; - uint32_t offset; - int i; - - feval("0 state-valid !"); - - feval("load-base"); - base = (char*)POP(); - - fhdr = (COFF_filehdr_t*)base; - - /* Is it an XCOFF file ? */ - - if (fhdr->f_magic != U802WRMAGIC && - fhdr->f_magic != U802ROMAGIC && - fhdr->f_magic != U802TOCMAGIC && - fhdr->f_magic != U802TOMAGIC) { - DPRINTF("Not a XCOFF file %02x\n", fhdr->f_magic); - return; - } - - /* Is it executable ? */ - - if (fhdr->f_magic != 0x01DF && - (fhdr->f_flags & COFF_F_EXEC) == 0) { - DPRINTF("Not an executable XCOFF file %02x\n", fhdr->f_flags); - return; - } - - /* Optional header is a.out ? */ - - if (fhdr->f_opthdr != sizeof(COFF_aouthdr_t)) { - DPRINTF("AOUT optional error size mismatch in XCOFF file\n"); - return; - } - - ahdr = (COFF_aouthdr_t*)(base + sizeof(COFF_filehdr_t)); - - /* check a.out magic number */ - - if (ahdr->magic != AOUT_MAGIC) { - DPRINTF("Invalid AOUT optional header\n"); - return; - } - - offset = sizeof(COFF_filehdr_t) + sizeof(COFF_aouthdr_t); - - DPRINTF("XCOFF file with %d sections\n", fhdr->f_nscns); - - for (i = 0; i < fhdr->f_nscns; i++) { - - DPRINTF("Read header at offset %0x\n", offset); - - shdr = (COFF_scnhdr_t*)(base + offset); - - DPRINTF("Initializing '%s' section from %0x %0x to %0x (%0x)\n", - shdr->s_name, offset, shdr->s_scnptr, - shdr->s_vaddr, shdr->s_size); - - if (strcmp(shdr->s_name, ".text") == 0) { - - memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, - shdr->s_size); -#ifdef CONFIG_PPC - flush_icache_range((char*)shdr->s_vaddr, - (char*)(shdr->s_vaddr + shdr->s_size)); -#endif - } else if (strcmp(shdr->s_name, ".data") == 0) { - - memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, - shdr->s_size); - - } else if (strcmp(shdr->s_name, ".bss") == 0) { - - memset((void *)shdr->s_vaddr, 0, shdr->s_size); - - } else { - DPRINTF(" Skip '%s' section\n", shdr->s_name); - } - offset += sizeof(COFF_scnhdr_t); - } - - /* FIXME: should initialize saved-program-state. */ - - DPRINTF("XCOFF entry point: %x\n", *(uint32_t*)ahdr->entry); - PUSH(*(uint32_t*)ahdr->entry); - feval("xcoff-entry !"); - - feval("-1 state-valid !"); -} - NODE_METHODS( xcoff_loader ) = { - { "init-program", xcoff_loader_init_program }, + { "init-program", xcoff_init_program }, }; void xcoff_loader_init( void )

1 0

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

28 Mar '10

Author: mcayland Date: Sun Mar 28 22:55:10 2010 New Revision: 719 URL: http://tracker.coreboot.org/trac/openbios/changeset/719 Log: Add is_fcode(), is_forth() and is_aout() functions which take a pointer to an area of memory which may contain a valid loader image. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/include/libopenbios/aout_load.h trunk/openbios-devel/include/libopenbios/fcode_load.h trunk/openbios-devel/include/libopenbios/forth_load.h trunk/openbios-devel/libopenbios/aout_load.c trunk/openbios-devel/libopenbios/fcode_load.c trunk/openbios-devel/libopenbios/forth_load.c Modified: trunk/openbios-devel/include/libopenbios/aout_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/aout_load.h Sun Mar 28 22:48:53 2010 (r718) +++ trunk/openbios-devel/include/libopenbios/aout_load.h Sun Mar 28 22:55:10 2010 (r719) @@ -17,8 +17,10 @@ #ifndef _H_AOUTLOAD #define _H_AOUTLOAD +#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" +extern int is_aout(struct exec *ehdr); extern int aout_load(struct sys_info *info, const char *filename); #endif /* _H_AOUTLOAD */ Modified: trunk/openbios-devel/include/libopenbios/fcode_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/fcode_load.h Sun Mar 28 22:48:53 2010 (r718) +++ trunk/openbios-devel/include/libopenbios/fcode_load.h Sun Mar 28 22:55:10 2010 (r719) @@ -17,6 +17,7 @@ #ifndef _H_FCODELOAD #define _H_FCODELOAD +extern int is_fcode(unsigned char *fcode); extern int fcode_load(const char *filename); #endif /* _H_FCODELOAD */ Modified: trunk/openbios-devel/include/libopenbios/forth_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/forth_load.h Sun Mar 28 22:48:53 2010 (r718) +++ trunk/openbios-devel/include/libopenbios/forth_load.h Sun Mar 28 22:55:10 2010 (r719) @@ -17,6 +17,7 @@ #ifndef _H_FORTHLOAD #define _H_FORTHLOAD +extern int is_forth(char *forth); extern int forth_load(const char *filename); #endif /* _H_FORTHLOAD */ Modified: trunk/openbios-devel/libopenbios/aout_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/aout_load.c Sun Mar 28 22:48:53 2010 (r718) +++ trunk/openbios-devel/libopenbios/aout_load.c Sun Mar 28 22:55:10 2010 (r719) @@ -58,6 +58,15 @@ return 0; } +int is_aout(struct exec *ehdr) +{ + return ((ehdr->a_info & 0xffff) == OMAGIC + || (ehdr->a_info & 0xffff) == NMAGIC + || (ehdr->a_info & 0xffff) == ZMAGIC + || (ehdr->a_info & 0xffff) == QMAGIC); + +} + int aout_load(struct sys_info *info, const char *filename) { int retval = -1; @@ -81,11 +90,11 @@ retval = LOADER_NOT_SUPPORT; goto out; } - if (!N_BADMAG(ehdr)) + if (is_aout(&ehdr)) break; } - if (N_BADMAG(ehdr)) { + if (!is_aout(&ehdr)) { debug("Not a bootable a.out image\n"); retval = LOADER_NOT_SUPPORT; goto out; Modified: trunk/openbios-devel/libopenbios/fcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/fcode_load.c Sun Mar 28 22:48:53 2010 (r718) +++ trunk/openbios-devel/libopenbios/fcode_load.c Sun Mar 28 22:55:10 2010 (r719) @@ -13,6 +13,15 @@ static int fd; +int is_fcode(unsigned char *fcode) +{ + return (fcode[0] == 0xf0 // start0 + || fcode[0] == 0xf1 // start1 + || fcode[0] == 0xf2 // start2 + || fcode[0] == 0xf3 // start4 + || fcode[0] == 0xfd); // version1 +} + int fcode_load(const char *filename) { int retval = -1; @@ -35,14 +44,9 @@ retval = LOADER_NOT_SUPPORT; goto out; } - switch (fcode_header[0]) { - case 0xf0: // start0 - case 0xf1: // start1 - case 0xf2: // start2 - case 0xf3: // start4 - case 0xfd: // version1 + + if (is_fcode(fcode_header)) goto found; - } } debug("Not a bootable FCode image\n"); Modified: trunk/openbios-devel/libopenbios/forth_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/forth_load.c Sun Mar 28 22:48:53 2010 (r718) +++ trunk/openbios-devel/libopenbios/forth_load.c Sun Mar 28 22:55:10 2010 (r719) @@ -16,8 +16,13 @@ #define debug printk static int fd; - static char *forthtext=NULL; + +int is_forth(char *forth) +{ + return (forth[0] == '\\' && forth[1] == ' '); +} + int forth_load(const char *filename) { char magic[2]; @@ -37,7 +42,7 @@ goto out; } - if (magic[0] != '\\' || magic[1] != ' ') { + if (!is_forth(magic)) { debug("No forth source image\n"); retval = LOADER_NOT_SUPPORT; goto out;

1 0

[commit] r718 - trunk/openbios-devel/include/libopenbios
by repository service 28 Mar '10

28 Mar '10

Author: blueswirl Date: Sun Mar 28 22:48:53 2010 New Revision: 718 URL: http://tracker.coreboot.org/trac/openbios/changeset/718 Log: Add missing newline Fixes build: CC target/arch/sparc64/boot.o In file included from ../arch/sparc64/boot.c:14: ../include/libopenbios/forth_load.h:22:28: error: no newline at end of file Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/libopenbios/forth_load.h Modified: trunk/openbios-devel/include/libopenbios/forth_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/forth_load.h Sun Mar 28 22:18:30 2010 (r717) +++ trunk/openbios-devel/include/libopenbios/forth_load.h Sun Mar 28 22:48:53 2010 (r718) @@ -19,4 +19,4 @@ extern int forth_load(const char *filename); -#endif /* _H_FORTHLOAD */ \ No newline at end of file +#endif /* _H_FORTHLOAD */

1 0

[commit] r717 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 arch/x86 config/examples libopenbios packages
by repository service 28 Mar '10

28 Mar '10

Author: mcayland Date: Sun Mar 28 22:18:30 2010 New Revision: 717 URL: http://tracker.coreboot.org/trac/openbios/changeset/717 Log: Introduce a set of CONFIG_LOADER_* configuration options to allow each architecture to specify the loaders that are to be used. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/config/examples/amd64_config.xml trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/cross-sparc32_config.xml trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/config/examples/cross-x86_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/examples/sparc32_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml trunk/openbios-devel/config/examples/x86_config.xml trunk/openbios-devel/libopenbios/build.xml trunk/openbios-devel/packages/build.xml trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/init.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 28 22:18:30 2010 (r717) @@ -11,6 +11,8 @@ #include "libopenbios/sys_info.h" #include "libopenbios/elf_load.h" #include "libopenbios/aout_load.h" +#include "libopenbios/fcode_load.h" +#include "libopenbios/forth_load.h" #include "openprom.h" #include "boot.h" @@ -33,22 +35,44 @@ bootpath = pop_fstr_copy(); printk("Trying %s (%s)\n", path, bootpath); +#ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ elf_load(&sys_info, path, param, &boot_notes); feval("state-valid @"); valid = POP(); if (valid) goto start_image; +#endif /* Linux loader (not using Forth) */ linux_load(&sys_info, path, param); +#ifdef CONFIG_LOADER_AOUT /* a.out loader */ aout_load(&sys_info, path); feval("state-valid @"); valid = POP(); if (valid) goto start_image; +#endif + +#ifdef CONFIG_LOADER_FCODE + /* Fcode loader */ + fcode_load(path); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; +#endif + +#ifdef CONFIG_LOADER_FORTH + /* Forth loader */ + forth_load(path); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; +#endif return 0; @@ -78,6 +102,23 @@ image_retval = entry(romvec, 0, 0, 0, 0); break; + + case 0x10: + /* Start Fcode image */ + printk("Evaluating FCode...\n"); + PUSH(address); + PUSH(1); + fword("byte-load"); + image_retval = 0; + break; + + case 0x11: + /* Start Forth image */ + PUSH(address); + PUSH(size); + fword("eval2"); + image_retval = 0; + break; } printk("Image returned with return value %#x\n", image_retval); Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 28 22:18:30 2010 (r717) @@ -11,6 +11,7 @@ #include "libopenbios/elf_load.h" #include "libopenbios/aout_load.h" #include "libopenbios/fcode_load.h" +#include "libopenbios/forth_load.h" #include "boot.h" struct sys_info sys_info; @@ -28,29 +29,44 @@ ucell valid, address, type, size; int image_retval = 0; +#ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ elf_load(&sys_info, path, param, &boot_notes); feval("state-valid @"); valid = POP(); if (valid) goto start_image; +#endif /* Linux loader (not using Forth) */ linux_load(&sys_info, path, param); +#ifdef CONFIG_LOADER_AOUT /* a.out loader */ aout_load(&sys_info, path); feval("state-valid @"); valid = POP(); if (valid) goto start_image; +#endif +#ifdef CONFIG_LOADER_FCODE /* Fcode loader */ fcode_load(path); feval("state-valid @"); valid = POP(); if (valid) goto start_image; +#endif + +#ifdef CONFIG_LOADER_FORTH + /* Forth loader */ + forth_load(path); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; +#endif return 0; @@ -85,6 +101,14 @@ fword("byte-load"); image_retval = 0; break; + + case 0x11: + /* Start Forth image */ + PUSH(address); + PUSH(size); + fword("eval2"); + image_retval = 0; + break; } printk("Image returned with return value %#x\n", image_retval); Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 28 22:18:30 2010 (r717) @@ -13,6 +13,8 @@ #include "libc/diskio.h" #include "libopenbios/sys_info.h" #include "libopenbios/elf_load.h" +#include "libopenbios/aout_load.h" +#include "libopenbios/fcode_load.h" #include "libopenbios/forth_load.h" #include "boot.h" @@ -24,22 +26,44 @@ ucell valid, address, type, size; int image_retval = 0;; +#ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ elf_load(&sys_info, path, param, &boot_notes); feval("state-valid @"); valid = POP(); if (valid) goto start_image; +#endif /* Linux loader (not using Forth) */ linux_load(&sys_info, path, param); +#ifdef CONFIG_LOADER_AOUT + /* a.out loader */ + aout_load(&sys_info, path); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; +#endif + +#ifdef CONFIG_LOADER_FCODE + /* Fcode loader */ + fcode_load(path); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; +#endif + +#ifdef CONFIG_LOADER_FORTH /* Forth loader */ forth_load(path); feval("state-valid @"); valid = POP(); if (valid) goto start_image; +#endif return 0; @@ -61,6 +85,20 @@ image_retval = start_elf(address, (uint32_t)NULL); break; + case 0x5: + /* Start a.out image */ + image_retval = start_elf(address, (uint32_t)NULL); + break; + + case 0x10: + /* Start Fcode image */ + printk("Evaluating FCode...\n"); + PUSH(address); + PUSH(1); + fword("byte-load"); + image_retval = 0; + break; + case 0x11: /* Start Forth image */ PUSH(address); Modified: trunk/openbios-devel/config/examples/amd64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/amd64_config.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/config/examples/amd64_config.xml Sun Mar 28 22:18:30 2010 (r717) @@ -35,6 +35,11 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="false"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml Sun Mar 28 22:18:30 2010 (r717) @@ -40,6 +40,11 @@ <option name="CONFIG_VGA_WIDTH" type="integer" value="800"/> <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> + <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/cross-sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-sparc32_config.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/config/examples/cross-sparc32_config.xml Sun Mar 28 22:18:30 2010 (r717) @@ -41,6 +41,11 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="false"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml Sun Mar 28 22:18:30 2010 (r717) @@ -41,6 +41,11 @@ <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> <option name="CONFIG_OFMEM" type="boolean" value="true"/> <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/> + <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="false"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/cross-x86_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-x86_config.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/config/examples/cross-x86_config.xml Sun Mar 28 22:18:30 2010 (r717) @@ -36,6 +36,11 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="true"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="false"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/config/examples/ppc_config.xml Sun Mar 28 22:18:30 2010 (r717) @@ -40,7 +40,11 @@ <option name="CONFIG_VGA_WIDTH" type="integer" value="800"/> <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> - + <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/config/examples/sparc32_config.xml Sun Mar 28 22:18:30 2010 (r717) @@ -41,6 +41,11 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="false"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/sparc64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/config/examples/sparc64_config.xml Sun Mar 28 22:18:30 2010 (r717) @@ -41,6 +41,11 @@ <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> <option name="CONFIG_OFMEM" type="boolean" value="true"/> <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/> + <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="false"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/x86_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/x86_config.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/config/examples/x86_config.xml Sun Mar 28 22:18:30 2010 (r717) @@ -36,6 +36,11 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="true"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="false"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/libopenbios/build.xml Sun Mar 28 22:18:30 2010 (r717) @@ -1,24 +1,16 @@ <build> <library name="openbios" type="static" target="target"> - <object source="aout_load.c" condition="SPARC32"/> - <object source="aout_load.c" condition="SPARC64"/> + <object source="aout_load.c" condition="LOADER_AOUT"/> <object source="bindings.c"/> <object source="client.c"/> <object source="console_common.c"/> - <object source="elf_info.c" condition="X86"/> - <object source="elf_info.c" condition="AMD64"/> - <object source="elf_info.c" condition="SPARC32"/> - <object source="elf_info.c" condition="SPARC64"/> - <object source="elf_info.c" condition="PPC"/> - <object source="elf_load.c" condition="X86"/> - <object source="elf_load.c" condition="SPARC32"/> - <object source="elf_load.c" condition="SPARC64"/> - <object source="elf_load.c" condition="AMD64"/> + <object source="elf_info.c" /> + <object source="elf_load.c" condition="LOADER_ELF"/> <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> - <object source="fcode_load.c" condition="SPARC64"/> - <object source="forth_load.c" condition="X86"/> + <object source="fcode_load.c" condition="LOADER_FCODE"/> + <object source="forth_load.c" condition="LOADER_FORTH"/> <object source="ipchecksum.c"/> <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> Modified: trunk/openbios-devel/packages/build.xml ============================================================================== --- trunk/openbios-devel/packages/build.xml Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/packages/build.xml Sun Mar 28 22:18:30 2010 (r717) @@ -5,8 +5,7 @@ <object source="cmdline.c" condition="CMDLINE"/> <object source="deblocker.c" condition="DEBLOCKER"/> <object source="disk-label.c" condition="DISK_LABEL"/> - <object source="elf-loader.c" condition="PPC"/> - <object source="elf-loader.c" condition="SPARC64"/> + <object source="elf-loader.c" condition="LOADER_ELF"/> <object source="init.c"/> <object source="mac-parts.c" condition="MAC_PARTS"/> <object source="misc-files.c" condition="FS"/> @@ -14,7 +13,7 @@ <object source="pc-parts.c" condition="PC_PARTS"/> <object source="sun-parts.c" condition="SUN_PARTS"/> <object source="video.c"/> - <object source="xcoff-loader.c" condition="PPC"/> + <object source="xcoff-loader.c" condition="LOADER_XCOFF"/> </library> <dictionary name="openbios" target="forth"> Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 28 22:18:30 2010 (r717) @@ -49,6 +49,7 @@ Elf_phdr *phdr; size_t size; char *addr; + cell tmp; feval("0 state-valid !"); @@ -67,11 +68,16 @@ size = MIN(phdr[i].p_filesz, phdr[i].p_memsz); if (!size) continue; +#if 0 if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) { printk("Claim failed!\n"); return; } - addr = (char*)phdr[i].p_vaddr; +#endif + /* Workaround for archs where sizeof(int) != pointer size */ + tmp = phdr[i].p_vaddr; + addr = (char *)tmp; + memcpy(addr, base + phdr[i].p_offset, size); #ifdef CONFIG_PPC flush_icache_range( addr, addr + size ); Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sat Mar 27 14:20:54 2010 (r716) +++ trunk/openbios-devel/packages/init.c Sun Mar 28 22:18:30 2010 (r717) @@ -42,12 +42,14 @@ #ifdef CONFIG_SUN_PARTS sunparts_init(); #endif -#ifdef CONFIG_PPC - elf_loader_init(); +#ifdef CONFIG_LOADER_XCOFF xcoff_loader_init(); - bootinfo_loader_init(); #endif -#ifdef CONFIG_SPARC64 +#ifdef CONFIG_LOADER_ELF elf_loader_init(); #endif +#ifdef CONFIG_PPC + bootinfo_loader_init(); +#endif + }

1 0

Next stage of planned loader work
by Mark Cave-Ayland 28 Mar '10

28 Mar '10

Hi all, Now that I've finished moving the various loaders into libopenbios, I'd like to set out my plans for the next stage of work. My ultimate aim is to enable various loaders to be enabled as defined within the main configuration XML files and to have these work automatically with the load and go words. I've broken down my plan into a number of steps below: i) Define configuration variables for each of the loaders, e.g. CONFIG_LOADER_ELF, CONFIG_LOADER_AOUT etc. and use these within the configuration files for the relevant platforms. Note: I see there is already a CONFIG_IMAGE_ELF option available - should I be using this instead or is strictly for embedding ELF kernels? ii) Refactor the existing loaders so that they contain a is_foo(addr) function for determining whether the specified address contains an image in the correct format. iii) Add a foo_init_program() function to each of the loader files that can be called by init-program to relocate the executable image. iv) Remove the majority of the Forth code in forth/debugging/client.fs so that the is_foo(addr) series of functions can be reused from C instead. Hence write a C version of init-program called (init-program) that can be called from Forth to do the majority of the work. v) Rework the boot word so it looks something like: :boot <path> load <path> go In other words, move the existing platform-boot code into an implementation of go (or (go)) so that it can be re-used. Oh, and with all this in place I can try booting a Milax Solaris kernel ;) Does this sound like a reasonable plan to everyone? If so, I'd like to start work on the next set of changes. 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 1

[commit] r716 - trunk/openbios-devel/arch/sparc32
by repository service 27 Mar '10

27 Mar '10

Author: blueswirl Date: Sat Mar 27 14:20:54 2010 New Revision: 716 URL: http://tracker.coreboot.org/trac/openbios/changeset/716 Log: Fix linker warning There were two global symbols named 'entry': LINK openbios-builtin.elf libsparc32.a(entry.o): warning: definition of `entry' overriding common libsparc32.a(boot.o): warning: common is here Add 'static' to hide the boot.c one. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/boot.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sat Mar 27 14:20:52 2010 (r715) +++ trunk/openbios-devel/arch/sparc32/boot.c Sat Mar 27 14:20:54 2010 (r716) @@ -20,7 +20,7 @@ uint32_t qemu_cmdline; uint32_t cmdline_size; char boot_device; -int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); +static int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); static int try_path(const char *path, char *param, const void *romvec) {

1 0

[commit] r715 - trunk/openbios-devel/include/libopenbios
by repository service 27 Mar '10

27 Mar '10

Author: blueswirl Date: Sat Mar 27 14:20:52 2010 New Revision: 715 URL: http://tracker.coreboot.org/trac/openbios/changeset/715 Log: Add missing newlines Fixes build: In file included from ../arch/sparc64/boot.c:12: ../include/libopenbios/aout_load.h:24:27: error: no newline at end of file In file included from ../arch/sparc64/boot.c:13: ../include/libopenbios/fcode_load.h:22:28: error: no newline at end of file Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/libopenbios/aout_load.h trunk/openbios-devel/include/libopenbios/fcode_load.h Modified: trunk/openbios-devel/include/libopenbios/aout_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/aout_load.h Sat Mar 27 13:09:16 2010 (r714) +++ trunk/openbios-devel/include/libopenbios/aout_load.h Sat Mar 27 14:20:52 2010 (r715) @@ -21,4 +21,4 @@ extern int aout_load(struct sys_info *info, const char *filename); -#endif /* _H_AOUTLOAD */ \ No newline at end of file +#endif /* _H_AOUTLOAD */ Modified: trunk/openbios-devel/include/libopenbios/fcode_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/fcode_load.h Sat Mar 27 13:09:16 2010 (r714) +++ trunk/openbios-devel/include/libopenbios/fcode_load.h Sat Mar 27 14:20:52 2010 (r715) @@ -19,4 +19,4 @@ extern int fcode_load(const char *filename); -#endif /* _H_FCODELOAD */ \ No newline at end of file +#endif /* _H_FCODELOAD */

1 0

[commit] r714 - in trunk/openbios-devel: arch/sparc64 include/libopenbios libopenbios
by repository service 27 Mar '10

27 Mar '10

Author: mcayland Date: Sat Mar 27 13:09:16 2010 New Revision: 714 URL: http://tracker.coreboot.org/trac/openbios/changeset/714 Log: Move the Fcode loader from arch/*/fcodeload.c to libopenbios/fcode_load.c. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/fcode_load.h trunk/openbios-devel/libopenbios/fcode_load.c Deleted: trunk/openbios-devel/arch/sparc64/fcodeload.c Modified: trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sat Mar 27 12:59:43 2010 (r713) +++ trunk/openbios-devel/arch/sparc64/boot.c Sat Mar 27 13:09:16 2010 (r714) @@ -10,6 +10,7 @@ #include "libopenbios/sys_info.h" #include "libopenbios/elf_load.h" #include "libopenbios/aout_load.h" +#include "libopenbios/fcode_load.h" #include "boot.h" struct sys_info sys_info; Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sat Mar 27 12:59:43 2010 (r713) +++ trunk/openbios-devel/arch/sparc64/boot.h Sat Mar 27 13:09:16 2010 (r714) @@ -9,9 +9,6 @@ // linux_load.c int linux_load(struct sys_info *info, const char *file, const char *cmdline); -// fcodeload.c -int fcode_load(const char *filename); - // context.c extern struct context * volatile __context; uint64_t start_elf(uint64_t entry_point, uint64_t param); Modified: trunk/openbios-devel/arch/sparc64/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml Sat Mar 27 12:59:43 2010 (r713) +++ trunk/openbios-devel/arch/sparc64/build.xml Sat Mar 27 13:09:16 2010 (r714) @@ -14,7 +14,6 @@ <object source="switch.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> - <object source="fcodeload.c"/> <object source="ofmem_sparc64.c"/> <object source="entry.S"/> <object source="vectors.S"/> Added: trunk/openbios-devel/include/libopenbios/fcode_load.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/fcode_load.h Sat Mar 27 13:09:16 2010 (r714) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2010/03/22 18:00:00 mcayland> + * Time-stamp: <2010/03/22 18:00:00 mcayland> + * + * <fcode_load.h> + * + * Fcode loader + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * 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 + * + */ + +#ifndef _H_FCODELOAD +#define _H_FCODELOAD + +extern int fcode_load(const char *filename); + +#endif /* _H_FCODELOAD */ \ No newline at end of file Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sat Mar 27 12:59:43 2010 (r713) +++ trunk/openbios-devel/libopenbios/build.xml Sat Mar 27 13:09:16 2010 (r714) @@ -17,6 +17,7 @@ <object source="elf_load.c" condition="AMD64"/> <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> + <object source="fcode_load.c" condition="SPARC64"/> <object source="forth_load.c" condition="X86"/> <object source="ipchecksum.c"/> <object source="linuxbios_info.c" condition="LINUXBIOS"/> Added: trunk/openbios-devel/libopenbios/fcode_load.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/fcode_load.c Sat Mar 27 13:09:16 2010 (r714) @@ -0,0 +1,82 @@ +/* + * FCode boot loader + */ + +#include "config.h" +#include "kernel/kernel.h" +#include "libopenbios/bindings.h" +#include "libopenbios/fcode_load.h" +#include "libopenbios/sys_info.h" +#include "libc/diskio.h" +#define printf printk +#define debug printk + +static int fd; + +int fcode_load(const char *filename) +{ + int retval = -1; + uint8_t fcode_header[8]; + unsigned long start, size; + unsigned int offset; + + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + + fd = open_io(filename); + if (!fd) + goto out; + + for (offset = 0; offset < 16 * 512; offset += 512) { + seek_io(fd, offset); + if (read_io(fd, &fcode_header, sizeof(fcode_header)) + != sizeof(fcode_header)) { + debug("Can't read FCode header from file %s\n", filename); + retval = LOADER_NOT_SUPPORT; + goto out; + } + switch (fcode_header[0]) { + case 0xf0: // start0 + case 0xf1: // start1 + case 0xf2: // start2 + case 0xf3: // start4 + case 0xfd: // version1 + goto found; + } + } + + debug("Not a bootable FCode image\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + + found: + size = (fcode_header[4] << 24) | (fcode_header[5] << 16) | + (fcode_header[6] << 8) | fcode_header[7]; + + start = 0x4000; + + printf("Loading FCode image...\n"); + + seek_io(fd, offset + sizeof(fcode_header)); + + if ((size_t)read_io(fd, (void *)start, size) != size) { + printf("Can't read file (size 0x%lx)\n", size); + goto out; + } + + debug("Loaded %lu bytes\n", size); + debug("entry point is %#lx\n", start); + + // Initialise saved-program-state + PUSH(start); + feval("saved-program-state >sps.entry !"); + PUSH(size); + feval("saved-program-state >sps.file-size !"); + feval("fcode saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + +out: + close_io(fd); + return retval; +}

1 0

[commit] r713 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 config/scripts
by repository service 27 Mar '10

27 Mar '10

Author: mcayland Date: Sat Mar 27 12:59:43 2010 New Revision: 713 URL: http://tracker.coreboot.org/trac/openbios/changeset/713 Log: Fix a couple of minor omissions (and an incorrect switch-arch alteration) from the previous commit. Modified: trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sat Mar 27 12:53:59 2010 (r712) +++ trunk/openbios-devel/arch/sparc32/boot.h Sat Mar 27 12:59:43 2010 (r713) @@ -6,9 +6,6 @@ * the copyright and warranty status of this work. */ -// forthload.c -int forth_load(const char *filename); - // linux_load.c int linux_load(struct sys_info *info, const char *file, const char *cmdline); Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sat Mar 27 12:53:59 2010 (r712) +++ trunk/openbios-devel/arch/sparc64/boot.h Sat Mar 27 12:59:43 2010 (r713) @@ -6,9 +6,6 @@ * the copyright and warranty status of this work. */ -// forthload.c -int forth_load(const char *filename); - // linux_load.c int linux_load(struct sys_info *info, const char *file, const char *cmdline); Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Mar 27 12:53:59 2010 (r712) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Mar 27 12:59:43 2010 (r713) @@ -150,8 +150,7 @@ ;; x86) - #select_prefix i486 - select_prefix x86_64 + select_prefix i486 CFLAGS="-fno-builtin -m32" AS_FLAGS="-Wa,-32" ;;

1 0

[commit] r712 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 arch/x86 config/scripts include/libopenbios libopenbios
by repository service 27 Mar '10

27 Mar '10

Author: mcayland Date: Sat Mar 27 12:53:59 2010 New Revision: 712 URL: http://tracker.coreboot.org/trac/openbios/changeset/712 Log: Move the Forth loader forthload.c from arch/*/forthload.c to libopenbios/forth_load.c. While the Forth loader source was included and built as part of the SPARC64 and SPARC32 builds, it was never actually invoked in the boot sequence. Hence this patch maintains the existing behaviour in that only X86 builds included the Forth loader. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/forth_load.h trunk/openbios-devel/libopenbios/forth_load.c Deleted: trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/x86/forthload.c Modified: trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/boot.h trunk/openbios-devel/arch/x86/build.xml trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Sat Mar 27 12:30:14 2010 (r711) +++ trunk/openbios-devel/arch/sparc32/build.xml Sat Mar 27 12:53:59 2010 (r712) @@ -15,7 +15,6 @@ <object source="udiv.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> - <object source="forthload.c"/> <object source="romvec.c"/> <object source="entry.S"/> <object source="vectors.S"/> Modified: trunk/openbios-devel/arch/sparc64/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml Sat Mar 27 12:30:14 2010 (r711) +++ trunk/openbios-devel/arch/sparc64/build.xml Sat Mar 27 12:53:59 2010 (r712) @@ -14,7 +14,6 @@ <object source="switch.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> - <object source="forthload.c"/> <object source="fcodeload.c"/> <object source="ofmem_sparc64.c"/> <object source="entry.S"/> Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sat Mar 27 12:30:14 2010 (r711) +++ trunk/openbios-devel/arch/x86/boot.c Sat Mar 27 12:53:59 2010 (r712) @@ -12,17 +12,20 @@ #include "arch/common/nvram.h" #include "libc/diskio.h" #include "libopenbios/sys_info.h" +#include "libopenbios/elf_load.h" +#include "libopenbios/forth_load.h" #include "boot.h" struct sys_info sys_info; static int try_path(const char *path, char *param) { + void *boot_notes = NULL; ucell valid, address, type, size; int image_retval = 0;; /* ELF Boot loader */ - elf_load(&sys_info, path, param); + elf_load(&sys_info, path, param, &boot_notes); feval("state-valid @"); valid = POP(); if (valid) @@ -32,7 +35,7 @@ linux_load(&sys_info, path, param); /* Forth loader */ - forth_load(&sys_info, path, param); + forth_load(path); feval("state-valid @"); valid = POP(); if (valid) Modified: trunk/openbios-devel/arch/x86/boot.h ============================================================================== --- trunk/openbios-devel/arch/x86/boot.h Sat Mar 27 12:30:14 2010 (r711) +++ trunk/openbios-devel/arch/x86/boot.h Sat Mar 27 12:53:59 2010 (r712) @@ -6,12 +6,6 @@ * the copyright and warranty status of this work. */ -/* forthload.c */ -int forth_load(struct sys_info *info, const char *filename, const char *cmdline); - -/* elfload.c */ -int elf_load(struct sys_info *info, const char *filename, const char *cmdline); - /* linux_load.c */ int linux_load(struct sys_info *info, const char *file, const char *cmdline); Modified: trunk/openbios-devel/arch/x86/build.xml ============================================================================== --- trunk/openbios-devel/arch/x86/build.xml Sat Mar 27 12:30:14 2010 (r711) +++ trunk/openbios-devel/arch/x86/build.xml Sat Mar 27 12:53:59 2010 (r712) @@ -14,7 +14,6 @@ <object source="linux_load.c"/> <object source="segment.c"/> <object source="sys_info.c"/> - <object source="forthload.c"/> <object source="entry.S"/> <object source="xbox/console.c" condition="XBOX"/> <object source="xbox/methods.c" condition="XBOX"/> Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Mar 27 12:30:14 2010 (r711) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Mar 27 12:53:59 2010 (r712) @@ -150,7 +150,8 @@ ;; x86) - select_prefix i486 + #select_prefix i486 + select_prefix x86_64 CFLAGS="-fno-builtin -m32" AS_FLAGS="-Wa,-32" ;; Added: trunk/openbios-devel/include/libopenbios/forth_load.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/forth_load.h Sat Mar 27 12:53:59 2010 (r712) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2010/03/22 18:00:00 mcayland> + * Time-stamp: <2010/03/22 18:00:00 mcayland> + * + * <forth_load.h> + * + * Forth loader + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * 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 + * + */ + +#ifndef _H_FORTHLOAD +#define _H_FORTHLOAD + +extern int forth_load(const char *filename); + +#endif /* _H_FORTHLOAD */ \ No newline at end of file Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sat Mar 27 12:30:14 2010 (r711) +++ trunk/openbios-devel/libopenbios/build.xml Sat Mar 27 12:53:59 2010 (r712) @@ -17,6 +17,7 @@ <object source="elf_load.c" condition="AMD64"/> <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> + <object source="forth_load.c" condition="X86"/> <object source="ipchecksum.c"/> <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> Added: trunk/openbios-devel/libopenbios/forth_load.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/forth_load.c Sat Mar 27 12:53:59 2010 (r712) @@ -0,0 +1,75 @@ +/* tag: forth source loader + * + * Copyright (C) 2004 Stefan Reinauer + * + * See the file "COPYING" for further information about + * the copyright and warranty status of this work. + */ + +#include "config.h" +#include "kernel/kernel.h" +#include "libopenbios/bindings.h" +#include "libopenbios/sys_info.h" +#include "libc/diskio.h" +#include "libopenbios/forth_load.h" +#define printk printk +#define debug printk + +static int fd; + +static char *forthtext=NULL; +int forth_load(const char *filename) +{ + char magic[2]; + unsigned long forthsize; + int retval = -1; + + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + + fd = open_io(filename); + if (!fd) + goto out; + + if (read_io(fd, magic, 2) != 2) { + debug("Can't read magic header\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + + if (magic[0] != '\\' || magic[1] != ' ') { + debug("No forth source image\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + + /* Calculate the file size by seeking to the end of the file */ + seek_io(fd, -1); + forthsize = tell(fd); + forthtext = malloc(forthsize+1); + seek_io(fd, 0); + + printk("Loading forth source ..."); + if ((size_t)read_io(fd, forthtext, forthsize) != forthsize) { + printk("Can't read forth text\n"); + goto out; + } + forthtext[forthsize]=0; + printk("ok\n"); + + // Initialise saved-program-state + PUSH((ucell)forthtext); + feval("saved-program-state >sps.entry !"); + PUSH((ucell)forthsize); + feval("saved-program-state >sps.file-size !"); + feval("forth saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + + retval=0; + +out: + //if (forthtext) + // free(forthtext); + return retval; +}

1 0

[commit] r711 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 include/arch/sparc32 include/arch/sparc64 include/libopenbios libopenbios
by repository service 27 Mar '10

27 Mar '10

Author: mcayland Date: Sat Mar 27 12:30:14 2010 New Revision: 711 URL: http://tracker.coreboot.org/trac/openbios/changeset/711 Log: Move the a.out loader from arch/*/aoutload.c into libopenbios as aout_load.c. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/aout_load.h trunk/openbios-devel/libopenbios/aout_load.c Deleted: trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc64/aoutload.c Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/include/arch/sparc32/types.h trunk/openbios-devel/include/arch/sparc64/types.h trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sat Mar 27 11:57:03 2010 (r710) +++ trunk/openbios-devel/arch/sparc32/boot.c Sat Mar 27 12:30:14 2010 (r711) @@ -9,6 +9,8 @@ #include "libc/diskio.h" #include "libc/vsprintf.h" #include "libopenbios/sys_info.h" +#include "libopenbios/elf_load.h" +#include "libopenbios/aout_load.h" #include "openprom.h" #include "boot.h" @@ -22,6 +24,7 @@ static int try_path(const char *path, char *param, const void *romvec) { + void *boot_notes = NULL; ucell valid, address, type, size; int image_retval = 0; @@ -31,7 +34,7 @@ printk("Trying %s (%s)\n", path, bootpath); /* ELF Boot loader */ - elf_load(&sys_info, path, param, romvec); + elf_load(&sys_info, path, param, &boot_notes); feval("state-valid @"); valid = POP(); if (valid) @@ -41,7 +44,7 @@ linux_load(&sys_info, path, param); /* a.out loader */ - aout_load(&sys_info, path, romvec); + aout_load(&sys_info, path); feval("state-valid @"); valid = POP(); if (valid) Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sat Mar 27 11:57:03 2010 (r710) +++ trunk/openbios-devel/arch/sparc32/boot.h Sat Mar 27 12:30:14 2010 (r711) @@ -9,13 +9,6 @@ // forthload.c int forth_load(const char *filename); -// elfload.c -int elf_load(struct sys_info *, const char *filename, const char *cmdline, - const void *romvec); - -// aout_load.c -int aout_load(struct sys_info *info, const char *filename, const void *romvec); - // linux_load.c int linux_load(struct sys_info *info, const char *file, const char *cmdline); Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Sat Mar 27 11:57:03 2010 (r710) +++ trunk/openbios-devel/arch/sparc32/build.xml Sat Mar 27 12:30:14 2010 (r711) @@ -15,7 +15,6 @@ <object source="udiv.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> - <object source="aoutload.c"/> <object source="forthload.c"/> <object source="romvec.c"/> <object source="entry.S"/> Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sat Mar 27 11:57:03 2010 (r710) +++ trunk/openbios-devel/arch/sparc64/boot.c Sat Mar 27 12:30:14 2010 (r711) @@ -9,6 +9,7 @@ #include "libc/vsprintf.h" #include "libopenbios/sys_info.h" #include "libopenbios/elf_load.h" +#include "libopenbios/aout_load.h" #include "boot.h" struct sys_info sys_info; Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sat Mar 27 11:57:03 2010 (r710) +++ trunk/openbios-devel/arch/sparc64/boot.h Sat Mar 27 12:30:14 2010 (r711) @@ -9,9 +9,6 @@ // forthload.c int forth_load(const char *filename); -// aout_load.c -int aout_load(struct sys_info *info, const char *filename); - // linux_load.c int linux_load(struct sys_info *info, const char *file, const char *cmdline); Modified: trunk/openbios-devel/arch/sparc64/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml Sat Mar 27 11:57:03 2010 (r710) +++ trunk/openbios-devel/arch/sparc64/build.xml Sat Mar 27 12:30:14 2010 (r711) @@ -14,7 +14,6 @@ <object source="switch.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> - <object source="aoutload.c"/> <object source="forthload.c"/> <object source="fcodeload.c"/> <object source="ofmem_sparc64.c"/> Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sat Mar 27 11:57:03 2010 (r710) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sat Mar 27 12:30:14 2010 (r711) @@ -41,6 +41,8 @@ #define FMT_ucellX "%08X" #define FMT_elf "%#x" +#define FMT_sizet "%lx" +#define FMT_aout_ehdr "%lx" #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sat Mar 27 11:57:03 2010 (r710) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sat Mar 27 12:30:14 2010 (r711) @@ -37,8 +37,8 @@ #define FMT_ucellx "%016llx" #define FMT_ucellX "%016llX" -#define FMT_sizet "%lx" #define FMT_elf "%#llx" +#define FMT_sizet "%lx" #define FMT_aout_ehdr "%x" #ifdef NEED_FAKE_INT128_T Added: trunk/openbios-devel/include/libopenbios/aout_load.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/aout_load.h Sat Mar 27 12:30:14 2010 (r711) @@ -0,0 +1,24 @@ +/* + * Creation Date: <2010/03/22 18:00:00 mcayland> + * Time-stamp: <2010/03/22 18:00:00 mcayland> + * + * <aout_load.h> + * + * a.out loader + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * 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 + * + */ + +#ifndef _H_AOUTLOAD +#define _H_AOUTLOAD + +#include "libopenbios/sys_info.h" + +extern int aout_load(struct sys_info *info, const char *filename); + +#endif /* _H_AOUTLOAD */ \ No newline at end of file Added: trunk/openbios-devel/libopenbios/aout_load.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/aout_load.c Sat Mar 27 12:30:14 2010 (r711) @@ -0,0 +1,147 @@ +/* a.out boot loader + * As we have seek, this implementation can be straightforward. + * 2003-07 by SONE Takeshi + */ + +#include "config.h" +#include "kernel/kernel.h" + +#ifdef CONFIG_SPARC64 +#define CONFIG_SPARC64_PAGE_SIZE_8KB +#endif + +#include "arch/common/a.out.h" +#include "libopenbios/sys_info.h" +#include "libopenbios/bindings.h" +#include "libopenbios/aout_load.h" +#include "libc/diskio.h" +#define printf printk +#define debug printk + +#define addr_fixup(addr) ((addr) & 0x00ffffff) + +static char *image_name, *image_version; +static int fd; + +static int check_mem_ranges(struct sys_info *info, + unsigned long start, + unsigned long size) +{ + int j; + unsigned long end; + unsigned long prog_start, prog_end; + struct memrange *mem; + + prog_start = virt_to_phys(&_start); + prog_end = virt_to_phys(&_end); + + end = start + size; + + if (start < prog_start && end > prog_start) + goto conflict; + if (start < prog_end && end > prog_end) + goto conflict; + mem = info->memrange; + for (j = 0; j < info->n_memranges; j++) { + if (mem[j].base <= start && mem[j].base + mem[j].size >= end) + break; + } + if (j >= info->n_memranges) + goto badseg; + return 1; + + conflict: + printf("%s occupies [%#lx-%#lx]\n", program_name, prog_start, prog_end); + + badseg: + printf("A.out file [%#lx-%#lx] doesn't fit into memory\n", start, end - 1); + return 0; +} + +int aout_load(struct sys_info *info, const char *filename) +{ + int retval = -1; + struct exec ehdr; + unsigned long start, size; + unsigned int offset; + + image_name = image_version = NULL; + + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + + fd = open_io(filename); + if (!fd) + goto out; + + for (offset = 0; offset < 16 * 512; offset += 512) { + seek_io(fd, offset); + if (read_io(fd, &ehdr, sizeof ehdr) != sizeof ehdr) { + debug("Can't read a.out header\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + if (!N_BADMAG(ehdr)) + break; + } + + if (N_BADMAG(ehdr)) { + debug("Not a bootable a.out image\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + + if (ehdr.a_text == 0x30800007) + ehdr.a_text=64*1024; + + if (N_MAGIC(ehdr) == NMAGIC) { + size = addr_fixup(N_DATADDR(ehdr)) + addr_fixup(ehdr.a_data); + } else { + size = addr_fixup(ehdr.a_text) + addr_fixup(ehdr.a_data); + } + + if (size < 7680) + size = 7680; + + + start = 0x4000; // N_TXTADDR(ehdr); + + if (!check_mem_ranges(info, start, size)) + goto out; + + printf("Loading a.out %s...\n", image_name ? image_name : "image"); + + seek_io(fd, offset + N_TXTOFF(ehdr)); + + if (N_MAGIC(ehdr) == NMAGIC) { + if ((size_t)read_io(fd, (void *)start, ehdr.a_text) != ehdr.a_text) { + printf("Can't read program text segment (size 0x" FMT_aout_ehdr ")\n", ehdr.a_text); + goto out; + } + if ((size_t)read_io(fd, (void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { + printf("Can't read program data segment (size 0x" FMT_aout_ehdr ")\n", ehdr.a_data); + goto out; + } + } else { + if ((size_t)read_io(fd, (void *)start, size) != size) { + printf("Can't read program (size 0x" FMT_sizet ")\n", size); + goto out; + } + } + + debug("Loaded %lu bytes\n", size); + debug("entry point is %#lx\n", start); + + // Initialise saved-program-state + PUSH(addr_fixup(start)); + feval("saved-program-state >sps.entry !"); + PUSH(size); + feval("saved-program-state >sps.file-size !"); + feval("aout saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + +out: + close_io(fd); + return retval; +} Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sat Mar 27 11:57:03 2010 (r710) +++ trunk/openbios-devel/libopenbios/build.xml Sat Mar 27 12:30:14 2010 (r711) @@ -1,6 +1,8 @@ <build> <library name="openbios" type="static" target="target"> + <object source="aout_load.c" condition="SPARC32"/> + <object source="aout_load.c" condition="SPARC64"/> <object source="bindings.c"/> <object source="client.c"/> <object source="console_common.c"/>

1 0

[commit] r710 - in trunk/openbios-devel: arch/amd64 arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 include/arch/amd64 include/arch/sparc32 include/arch/sparc64 include/arch/x86 include/...
by repository service 27 Mar '10

27 Mar '10

Author: mcayland Date: Sat Mar 27 11:57:03 2010 New Revision: 710 URL: http://tracker.coreboot.org/trac/openbios/changeset/710 Log: Create a brand new ELF loader based upon arch/*/elfload.c and libopenbios/elfload.c combined together in libopenbios. This means that each arch no longer needs its own ELF loader implementation. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/elf_load.h trunk/openbios-devel/libopenbios/elf_load.c Deleted: trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/include/libopenbios/elfload.h trunk/openbios-devel/libopenbios/elfload.c Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/x86/build.xml trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/segment.c trunk/openbios-devel/include/arch/amd64/io.h trunk/openbios-devel/include/arch/amd64/types.h trunk/openbios-devel/include/arch/sparc32/types.h trunk/openbios-devel/include/arch/sparc64/types.h trunk/openbios-devel/include/arch/x86/io.h trunk/openbios-devel/include/arch/x86/types.h trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sat Mar 27 11:57:03 2010 (r710) @@ -16,7 +16,7 @@ #include "config.h" #include "libopenbios/bindings.h" -#include "libopenbios/elfload.h" +#include "libopenbios/elf_load.h" #include "arch/common/nvram.h" #include "packages/nvram.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/arch/sparc32/build.xml Sat Mar 27 11:57:03 2010 (r710) @@ -15,7 +15,6 @@ <object source="udiv.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> - <object source="elfload.c"/> <object source="aoutload.c"/> <object source="forthload.c"/> <object source="romvec.c"/> Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/arch/sparc64/boot.c Sat Mar 27 11:57:03 2010 (r710) @@ -8,6 +8,7 @@ #include "libc/diskio.h" #include "libc/vsprintf.h" #include "libopenbios/sys_info.h" +#include "libopenbios/elf_load.h" #include "boot.h" struct sys_info sys_info; @@ -26,7 +27,7 @@ int image_retval = 0; /* ELF Boot loader */ - elf_load(&sys_info, path, param); + elf_load(&sys_info, path, param, &boot_notes); feval("state-valid @"); valid = POP(); if (valid) Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/arch/sparc64/boot.h Sat Mar 27 11:57:03 2010 (r710) @@ -9,9 +9,6 @@ // forthload.c int forth_load(const char *filename); -// elfload.c -int elf_load(struct sys_info *info, const char *filename, const char *cmdline); - // aout_load.c int aout_load(struct sys_info *info, const char *filename); Modified: trunk/openbios-devel/arch/sparc64/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/arch/sparc64/build.xml Sat Mar 27 11:57:03 2010 (r710) @@ -14,7 +14,6 @@ <object source="switch.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> - <object source="elfload.c"/> <object source="aoutload.c"/> <object source="forthload.c"/> <object source="fcodeload.c"/> Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/arch/unix/boot.c Sat Mar 27 11:57:03 2010 (r710) @@ -4,7 +4,7 @@ #undef BOOTSTRAP #include "config.h" #include "libopenbios/bindings.h" -#include "libopenbios/elfload.h" +#include "libopenbios/elf_load.h" #include "arch/common/nvram.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/x86/build.xml ============================================================================== --- trunk/openbios-devel/arch/x86/build.xml Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/arch/x86/build.xml Sat Mar 27 11:57:03 2010 (r710) @@ -14,7 +14,6 @@ <object source="linux_load.c"/> <object source="segment.c"/> <object source="sys_info.c"/> - <object source="elfload.c"/> <object source="forthload.c"/> <object source="entry.S"/> <object source="xbox/console.c" condition="XBOX"/> Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/arch/x86/linux_load.c Sat Mar 27 11:57:03 2010 (r710) @@ -460,7 +460,6 @@ uint32_t max; uint32_t start, end, size; uint64_t forced; - extern char _start[], _end[]; fd = open_io(initrd_file); if (!fd) { Modified: trunk/openbios-devel/arch/x86/segment.c ============================================================================== --- trunk/openbios-devel/arch/x86/segment.c Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/arch/x86/segment.c Sat Mar 27 11:57:03 2010 (r710) @@ -40,7 +40,6 @@ {0xffff, 0, 0, 0x93, 0xcf, 0}, }; -extern char _start[], _end[]; void relocate(struct sys_info *info) { Modified: trunk/openbios-devel/include/arch/amd64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/io.h Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/include/arch/amd64/io.h Sat Mar 27 11:57:03 2010 (r710) @@ -1,6 +1,7 @@ #ifndef _ASM_IO_H #define _ASM_IO_H +extern char _start, _end; extern unsigned long virt_offset; #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/include/arch/amd64/types.h Sat Mar 27 11:57:03 2010 (r710) @@ -23,6 +23,8 @@ typedef __int128_t dcell; typedef __uint128_t ducell; +#define FMT_elf "%#x" + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sat Mar 27 11:57:03 2010 (r710) @@ -40,6 +40,8 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +#define FMT_elf "%#x" + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sat Mar 27 11:57:03 2010 (r710) @@ -37,6 +37,10 @@ #define FMT_ucellx "%016llx" #define FMT_ucellX "%016llX" +#define FMT_sizet "%lx" +#define FMT_elf "%#llx" +#define FMT_aout_ehdr "%x" + #ifdef NEED_FAKE_INT128_T typedef struct { uint64_t hi; Modified: trunk/openbios-devel/include/arch/x86/io.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/io.h Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/include/arch/x86/io.h Sat Mar 27 11:57:03 2010 (r710) @@ -3,6 +3,7 @@ #include "asm/types.h" +extern char _start, _end; extern unsigned long virt_offset; #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/include/arch/x86/types.h Sat Mar 27 11:57:03 2010 (r710) @@ -29,6 +29,8 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +#define FMT_elf "%#x" + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) Added: trunk/openbios-devel/include/libopenbios/elf_load.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/elf_load.h Sat Mar 27 11:57:03 2010 (r710) @@ -0,0 +1,30 @@ +/* + * Creation Date: <2001/05/05 16:44:17 samuel> + * Time-stamp: <2003/10/22 23:18:42 samuel> + * + * <elfload.h> + * + * Elf loader + * + * Copyright (C) 2001, 2003 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 + * + */ + +#ifndef _H_ELFLOAD +#define _H_ELFLOAD + +#include "arch/common/elf.h" +#include "asm/elf.h" +#include "libopenbios/sys_info.h" + +extern int elf_load(struct sys_info *info, const char *filename, const char *cmdline, void **boot_notes); +extern int is_elf(Elf_ehdr *ehdr); +extern int find_elf(Elf_ehdr *ehdr); + +extern Elf_phdr * elf_readhdrs(int offset, Elf_ehdr *ehdr); + +#endif /* _H_ELFLOAD */ Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Fri Mar 26 23:33:50 2010 (r709) +++ trunk/openbios-devel/libopenbios/build.xml Sat Mar 27 11:57:03 2010 (r710) @@ -9,6 +9,10 @@ <object source="elf_info.c" condition="SPARC32"/> <object source="elf_info.c" condition="SPARC64"/> <object source="elf_info.c" condition="PPC"/> + <object source="elf_load.c" condition="X86"/> + <object source="elf_load.c" condition="SPARC32"/> + <object source="elf_load.c" condition="SPARC64"/> + <object source="elf_load.c" condition="AMD64"/> <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> <object source="ipchecksum.c"/> Added: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/elf_load.c Sat Mar 27 11:57:03 2010 (r710) @@ -0,0 +1,462 @@ +/* ELF Boot loader + * As we have seek, this implementation can be straightforward. + * 2003-07 by SONE Takeshi + */ + +#include "config.h" +#include "kernel/kernel.h" +#include "libc/diskio.h" +#include "arch/common/elf_boot.h" +#include "libopenbios/elf_load.h" +#include "libopenbios/sys_info.h" +#include "libopenbios/ipchecksum.h" +#include "libopenbios/bindings.h" +#define printf printk +#define debug printk + +#define DEBUG 0 + +#define MAX_HEADERS 0x20 +#define BS 0x100 /* smallest step used when looking for the ELF header */ + +/* FreeBSD and possibly others mask the high 8 bits */ +#define addr_fixup(addr) ((addr) & 0x00ffffff) + +static char *image_name, *image_version; +static int fd; + +/* Note: avoid name collision with platforms which have their own version of calloc() */ +static void *ob_calloc(size_t nmemb, size_t size) +{ + size_t alloc_size = nmemb * size; + void *mem; + + if (alloc_size < nmemb || alloc_size < size) { + printf("calloc overflow: %u, %u\n", nmemb, size); + return NULL; + } + + mem = malloc(alloc_size); + memset(mem, 0, alloc_size); + + return mem; +} + +static int check_mem_ranges(struct sys_info *info, + Elf_phdr *phdr, int phnum) +{ + int i, j; + unsigned long start, end; + unsigned long prog_start, prog_end; + struct memrange *mem; + + prog_start = virt_to_phys(&_start); + prog_end = virt_to_phys(&_end); + + for (i = 0; i < phnum; i++) { + if (phdr[i].p_type != PT_LOAD) + continue; + start = addr_fixup(phdr[i].p_paddr); + end = start + phdr[i].p_memsz; + if (start < prog_start && end > prog_start) + goto conflict; + if (start < prog_end && end > prog_end) + goto conflict; + mem=info->memrange; + for (j = 0; j < info->n_memranges; j++) { + if (mem[j].base <= start && mem[j].base + mem[j].size >= end) + break; + } + if (j >= info->n_memranges) + goto badseg; + } + return 1; + +conflict: + printf("%s occupies [%#lx-%#lx]\n", program_name, prog_start, prog_end); + +badseg: + printf("Segment %d [%#lx-%#lx] doesn't fit into memory\n", i, start, end-1); + return 0; +} + +static unsigned long process_image_notes(Elf_phdr *phdr, int phnum, + unsigned short *sum_ptr, + unsigned int offset) +{ + int i; + char *buf = NULL; + int retval = 0; + unsigned long addr, end; + Elf_Nhdr *nhdr; + const char *name; + void *desc; + + for (i = 0; i < phnum; i++) { + if (phdr[i].p_type != PT_NOTE) + continue; + buf = malloc(phdr[i].p_filesz); + seek_io(fd, offset + phdr[i].p_offset); + if ((size_t)read_io(fd, buf, phdr[i].p_filesz) != phdr[i].p_filesz) { + printf("Can't read note segment\n"); + goto out; + } + addr = (unsigned long) buf; + end = addr + phdr[i].p_filesz; + while (addr < end) { + nhdr = (Elf_Nhdr *) addr; + addr += sizeof(Elf_Nhdr); + name = (const char *) addr; + addr += (nhdr->n_namesz+3) & ~3; + desc = (void *) addr; + addr += (nhdr->n_descsz+3) & ~3; + + if (nhdr->n_namesz==sizeof(ELF_NOTE_BOOT) + && memcmp(name, ELF_NOTE_BOOT, sizeof(ELF_NOTE_BOOT))==0) { + if (nhdr->n_type == EIN_PROGRAM_NAME) { + image_name = ob_calloc(1, nhdr->n_descsz + 1); + memcpy(image_name, desc, nhdr->n_descsz); + } + if (nhdr->n_type == EIN_PROGRAM_VERSION) { + image_version = ob_calloc(1, nhdr->n_descsz + 1); + memcpy(image_version, desc, nhdr->n_descsz); + } + if (nhdr->n_type == EIN_PROGRAM_CHECKSUM) { + *sum_ptr = *(unsigned short *) desc; + debug("Image checksum: %#04x\n", *sum_ptr); + /* Where in the file */ + retval = phdr[i].p_offset + + (unsigned long) desc - (unsigned long) buf; + } + } + } + } +out: + close_io(fd); + if (buf) + free(buf); + return retval; +} + +static int load_segments(Elf_phdr *phdr, int phnum, + unsigned long checksum_offset, + unsigned int offset, unsigned long *bytes) +{ + //unsigned int start_time, time; + int i; + + *bytes = 0; + // start_time = currticks(); + for (i = 0; i < phnum; i++) { + if (phdr[i].p_type != PT_LOAD) + continue; + debug("segment %d addr:" FMT_elf " file:" FMT_elf " mem:" FMT_elf " ", + i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz); + seek_io(fd, offset + phdr[i].p_offset); + debug("loading... "); + if ((size_t)read_io(fd, phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) + != phdr[i].p_filesz) { + printf("Can't read program segment %d\n", i); + return 0; + } + bytes += phdr[i].p_filesz; + debug("clearing... "); + memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, + phdr[i].p_memsz - phdr[i].p_filesz); + if (phdr[i].p_offset <= checksum_offset + && phdr[i].p_offset + phdr[i].p_filesz >= checksum_offset+2) { + debug("clearing checksum... "); + memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + checksum_offset + - phdr[i].p_offset), 0, 2); + } + debug("ok\n"); + + } + // time = currticks() - start_time; + //debug("Loaded %lu bytes in %ums (%luKB/s)\n", bytes, time, + // time? bytes/time : 0); + debug("Loaded %lu bytes \n", *bytes); + + return 1; +} + +static int verify_image(Elf_ehdr *ehdr, Elf_phdr *phdr, int phnum, + unsigned short image_sum) +{ + unsigned short sum, part_sum; + unsigned long offset; + int i; + + sum = 0; + offset = 0; + + part_sum = ipchksum(ehdr, sizeof *ehdr); + sum = add_ipchksums(offset, sum, part_sum); + offset += sizeof *ehdr; + + part_sum = ipchksum(phdr, phnum * sizeof(*phdr)); + sum = add_ipchksums(offset, sum, part_sum); + offset += phnum * sizeof(*phdr); + + for (i = 0; i < phnum; i++) { + if (phdr[i].p_type != PT_LOAD) + continue; + part_sum = ipchksum(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_memsz); + sum = add_ipchksums(offset, sum, part_sum); + offset += phdr[i].p_memsz; + } + + if (sum != image_sum) { + printf("Verify FAILED (image:%#04x vs computed:%#04x)\n", + image_sum, sum); + return 0; + } + return 1; +} + +static inline unsigned padded(unsigned s) +{ + return (s + 3) & ~3; +} + +static Elf_Bhdr *add_boot_note(Elf_Bhdr *bhdr, const char *name, + unsigned type, const char *desc, unsigned descsz) +{ + Elf_Nhdr nhdr; + unsigned ent_size, new_size, pad; + char *addr; + + if (!bhdr) + return NULL; + + nhdr.n_namesz = name? strlen(name)+1 : 0; + nhdr.n_descsz = descsz; + nhdr.n_type = type; + ent_size = sizeof(nhdr) + padded(nhdr.n_namesz) + padded(nhdr.n_descsz); + if (bhdr->b_size + ent_size > 0xffff) { + printf("Boot notes too big\n"); + free(bhdr); + return NULL; + } + if (bhdr->b_size + ent_size > bhdr->b_checksum) { + do { + new_size = bhdr->b_checksum * 2; + } while (new_size < bhdr->b_size + ent_size); + if (new_size > 0xffff) + new_size = 0xffff; + debug("expanding boot note size to %u\n", new_size); +#ifdef HAVE_REALLOC + bhdr = realloc(bhdr, new_size); + bhdr->b_checksum = new_size; +#else + printf("Boot notes too big\n"); + free(bhdr); + return NULL; +#endif + } + + addr = (char *) bhdr; + addr += bhdr->b_size; + memcpy(addr, &nhdr, sizeof(nhdr)); + addr += sizeof(nhdr); + + memcpy(addr, name, nhdr.n_namesz); + addr += nhdr.n_namesz; + pad = padded(nhdr.n_namesz) - nhdr.n_namesz; + memset(addr, 0, pad); + addr += pad; + + memcpy(addr, desc, nhdr.n_descsz); + addr += nhdr.n_descsz; + pad = padded(nhdr.n_descsz) - nhdr.n_descsz; + memset(addr, 0, pad); + addr += pad; + + bhdr->b_size += ent_size; + bhdr->b_records++; + return bhdr; +} + +static inline Elf_Bhdr *add_note_string(Elf_Bhdr *bhdr, const char *name, + unsigned type, const char *desc) +{ + return add_boot_note(bhdr, name, type, desc, strlen(desc) + 1); +} + +static Elf_Bhdr *build_boot_notes(struct sys_info *info, const char *cmdline) +{ + Elf_Bhdr *bhdr; + + bhdr = malloc(256); + bhdr->b_signature = ELF_BHDR_MAGIC; + bhdr->b_size = sizeof *bhdr; + bhdr->b_checksum = 256; /* XXX cache the current buffer size here */ + bhdr->b_records = 0; + + if (info->firmware) + bhdr = add_note_string(bhdr, NULL, EBN_FIRMWARE_TYPE, info->firmware); + bhdr = add_note_string(bhdr, NULL, EBN_BOOTLOADER_NAME, program_name); + bhdr = add_note_string(bhdr, NULL, EBN_BOOTLOADER_VERSION, program_version); + if (cmdline) + bhdr = add_note_string(bhdr, NULL, EBN_COMMAND_LINE, cmdline); + if (!bhdr) + return bhdr; + bhdr->b_checksum = 0; + bhdr->b_checksum = ipchksum(bhdr, bhdr->b_size); + return bhdr; +} + +int +is_elf(Elf_ehdr *ehdr) +{ + return (ehdr->e_ident[EI_MAG0] == ELFMAG0 + && ehdr->e_ident[EI_MAG1] == ELFMAG1 + && ehdr->e_ident[EI_MAG2] == ELFMAG2 + && ehdr->e_ident[EI_MAG3] == ELFMAG3 + && ehdr->e_ident[EI_CLASS] == ARCH_ELF_CLASS + && ehdr->e_ident[EI_DATA] == ARCH_ELF_DATA + && ehdr->e_ident[EI_VERSION] == EV_CURRENT + && ehdr->e_type == ET_EXEC + && ARCH_ELF_MACHINE_OK(ehdr->e_machine) + && ehdr->e_version == EV_CURRENT + && ehdr->e_phentsize == sizeof(Elf_phdr)); +} + +int +find_elf(Elf_ehdr *ehdr) +{ + int offset; + + for (offset = 0; offset < MAX_HEADERS * BS; offset += BS) { + if ((size_t)read_io(fd, ehdr, sizeof ehdr) != sizeof ehdr) { + debug("Can't read ELF header\n"); + return 0; + } + + if (is_elf(ehdr)) { + debug("Found ELF header at offset %d\n", offset); + return offset; + } + + seek_io(fd, offset); + } + + debug("Not a bootable ELF image\n"); + return 0; +} + +Elf_phdr * +elf_readhdrs(int offset, Elf_ehdr *ehdr) +{ + unsigned long phdr_size; + Elf_phdr *phdr; + + phdr_size = ehdr->e_phnum * sizeof(Elf_phdr); + phdr = malloc(phdr_size); + seek_io(fd, offset + ehdr->e_phoff); + if ((size_t)read_io(fd, phdr, phdr_size) != phdr_size) { + printf("Can't read program header\n"); + return NULL; + } + + return phdr; +} + +int elf_load(struct sys_info *info, const char *filename, const char *cmdline, void **boot_notes) +{ + Elf_ehdr ehdr; + Elf_phdr *phdr = NULL; + unsigned long checksum_offset, file_size; + unsigned short checksum = 0; + int retval = -1; + unsigned int offset; + + image_name = image_version = NULL; + + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + + fd = open_io(filename); + if (!fd) + goto out; + + offset = find_elf(&ehdr); + if (!offset) { + retval = LOADER_NOT_SUPPORT; + goto out; + } + +#if DEBUG + printk("ELF header:\n"); + printk(" ehdr.e_type = %d\n", (int)ehdr.e_type); + printk(" ehdr.e_machine = %d\n", (int)ehdr.e_machine); + printk(" ehdr.e_version = %d\n", (int)ehdr.e_version); + printk(" ehdr.e_entry = 0x%08x\n", (int)ehdr.e_entry); + printk(" ehdr.e_phoff = 0x%08x\n", (int)ehdr.e_phoff); + printk(" ehdr.e_shoff = 0x%08x\n", (int)ehdr.e_shoff); + printk(" ehdr.e_flags = %d\n", (int)ehdr.e_flags); + printk(" ehdr.e_ehsize = 0x%08x\n", (int)ehdr.e_ehsize); + printk(" ehdr.e_phentsize = 0x%08x\n", (int)ehdr.e_phentsize); + printk(" ehdr.e_phnum = %d\n", (int)ehdr.e_phnum); +#endif + + if (ehdr.e_phnum > MAX_HEADERS) { + printk ("elfload: too many program headers (MAX_HEADERS)\n"); + retval = 0; + goto out; + } + + phdr = elf_readhdrs(offset, &ehdr); + if (!phdr) + goto out; + + if (!check_mem_ranges(info, phdr, ehdr.e_phnum)) + goto out; + + checksum_offset = process_image_notes(phdr, ehdr.e_phnum, &checksum, offset); + + printf("Loading %s", image_name ? image_name : "image"); + if (image_version) + printf(" version %s", image_version); + printf("...\n"); + + if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset, &file_size)) + goto out; + + if (checksum_offset) { + if (!verify_image(&ehdr, phdr, ehdr.e_phnum, checksum)) + goto out; + } + + /* If we are attempting an ELF boot image, we pass a non-NULL pointer + into boot_notes and mark the image as elf-boot rather than standard + ELF */ + if (boot_notes) { + *boot_notes = (void *)virt_to_phys(build_boot_notes(info, cmdline)); + feval("elf-boot saved-program-state >sps.file-type !"); + } else { + feval("elf saved-program-state >sps.file-type !"); + } + + //debug("current time: %lu\n", currticks()); + + debug("entry point is " FMT_elf "\n", addr_fixup(ehdr.e_entry)); + + // Initialise saved-program-state + PUSH(addr_fixup(ehdr.e_entry)); + feval("saved-program-state >sps.entry !"); + PUSH(file_size); + feval("saved-program-state >sps.file-size !"); + + feval("-1 state-valid !"); + +out: + close_io(fd); + if (phdr) + free(phdr); + if (image_name) + free(image_name); + if (image_version) + free(image_version); + return retval; +}

1 0

[commit] r709 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 arch/x86 include/arch/sparc32 include/arch/x86
by repository service 26 Mar '10

26 Mar '10

Author: mcayland Date: Fri Mar 26 23:33:50 2010 New Revision: 709 URL: http://tracker.coreboot.org/trac/openbios/changeset/709 Log: Switch the loaders for x86, sparc64 and sparc32 over to use the new saved-program-state in boot() rather than try to execute the device payload directly. This is the first stage in isolating the OF "load" and "go" words, and in preparation for moving the majority of the loaders into libopenbios. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/include/arch/sparc32/types.h trunk/openbios-devel/include/arch/x86/types.h Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Fri Mar 26 23:33:50 2010 (r709) @@ -56,7 +56,6 @@ int aout_load(struct sys_info *info, const char *filename, const void *romvec) { int retval = -1; - int image_retval; struct exec ehdr; unsigned long start, size; unsigned int offset = 512; @@ -134,18 +133,6 @@ feval("-1 state-valid !"); - printf("Jumping to entry point...\n"); - -#if 1 - { - int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); - - entry = (void *) addr_fixup(start); - image_retval = entry(romvec, 0, 0, 0, 0); - } -#endif - - printf("Image returned with return value %#x\n", image_retval); retval = 0; out: Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/sparc32/boot.c Fri Mar 26 23:33:50 2010 (r709) @@ -4,7 +4,6 @@ #undef BOOTSTRAP #include "config.h" #include "libopenbios/bindings.h" -#include "libopenbios/elfload.h" #include "arch/common/nvram.h" #include "drivers/drivers.h" #include "libc/diskio.h" @@ -19,25 +18,78 @@ uint32_t qemu_cmdline; uint32_t cmdline_size; char boot_device; +int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); -static void try_path(const char *path, char *param, const void *romvec) +static int try_path(const char *path, char *param, const void *romvec) { + ucell valid, address, type, size; + int image_retval = 0; + push_str(path); fword("pathres-resolve-aliases"); bootpath = pop_fstr_copy(); printk("Trying %s (%s)\n", path, bootpath); - elf_load(&sys_info, path, param, romvec); - linux_load(&sys_info, path, param); - aout_load(&sys_info, path, romvec); + /* ELF Boot loader */ + elf_load(&sys_info, path, param, romvec); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; + + /* Linux loader (not using Forth) */ + linux_load(&sys_info, path, param); + + /* a.out loader */ + aout_load(&sys_info, path, romvec); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; + + return 0; + + +start_image: + /* Get the entry point and the type (see forth/debugging/client.fs) */ + feval("saved-program-state >sps.entry @"); + address = POP(); + feval("saved-program-state >sps.file-type @"); + type = POP(); + feval("saved-program-state >sps.file-size @"); + size = POP(); + + printk("Jumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); + + switch (type) { + case 0x0: + /* Start ELF boot image */ + entry = (void *) address; + image_retval = entry(romvec, 0, 0, 0, 0); + + break; + + case 0x5: + /* Start a.out image */ + entry = (void *) address; + image_retval = entry(romvec, 0, 0, 0, 0); + + break; + } + + printk("Image returned with return value %#x\n", image_retval); + + return -1; } + void boot(void) { char *path = pop_fstr_copy(), *param, altpath[256]; const char *oldpath = path; int unit = 0; const void *romvec; + int result; if(!path) { push_str("boot-device"); @@ -102,8 +154,6 @@ romvec = init_openprom(); if (kernel_size) { - int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); - printk("[sparc] Kernel already loaded\n"); entry = (void *) kernel_image; entry(romvec, 0, 0, 0, 0); @@ -115,17 +165,19 @@ else printk("without parameters.\n"); - try_path(path, param, romvec); - - push_str(path); - PUSH(':'); - fword("left-split"); - snprintf(altpath, sizeof(altpath), "%s:d", pop_fstr_copy()); - POP(); - POP(); + result = try_path(path, param, romvec); + if (!result) { + push_str(path); + PUSH(':'); + fword("left-split"); + snprintf(altpath, sizeof(altpath), "%s:d", pop_fstr_copy()); + POP(); + POP(); + + try_path(altpath, param, romvec); + } - try_path(altpath, param, romvec); - printk("Unsupported image format\n"); + printk("Unsupported image format\n"); free(path); } Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/sparc32/elfload.c Fri Mar 26 23:33:50 2010 (r709) @@ -312,7 +312,6 @@ unsigned short checksum = 0; Elf_Bhdr *boot_notes = NULL; int retval = -1; - int image_retval; unsigned int offset; image_name = image_version = NULL; @@ -394,21 +393,6 @@ feval("-1 state-valid !"); - printf("Jumping to entry point...\n"); - -#if 1 - { - int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); - - entry = (void *) addr_fixup(ehdr.e_entry); - image_retval = entry(romvec, 0, 0, 0, 0); - } -#else - image_retval = start_elf(addr_fixup(ehdr.e_entry), virt_to_phys(boot_notes)); -#endif - - // console_init(); FIXME - printf("Image returned with return value %#x\n", image_retval); retval = 0; out: Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/sparc32/forthload.c Fri Mar 26 23:33:50 2010 (r709) @@ -68,9 +68,6 @@ feval("-1 state-valid !"); - PUSH ( (ucell)forthtext ); - PUSH ( (ucell)forthsize ); - fword("eval2"); retval=0; out: Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Fri Mar 26 23:33:50 2010 (r709) @@ -57,7 +57,6 @@ int aout_load(struct sys_info *info, const char *filename) { int retval = -1; - int image_retval; struct exec ehdr; unsigned long start, size; unsigned int offset; @@ -138,14 +137,6 @@ feval("-1 state-valid !"); - printf("Jumping to entry point...\n"); - - { - extern int sparc64_of_client_interface( int *params ); - image_retval = start_client_image(addr_fixup(start), (uint64_t)&sparc64_of_client_interface); - } - - printf("Image returned with return value %#x\n", image_retval); retval = 0; out: Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/sparc64/boot.c Fri Mar 26 23:33:50 2010 (r709) @@ -4,7 +4,6 @@ #undef BOOTSTRAP #include "config.h" #include "libopenbios/bindings.h" -#include "libopenbios/elfload.h" #include "arch/common/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" @@ -17,16 +16,88 @@ uint64_t qemu_cmdline; uint64_t cmdline_size; char boot_device; +extern int sparc64_of_client_interface( int *params ); + + +static int try_path(const char *path, char *param) +{ + void *boot_notes = NULL; + ucell valid, address, type, size; + int image_retval = 0; + + /* ELF Boot loader */ + elf_load(&sys_info, path, param); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; + + /* Linux loader (not using Forth) */ + linux_load(&sys_info, path, param); + + /* a.out loader */ + aout_load(&sys_info, path); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; + + /* Fcode loader */ + fcode_load(path); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; + + return 0; + + +start_image: + /* Get the entry point and the type (see forth/debugging/client.fs) */ + feval("saved-program-state >sps.entry @"); + address = POP(); + feval("saved-program-state >sps.file-type @"); + type = POP(); + feval("saved-program-state >sps.file-size @"); + size = POP(); + + printk("Jumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); + + switch (type) { + case 0x0: + /* Start ELF boot image */ + image_retval = start_elf(address, (uint64_t)boot_notes); + break; + + case 0x5: + /* Start a.out image */ + image_retval = start_client_image(address, (uint64_t)&sparc64_of_client_interface); + break; + + case 0x10: + /* Start Fcode image */ + printk("Evaluating FCode...\n"); + PUSH(address); + PUSH(1); + fword("byte-load"); + image_retval = 0; + break; + } + + printk("Image returned with return value %#x\n", image_retval); + + return -1; +} void boot(void) { char *path=pop_fstr_copy(), *param; char altpath[256]; + int result; if (kernel_size) { void (*entry)(unsigned long p1, unsigned long p2, unsigned long p3, - unsigned long p4, unsigned long p5); - extern int sparc64_of_client_interface( int *params ); + unsigned long p4, unsigned long p5);; printk("[sparc64] Kernel already loaded\n"); entry = (void *) (unsigned long)kernel_image; @@ -82,24 +153,13 @@ else printk("without parameters.\n"); + result = try_path(path, param); + if (!result) { + snprintf(altpath, sizeof(altpath), "%s:f", path); + try_path(altpath, param); + } - if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, path) == LOADER_NOT_SUPPORT) - if (fcode_load(path) == LOADER_NOT_SUPPORT) { - - snprintf(altpath, sizeof(altpath), "%s:f", path); - - if (elf_load(&sys_info, altpath, param) - == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, altpath, param) - == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, altpath) - == LOADER_NOT_SUPPORT) - if (fcode_load(altpath) - == LOADER_NOT_SUPPORT) - printk("Unsupported image format\n"); - } + printk("Unsupported image format\n"); free(path); } Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/sparc64/elfload.c Fri Mar 26 23:33:50 2010 (r709) @@ -311,7 +311,6 @@ unsigned short checksum = 0; Elf_Bhdr *boot_notes = NULL; int retval = -1; - int image_retval; unsigned int offset; image_name = image_version = NULL; @@ -393,27 +392,6 @@ feval("-1 state-valid !"); - printf("Jumping to entry point...\n"); - -#if 0 - { - extern unsigned int qemu_mem_size; - extern char boot_device; - void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device); - - int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); - const void *romvec; - - romvec = init_openprom(qemu_mem_size, cmdline, boot_device); - entry = (void *) addr_fixup(ehdr.e_entry); - image_retval = entry(romvec, 0, 0, 0, 0); - } -#else - image_retval = start_elf(addr_fixup(ehdr.e_entry), virt_to_phys(boot_notes)); -#endif - - // console_init(); FIXME - printf("Image returned with return value %#x\n", image_retval); retval = 0; out: Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Fri Mar 26 23:33:50 2010 (r709) @@ -74,11 +74,7 @@ feval("saved-program-state >sps.file-size !"); feval("fcode saved-program-state >sps.file-type !"); - printf("Evaluating FCode...\n"); - - PUSH(start); - PUSH(1); - fword("byte-load"); + feval("-1 state-valid !"); retval = 0; Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/sparc64/forthload.c Fri Mar 26 23:33:50 2010 (r709) @@ -68,9 +68,6 @@ feval("-1 state-valid !"); - PUSH ( (ucell)forthtext ); - PUSH ( (ucell)forthsize ); - fword("eval2"); retval=0; out: Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/x86/boot.c Fri Mar 26 23:33:50 2010 (r709) @@ -9,7 +9,6 @@ #undef BOOTSTRAP #include "config.h" #include "libopenbios/bindings.h" -#include "libopenbios/elfload.h" #include "arch/common/nvram.h" #include "libc/diskio.h" #include "libopenbios/sys_info.h" @@ -17,6 +16,62 @@ struct sys_info sys_info; +static int try_path(const char *path, char *param) +{ + ucell valid, address, type, size; + int image_retval = 0;; + + /* ELF Boot loader */ + elf_load(&sys_info, path, param); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; + + /* Linux loader (not using Forth) */ + linux_load(&sys_info, path, param); + + /* Forth loader */ + forth_load(&sys_info, path, param); + feval("state-valid @"); + valid = POP(); + if (valid) + goto start_image; + + return 0; + + +start_image: + /* Get the entry point and the type (see forth/debugging/client.fs) */ + feval("saved-program-state >sps.entry @"); + address = POP(); + feval("saved-program-state >sps.file-type @"); + type = POP(); + feval("saved-program-state >sps.file-size @"); + size = POP(); + + printk("Jumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); + + switch (type) { + case 0x0: + /* Start ELF boot image */ + image_retval = start_elf(address, (uint32_t)NULL); + break; + + case 0x11: + /* Start Forth image */ + PUSH(address); + PUSH(size); + fword("eval2"); + image_retval = 0; + break; + } + + printk("Image returned with return value %#x\n", image_retval); + + return -1; +} + void boot(void) { char *path=pop_fstr_copy(), *param; @@ -34,15 +89,9 @@ printk("[x86] Booting file '%s' with parameters '%s'\n",path, param); - if (elf_load(&sys_info, path, param) != LOADER_NOT_SUPPORT) - goto loaded; - if (linux_load(&sys_info, path, param) != LOADER_NOT_SUPPORT) - goto loaded; - if (forth_load(&sys_info, path, param) != LOADER_NOT_SUPPORT) - goto loaded; + try_path(path, param); printk("Unsupported image format\n"); -loaded: free(path); } Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/x86/elfload.c Fri Mar 26 23:33:50 2010 (r709) @@ -313,7 +313,6 @@ unsigned short checksum = 0; Elf_Bhdr *boot_notes = NULL; int retval = -1; - int image_retval; image_name = image_version = NULL; @@ -379,7 +378,7 @@ debug("entry point is %#x\n", ehdr.e_entry); // Initialise saved-program-state - PUSH(ehdr.e_entry); + PUSH(ehdr.e_entry & ADDRMASK); feval("saved-program-state >sps.entry !"); PUSH(file_size); feval("saved-program-state >sps.file-size !"); @@ -387,11 +386,6 @@ feval("-1 state-valid !"); - printk("Jumping to entry point...\n"); - image_retval = start_elf(ehdr.e_entry & ADDRMASK, virt_to_phys(boot_notes)); - - // console_init(); FIXME - printk("Image returned with return value %#x\n", image_retval); retval = 0; out: Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/arch/x86/forthload.c Fri Mar 26 23:33:50 2010 (r709) @@ -68,11 +68,6 @@ feval("-1 state-valid !"); - PUSH ( (ucell)forthtext ); - PUSH ( (ucell)forthsize ); - fword("eval2"); - retval=0; - out: //if (forthtext) // free(forthtext); Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/include/arch/sparc32/types.h Fri Mar 26 23:33:50 2010 (r709) @@ -35,6 +35,11 @@ typedef long long dcell; typedef unsigned long long ducell; +#define FMT_cell "%ld" +#define FMT_ucell "%lu" +#define FMT_ucellx "%08x" +#define FMT_ucellX "%08X" + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Fri Mar 26 22:17:32 2010 (r708) +++ trunk/openbios-devel/include/arch/x86/types.h Fri Mar 26 23:33:50 2010 (r709) @@ -24,6 +24,11 @@ typedef int64_t dcell; typedef uint64_t ducell; +#define FMT_cell "%ld" +#define FMT_ucell "%lu" +#define FMT_ucellx "%08x" +#define FMT_ucellX "%08X" + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3)

1 0

[commit] r708 - in trunk/openbios-devel: arch/amd64 arch/sparc32 arch/sparc64 arch/x86 forth/debugging
by repository service 26 Mar '10

26 Mar '10

Author: mcayland Date: Fri Mar 26 22:17:32 2010 New Revision: 708 URL: http://tracker.coreboot.org/trac/openbios/changeset/708 Log: Introduce the concept of the OF saved-program-state structure and modify all of the loaders (except PPC) to make use of it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/forth/debugging/client.fs Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/amd64/elfload.c Fri Mar 26 22:17:32 2010 (r708) @@ -311,6 +311,9 @@ image_name = image_version = 0; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + if (!file_open(filename)) goto out; @@ -368,6 +371,16 @@ debug("entry point is %#x\n", ehdr.e_entry); printf("Jumping to entry point...\n"); + + // Initialise saved-program-state + PUSH(ehdr.e_entry); + feval("saved-program-state >sps.entry !"); + PUSH(file_size); + feval("saved-program-state >sps.file-size !"); + feval("elf-boot saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + image_retval = start_elf(ehdr.e_entry, virt_to_phys(boot_notes)); // console_init(); FIXME Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Fri Mar 26 22:17:32 2010 (r708) @@ -7,6 +7,7 @@ #include "kernel/kernel.h" #include "arch/common/a.out.h" #include "libopenbios/sys_info.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "boot.h" #define printf printk @@ -62,6 +63,9 @@ image_name = image_version = NULL; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + fd = open_io(filename); if (!fd) goto out; @@ -119,8 +123,17 @@ } debug("Loaded %lu bytes\n", size); - debug("entry point is %#lx\n", start); + + // Initialise saved-program-state + PUSH(addr_fixup(start)); + feval("saved-program-state >sps.entry !"); + PUSH(size); + feval("saved-program-state >sps.file-size !"); + feval("aout saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + printf("Jumping to entry point...\n"); #if 1 Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/sparc32/elfload.c Fri Mar 26 22:17:32 2010 (r708) @@ -10,6 +10,7 @@ #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "boot.h" #define printf printk @@ -135,13 +136,12 @@ static int load_segments(Elf_phdr *phdr, int phnum, unsigned long checksum_offset, - unsigned int offset) + unsigned int offset, unsigned long *bytes) { - unsigned long bytes; //unsigned int start_time, time; int i; - bytes = 0; + *bytes = 0; // start_time = currticks(); for (i = 0; i < phnum; i++) { if (phdr[i].p_type != PT_LOAD) @@ -155,7 +155,7 @@ printf("Can't read program segment %d\n", i); return 0; } - bytes += phdr[i].p_filesz; + *bytes += phdr[i].p_filesz; debug("clearing... "); memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); @@ -171,7 +171,7 @@ // time = currticks() - start_time; //debug("Loaded %lu bytes in %ums (%luKB/s)\n", bytes, time, // time? bytes/time : 0); - debug("Loaded %lu bytes \n", bytes); + debug("Loaded %lu bytes \n", *bytes); return 1; } @@ -308,7 +308,7 @@ Elf_ehdr ehdr; Elf_phdr *phdr = NULL; unsigned long phdr_size; - unsigned long checksum_offset; + unsigned long checksum_offset, file_size; unsigned short checksum = 0; Elf_Bhdr *boot_notes = NULL; int retval = -1; @@ -317,6 +317,9 @@ image_name = image_version = NULL; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + fd = open_io(filename); if (!fd) goto out; @@ -368,7 +371,7 @@ printf(" version %s", image_version); printf("...\n"); - if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset)) + if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset, &file_size)) goto out; if (checksum_offset) { @@ -381,6 +384,16 @@ //debug("current time: %lu\n", currticks()); debug("entry point is %#x\n", addr_fixup(ehdr.e_entry)); + + // Initialise saved-program-state + PUSH(addr_fixup(ehdr.e_entry)); + feval("saved-program-state >sps.entry !"); + PUSH(file_size); + feval("saved-program-state >sps.file-size !"); + feval("elf-boot saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + printf("Jumping to entry point...\n"); #if 1 Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/sparc32/forthload.c Fri Mar 26 22:17:32 2010 (r708) @@ -24,6 +24,9 @@ unsigned long forthsize; int retval = -1; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + fd = open_io(filename); if (!fd) goto out; @@ -54,6 +57,17 @@ forthtext[forthsize]=0; printk("ok\n"); + close_io(fd); + + // Initialise saved-program-state + PUSH((ucell)forthtext); + feval("saved-program-state >sps.entry !"); + PUSH((ucell)forthsize); + feval("saved-program-state >sps.file-size !"); + feval("forth saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + PUSH ( (ucell)forthtext ); PUSH ( (ucell)forthsize ); fword("eval2"); Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Fri Mar 26 22:17:32 2010 (r708) @@ -8,6 +8,7 @@ #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "arch/common/a.out.h" #include "libopenbios/sys_info.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "boot.h" #define printf printk @@ -63,6 +64,9 @@ image_name = image_version = NULL; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + fd = open_io(filename); if (!fd) goto out; @@ -123,8 +127,17 @@ } debug("Loaded %lu bytes\n", size); - debug("entry point is %#lx\n", start); + + // Initialise saved-program-state + PUSH(addr_fixup(start)); + feval("saved-program-state >sps.entry !"); + PUSH(size); + feval("saved-program-state >sps.file-size !"); + feval("aout saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + printf("Jumping to entry point...\n"); { Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/sparc64/elfload.c Fri Mar 26 22:17:32 2010 (r708) @@ -10,6 +10,7 @@ #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "boot.h" #define printf printk @@ -135,13 +136,12 @@ static int load_segments(Elf_phdr *phdr, int phnum, unsigned long checksum_offset, - unsigned int offset) + unsigned int offset, unsigned long *bytes) { - unsigned long bytes; //unsigned int start_time, time; int i; - bytes = 0; + *bytes = 0; // start_time = currticks(); for (i = 0; i < phnum; i++) { if (phdr[i].p_type != PT_LOAD) @@ -155,7 +155,7 @@ printf("Can't read program segment %d\n", i); return 0; } - bytes += phdr[i].p_filesz; + *bytes += phdr[i].p_filesz; debug("clearing... "); memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); @@ -171,7 +171,7 @@ // time = currticks() - start_time; //debug("Loaded %lu bytes in %ums (%luKB/s)\n", bytes, time, // time? bytes/time : 0); - debug("Loaded %lu bytes \n", bytes); + debug("Loaded %lu bytes \n", *bytes); return 1; } @@ -307,7 +307,7 @@ Elf_ehdr ehdr; Elf_phdr *phdr = NULL; unsigned long phdr_size; - unsigned long checksum_offset; + unsigned long checksum_offset, file_size; unsigned short checksum = 0; Elf_Bhdr *boot_notes = NULL; int retval = -1; @@ -316,6 +316,9 @@ image_name = image_version = NULL; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + fd = open_io(filename); if (!fd) goto out; @@ -367,7 +370,7 @@ printf(" version %s", image_version); printf("...\n"); - if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset)) + if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset, &file_size)) goto out; if (checksum_offset) { @@ -380,6 +383,16 @@ //debug("current time: %lu\n", currticks()); debug("entry point is %#llx\n", addr_fixup(ehdr.e_entry)); + + // Initialise saved-program-state + PUSH(addr_fixup(ehdr.e_entry)); + feval("saved-program-state >sps.entry !"); + PUSH(file_size); + feval("saved-program-state >sps.file-size !"); + feval("elf-boot saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + printf("Jumping to entry point...\n"); #if 0 Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Fri Mar 26 22:17:32 2010 (r708) @@ -20,6 +20,9 @@ unsigned long start, size; unsigned int offset; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + fd = open_io(filename); if (!fd) goto out; @@ -62,8 +65,15 @@ } debug("Loaded %lu bytes\n", size); - debug("entry point is %#lx\n", start); + + // Initialise saved-program-state + PUSH(start); + feval("saved-program-state >sps.entry !"); + PUSH(size); + feval("saved-program-state >sps.file-size !"); + feval("fcode saved-program-state >sps.file-type !"); + printf("Evaluating FCode...\n"); PUSH(start); Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/sparc64/forthload.c Fri Mar 26 22:17:32 2010 (r708) @@ -24,6 +24,9 @@ unsigned long forthsize; int retval = -1; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + fd = open_io(filename); if (!fd) goto out; @@ -56,6 +59,15 @@ close_io(fd); + // Initialise saved-program-state + PUSH((ucell)forthtext); + feval("saved-program-state >sps.entry !"); + PUSH((ucell)forthsize); + feval("saved-program-state >sps.file-size !"); + feval("forth saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + PUSH ( (ucell)forthtext ); PUSH ( (ucell)forthsize ); fword("eval2"); Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/x86/elfload.c Fri Mar 26 22:17:32 2010 (r708) @@ -10,6 +10,7 @@ #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "boot.h" @@ -137,13 +138,12 @@ } static int load_segments(Elf_phdr *phdr, int phnum, - unsigned long checksum_offset) + unsigned long checksum_offset, unsigned long *bytes) { - unsigned long bytes; //unsigned int start_time, time; int i; - bytes = 0; + *bytes = 0; // start_time = currticks(); for (i = 0; i < phnum; i++) { if (phdr[i].p_type != PT_LOAD) @@ -157,7 +157,7 @@ printk("Can't read program segment %d\n", i); return 0; } - bytes += phdr[i].p_filesz; + *bytes += phdr[i].p_filesz; debug("clearing... "); memset(phys_to_virt(phdr[i].p_paddr + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); @@ -173,7 +173,7 @@ // time = currticks() - start_time; //debug("Loaded %lu bytes in %ums (%luKB/s)\n", bytes, time, // time? bytes/time : 0); - debug("Loaded %lu bytes \n", bytes); + debug("Loaded %lu bytes \n", *bytes); return 1; } @@ -309,7 +309,7 @@ Elf_ehdr ehdr; Elf_phdr *phdr = NULL; unsigned long phdr_size; - unsigned long checksum_offset; + unsigned long checksum_offset, file_size; unsigned short checksum = 0; Elf_Bhdr *boot_notes = NULL; int retval = -1; @@ -317,6 +317,9 @@ image_name = image_version = NULL; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + fd = open_io(filename); if (!fd) goto out; @@ -361,7 +364,7 @@ printk(" version %s", image_version); printk("...\n"); - if (!load_segments(phdr, ehdr.e_phnum, checksum_offset)) + if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, &file_size)) goto out; if (checksum_offset) { @@ -374,6 +377,16 @@ //debug("current time: %lu\n", currticks()); debug("entry point is %#x\n", ehdr.e_entry); + + // Initialise saved-program-state + PUSH(ehdr.e_entry); + feval("saved-program-state >sps.entry !"); + PUSH(file_size); + feval("saved-program-state >sps.file-size !"); + feval("elf-boot saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + printk("Jumping to entry point...\n"); image_retval = start_elf(ehdr.e_entry & ADDRMASK, virt_to_phys(boot_notes)); Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/arch/x86/forthload.c Fri Mar 26 22:17:32 2010 (r708) @@ -24,6 +24,9 @@ unsigned long forthsize; int retval = -1; + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + fd = open_io(filename); if (!fd) goto out; @@ -54,6 +57,17 @@ forthtext[forthsize]=0; printk("ok\n"); + close_io(fd); + + // Initialise saved-program-state + PUSH((ucell)forthtext); + feval("saved-program-state >sps.entry !"); + PUSH((ucell)forthsize); + feval("saved-program-state >sps.file-size !"); + feval("forth saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + PUSH ( (ucell)forthtext ); PUSH ( (ucell)forthsize ); fword("eval2"); Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Fri Mar 26 21:25:04 2010 (r707) +++ trunk/openbios-devel/forth/debugging/client.fs Fri Mar 26 22:17:32 2010 (r708) @@ -16,6 +16,12 @@ \ 7.6.2 Program download and execute +struct ( saved-program-state ) + /n field >sps.entry + /n field >sps.file-size + /n field >sps.file-type +constant saved-program-state.size +create saved-program-state saved-program-state.size allot variable state-valid 0 state-valid ! @@ -28,10 +34,14 @@ variable file-type -0 constant elf -1 constant bootinfo -2 constant xcoff -3 constant pe +0 constant elf-boot +1 constant elf +2 constant bootinfo +3 constant xcoff +4 constant pe +5 constant aout +10 constant fcode +11 constant forth \ Array indexes and values for e_type

1 0

[commit] r707 - in trunk/openbios-devel/arch: amd64 sparc32 sparc64 x86
by repository service 26 Mar '10

26 Mar '10

Author: mcayland Date: Fri Mar 26 21:25:04 2010 New Revision: 707 URL: http://tracker.coreboot.org/trac/openbios/changeset/707 Log: Remove loadfs.c and loadfs.h from all of the various architectures. They appear to be almost non-existent wrappers which add an extra layer of indirection without much benefit. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Deleted: trunk/openbios-devel/arch/amd64/loadfs.c trunk/openbios-devel/arch/amd64/loadfs.h trunk/openbios-devel/arch/sparc32/loadfs.c trunk/openbios-devel/arch/sparc32/loadfs.h trunk/openbios-devel/arch/sparc64/loadfs.c trunk/openbios-devel/arch/sparc64/loadfs.h trunk/openbios-devel/arch/x86/loadfs.c trunk/openbios-devel/arch/x86/loadfs.h Modified: trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/x86/build.xml trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/linux_load.c Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Fri Mar 26 21:25:04 2010 (r707) @@ -7,7 +7,7 @@ #include "kernel/kernel.h" #include "arch/common/a.out.h" #include "libopenbios/sys_info.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printf printk #define debug printk @@ -15,6 +15,7 @@ #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; +static int fd; static int check_mem_ranges(struct sys_info *info, unsigned long start, @@ -61,12 +62,13 @@ image_name = image_version = NULL; - if (!file_open(filename)) + fd = open_io(filename); + if (!fd) goto out; - file_seek(offset); + seek_io(fd, offset); - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + if (read_io(fd, &ehdr, sizeof ehdr) != sizeof ehdr) { debug("Can't read a.out header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -98,19 +100,19 @@ printf("Loading a.out %s...\n", image_name ? image_name : "image"); - file_seek(offset + N_TXTOFF(ehdr)); + seek_io(fd, offset + N_TXTOFF(ehdr)); if (N_MAGIC(ehdr) == NMAGIC) { - if ((unsigned long)lfile_read((void *)start, ehdr.a_text) != ehdr.a_text) { + if ((unsigned long)read_io(fd, (void *)start, ehdr.a_text) != ehdr.a_text) { printf("Can't read program text segment (size 0x%lx)\n", ehdr.a_text); goto out; } - if ((unsigned long)lfile_read((void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { + if ((unsigned long)read_io(fd, (void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { printf("Can't read program data segment (size 0x%lx)\n", ehdr.a_data); goto out; } } else { - if ((unsigned long)lfile_read((void *)start, size) != size) { + if ((unsigned long)read_io(fd, (void *)start, size) != size) { printf("Can't read program (size 0x%lx)\n", size); goto out; } @@ -134,6 +136,6 @@ retval = 0; out: - file_close(); + close_io(fd); return retval; } Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc32/build.xml Fri Mar 26 21:25:04 2010 (r707) @@ -18,7 +18,6 @@ <object source="elfload.c"/> <object source="aoutload.c"/> <object source="forthload.c"/> - <object source="loadfs.c"/> <object source="romvec.c"/> <object source="entry.S"/> <object source="vectors.S"/> Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc32/elfload.c Fri Mar 26 21:25:04 2010 (r707) @@ -10,7 +10,7 @@ #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printf printk #define debug printk @@ -18,6 +18,7 @@ #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; +static int fd; static void *calloc(size_t nmemb, size_t size) { @@ -90,8 +91,8 @@ if (phdr[i].p_type != PT_NOTE) continue; buf = malloc(phdr[i].p_filesz); - file_seek(offset + phdr[i].p_offset); - if ((uint32_t)lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { + seek_io(fd, offset + phdr[i].p_offset); + if ((uint32_t)read_io(fd, buf, phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read note segment\n"); goto out; } @@ -126,7 +127,7 @@ } } out: - file_close(); + close_io(fd); if (buf) free(buf); return retval; @@ -147,9 +148,9 @@ continue; debug("segment %d addr:%#x file:%#x mem:%#x ", i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz); - file_seek(offset + phdr[i].p_offset); + seek_io(fd, offset + phdr[i].p_offset); debug("loading... "); - if ((uint32_t)lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) + if ((uint32_t)read_io(fd, phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read program segment %d\n", i); return 0; @@ -316,11 +317,12 @@ image_name = image_version = NULL; - if (!file_open(filename)) + fd = open_io(filename); + if (!fd) goto out; for (offset = 0; offset < 16 * 512; offset += 512) { - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + if (read_io(fd, &ehdr, sizeof ehdr) != sizeof ehdr) { debug("Can't read ELF header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -329,7 +331,7 @@ if (ehdr.e_ident[EI_MAG0] == ELFMAG0) break; - file_seek(offset); + seek_io(fd, offset); } if (ehdr.e_ident[EI_MAG0] != ELFMAG0 @@ -350,8 +352,8 @@ phdr_size = ehdr.e_phnum * sizeof *phdr; phdr = malloc(phdr_size); - file_seek(offset + ehdr.e_phoff); - if ((uint32_t)lfile_read(phdr, phdr_size) != phdr_size) { + seek_io(fd, offset + ehdr.e_phoff); + if ((uint32_t)read_io(fd, phdr, phdr_size) != phdr_size) { printf("Can't read program header\n"); goto out; } @@ -397,7 +399,7 @@ retval = 0; out: - file_close(); + close_io(fd); if (phdr) free(phdr); if (boot_notes) Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc32/forthload.c Fri Mar 26 21:25:04 2010 (r707) @@ -10,12 +10,13 @@ #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printk printk #define debug printk static char *forthtext=NULL; +static int fd; int forth_load(const char *filename) { @@ -23,10 +24,11 @@ unsigned long forthsize; int retval = -1; - if (!file_open(filename)) + fd = open_io(filename); + if (!fd) goto out; - if (lfile_read(magic, 2) != 2) { + if (read_io(fd, magic, 2) != 2) { debug("Can't read magic header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -38,13 +40,14 @@ goto out; } - forthsize = file_size(); - + /* Calculate the file size by seeking to the end of the file */ + seek_io(fd, -1); + forthsize = tell(fd); forthtext = malloc(forthsize+1); - file_seek(0); + seek_io(fd, 0); printk("Loading forth source ..."); - if ((unsigned long)lfile_read(forthtext, forthsize) != forthsize) { + if ((unsigned long)read_io(fd, forthtext, forthsize) != forthsize) { printk("Can't read forth text\n"); goto out; } Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Fri Mar 26 21:25:04 2010 (r707) @@ -13,7 +13,7 @@ #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" #include "context.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printf printk @@ -157,6 +157,25 @@ }; static uint64_t forced_memsize; +static int fd; + +static unsigned long file_size(void) +{ + llong fpos, fsize; + + /* Save current position */ + fpos = tell(fd); + + /* Go to end of file and get position */ + seek_io(fd, -1); + fsize = tell(fd); + + /* Go back to old position */ + seek_io(fd, 0); + seek_io(fd, fpos); + + return fsize; +} /* Load the first part the file and check if it's Linux */ static uint32_t load_linux_header(struct linux_header *hdr) @@ -164,7 +183,7 @@ int load_high; uint32_t kern_addr; - if (lfile_read(hdr, sizeof *hdr) != sizeof *hdr) { + if (read_io(fd, hdr, sizeof *hdr) != sizeof *hdr) { debug("Can't read Linux header\n"); return 0; } @@ -191,8 +210,8 @@ printf("Found Linux"); if (hdr->protocol_version >= 0x200 && hdr->kver_addr) { char kver[256]; - file_seek(hdr->kver_addr + 0x200); - if (lfile_read(kver, sizeof kver) != 0) { + seek_io(fd, hdr->kver_addr + 0x200); + if (read_io(fd, kver, sizeof kver) != 0) { kver[255] = 0; printf(" version %s", kver); } @@ -412,7 +431,7 @@ if (hdr->setup_sects == 0) hdr->setup_sects = 4; kern_offset = (hdr->setup_sects + 1) * 512; - file_seek(kern_offset); + seek_io(fd, kern_offset); kern_size = file_size() - kern_offset; debug("offset=%#x addr=%#x size=%#x\n", kern_offset, kern_addr, kern_size); @@ -425,7 +444,7 @@ #endif printf("Loading kernel... "); - if ((uint32_t)lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { + if ((uint32_t)read_io(fd, phys_to_virt(kern_addr), kern_size) != kern_size) { printf("Can't read kernel\n"); return 0; } @@ -441,7 +460,8 @@ uint32_t start, end, size; uint64_t forced; - if (!file_open(initrd_file)) { + fd = open_io(initrd_file); + if (!fd) { printf("Can't open initrd: %s\n", initrd_file); return -1; } @@ -498,7 +518,7 @@ } printf("Loading initrd... "); - if ((uint32_t)lfile_read(phys_to_virt(start), size) != size) { + if ((uint32_t)read_io(fd, phys_to_virt(start), size) != size) { printf("Can't read initrd\n"); return -1; } @@ -507,6 +527,8 @@ params->initrd_start = start; params->initrd_size = size; + close_io(fd); + return 0; } @@ -586,12 +608,13 @@ uint32_t kern_addr, kern_size; char *initrd_file = NULL; - if (!file_open(file)) + fd = open_io(file); + if (!fd) return -1; kern_addr = load_linux_header(&hdr); if (kern_addr == 0) { - file_close(); + close_io(fd); return LOADER_NOT_SUPPORT; } Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Fri Mar 26 21:25:04 2010 (r707) @@ -8,7 +8,7 @@ #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "arch/common/a.out.h" #include "libopenbios/sys_info.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printf printk #define debug printk @@ -16,6 +16,7 @@ #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; +static int fd; static int check_mem_ranges(struct sys_info *info, unsigned long start, @@ -62,12 +63,13 @@ image_name = image_version = NULL; - if (!file_open(filename)) + fd = open_io(filename); + if (!fd) goto out; for (offset = 0; offset < 16 * 512; offset += 512) { - file_seek(offset); - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + seek_io(fd, offset); + if (read_io(fd, &ehdr, sizeof ehdr) != sizeof ehdr) { debug("Can't read a.out header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -102,19 +104,19 @@ printf("Loading a.out %s...\n", image_name ? image_name : "image"); - file_seek(offset + N_TXTOFF(ehdr)); + seek_io(fd, offset + N_TXTOFF(ehdr)); if (N_MAGIC(ehdr) == NMAGIC) { - if ((unsigned long)lfile_read((void *)start, ehdr.a_text) != ehdr.a_text) { + if ((unsigned long)read_io(fd, (void *)start, ehdr.a_text) != ehdr.a_text) { printf("Can't read program text segment (size 0x%x)\n", ehdr.a_text); goto out; } - if ((unsigned long)lfile_read((void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { + if ((unsigned long)read_io(fd, (void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { printf("Can't read program data segment (size 0x%x)\n", ehdr.a_data); goto out; } } else { - if ((unsigned long)lfile_read((void *)start, size) != size) { + if ((unsigned long)read_io(fd, (void *)start, size) != size) { printf("Can't read program (size 0x%lx)\n", size); goto out; } @@ -134,6 +136,6 @@ retval = 0; out: - file_close(); + close_io(fd); return retval; } Modified: trunk/openbios-devel/arch/sparc64/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc64/build.xml Fri Mar 26 21:25:04 2010 (r707) @@ -18,7 +18,6 @@ <object source="aoutload.c"/> <object source="forthload.c"/> <object source="fcodeload.c"/> - <object source="loadfs.c"/> <object source="ofmem_sparc64.c"/> <object source="entry.S"/> <object source="vectors.S"/> Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc64/elfload.c Fri Mar 26 21:25:04 2010 (r707) @@ -10,7 +10,7 @@ #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printf printk #define debug printk @@ -18,6 +18,7 @@ #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; +static int fd; static void *calloc(size_t nmemb, size_t size) { @@ -90,8 +91,8 @@ if (phdr[i].p_type != PT_NOTE) continue; buf = malloc(phdr[i].p_filesz); - file_seek(offset + phdr[i].p_offset); - if ((uint64_t)lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { + seek_io(fd, offset + phdr[i].p_offset); + if ((uint64_t)read_io(fd, buf, phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read note segment\n"); goto out; } @@ -126,7 +127,7 @@ } } out: - file_close(); + close_io(fd); if (buf) free(buf); return retval; @@ -147,9 +148,9 @@ continue; debug("segment %d addr:%#llx file:%#llx mem:%#llx ", i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz); - file_seek(offset + phdr[i].p_offset); + seek_io(fd, offset + phdr[i].p_offset); debug("loading... "); - if ((uint64_t)lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) + if ((uint64_t)read_io(fd, phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read program segment %d\n", i); return 0; @@ -315,11 +316,12 @@ image_name = image_version = NULL; - if (!file_open(filename)) + fd = open_io(filename); + if (!fd) goto out; for (offset = 0; offset < 16 * 512; offset += 512) { - if ((size_t)lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + if ((size_t)read_io(fd, &ehdr, sizeof ehdr) != sizeof ehdr) { debug("Can't read ELF header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -328,7 +330,7 @@ if (ehdr.e_ident[EI_MAG0] == ELFMAG0) break; - file_seek(offset); + seek_io(fd, offset); } if (ehdr.e_ident[EI_MAG0] != ELFMAG0 @@ -349,8 +351,8 @@ phdr_size = ehdr.e_phnum * sizeof *phdr; phdr = malloc(phdr_size); - file_seek(offset + ehdr.e_phoff); - if ((unsigned long)lfile_read(phdr, phdr_size) != phdr_size) { + seek_io(fd, offset + ehdr.e_phoff); + if ((unsigned long)read_io(fd, phdr, phdr_size) != phdr_size) { printf("Can't read program header\n"); goto out; } @@ -402,7 +404,7 @@ retval = 0; out: - file_close(); + close_io(fd); if (phdr) free(phdr); if (boot_notes) Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Fri Mar 26 21:25:04 2010 (r707) @@ -6,11 +6,13 @@ #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printf printk #define debug printk +static int fd; + int fcode_load(const char *filename) { int retval = -1; @@ -18,12 +20,13 @@ unsigned long start, size; unsigned int offset; - if (!file_open(filename)) + fd = open_io(filename); + if (!fd) goto out; for (offset = 0; offset < 16 * 512; offset += 512) { - file_seek(offset); - if (lfile_read(&fcode_header, sizeof(fcode_header)) + seek_io(fd, offset); + if (read_io(fd, &fcode_header, sizeof(fcode_header)) != sizeof(fcode_header)) { debug("Can't read FCode header from file %s\n", filename); retval = LOADER_NOT_SUPPORT; @@ -51,9 +54,9 @@ printf("Loading FCode image...\n"); - file_seek(offset + sizeof(fcode_header)); + seek_io(fd, offset + sizeof(fcode_header)); - if ((unsigned long)lfile_read((void *)start, size) != size) { + if ((unsigned long)read_io(fd, (void *)start, size) != size) { printf("Can't read file (size 0x%lx)\n", size); goto out; } @@ -70,6 +73,6 @@ retval = 0; out: - file_close(); + close_io(fd); return retval; } Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc64/forthload.c Fri Mar 26 21:25:04 2010 (r707) @@ -10,22 +10,25 @@ #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printk printk #define debug printk static char *forthtext=NULL; +static int fd; + int forth_load(const char *filename) { char magic[2]; unsigned long forthsize; int retval = -1; - if (!file_open(filename)) + fd = open_io(filename); + if (!fd) goto out; - if (lfile_read(magic, 2) != 2) { + if (read_io(fd, magic, 2) != 2) { debug("Can't read magic header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -37,19 +40,22 @@ goto out; } - forthsize = file_size(); - + /* Calculate the file size by seeking to the end of the file */ + seek_io(fd, -1); + forthsize = tell(fd); forthtext = malloc(forthsize+1); - file_seek(0); + seek_io(fd, 0); printk("Loading forth source ..."); - if ((unsigned long)lfile_read(forthtext, forthsize) != forthsize) { + if ((unsigned long)read_io(fd, forthtext, forthsize) != forthsize) { printk("Can't read forth text\n"); goto out; } forthtext[forthsize]=0; printk("ok\n"); + close_io(fd); + PUSH ( (ucell)forthtext ); PUSH ( (ucell)forthsize ); fword("eval2"); Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Fri Mar 26 21:25:04 2010 (r707) @@ -13,7 +13,7 @@ #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" #include "context.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printf printk @@ -157,6 +157,25 @@ }; static uint64_t forced_memsize; +static int fd; + +static unsigned long file_size(void) +{ + llong fpos, fsize; + + /* Save current position */ + fpos = tell(fd); + + /* Go to end of file and get position */ + seek_io(fd, -1); + fsize = tell(fd); + + /* Go back to old position */ + seek_io(fd, 0); + seek_io(fd, fpos); + + return fsize; +} /* Load the first part the file and check if it's Linux */ static uint32_t load_linux_header(struct linux_header *hdr) @@ -164,7 +183,7 @@ int load_high; uint32_t kern_addr; - if (lfile_read(hdr, sizeof *hdr) != sizeof *hdr) { + if (read_io(fd, hdr, sizeof *hdr) != sizeof *hdr) { debug("Can't read Linux header\n"); return 0; } @@ -191,8 +210,8 @@ printf("Found Linux"); if (hdr->protocol_version >= 0x200 && hdr->kver_addr) { char kver[256]; - file_seek(hdr->kver_addr + 0x200); - if (lfile_read(kver, sizeof kver) != 0) { + seek_io(fd, hdr->kver_addr + 0x200); + if (read_io(fd, kver, sizeof kver) != 0) { kver[255] = 0; printf(" version %s", kver); } @@ -412,7 +431,7 @@ if (hdr->setup_sects == 0) hdr->setup_sects = 4; kern_offset = (hdr->setup_sects + 1) * 512; - file_seek(kern_offset); + seek_io(fd, kern_offset); kern_size = file_size() - kern_offset; debug("offset=%#x addr=%#x size=%#x\n", kern_offset, kern_addr, kern_size); @@ -425,7 +444,7 @@ #endif printf("Loading kernel... "); - if ((uint32_t)lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { + if ((uint32_t)read_io(fd, phys_to_virt(kern_addr), kern_size) != kern_size) { printf("Can't read kernel\n"); return 0; } @@ -441,7 +460,8 @@ uint32_t start, end, size; uint64_t forced; - if (!file_open(initrd_file)) { + fd = open_io(initrd_file); + if (!fd) { printf("Can't open initrd: %s\n", initrd_file); return -1; } @@ -498,7 +518,7 @@ } printf("Loading initrd... "); - if ((uint32_t)lfile_read(phys_to_virt(start), size) != size) { + if ((uint32_t)read_io(fd, phys_to_virt(start), size) != size) { printf("Can't read initrd\n"); return -1; } @@ -507,6 +527,8 @@ params->initrd_start = start; params->initrd_size = size; + close_io(fd); + return 0; } @@ -586,12 +608,13 @@ uint32_t kern_addr, kern_size; char *initrd_file = NULL; - if (!file_open(file)) + fd = open_io(file); + if (!fd) return -1; kern_addr = load_linux_header(&hdr); if (kern_addr == 0) { - file_close(); + close_io(fd); return LOADER_NOT_SUPPORT; } Modified: trunk/openbios-devel/arch/x86/build.xml ============================================================================== --- trunk/openbios-devel/arch/x86/build.xml Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/x86/build.xml Fri Mar 26 21:25:04 2010 (r707) @@ -16,7 +16,6 @@ <object source="sys_info.c"/> <object source="elfload.c"/> <object source="forthload.c"/> - <object source="loadfs.c"/> <object source="entry.S"/> <object source="xbox/console.c" condition="XBOX"/> <object source="xbox/methods.c" condition="XBOX"/> Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/x86/elfload.c Fri Mar 26 21:25:04 2010 (r707) @@ -10,7 +10,7 @@ #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define debug printk @@ -22,6 +22,7 @@ extern char _start, _end; static char *image_name, *image_version; +static int fd; static void *calloc(size_t nmemb, size_t size) { @@ -94,8 +95,8 @@ if (phdr[i].p_type != PT_NOTE) continue; buf = malloc(phdr[i].p_filesz); - file_seek(phdr[i].p_offset); - if (lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { + seek_io(fd, phdr[i].p_offset); + if (read_io(fd, buf, phdr[i].p_filesz) != phdr[i].p_filesz) { printk("Can't read note segment\n"); goto out; } @@ -149,9 +150,9 @@ continue; debug("segment %d addr:%#x file:%#x mem:%#x ", i, phdr[i].p_paddr, phdr[i].p_filesz, phdr[i].p_memsz); - file_seek(phdr[i].p_offset); + seek_io(fd, phdr[i].p_offset); debug("loading... "); - if (lfile_read(phys_to_virt(phdr[i].p_paddr & ADDRMASK), phdr[i].p_filesz) + if (read_io(fd, phys_to_virt(phdr[i].p_paddr & ADDRMASK), phdr[i].p_filesz) != phdr[i].p_filesz) { printk("Can't read program segment %d\n", i); return 0; @@ -316,10 +317,11 @@ image_name = image_version = NULL; - if (!file_open(filename)) + fd = open_io(filename); + if (!fd) goto out; - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + if (read_io(fd, &ehdr, sizeof ehdr) != sizeof ehdr) { debug("Can't read ELF header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -343,8 +345,8 @@ phdr_size = ehdr.e_phnum * sizeof *phdr; phdr = malloc(phdr_size); - file_seek(ehdr.e_phoff); - if (lfile_read(phdr, phdr_size) != phdr_size) { + seek_io(fd, ehdr.e_phoff); + if (read_io(fd, phdr, phdr_size) != phdr_size) { printk("Can't read program header\n"); goto out; } Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/x86/forthload.c Fri Mar 26 21:25:04 2010 (r707) @@ -10,22 +10,25 @@ #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printk printk #define debug printk static char *forthtext=NULL; +static int fd; + int forth_load(struct sys_info *info, const char *filename, const char *cmdline) { char magic[2]; unsigned long forthsize; int retval = -1; - if (!file_open(filename)) + fd = open_io(filename); + if (!fd) goto out; - if (lfile_read(magic, 2) != 2) { + if (read_io(fd, magic, 2) != 2) { debug("Can't read magic header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -37,13 +40,14 @@ goto out; } - forthsize = file_size(); - + /* Calculate the file size by seeking to the end of the file */ + seek_io(fd, -1); + forthsize = tell(fd); forthtext = malloc(forthsize+1); - file_seek(0); + seek_io(fd, 0); printk("Loading forth source ..."); - if (lfile_read(forthtext, forthsize) != forthsize) { + if (read_io(fd, forthtext, forthsize) != forthsize) { printk("Can't read forth text\n"); goto out; } Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Thu Mar 25 22:14:00 2010 (r706) +++ trunk/openbios-devel/arch/x86/linux_load.c Fri Mar 26 21:25:04 2010 (r707) @@ -14,7 +14,7 @@ #include "libopenbios/sys_info.h" #include "context.h" #include "segment.h" -#include "loadfs.h" +#include "libc/diskio.h" #include "boot.h" #define printf printk @@ -158,6 +158,25 @@ }; static uint64_t forced_memsize; +static int fd; + +static unsigned long file_size(void) +{ + llong fpos, fsize; + + /* Save current position */ + fpos = tell(fd); + + /* Go to end of file and get position */ + seek_io(fd, -1); + fsize = tell(fd); + + /* Go back to old position */ + seek_io(fd, 0); + seek_io(fd, fpos); + + return fsize; +} /* Load the first part the file and check if it's Linux */ static uint32_t load_linux_header(struct linux_header *hdr) @@ -165,7 +184,7 @@ int load_high; uint32_t kern_addr; - if (lfile_read(hdr, sizeof *hdr) != sizeof *hdr) { + if (read_io(fd, hdr, sizeof *hdr) != sizeof *hdr) { debug("Can't read Linux header\n"); return 0; } @@ -192,8 +211,8 @@ printf("Found Linux"); if (hdr->protocol_version >= 0x200 && hdr->kver_addr) { char kver[256]; - file_seek(hdr->kver_addr + 0x200); - if (lfile_read(kver, sizeof kver) != 0) { + seek_io(fd, hdr->kver_addr + 0x200); + if (read_io(fd, kver, sizeof kver) != 0) { kver[255] = 0; printf(" version %s", kver); } @@ -413,7 +432,7 @@ if (hdr->setup_sects == 0) hdr->setup_sects = 4; kern_offset = (hdr->setup_sects + 1) * 512; - file_seek(kern_offset); + seek_io(fd, kern_offset); kern_size = file_size() - kern_offset; debug("offset=%#x addr=%#x size=%#x\n", kern_offset, kern_addr, kern_size); @@ -426,7 +445,7 @@ #endif printf("Loading kernel... "); - if (lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { + if (read_io(fd, phys_to_virt(kern_addr), kern_size) != kern_size) { printf("Can't read kernel\n"); return 0; } @@ -443,7 +462,8 @@ uint64_t forced; extern char _start[], _end[]; - if (!file_open(initrd_file)) { + fd = open_io(initrd_file); + if (!fd) { printf("Can't open initrd: %s\n", initrd_file); return -1; } @@ -500,7 +520,7 @@ } printf("Loading initrd... "); - if (lfile_read(phys_to_virt(start), size) != size) { + if (read_io(fd, phys_to_virt(start), size) != size) { printf("Can't read initrd\n"); return -1; } @@ -509,6 +529,8 @@ params->initrd_start = start; params->initrd_size = size; + close_io(fd); + return 0; } @@ -612,7 +634,8 @@ uint32_t kern_addr, kern_size; char *initrd_file = NULL; - if (!file_open(file)) + fd = open_io(file); + if (!fd) return -1; kern_addr = load_linux_header(&hdr);

1 0

Some notes on forthstrap
by Mark Cave-Ayland 25 Mar '10

25 Mar '10

Hi folks, With my attempt to figure out why the PPC builds aren't working, I've spent a little more time working on improving the error reporting in forthstrap. Having had more of an insight as to how forthstrap works, I figured it might be useful to share my notes on how the process works. Tracing through the code, I now realise why my first attempt at locating errors didn't work very well. It seems that forthstrap (kernel/bootstrap.c) actually has two different modes depending upon whether a base dictionary is supplied on the command line or not. - If no base dictionary is supplied, then the input source files are compiled using the C implementation of the forth interpreter realised by the interpret_source() function. - If a base dictionary is supplied, load the base dictionary from disk and invoke the initialize word in order to run the forth kernel. From the Makefile it is possible to see that the first time forthstrap is invoked, no base dictionary is supplied and so a dictionary containing a basic Forth interpreter is built using the C interpreter implementation in kernel/bootstrap.c. On subsequent calls to forthstrap, the previous dictionary is passed in as a base dictionary. forthstrap loads the dictionary and invokes the initialize word to run the Forth interpreter. The important part is the #ifdef...#endif section in kernel/forth.c for the "key" word. What this does is override the default I/O functions so that the contents of each input file passed on the command line are piped into the kernel one character at a time. By adding a new switch to forthstrap and trapping the "emit" word in a similar way, it is possible to redirect the console output to a separate file for debugging purposes. Hence I've added a -c switch to forthstrap and altered the build system so that for a given base dictionary foo.dict, a new file call foo.dict-console.log is automatically generated which shows the Forth words being piped into the kernel. With these changes in place, the ability to debug a broken build is considerably increased. Now when I try and build one of the broken PPC builds (in this case pearpc), I get the following in SVN trunk: Configuring OpenBIOS on amd64 for cross-ppc Initializing build tree obj-ppc...ok. Creating target Makefile...ok. Creating config files...ok. Building OpenBIOS for ppc Building...error: make[1]: Entering directory `/home/build/src/openbios/openbios-devel.pre/obj-ppc' GEN target/include/openbios-version.h GEN forth/version.fs HOSTCC host/kernel/bootstrap.o HOSTCC host/kernel/dict.o HOSTCC host/kernel/primitives.o HOSTCC host/kernel/stack.o HOSTCC forthstrap GEN bootstrap.dict GEN openbios.dict GEN openbios-pearpc.dict ../arch/ppc/pearpc/tree.fs:64: no such device. make[1]: *** [openbios-pearpc.dict] Error 1 make[1]: Leaving directory `/home/build/src/openbios/openbios-devel.pre/obj-ppc' make: *** [build] Error 1 Surely enough, at the end of line 63 in arch/ppc/pearpc/tree.fs we see the following: " /pci" find-device Hence it seems as if no /pci node is being created which is breaking the pearpc build. And just to confirm this, the last few lines of openbios-pearpc.dict-console.log look like this: build@zeno:~/src/openbios/openbios-devel.pre$ tail -n 5 obj-ppc/openbios-pearpc.dict-console.log 0 > h# 88201 encode-int " cpu-version" property ok 0 > 0 encode-int " reg" property ok 0 > finish-device ok 0 > ok 0 > " /pci" find-device Now I've got things to the point where the error reporting works well, I'll get back to finishing up my loader consolidation patch... 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] r706 - in trunk/openbios-devel: config/xml include/kernel kernel
by repository service 25 Mar '10

25 Mar '10

Author: mcayland Date: Thu Mar 25 22:14:00 2010 New Revision: 706 URL: http://tracker.coreboot.org/trac/openbios/changeset/706 Log: Revert the parts of the last commit which changed the exception function to use an exception pointer as it isn't really required. Update forthstrap to add a new -c option that when specified will direct the Forth kernel console output to a file and integrate this into the build system. By default, when a dictionary is built using a base dictionary then a new log file called <dict>-console.log will be generated to help debugging if the build fails. Also update the exception handler in kernel/bootstrap.c so that it matches the entire range of error codes in forth/bootstrap/interpreter.fs. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/config/xml/dictionary.xsl trunk/openbios-devel/include/kernel/kernel.h trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/forth.c trunk/openbios-devel/kernel/internal.c Modified: trunk/openbios-devel/config/xml/dictionary.xsl ============================================================================== --- trunk/openbios-devel/config/xml/dictionary.xsl Wed Mar 24 12:49:41 2010 (r705) +++ trunk/openbios-devel/config/xml/dictionary.xsl Thu Mar 25 22:14:00 2010 (r706) @@ -129,6 +129,7 @@ <xsl:if test="$init!=''"> <xsl:text> -d $(ODIR)/</xsl:text><xsl:value-of select="$init"/><xsl:text>.dict</xsl:text> </xsl:if> + <xsl:text> -c $(a)-console.log</xsl:text> <xsl:text> $(</xsl:text> <xsl:value-of select="@name"/> <xsl:text>-DICTIONARY)," GEN $(TARGET_DIR)$@")

</xsl:text> Modified: trunk/openbios-devel/include/kernel/kernel.h ============================================================================== --- trunk/openbios-devel/include/kernel/kernel.h Wed Mar 24 12:49:41 2010 (r705) +++ trunk/openbios-devel/include/kernel/kernel.h Thu Mar 25 22:14:00 2010 (r706) @@ -34,12 +34,13 @@ extern void modules_init( void ); /* arch kernel hooks */ -extern void (*exception)(cell no); +extern void exception(cell no); #ifdef FCOMPILER extern void include_file( const char *str ); extern void encode_file( const char *str ); extern int get_inputbyte( void ); +extern void put_outputbyte( int c ); #endif #ifndef BOOTSTRAP Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Wed Mar 24 12:49:41 2010 (r705) +++ trunk/openbios-devel/kernel/bootstrap.c Thu Mar 25 22:14:00 2010 (r706) @@ -54,6 +54,9 @@ static char *srcbasedict; +/* console variables */ +static FILE *console; + #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH unsigned long base_address; #endif @@ -487,14 +490,42 @@ /* - * Common Forth exception handler + * Forth exception handler */ -static void exception_common(cell no) +void exception(cell no) { + printk("%s:%d: ", srcfilenames[cursrc - 1], srclines[cursrc - 1]); + + /* See also forth/bootstrap/interpreter.fs */ switch (no) { + case -1: + case -2: + printk("Aborted.\n"); + break; + case -3: + printk("Stack Overflow.\n"); + break; + case -4: + printk("Stack Underflow.\n"); + break; + case -5: + printk("Return Stack Overflow.\n"); + break; + case -6: + printk("Return Stack Underflow.\n"); + break; case -19: - printk(" undefined word.\n"); + printk("undefined word.\n"); + break; + case -21: + printk("out of memory.\n"); + break; + case -33: + printk("undefined method.\n"); + break; + case -34: + printk("no such device.\n"); break; default: printk("error %" FMT_CELL_d " occured.\n", no); @@ -504,30 +535,6 @@ /* - * Exception handler for run_dictionary() - */ - -static void exception_run_dictionary(cell no) -{ - printk("Error executing base dictionary %s: ", srcbasedict); - - exception_common(no); -} - - -/* - * Exception handler for interpret_source() - */ - -static void exception_interpret_source(cell no) -{ - printk("%s:%d: ", srcfilenames[cursrc - 1], srclines[cursrc - 1]); - - exception_common(no); -} - - -/* * This is the C version of the forth interpreter */ @@ -548,9 +555,6 @@ exit(1); } - /* Set up exception handler for this invocation (allows better error reporting) */ - exception = exception_interpret_source; - /* FIXME: We should read this file at * once. No need to get it char by char */ @@ -731,7 +735,7 @@ if (*test != 0) { /* what is it?? */ - printk("%s:%d - %s is not defined.\n\n", srcfilenames[cursrc - 1], srclines[cursrc - 1], tib); + printk("%s:%d: %s is not defined.\n\n", srcfilenames[cursrc - 1], srclines[cursrc - 1], tib); errors++; #ifdef CONFIG_DEBUG_INTERPRETER continue; @@ -844,14 +848,27 @@ } tmp = getc( srcfiles[cursrc-1] ); - if (tmp != EOF) + + /* Update current line number */ + if (tmp == '\n') { + srclines[cursrc - 1]++; + } + + if (tmp != EOF) { return tmp; + } fclose(srcfiles[--cursrc]); return get_inputbyte(); } +void put_outputbyte( int c ) +{ + if (console) + fputc(c, console); +} + /* * segmentation fault handler. linux specific? */ @@ -951,7 +968,7 @@ } -static void run_dictionary(char *basedict) +static void run_dictionary(char *basedict, char *confile) { if(!basedict) return; @@ -978,11 +995,17 @@ if (verbose) printk("Jumping to dictionary %s...\n", basedict); - /* Set up exception handler for this invocation (allows better error reporting) */ - exception = exception_run_dictionary; + /* If a console file has been specified, open it */ + if (confile) + console = fopen(confile, "w"); + srcbasedict = basedict; enterforth((xt_t)PC); + + /* Close the console file */ + if (console) + fclose(console); } static void new_dictionary(const char *source) @@ -1015,6 +1038,8 @@ " use this dictionary as base\n" \ " -D|--target-dictionary output.dict\n" \ " write to output.dict\n" \ + " -c|--console output.log\n" \ + " write kernel console output to log file\n" \ " -s|--segfault install segfault handler\n\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ @@ -1026,6 +1051,8 @@ " use this dictionary as base\n" \ " -D output.dict\n" \ " write to output.dict\n" \ + " -c output.log\n" \ + " write kernel console output to log file\n" \ " -s install segfault handler\n\n" #endif @@ -1037,11 +1064,12 @@ unsigned char *ressources=NULL; /* All memory used by us */ char *dictname = NULL; char *basedict = NULL; + char *consolefile = NULL; unsigned char *bootstrapdict[2]; int c, cnt; - const char *optstring = "VvhsI:d:D:?"; + const char *optstring = "VvhsI:d:D:c:?"; while (1) { #ifdef __GLIBC__ @@ -1054,6 +1082,7 @@ {"include", 1, NULL, 'I'}, {"source-dictionary", 1, NULL, 'd'}, {"target-dictionary", 1, NULL, 'D'}, + {"console", 1, NULL, 'c'}, }; /* @@ -1093,11 +1122,17 @@ if (!basedict) { basedict = optarg; } + break; case 'D': if(!dictname) { dictname = optarg; } break; + case 'c': + if (!consolefile) { + consolefile = optarg; + } + break; default: return 1; } @@ -1176,7 +1211,7 @@ for (c=argc-1; c>=optind; c--) include_file(argv[c]); - run_dictionary(basedict); + run_dictionary(basedict, consolefile); } if(errors) break; Modified: trunk/openbios-devel/kernel/forth.c ============================================================================== --- trunk/openbios-devel/kernel/forth.c Wed Mar 24 12:49:41 2010 (r705) +++ trunk/openbios-devel/kernel/forth.c Thu Mar 25 22:14:00 2010 (r706) @@ -860,11 +860,11 @@ static void emit(void) { -#ifndef FCOMPILER cell tmp = POP(); +#ifndef FCOMPILER putchar(tmp); #else - (void) POP(); + put_outputbyte(tmp); #endif } Modified: trunk/openbios-devel/kernel/internal.c ============================================================================== --- trunk/openbios-devel/kernel/internal.c Wed Mar 24 12:49:41 2010 (r705) +++ trunk/openbios-devel/kernel/internal.c Thu Mar 25 22:14:00 2010 (r706) @@ -25,10 +25,6 @@ ucell PC; volatile int interruptforth = 0; -#ifdef FCOMPILER -void (*exception)(cell no) = NULL; -#endif - #define DEBUG_MODE_NONE 0 #define DEBUG_MODE_STEP 1 #define DEBUG_MODE_TRACE 2

1 0

Multiple APIs for ELF file handling
by Mark Cave-Ayland 24 Mar '10

24 Mar '10

Hi all, I've spent some time today looking at the ELF loader code for each different architecture, and with a bit of work I believe that I can modify arch/sparc64/elfload.c so that it can be used across all architectures. Looking closer at the source, it can be seen that are actually two sets of ELF routines: one in arch/*/elfload.c, and another set in libopenbios/elfload.c which only appears to be used by the PPC code. I've already manage to refactor the SPARC64 code so it reuses (and also exposes) the same API for use with the PPC code, except with one exception: file handles. In arch/*/elfload.c, the preferred method for using handles is to make use of the included loadfs.c methods which works with an implicit file handle (i.e. the file handle isn't passed into any of the functions). In contrast, the PPC code directly calls the *_io() API (see find_elf()/elf_readhdrs()) and so requires an explicit file handle to be passed into each function. I'm currently leaning towards the PPC method, since loadfs.c seems to be such a lightweight wrapper that it hardly seems worth keeping. Can anyone see a reason to keep this before I go and rip it out? 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

4 12

[commit] r705 - in trunk/openbios-devel: include/kernel kernel
by repository service 24 Mar '10

24 Mar '10

Author: mcayland Date: Wed Mar 24 12:49:41 2010 New Revision: 705 URL: http://tracker.coreboot.org/trac/openbios/changeset/705 Log: Change the sysdebug exception() callback so that it is now a function pointer, rather than a function. This enables us to setup an appropriate exception handler for the task in hand; in particular it allows us to distinguish between an error that occurs when attempting to execute a base dictionary, and an error that occurs when interpreting source. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/include/kernel/kernel.h trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/internal.c Modified: trunk/openbios-devel/include/kernel/kernel.h ============================================================================== --- trunk/openbios-devel/include/kernel/kernel.h Wed Mar 24 11:28:51 2010 (r704) +++ trunk/openbios-devel/include/kernel/kernel.h Wed Mar 24 12:49:41 2010 (r705) @@ -34,7 +34,7 @@ extern void modules_init( void ); /* arch kernel hooks */ -extern void exception(cell no); +extern void (*exception)(cell no); #ifdef FCOMPILER extern void include_file( const char *str ); Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Wed Mar 24 11:28:51 2010 (r704) +++ trunk/openbios-devel/kernel/bootstrap.c Wed Mar 24 12:49:41 2010 (r705) @@ -52,6 +52,8 @@ static int srclines[MAX_SRC_FILES]; static unsigned int cursrc = 0; +static char *srcbasedict; + #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH unsigned long base_address; #endif @@ -485,6 +487,47 @@ /* + * Common Forth exception handler + */ + +static void exception_common(cell no) +{ + switch (no) { + case -19: + printk(" undefined word.\n"); + break; + default: + printk("error %" FMT_CELL_d " occured.\n", no); + } + exit(1); +} + + +/* + * Exception handler for run_dictionary() + */ + +static void exception_run_dictionary(cell no) +{ + printk("Error executing base dictionary %s: ", srcbasedict); + + exception_common(no); +} + + +/* + * Exception handler for interpret_source() + */ + +static void exception_interpret_source(cell no) +{ + printk("%s:%d: ", srcfilenames[cursrc - 1], srclines[cursrc - 1]); + + exception_common(no); +} + + +/* * This is the C version of the forth interpreter */ @@ -505,6 +548,9 @@ exit(1); } + /* Set up exception handler for this invocation (allows better error reporting) */ + exception = exception_interpret_source; + /* FIXME: We should read this file at * once. No need to get it char by char */ @@ -862,20 +908,6 @@ PUSH(pointer2cell(memory) + MEMORY_SIZE-1); } -void exception(cell no) -{ - printk("%s:%d: ", srcfilenames[cursrc - 1], srclines[cursrc - 1]); - - switch (no) { - case -19: - printk(" undefined word.\n"); - break; - default: - printk("error %" FMT_CELL_d " occured.\n", no); - } - exit(1); -} - void include_file( const char *name ) @@ -927,8 +959,12 @@ read_dictionary(basedict); PC = (ucell)findword("initialize"); - if (!PC) + if (!PC) { + if (verbose) { + printk("Unable to find initialize word in dictionary %s; ignoring\n", basedict); + } return; + } if(!srcfiles[0]) { cursrc = 1; @@ -940,7 +976,11 @@ init_memory(); if (verbose) - printk("Jumping to dictionary..."); + printk("Jumping to dictionary %s...\n", basedict); + + /* Set up exception handler for this invocation (allows better error reporting) */ + exception = exception_run_dictionary; + srcbasedict = basedict; enterforth((xt_t)PC); } Modified: trunk/openbios-devel/kernel/internal.c ============================================================================== --- trunk/openbios-devel/kernel/internal.c Wed Mar 24 11:28:51 2010 (r704) +++ trunk/openbios-devel/kernel/internal.c Wed Mar 24 12:49:41 2010 (r705) @@ -25,6 +25,10 @@ ucell PC; volatile int interruptforth = 0; +#ifdef FCOMPILER +void (*exception)(cell no) = NULL; +#endif + #define DEBUG_MODE_NONE 0 #define DEBUG_MODE_STEP 1 #define DEBUG_MODE_TRACE 2

1 0

[commit] r704 - trunk/openbios-devel/kernel
by repository service 24 Mar '10

24 Mar '10

Author: mcayland Date: Wed Mar 24 11:28:51 2010 New Revision: 704 URL: http://tracker.coreboot.org/trac/openbios/changeset/704 Log: Add source file and line number tracking to forthstrap to allow the user to locate forth errors much more easily. An example of the new output is given below: build@zeno:~/src/openbios/openbios-devel.pre$ ./config/scripts/switch-arch cross-ppc; make Configuring OpenBIOS on amd64 for cross-ppc Initializing build tree obj-ppc...ok. Creating target Makefile...ok. Creating config files...ok. Building OpenBIOS for ppc Building...error: HOSTCC host/kernel/stack.o HOSTCC forthstrap GEN bootstrap.dict bootstrap.fs:339 - foo is not defined. Modified: trunk/openbios-devel/kernel/bootstrap.c Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Wed Mar 17 23:20:12 2010 (r703) +++ trunk/openbios-devel/kernel/bootstrap.c Wed Mar 24 11:28:51 2010 (r704) @@ -29,6 +29,7 @@ #include "cross.h" #include "openbios-version.h" +#define MAX_PATH_LEN 256 #define MEMORY_SIZE (1024*1024) /* 1M ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256k for the dictionary */ @@ -44,7 +45,11 @@ static int segfault = 0; static int verbose = 0; -static FILE *srcfiles[128]; +#define MAX_SRC_FILES 128 + +static FILE *srcfiles[MAX_SRC_FILES]; +static char *srcfilenames[MAX_SRC_FILES]; +static int srclines[MAX_SRC_FILES]; static unsigned int cursrc = 0; #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH @@ -292,8 +297,13 @@ while (!feof(f)) { c = getc(f); - if (c == ' ' || c == '\t' || c == '\n') + if (c == ' ' || c == '\t') + continue; + + if (c == '\n') { + srclines[cursrc - 1]++; continue; + } ungetc(c, f); break; @@ -309,7 +319,7 @@ static int parse(FILE * f, char *line, char delim) { - int cnt = 0, c; + int cnt = 0, c = 0; while (!feof(f)) { c = getc(f); @@ -317,12 +327,17 @@ if (delim && c == delim) break; - if ((!delim) && (c == ' ' || c == '\n' || c == '\t')) + if ((!delim) && (c == ' ' || c == '\t' || c == '\n')) break; line[cnt++] = c; } + /* Update current line number */ + if (c == '\n') { + srclines[cursrc - 1]++; + } + line[cnt] = 0; return cnt; @@ -442,21 +457,33 @@ static FILE *fopen_include(const char *fil) { -#define MAX_PATH_LEN 256 char fullpath[MAX_PATH_LEN]; FILE *ret; include *incl = &includes; while (incl) { snprintf(fullpath, sizeof(fullpath), "%s/%s", incl->path, fil); + ret = fopen(fullpath, "r"); - if (ret != NULL) + if (ret != NULL) { + +#ifdef CONFIG_DEBUG_INTERPRETER + printk("Including '%s'\n", name ); +#endif + srcfilenames [ cursrc ] = malloc(strlen(fil) + 1); + strcpy(srcfilenames[ cursrc ], fil); + srclines [ cursrc ] = 1; + srcfiles [ cursrc++ ] = ret; + return ret; + } + incl = incl->next; } return NULL; } + /* * This is the C version of the forth interpreter */ @@ -658,7 +685,7 @@ if (*test != 0) { /* what is it?? */ - printk("%s is not defined.\n\n", tib); + printk("%s:%d - %s is not defined.\n\n", srcfilenames[cursrc - 1], srclines[cursrc - 1], tib); errors++; #ifdef CONFIG_DEBUG_INTERPRETER continue; @@ -680,7 +707,9 @@ writecell(num); } } + fclose(f); + cursrc--; return 0; } @@ -753,7 +782,8 @@ ungetc(tmp, srcfiles[cursrc-1]); return -1; } - fclose( srcfiles[--cursrc] ); + + fclose(srcfiles[--cursrc]); return availchar(); } @@ -770,7 +800,8 @@ tmp = getc( srcfiles[cursrc-1] ); if (tmp != EOF) return tmp; - fclose( srcfiles[--cursrc] ); + + fclose(srcfiles[--cursrc]); return get_inputbyte(); } @@ -833,12 +864,14 @@ void exception(cell no) { + printk("%s:%d: ", srcfilenames[cursrc - 1], srclines[cursrc - 1]); + switch (no) { case -19: printk(" undefined word.\n"); break; default: - printk("\nError %" FMT_CELL_d " occured.\n", no); + printk("error %" FMT_CELL_d " occured.\n", no); } exit(1); } @@ -847,21 +880,21 @@ void include_file( const char *name ) { - FILE *file = fopen_include( name ); - if( !file ) { - printk("\npanic: Failed opening '%s'\n", name ); - exit(1); - } + FILE *file; + if( cursrc >= sizeof(srcfiles)/sizeof(srcfiles[0]) ) { printk("\npanic: Maximum include depth reached!\n"); exit(1); } -#ifdef CONFIG_DEBUG_INTERPRETER - printk("Including '%s'\n", name ); -#endif - srcfiles[ cursrc++ ] = file; + + file = fopen_include( name ); + if( !file ) { + printk("\npanic: Failed opening file '%s'\n", name ); + exit(1); + } } + void encode_file( const char *name ) {

1 0

www.openfirmware.info website down?
by Mark Cave-Ayland 23 Mar '10

23 Mar '10

Or is it just some kind of routing issue? I seem to get intermittent pings but no website. 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 2

Re: [OpenBIOS] Building OpenBIOS on Mac OS X
by Programmingkid 22 Mar '10

22 Mar '10

> Programmingkid wrote: > >> I have recently been able to go further in the build process of OpenBIOS thanks to recent changes. It stop building after forthstrap is made. >> >> Here is the error: >> >> HOSTCC forthstrap >> GEN bootstrap.dict >> panic: segmentation violation at 0x30061c >> dict=0x100300000 here=0x100300628(dict+0x628) pc=0x0(dict+0xffd00000) >> dstackcnt=0 rstackcnt=0 instruction=deadbeef >> dstack: 0x0 >> rstack: 0x0 >> Writing dictionary core file >> make[1]: *** [bootstrap.dict] Error 1 >> >> Anyone know how to fix this problem or know what is causing the problem? > > Oh really? I didn't realise that an OS X host build was broken, but it's > good to hear that at least you can get a bit further now. Is this from a > vanilla SVN checkout? The only reason I ask is that when I was working > on code patches in forth/bootstrap/bootstrap.fs, it was fairly easy to > cause forthstrap to segfault due to coding errors. I always download the "most current snapshot". I never use the SVN checkout.

1 0

Building OpenBIOS on Mac OS X
by Programmingkid 19 Mar '10

19 Mar '10

I have recently been able to go further in the build process of OpenBIOS thanks to recent changes. It stop building after forthstrap is made. Here is the error: HOSTCC forthstrap GEN bootstrap.dict panic: segmentation violation at 0x30061c dict=0x100300000 here=0x100300628(dict+0x628) pc=0x0(dict+0xffd00000) dstackcnt=0 rstackcnt=0 instruction=deadbeef dstack: 0x0 rstack: 0x0 Writing dictionary core file make[1]: *** [bootstrap.dict] Error 1 Anyone know how to fix this problem or know what is causing the problem?

2 1

[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

[commit] r693 - in trunk/openbios-devel: arch/amd64 arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 drivers include include/arch/common include/arch/ppc include/arch/sparc64 include/libopenbios in...
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 17:09:44 2010 New Revision: 693 URL: http://tracker.coreboot.org/trac/openbios/changeset/693 Log: Fix the sys_info.h header file so it doesn't reference functions both inside and outside of libopenbios, and move the firmware configuration header file to include/arch/common. Following through the code showed that elfnote.c and linuxbios.c were being used by sys_info and so these are also renamed to elf_info.c and linuxbios_info.c for clarity. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/common/ trunk/openbios-devel/include/arch/common/fw_cfg.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/fw_cfg.h trunk/openbios-devel/include/libopenbios/sys_info.h (contents, props changed) - copied, changed from r692, trunk/openbios-devel/include/sys_info.h trunk/openbios-devel/libopenbios/elf_info.c (contents, props changed) - copied, changed from r692, trunk/openbios-devel/libopenbios/elfnote.c trunk/openbios-devel/libopenbios/linuxbios_info.c (contents, props changed) - copied, changed from r692, trunk/openbios-devel/libopenbios/linuxbios.c Deleted: trunk/openbios-devel/include/openbios/fw_cfg.h trunk/openbios-devel/include/sys_info.h trunk/openbios-devel/libopenbios/elfnote.c trunk/openbios-devel/libopenbios/linuxbios.c Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/builtin.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/multiboot.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/amd64/plainboot.c trunk/openbios-devel/arch/amd64/segment.c trunk/openbios-devel/arch/amd64/sys_info.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/builtin.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/entry.S trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/multiboot.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/plainboot.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/builtin.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/entry.S trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/multiboot.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/sparc64/plainboot.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/builtin.c trunk/openbios-devel/arch/x86/context.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/multiboot.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/plainboot.c trunk/openbios-devel/arch/x86/segment.c trunk/openbios-devel/arch/x86/sys_info.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/include/arch/ppc/io.h trunk/openbios-devel/include/arch/sparc64/io.h trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ #include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" int elf_load(struct sys_info *, const char *filename, const char *cmdline); int linux_load(struct sys_info *, const char *filename, const char *cmdline); Modified: trunk/openbios-devel/arch/amd64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include <asm/types.h> -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #define printf printk Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "segment.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/amd64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define printf printk Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -12,11 +12,12 @@ #include "dict.h" #include "kernel/kernel.h" #include "kernel/stack.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #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/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/amd64/segment.c ============================================================================== --- trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 17:09:44 2010 (r693) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "relocate.h" #include "segment.h" Modified: trunk/openbios-devel/arch/amd64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #define printf printk Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 17:09:44 2010 (r693) @@ -31,7 +31,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #include "arch/ppc/processor.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 17:09:44 2010 (r693) @@ -23,7 +23,7 @@ #include "kernel.h" #include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" //#define DEBUG_QEMU Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "a.out.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "drivers/drivers.h" #include "libc/diskio.h" #include "libc/vsprintf.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openprom.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 17:09:44 2010 (r693) @@ -33,6 +33,7 @@ // sys_info.c extern unsigned int qemu_mem_size; +extern void collect_sys_info(struct sys_info *info); // romvec.c extern struct linux_arguments_v0 obp_arg; Modified: trunk/openbios-devel/arch/sparc32/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "asm/types.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "context.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define MAIN_STACK_SIZE 16384 Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/entry.S Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/entry.S Sun Mar 14 17:09:44 2010 (r693) @@ -12,7 +12,7 @@ #include "asm/crs.h" #define NO_QEMU_PROTOS #define NO_OPENBIOS_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #define CFG_ADDR 0x00000510 #define CFG_ASI 0x2d Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printk printk Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 17:09:44 2010 (r693) @@ -13,7 +13,7 @@ #include "asm/asi.h" #include "pgtsrmmu.h" #include "openprom.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define NCTX_SWIFT 0x100 Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -15,7 +15,7 @@ #include "kernel/stack.h" #include "openbios/nvram.h" #include "../../drivers/timer.h" // XXX -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "boot.h" #include "video_subr.h" Modified: trunk/openbios-devel/arch/sparc32/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #ifdef CONFIG_DEBUG_OBP Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,7 +1,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "a.out.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" struct sys_info sys_info; Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 17:09:44 2010 (r693) @@ -37,6 +37,7 @@ // sys_info.c extern uint64_t qemu_mem_size; +extern void collect_sys_info(struct sys_info *info); // console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); Modified: trunk/openbios-devel/arch/sparc64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "asm/types.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 17:09:44 2010 (r693) @@ -13,7 +13,7 @@ #include "openbios.h" #include "video_subr.h" #include "libc/vsprintf.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" /* ****************************************************************** Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "context.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define MAIN_STACK_SIZE 16384 Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/entry.S Sun Mar 14 17:09:44 2010 (r693) @@ -13,7 +13,7 @@ #include "lsu.h" #define NO_QEMU_PROTOS #define NO_OPENBIOS_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #define PROM_ADDR 0x1fff0000000 #define CFG_ADDR 0x1fe02000510 Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 17:09:44 2010 (r693) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printk printk Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "libc/vsprintf.h" #include "libopenbios/bindings.h" #include "spitfire.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #include "ofmem_sparc64.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,14 +11,14 @@ #include "drivers/drivers.h" #include "dict.h" #include "openbios/nvram.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "drivers/pci.h" #include "asm/pci.h" #include "boot.h" #include "../../drivers/timer.h" // XXX #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #include "video_subr.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/sparc64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,7 +1,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -12,7 +12,7 @@ #include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" struct sys_info sys_info; Modified: trunk/openbios-devel/arch/x86/builtin.c ============================================================================== --- trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/context.c Sun Mar 14 17:09:44 2010 (r693) @@ -10,7 +10,7 @@ #include "kernel/kernel.h" #include "segment.h" #include "context.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define MAIN_STACK_SIZE 16384 Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printk printk Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "segment.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -14,11 +14,12 @@ #include "kernel/stack.h" #include "drivers/drivers.h" #include "drivers/pci.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "relocate.h" void boot(void); +void collect_sys_info(struct sys_info *info); static unsigned char intdict[256 * 1024]; Modified: trunk/openbios-devel/arch/x86/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/x86/segment.c ============================================================================== --- trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 17:09:44 2010 (r693) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "relocate.h" #include "segment.h" Modified: trunk/openbios-devel/arch/x86/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 17:09:44 2010 (r693) @@ -3,7 +3,7 @@ #include "libc/byteorder.h" #include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #if !defined(CONFIG_SPARC64) static volatile uint16_t *fw_cfg_cmd; Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 17:09:44 2010 (r693) @@ -21,7 +21,7 @@ #include "libopenbios/ofmem.h" #include "obio.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #include "escc.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Copied: trunk/openbios-devel/include/arch/common/fw_cfg.h (from r692, trunk/openbios-devel/include/openbios/fw_cfg.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/fw_cfg.h Sun Mar 14 17:09:44 2010 (r693, copy of r692, trunk/openbios-devel/include/openbios/fw_cfg.h) @@ -0,0 +1,84 @@ +#ifndef FW_CFG_H +#define FW_CFG_H + +#define FW_CFG_SIGNATURE 0x00 +#define FW_CFG_ID 0x01 +#define FW_CFG_UUID 0x02 +#define FW_CFG_RAM_SIZE 0x03 +#define FW_CFG_NOGRAPHIC 0x04 +#define FW_CFG_NB_CPUS 0x05 +#define FW_CFG_MACHINE_ID 0x06 +#define FW_CFG_KERNEL_ADDR 0x07 +#define FW_CFG_KERNEL_SIZE 0x08 +#define FW_CFG_KERNEL_CMDLINE 0x09 +#define FW_CFG_INITRD_ADDR 0x0a +#define FW_CFG_INITRD_SIZE 0x0b +#define FW_CFG_BOOT_DEVICE 0x0c +#define FW_CFG_NUMA 0x0d +#define FW_CFG_BOOT_MENU 0x0e +#define FW_CFG_MAX_CPUS 0x0f +#define FW_CFG_KERNEL_ENTRY 0x10 +#define FW_CFG_KERNEL_DATA 0x11 +#define FW_CFG_INITRD_DATA 0x12 +#define FW_CFG_CMDLINE_ADDR 0x13 +#define FW_CFG_CMDLINE_SIZE 0x14 +#define FW_CFG_CMDLINE_DATA 0x15 +#define FW_CFG_SETUP_ADDR 0x16 +#define FW_CFG_SETUP_SIZE 0x17 +#define FW_CFG_SETUP_DATA 0x18 +#define FW_CFG_FILE_DIR 0x19 + +#define FW_CFG_FILE_FIRST 0x20 +#define FW_CFG_FILE_SLOTS 0x10 +#define FW_CFG_MAX_ENTRY (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) + +#define FW_CFG_WRITE_CHANNEL 0x4000 +#define FW_CFG_ARCH_LOCAL 0x8000 +#define FW_CFG_ENTRY_MASK ~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL) + +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03) +#define FW_CFG_PPC_CPUFREQ (FW_CFG_ARCH_LOCAL + 0x04) + +#define FW_CFG_INVALID 0xffff + +#ifndef NO_QEMU_PROTOS +typedef struct FWCfgFile { + uint32_t size; /* file size */ + uint16_t select; /* write this to 0x510 to read it */ + uint16_t reserved; + char name[56]; +} FWCfgFile; + +typedef struct FWCfgFiles { + uint32_t count; + FWCfgFile f[]; +} FWCfgFiles; + +typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); + +typedef struct _FWCfgState FWCfgState; +int fw_cfg_add_bytes(FWCfgState *s, uint16_t key, uint8_t *data, uint32_t len); +int fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value); +int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value); +int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value); +int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, + void *callback_opaque, uint8_t *data, size_t len); +int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename, + uint8_t *data, uint32_t len); +FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, + target_phys_addr_t crl_addr, target_phys_addr_t data_addr); + +#endif /* NO_QEMU_PROTOS */ + +#ifndef NO_OPENBIOS_PROTOS +void fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes); +uint64_t fw_cfg_read_i64(uint16_t cmd); +uint32_t fw_cfg_read_i32(uint16_t cmd); +uint16_t fw_cfg_read_i16(uint16_t cmd); +void fw_cfg_init(void); +#endif /* NO_OPENBIOS_PROTOS */ + +#endif Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/include/arch/ppc/io.h Sun Mar 14 17:09:44 2010 (r693) @@ -4,7 +4,7 @@ #include "asm/types.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" extern unsigned long virt_offset; Modified: trunk/openbios-devel/include/arch/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/io.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/include/arch/sparc64/io.h Sun Mar 14 17:09:44 2010 (r693) @@ -4,7 +4,7 @@ #include "asm/types.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" extern unsigned long va_shift; // Set in entry.S // Defined in ldscript Copied and modified: trunk/openbios-devel/include/libopenbios/sys_info.h (from r692, trunk/openbios-devel/include/sys_info.h) ============================================================================== --- trunk/openbios-devel/include/sys_info.h Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/include/libopenbios/sys_info.h Sun Mar 14 17:09:44 2010 (r693) @@ -22,7 +22,6 @@ unsigned long *dict_end; }; -void collect_sys_info(struct sys_info *info); void collect_elfboot_info(struct sys_info *info); void collect_linuxbios_info(struct sys_info *info); Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/libopenbios/build.xml Sun Mar 14 17:09:44 2010 (r693) @@ -4,15 +4,15 @@ <object source="bindings.c"/> <object source="client.c"/> <object source="console_common.c"/> - <object source="elfnote.c" condition="X86"/> - <object source="elfnote.c" condition="AMD64"/> - <object source="elfnote.c" condition="SPARC32"/> - <object source="elfnote.c" condition="SPARC64"/> - <object source="elfload.c" condition="PPC"/> + <object source="elf_info.c" condition="X86"/> + <object source="elf_info.c" condition="AMD64"/> + <object source="elf_info.c" condition="SPARC32"/> + <object source="elf_info.c" condition="SPARC64"/> + <object source="elf_info.c" condition="PPC"/> <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> <object source="ipchecksum.c"/> - <object source="linuxbios.c" condition="LINUXBIOS"/> + <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> </library> Copied and modified: trunk/openbios-devel/libopenbios/elf_info.c (from r692, trunk/openbios-devel/libopenbios/elfnote.c) ============================================================================== --- trunk/openbios-devel/libopenbios/elfnote.c Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,7 +1,7 @@ /* Support for ELF Boot Proposal as a boot image */ #include "openbios/config.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "asm/io.h" #include "libopenbios/ipchecksum.h" #include "openbios-version.h" Copied and modified: trunk/openbios-devel/libopenbios/linuxbios_info.c (from r692, trunk/openbios-devel/libopenbios/linuxbios.c) ============================================================================== --- trunk/openbios-devel/libopenbios/linuxbios.c Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/libopenbios/linuxbios_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "asm/io.h" #include "linuxbios.h" #include "libopenbios/ipchecksum.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #ifdef CONFIG_DEBUG_BOOT #define debug printk

3 2

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

14 Mar '10

Author: mcayland Date: Sun Mar 14 21:10:01 2010 New Revision: 696 URL: http://tracker.coreboot.org/trac/openbios/changeset/696 Log: Split video_subr.h into its separate components so that they can live in the right places, rather than placing the definitions from lots of different C files into a single header. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Deleted: trunk/openbios-devel/include/video_subr.h Modified: trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/vga.h trunk/openbios-devel/drivers/vga_load_regs.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 21:10:01 2010 (r696) @@ -35,6 +35,9 @@ extern unsigned int qemu_mem_size; extern void collect_sys_info(struct sys_info *info); +// console.c +void cls(void); + // romvec.c extern struct linux_arguments_v0 obp_arg; Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 21:10:01 2010 (r696) @@ -9,9 +9,11 @@ #include "kernel/kernel.h" #include "drivers/drivers.h" #include "openbios.h" -#include "video_subr.h" +#include "libopenbios/console.h" #include "libopenbios/ofmem.h" +void cls(void); + #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 21:10:01 2010 (r696) @@ -18,7 +18,7 @@ #include "libopenbios/sys_info.h" #include "openbios.h" #include "boot.h" -#include "video_subr.h" +#include "packages/video.h" #define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 21:10:01 2010 (r696) @@ -41,6 +41,7 @@ // console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); +void cls(void); // lib.c void ob_mmu_init(const char *cpuname, uint64_t ram_size); Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 21:10:01 2010 (r696) @@ -11,7 +11,6 @@ #include "drivers/drivers.h" #include "libopenbios/fontdata.h" #include "openbios.h" -#include "video_subr.h" #include "libc/vsprintf.h" #include "libopenbios/sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 21:10:01 2010 (r696) @@ -19,7 +19,6 @@ #include "../../drivers/timer.h" // XXX #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" -#include "video_subr.h" #include "libopenbios/ofmem.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 21:10:01 2010 (r696) @@ -23,7 +23,7 @@ #include "libc/vsprintf.h" #include "drivers/drivers.h" -#include "video_subr.h" +#include "drivers/vga.h" #include "timer.h" #include "pci.h" #include "pci_database.h" Modified: trunk/openbios-devel/drivers/vga.h ============================================================================== --- trunk/openbios-devel/drivers/vga.h Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/vga.h Sun Mar 14 21:10:01 2010 (r696) @@ -14,7 +14,7 @@ #ifndef VGA_H_INCL #define VGA_H_INCL 1 -#include "video_subr.h" +#include "drivers/vga.h" //#include <cpu/p5/io.h> Modified: trunk/openbios-devel/drivers/vga_load_regs.c ============================================================================== --- trunk/openbios-devel/drivers/vga_load_regs.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/vga_load_regs.c Sun Mar 14 21:10:01 2010 (r696) @@ -1,5 +1,5 @@ #include "asm/io.h" -#include "video_subr.h" +#include "drivers/vga.h" #include "vga.h" /* Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 21:10:01 2010 (r696) @@ -24,7 +24,8 @@ #include "libopenbios/fontdata.h" #include "asm/io.h" #include "libc/vsprintf.h" -#include "video_subr.h" +#include "drivers/vga.h" +#include "packages/video.h" #include "libopenbios/ofmem.h" /* VGA init. We use the Bochs VESA VBE extensions */ Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 21:10:01 2010 (r696) @@ -15,7 +15,8 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/fontdata.h" -#include "video_subr.h" +#include "libopenbios/console.h" +#include "packages/video.h" #define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 21:10:01 2010 (r696) @@ -19,7 +19,9 @@ #include "libc/diskio.h" #include "libopenbios/ofmem.h" #include "drivers/drivers.h" -#include "video_subr.h" +#include "packages/video.h" +#include "libopenbios/console.h" +#include "drivers/vga.h" typedef struct osi_fb_info { unsigned long mphys;

1 0

[commit] r695 - in trunk/openbios-devel: arch/amd64 arch/ppc arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 arch/x86/xbox drivers fs fs/ext2 f...
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 18:19:58 2010 New Revision: 695 URL: http://tracker.coreboot.org/trac/openbios/changeset/695 Log: Move the basic OpenBIOS configuration header files from include/openbios to include/. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/config.h (contents, props changed) - copied, changed from r692, trunk/openbios-devel/include/openbios/config.h trunk/openbios-devel/include/sysinclude.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/sysinclude.h Deleted: trunk/openbios-devel/include/openbios/config.h trunk/openbios-devel/include/openbios/sysinclude.h Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/builtin.c trunk/openbios-devel/arch/amd64/console.c trunk/openbios-devel/arch/amd64/context.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/lib.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/loadfs.c trunk/openbios-devel/arch/amd64/multiboot.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/amd64/plainboot.c trunk/openbios-devel/arch/amd64/segment.c trunk/openbios-devel/arch/amd64/sys_info.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/briq/methods.c trunk/openbios-devel/arch/ppc/briq/tree.c trunk/openbios-devel/arch/ppc/briq/vfd.c trunk/openbios-devel/arch/ppc/kernel.c trunk/openbios-devel/arch/ppc/mol/console.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/mol/main.c trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/mol/mol.c trunk/openbios-devel/arch/ppc/mol/osi-blk.c trunk/openbios-devel/arch/ppc/mol/osi-scsi.c trunk/openbios-devel/arch/ppc/mol/prom.c trunk/openbios-devel/arch/ppc/mol/pseudodisk.c trunk/openbios-devel/arch/ppc/mol/tree.c trunk/openbios-devel/arch/ppc/ofmem.c trunk/openbios-devel/arch/ppc/pearpc/console.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/main.c trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/pearpc/pearpc.c trunk/openbios-devel/arch/ppc/pearpc/tree.c trunk/openbios-devel/arch/ppc/pearpc/vfd.c trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/ppc/qemu/vfd.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/builtin.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/loadfs.c trunk/openbios-devel/arch/sparc32/multiboot.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/plainboot.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/builtin.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/loadfs.c trunk/openbios-devel/arch/sparc64/multiboot.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/sparc64/plainboot.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/unix/blk.c trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/unix/plugins.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/builtin.c trunk/openbios-devel/arch/x86/console.c trunk/openbios-devel/arch/x86/context.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/exception.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/lib.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/loadfs.c trunk/openbios-devel/arch/x86/multiboot.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/plainboot.c trunk/openbios-devel/arch/x86/segment.c trunk/openbios-devel/arch/x86/sys_info.c trunk/openbios-devel/arch/x86/xbox/console.c trunk/openbios-devel/arch/x86/xbox/methods.c trunk/openbios-devel/drivers/adb_bus.c trunk/openbios-devel/drivers/adb_kbd.c trunk/openbios-devel/drivers/adb_mouse.c trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/kbd.c trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/pc_kbd.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/timer.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/fs/ext2/libext2.h trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c trunk/openbios-devel/fs/grubfs/glue.h trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/hfs/block.c trunk/openbios-devel/fs/hfs/btree.c trunk/openbios-devel/fs/hfs/data.c trunk/openbios-devel/fs/hfs/file.c trunk/openbios-devel/fs/hfs/hfs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfs/low.c trunk/openbios-devel/fs/hfs/medium.c trunk/openbios-devel/fs/hfs/node.c trunk/openbios-devel/fs/hfs/record.c trunk/openbios-devel/fs/hfs/volume.c trunk/openbios-devel/fs/hfsplus/blockiter.c trunk/openbios-devel/fs/hfsplus/btree.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/hfsplus/include/swab.h trunk/openbios-devel/fs/hfsplus/libhfsp.c trunk/openbios-devel/fs/hfsplus/record.c trunk/openbios-devel/fs/hfsplus/unicode.c trunk/openbios-devel/fs/hfsplus/volume.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/libiso9660.h trunk/openbios-devel/include/drivers/drivers.h trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/include/libc/vsprintf.h trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/dict.c trunk/openbios-devel/kernel/primitives.c trunk/openbios-devel/kernel/stack.c trunk/openbios-devel/libc/ctype.c trunk/openbios-devel/libc/diskio.c trunk/openbios-devel/libc/extra.c trunk/openbios-devel/libc/misc.c trunk/openbios-devel/libc/string.c trunk/openbios-devel/libc/vsprintf.c trunk/openbios-devel/libopenbios/bindings.c trunk/openbios-devel/libopenbios/client.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/libopenbios/elf_info.c trunk/openbios-devel/libopenbios/elfload.c trunk/openbios-devel/libopenbios/linuxbios_info.c trunk/openbios-devel/libopenbios/ofmem_common.c trunk/openbios-devel/packages/bootinfo-loader.c trunk/openbios-devel/packages/cmdline.c trunk/openbios-devel/packages/deblocker.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/init.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/nvram.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c trunk/openbios-devel/packages/video.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/amd64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include <asm/types.h> #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/amd64/console.c ============================================================================== --- trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/amd64/context.c ============================================================================== --- trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-10 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "segment.h" #include "context.h" Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/amd64/lib.c ============================================================================== --- trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include <stdarg.h> #include "libc/stdlib.h" Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/amd64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/amd64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" Modified: trunk/openbios-devel/arch/amd64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/amd64/segment.c ============================================================================== --- trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "relocate.h" Modified: trunk/openbios-devel/arch/amd64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/ppc/briq/briq.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/briq/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/briq/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/briq/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" void devtree_init( void ) Modified: trunk/openbios-devel/arch/ppc/briq/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 18:19:58 2010 (r695) @@ -17,7 +17,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "dict.h" #include "libopenbios/bindings.h" #include "kernel/stack.h" Modified: trunk/openbios-devel/arch/ppc/mol/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "mol/mol.h" Modified: trunk/openbios-devel/arch/ppc/mol/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/mol/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.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 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-blk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mol/mol.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-scsi.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mol/mol.h" #include "scsi_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/prom.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/prom.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/prom.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "osi_calls.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/mol/pseudodisk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "osi_calls.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/mol/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mol/mol.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 18:19:58 2010 (r695) @@ -17,7 +17,7 @@ /* TODO: Clean up MOLisms in a decent way */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.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 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" void devtree_init( void ) Modified: trunk/openbios-devel/arch/ppc/pearpc/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -11,7 +11,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ */ #include "qemu-dict.h" -#include "openbios/config.h" +#include "config.h" #include "dict.h" #include "libopenbios/bindings.h" #include "kernel/stack.h" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libopenbios/bindings.h" Modified: trunk/openbios-devel/arch/ppc/qemu/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "qemu/qemu.h" Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/a.out.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/sparc32/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "drivers/drivers.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-10 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "context.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "asm/types.h" Modified: trunk/openbios-devel/arch/sparc32/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ */ #include "openprom.h" -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "arch/common/a.out.h" Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/sparc64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-10 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "context.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * FCode boot loader */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libc/vsprintf.h" #include "libopenbios/bindings.h" #include "spitfire.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "ofmem_sparc64.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "dict.h" Modified: trunk/openbios-devel/arch/sparc64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/unix/blk.c ============================================================================== --- trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 18:19:58 2010 (r695) @@ -11,7 +11,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "blk.h" Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/unix/plugins.c ============================================================================== --- trunk/openbios-devel/arch/unix/plugins.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/plugins.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 18:19:58 2010 (r695) @@ -24,9 +24,9 @@ #include <getopt.h> #endif -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include "mconfig.h" -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "dict.h" #include "kernel/stack.h" Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/x86/builtin.c ============================================================================== --- trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" /* Modified: trunk/openbios-devel/arch/x86/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "segment.h" #include "context.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/x86/exception.c ============================================================================== --- trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "asm/types.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/x86/lib.c ============================================================================== --- trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include <stdarg.h> #include "libc/stdlib.h" Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/x86/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" Modified: trunk/openbios-devel/arch/x86/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/x86/segment.c ============================================================================== --- trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "relocate.h" Modified: trunk/openbios-devel/arch/x86/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/x86/xbox/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -10,7 +10,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/x86/xbox/methods.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" // #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/drivers/adb_bus.c ============================================================================== --- trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/adb_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/adb_mouse.c ============================================================================== --- trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/cuda.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/escc.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 18:19:58 2010 (r695) @@ -13,7 +13,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 18:19:58 2010 (r695) @@ -13,7 +13,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/iommu.c Sun Mar 14 18:19:58 2010 (r695) @@ -4,7 +4,7 @@ ** Copyright 1999 Pete Zaitcev ** This code is licensed under GNU General Public License. **/ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "iommu.h" Modified: trunk/openbios-devel/drivers/kbd.c ============================================================================== --- trunk/openbios-devel/drivers/kbd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/kbd.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "asm/types.h" #include "kbd.h" Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "openbios/nvram.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 18:19:58 2010 (r695) @@ -10,7 +10,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/pci.h" Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 18:19:58 2010 (r695) @@ -10,7 +10,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/timer.c ============================================================================== --- trunk/openbios-devel/drivers/timer.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/timer.c Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "timer.h" #include "asm/io.h" Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * MA 02110-1301, USA. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" Modified: trunk/openbios-devel/fs/ext2/libext2.h ============================================================================== --- trunk/openbios-devel/fs/ext2/libext2.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/ext2/libext2.h Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ #ifndef __LIBEXT2_H__ #define __LIBEXT2_H__ -#include "openbios/config.h" +#include "config.h" #include "ext2.h" extern ext2_VOLUME* ext2_mount(int fd); Modified: trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ #ifdef FSYS_EXT2FS -#include "openbios/config.h" +#include "config.h" #include "shared.h" #include "filesys.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/fs/grubfs/glue.h ============================================================================== --- trunk/openbios-devel/fs/grubfs/glue.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/grubfs/glue.h Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ #define __GLUE_H #include "asm/types.h" -#include "openbios/config.h" +#include "config.h" #include "libc/byteorder.h" typedef uint64_t sector_t; Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "fs/fs.h" #include "filesys.h" Modified: trunk/openbios-devel/fs/hfs/block.c ============================================================================== --- trunk/openbios-devel/fs/hfs/block.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/block.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: block.c,v 1.11 1998/11/02 22:08:52 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "volume.h" Modified: trunk/openbios-devel/fs/hfs/btree.c ============================================================================== --- trunk/openbios-devel/fs/hfs/btree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/btree.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: btree.c,v 1.10 1998/11/02 22:08:54 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "btree.h" Modified: trunk/openbios-devel/fs/hfs/data.c ============================================================================== --- trunk/openbios-devel/fs/hfs/data.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/data.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: data.c,v 1.7 1998/11/02 22:08:57 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "data.h" #define TIMEDIFF 2082844800UL Modified: trunk/openbios-devel/fs/hfs/file.c ============================================================================== --- trunk/openbios-devel/fs/hfs/file.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/file.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: file.c,v 1.9 1998/11/02 22:08:59 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "file.h" #include "btree.h" Modified: trunk/openbios-devel/fs/hfs/hfs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/hfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: hfs.c,v 1.15 1998/11/02 22:09:00 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "data.h" #include "block.h" Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "fs/fs.h" #include "libc/vsprintf.h" #include "libhfs.h" Modified: trunk/openbios-devel/fs/hfs/low.c ============================================================================== --- trunk/openbios-devel/fs/hfs/low.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/low.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: low.c,v 1.8 1998/11/02 22:09:03 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "low.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfs/medium.c ============================================================================== --- trunk/openbios-devel/fs/hfs/medium.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/medium.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: medium.c,v 1.4 1998/11/02 22:09:04 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "block.h" #include "low.h" Modified: trunk/openbios-devel/fs/hfs/node.c ============================================================================== --- trunk/openbios-devel/fs/hfs/node.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/node.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: node.c,v 1.9 1998/11/02 22:09:05 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "node.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfs/record.c ============================================================================== --- trunk/openbios-devel/fs/hfs/record.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/record.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: record.c,v 1.9 1998/11/02 22:09:07 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "record.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfs/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfs/volume.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/volume.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: volume.c,v 1.12 1998/11/02 22:09:10 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "volume.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfsplus/blockiter.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/blockiter.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/blockiter.c Sun Mar 14 18:19:58 2010 (r695) @@ -25,7 +25,7 @@ * $Id: blockiter.c,v 1.2 2000/10/17 05:58:46 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "blockiter.h" #include "volume.h" Modified: trunk/openbios-devel/fs/hfsplus/btree.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/btree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/btree.c Sun Mar 14 18:19:58 2010 (r695) @@ -28,7 +28,7 @@ * $Id: btree.c,v 1.14 2000/10/25 05:43:04 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "volume.h" #include "btree.h" Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "fs/fs.h" #include "libhfsp.h" #include "volume.h" Modified: trunk/openbios-devel/fs/hfsplus/include/swab.h ============================================================================== --- trunk/openbios-devel/fs/hfsplus/include/swab.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/include/swab.h Sun Mar 14 18:19:58 2010 (r695) @@ -25,7 +25,7 @@ * $Id: swab.h,v 1.1.1.1 2002/03/05 19:50:29 klaus Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libc/byteorder.h" /* basic fuction: Modified: trunk/openbios-devel/fs/hfsplus/libhfsp.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/libhfsp.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/libhfsp.c Sun Mar 14 18:19:58 2010 (r695) @@ -23,7 +23,7 @@ * $Id: libhfsp.c,v 1.1.1.1 2000/07/25 10:33:40 kkaempf Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" const char *hfsp_error = "no error"; /* static error string */ Modified: trunk/openbios-devel/fs/hfsplus/record.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/record.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/record.c Sun Mar 14 18:19:58 2010 (r695) @@ -26,7 +26,7 @@ * $Id: record.c,v 1.24 2000/10/17 05:58:46 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "hfstime.h" #include "record.h" Modified: trunk/openbios-devel/fs/hfsplus/unicode.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/unicode.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/unicode.c Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "unicode.h" Modified: trunk/openbios-devel/fs/hfsplus/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/volume.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/volume.c Sun Mar 14 18:19:58 2010 (r695) @@ -25,7 +25,7 @@ * $Id: volume.c,v 1.21 2000/10/25 05:43:04 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "volume.h" #include "record.h" Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/ioglue.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/fs/iso9660/libiso9660.h ============================================================================== --- trunk/openbios-devel/fs/iso9660/libiso9660.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/iso9660/libiso9660.h Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ #ifndef __LIBISO9660_H__ #define __LIBISO9660_H__ -#include "openbios/config.h" +#include "config.h" #include "iso9660.h" extern iso9660_VOLUME* iso9660_mount(int fd); Copied and modified: trunk/openbios-devel/include/config.h (from r692, trunk/openbios-devel/include/openbios/config.h) ============================================================================== --- trunk/openbios-devel/include/openbios/config.h Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/include/config.h Sun Mar 14 18:19:58 2010 (r695) @@ -60,7 +60,7 @@ #endif /* BOOTSTRAP */ -#include "openbios/sysinclude.h" +#include "sysinclude.h" #ifndef MIN #define MIN(x,y) (((x) < (y)) ? (x) : (y)) Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/include/drivers/drivers.h Sun Mar 14 18:19:58 2010 (r695) @@ -11,7 +11,7 @@ #ifndef OPENBIOS_DRIVERS_H #define OPENBIOS_DRIVERS_H -#include "openbios/config.h" +#include "config.h" #ifdef CONFIG_DRIVER_PCI /* drivers/pci.c */ Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/include/libc/string.h Sun Mar 14 18:19:58 2010 (r695) @@ -17,7 +17,7 @@ #ifndef _H_STRING #define _H_STRING -#include "openbios/config.h" +#include "config.h" #define bzero(s,n) memset( s, 0, n ) #define atol(nptr) strtol(nptr, NULL, 10 ) Modified: trunk/openbios-devel/include/libc/vsprintf.h ============================================================================== --- trunk/openbios-devel/include/libc/vsprintf.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/include/libc/vsprintf.h Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ #define _H_VSPRINTF #include <stdarg.h> -#include "openbios/config.h" +#include "config.h" extern int vsprintf(char *buf, const char *fmt, va_list args ); extern int sprintf(char * buf, const char *fmt, ...); Copied: trunk/openbios-devel/include/sysinclude.h (from r692, trunk/openbios-devel/include/openbios/sysinclude.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/sysinclude.h Sun Mar 14 18:19:58 2010 (r695, copy of r692, trunk/openbios-devel/include/openbios/sysinclude.h) @@ -0,0 +1,20 @@ +#ifndef __SYSINCLUDE_H +#define __SYSINCLUDE_H + +#ifdef BOOTSTRAP +#include "asm/types.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#else /* BOOTSTRAP */ +#include "libc/stdlib.h" +#include "libc/string.h" +#endif /* BOOTSTRAP */ + +extern int printk( const char *fmt, ... ) \ + __attribute__ ((format (printf, 1, 2))); +#ifdef BOOTSTRAP +#define printk printf +#endif + +#endif /* __SYSINCLUDE_H */ Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -21,9 +21,9 @@ #include <getopt.h> #endif -#include "openbios/config.h" +#include "config.h" #include "kernel/stack.h" -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include "kernel/kernel.h" #include "dict.h" #include "cross.h" Modified: trunk/openbios-devel/kernel/dict.c ============================================================================== --- trunk/openbios-devel/kernel/dict.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/dict.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "dict.h" #ifdef BOOTSTRAP Modified: trunk/openbios-devel/kernel/primitives.c ============================================================================== --- trunk/openbios-devel/kernel/primitives.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/primitives.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,8 +6,8 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" -#include "openbios/sysinclude.h" +#include "config.h" +#include "sysinclude.h" #include "kernel/stack.h" #include "kernel/kernel.h" #include "dict.h" Modified: trunk/openbios-devel/kernel/stack.c ============================================================================== --- trunk/openbios-devel/kernel/stack.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/stack.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "kernel/stack.h" #include "cross.h" Modified: trunk/openbios-devel/libc/ctype.c ============================================================================== --- trunk/openbios-devel/libc/ctype.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/ctype.c Sun Mar 14 18:19:58 2010 (r695) @@ -4,7 +4,7 @@ * Copyright (C) 1991, 1992 Linus Torvalds */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" const unsigned char _ctype[] = { Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/diskio.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/libc/extra.c ============================================================================== --- trunk/openbios-devel/libc/extra.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/extra.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "libc/vsprintf.h" #include "libopenbios/bindings.h" Modified: trunk/openbios-devel/libc/misc.c ============================================================================== --- trunk/openbios-devel/libc/misc.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/misc.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" int errno_int; Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/string.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * reentrant and should be faster). Use only strsep() in new code, please. */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "libc/stdlib.h" Modified: trunk/openbios-devel/libc/vsprintf.c ============================================================================== --- trunk/openbios-devel/libc/vsprintf.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/vsprintf.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * - changed to provide snprintf and vsnprintf functions */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/libopenbios/bindings.c ============================================================================== --- trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "libc/stdlib.h" Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/client.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/of.h" Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/fontdata.h" #include "video_subr.h" Modified: trunk/openbios-devel/libopenbios/elf_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,5 +1,5 @@ /* Support for ELF Boot Proposal as a boot image */ -#include "openbios/config.h" +#include "config.h" #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "asm/io.h" Modified: trunk/openbios-devel/libopenbios/elfload.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -29,7 +29,7 @@ (at your option) any later version. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/libopenbios/linuxbios_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/linuxbios_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/linuxbios_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,7 +1,7 @@ /* Adapted from Etherboot 5.1.8 */ -#include "openbios/config.h" -#include "openbios/sysinclude.h" +#include "config.h" +#include "sysinclude.h" #include "asm/types.h" #include "asm/io.h" #include "linuxbios.h" Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/bootinfo-loader.c ============================================================================== --- trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/cmdline.c ============================================================================== --- trunk/openbios-devel/packages/cmdline.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/cmdline.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/packages/deblocker.c ============================================================================== --- trunk/openbios-devel/packages/deblocker.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/deblocker.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/disk-label.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "packages.h" Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mac-parts.h" #include "packages.h" Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/misc-files.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/nvram.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libopenbios/ofmem.h"

1 0

[commit] r694 - in trunk/openbios-devel: arch/amd64 arch/sparc32 arch/sparc64 arch/x86 include include/arch/common include/libopenbios include/openbios libopenbios packages
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 18:06:20 2010 New Revision: 694 URL: http://tracker.coreboot.org/trac/openbios/changeset/694 Log: Move the a.out, ELF and XCOFF header files down into include/arch/common. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/common/a.out.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/a.out.h trunk/openbios-devel/include/arch/common/elf.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/elf.h trunk/openbios-devel/include/arch/common/elf_boot.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/elf_boot.h trunk/openbios-devel/include/arch/common/xcoff.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/xcoff.h Deleted: trunk/openbios-devel/include/a.out.h trunk/openbios-devel/include/elf_boot.h trunk/openbios-devel/include/openbios/elf.h trunk/openbios-devel/include/openbios/xcoff.h Modified: trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/include/libopenbios/elfload.h trunk/openbios-devel/libopenbios/elf_info.c trunk/openbios-devel/libopenbios/elfload.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "a.out.h" +#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 18:06:20 2010 (r694) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 18:06:20 2010 (r694) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB -#include "a.out.h" +#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 18:06:20 2010 (r694) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Copied: trunk/openbios-devel/include/arch/common/a.out.h (from r692, trunk/openbios-devel/include/a.out.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/a.out.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/a.out.h) @@ -0,0 +1,271 @@ +#ifndef __A_OUT_GNU_H__ +#define __A_OUT_GNU_H__ + +#define __GNU_EXEC_MACROS__ + +#ifndef __STRUCT_EXEC_OVERRIDE__ + +#include "asm/a.out.h" + +#endif /* __STRUCT_EXEC_OVERRIDE__ */ + +/* these go in the N_MACHTYPE field */ +enum machine_type { +#if defined (M_OLDSUN2) + M__OLDSUN2 = M_OLDSUN2, +#else + M_OLDSUN2 = 0, +#endif +#if defined (M_68010) + M__68010 = M_68010, +#else + M_68010 = 1, +#endif +#if defined (M_68020) + M__68020 = M_68020, +#else + M_68020 = 2, +#endif +#if defined (M_SPARC) + M__SPARC = M_SPARC, +#else + M_SPARC = 3, +#endif + /* skip a bunch so we don't run into any of sun's numbers */ + M_386 = 100, + M_MIPS1 = 151, /* MIPS R3000/R3000 binary */ + M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ +}; + +#if !defined (N_MAGIC) +#define N_MAGIC(exec) ((exec).a_info & 0xffff) +#endif +#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff)) +#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff) +#define N_SET_INFO(exec, magic, type, flags) \ + ((exec).a_info = ((magic) & 0xffff) \ + | (((int)(type) & 0xff) << 16) \ + | (((flags) & 0xff) << 24)) +#define N_SET_MAGIC(exec, magic) \ + ((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff))) + +#define N_SET_MACHTYPE(exec, machtype) \ + ((exec).a_info = \ + ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16)) + +#define N_SET_FLAGS(exec, flags) \ + ((exec).a_info = \ + ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24)) + +/* Code indicating object file or impure executable. */ +#define OMAGIC 0407 +/* Code indicating pure executable. */ +#define NMAGIC 0410 +/* Code indicating demand-paged executable. */ +#define ZMAGIC 0413 +/* This indicates a demand-paged executable with the header in the text. + The first page is unmapped to help trap NULL pointer references */ +#define QMAGIC 0314 + +/* Code indicating core file. */ +#define CMAGIC 0421 + +#if !defined (N_BADMAG) +#define N_BADMAG(x) (N_MAGIC(x) != OMAGIC \ + && N_MAGIC(x) != NMAGIC \ + && N_MAGIC(x) != ZMAGIC \ + && N_MAGIC(x) != QMAGIC) +#endif + +#define _N_HDROFF(x) (1024 - sizeof (struct exec)) + +#if !defined (N_TXTOFF) +#define N_TXTOFF(x) \ + (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \ + (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec))) +#endif + +#if !defined (N_DATOFF) +#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text) +#endif + +#if !defined (N_TRELOFF) +#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data) +#endif + +#if !defined (N_DRELOFF) +#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x)) +#endif + +#if !defined (N_SYMOFF) +#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x)) +#endif + +#if !defined (N_STROFF) +#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x)) +#endif + +/* Address of text segment in memory after it is loaded. */ +#if !defined (N_TXTADDR) +#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0) +#endif + +/* Address of data segment in memory after it is loaded. + Note that it is up to you to define SEGMENT_SIZE + on machines not listed here. */ +#if defined(vax) || defined(hp300) || defined(pyr) +#define SEGMENT_SIZE page_size +#endif +#ifdef sony +#define SEGMENT_SIZE 0x2000 +#endif /* Sony. */ +#ifdef is68k +#define SEGMENT_SIZE 0x20000 +#endif +#if defined(m68k) && defined(PORTAR) +#define PAGE_SIZE 0x400 +#define SEGMENT_SIZE PAGE_SIZE +#endif + +#if !defined(SEGMENT_SIZE) +#ifdef linux +#if defined(__i386__) || defined(__mc68000__) +#define SEGMENT_SIZE 1024 +#elif defined(__sparc__) +#define SEGMENT_SIZE 0x2000 +#else +#if defined(PAGE_SIZE) +#define SEGMENT_SIZE PAGE_SIZE +#endif +#endif +#endif +#endif + +#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1)) + +#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) + +#ifndef N_DATADDR +#define N_DATADDR(x) \ + (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \ + : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x)))) +#endif + +/* Address of bss segment in memory after it is loaded. */ +#if !defined (N_BSSADDR) +#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data) +#endif + +#if !defined (N_NLIST_DECLARED) +struct nlist { + union { + char *n_name; + struct nlist *n_next; + long n_strx; + } n_un; + unsigned char n_type; + char n_other; + short n_desc; + unsigned long n_value; +}; +#endif /* no N_NLIST_DECLARED. */ + +#if !defined (N_UNDF) +#define N_UNDF 0 +#endif +#if !defined (N_ABS) +#define N_ABS 2 +#endif +#if !defined (N_TEXT) +#define N_TEXT 4 +#endif +#if !defined (N_DATA) +#define N_DATA 6 +#endif +#if !defined (N_BSS) +#define N_BSS 8 +#endif +#if !defined (N_FN) +#define N_FN 15 +#endif + +#if !defined (N_EXT) +#define N_EXT 1 +#endif +#if !defined (N_TYPE) +#define N_TYPE 036 +#endif +#if !defined (N_STAB) +#define N_STAB 0340 +#endif + +/* The following type indicates the definition of a symbol as being + an indirect reference to another symbol. The other symbol + appears as an undefined reference, immediately following this symbol. + + Indirection is asymmetrical. The other symbol's value will be used + to satisfy requests for the indirect symbol, but not vice versa. + If the other symbol does not have a definition, libraries will + be searched to find a definition. */ +#define N_INDR 0xa + +/* The following symbols refer to set elements. + All the N_SET[ATDB] symbols with the same name form one set. + Space is allocated for the set in the text section, and each set + element's value is stored into one word of the space. + The first word of the space is the length of the set (number of elements). + + The address of the set is made into an N_SETV symbol + whose name is the same as the name of the set. + This symbol acts like a N_DATA global symbol + in that it can satisfy undefined external references. */ + +/* These appear as input to LD, in a .o file. */ +#define N_SETA 0x14 /* Absolute set element symbol */ +#define N_SETT 0x16 /* Text set element symbol */ +#define N_SETD 0x18 /* Data set element symbol */ +#define N_SETB 0x1A /* Bss set element symbol */ + +/* This is output from LD. */ +#define N_SETV 0x1C /* Pointer to set vector in data area. */ + +#if !defined (N_RELOCATION_INFO_DECLARED) +/* This structure describes a single relocation to be performed. + The text-relocation section of the file is a vector of these structures, + all of which apply to the text section. + Likewise, the data-relocation section applies to the data section. */ + +struct relocation_info +{ + /* Address (within segment) to be relocated. */ + int r_address; + /* The meaning of r_symbolnum depends on r_extern. */ + unsigned int r_symbolnum:24; + /* Nonzero means value is a pc-relative offset + and it should be relocated for changes in its own address + as well as for changes in the symbol or section specified. */ + unsigned int r_pcrel:1; + /* Length (as exponent of 2) of the field to be relocated. + Thus, a value of 2 indicates 1<<2 bytes. */ + unsigned int r_length:2; + /* 1 => relocate with value of symbol. + r_symbolnum is the index of the symbol + in file's the symbol table. + 0 => relocate with the address of a segment. + r_symbolnum is N_TEXT, N_DATA, N_BSS or N_ABS + (the N_EXT bit may be set also, but signifies nothing). */ + unsigned int r_extern:1; + /* Four bits that aren't used, but when writing an object file + it is desirable to clear them. */ +#ifdef NS32K + unsigned r_bsr:1; + unsigned r_disp:1; + unsigned r_pad:2; +#else + unsigned int r_pad:4; +#endif +}; +#endif /* no N_RELOCATION_INFO_DECLARED. */ + + +#endif /* __A_OUT_GNU_H__ */ Copied: trunk/openbios-devel/include/arch/common/elf.h (from r692, trunk/openbios-devel/include/openbios/elf.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/elf.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/openbios/elf.h) @@ -0,0 +1,227 @@ +#ifndef ELF_H +#define ELF_H + +#define EI_NIDENT 16 /* Size of e_ident array. */ + +/* Values for e_type. */ +#define ET_NONE 0 /* No file type */ +#define ET_REL 1 /* Relocatable file */ +#define ET_EXEC 2 /* Executable file */ +#define ET_DYN 3 /* Shared object file */ +#define ET_CORE 4 /* Core file */ + +/* Values for e_machine (architecute). */ +#define EM_NONE 0 /* No machine */ +#define EM_M32 1 /* AT&T WE 32100 */ +#define EM_SPARC 2 /* SUN SPARC */ +#define EM_386 3 /* Intel 80386+ */ +#define EM_68K 4 /* Motorola m68k family */ +#define EM_88K 5 /* Motorola m88k family */ +#define EM_486 6 /* Perhaps disused */ +#define EM_860 7 /* Intel 80860 */ +#define EM_MIPS 8 /* MIPS R3000 big-endian */ +#define EM_S370 9 /* IBM System/370 */ +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ + +#define EM_PARISC 15 /* HPPA */ +#define EM_VPP500 17 /* Fujitsu VPP500 */ +#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ +#define EM_960 19 /* Intel 80960 */ +#define EM_PPC 20 /* PowerPC */ +#define EM_PPC64 21 /* PowerPC 64-bit */ +#define EM_S390 22 /* IBM S390 */ + +#define EM_V800 36 /* NEC V800 series */ +#define EM_FR20 37 /* Fujitsu FR20 */ +#define EM_RH32 38 /* TRW RH-32 */ +#define EM_RCE 39 /* Motorola RCE */ +#define EM_ARM 40 /* ARM */ +#define EM_FAKE_ALPHA 41 /* Digital Alpha */ +#define EM_SH 42 /* Hitachi SH */ +#define EM_SPARCV9 43 /* SPARC v9 64-bit */ +#define EM_TRICORE 44 /* Siemens Tricore */ +#define EM_ARC 45 /* Argonaut RISC Core */ +#define EM_H8_300 46 /* Hitachi H8/300 */ +#define EM_H8_300H 47 /* Hitachi H8/300H */ +#define EM_H8S 48 /* Hitachi H8S */ +#define EM_H8_500 49 /* Hitachi H8/500 */ +#define EM_IA_64 50 /* Intel Merced */ +#define EM_MIPS_X 51 /* Stanford MIPS-X */ +#define EM_COLDFIRE 52 /* Motorola Coldfire */ +#define EM_68HC12 53 /* Motorola M68HC12 */ +#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/ +#define EM_PCP 55 /* Siemens PCP */ +#define EM_NCPU 56 /* Sony nCPU embeeded RISC */ +#define EM_NDR1 57 /* Denso NDR1 microprocessor */ +#define EM_STARCORE 58 /* Motorola Start*Core processor */ +#define EM_ME16 59 /* Toyota ME16 processor */ +#define EM_ST100 60 /* STMicroelectronic ST100 processor */ +#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/ +#define EM_X86_64 62 /* AMD x86-64 architecture */ +#define EM_PDSP 63 /* Sony DSP Processor */ + +#define EM_FX66 66 /* Siemens FX66 microcontroller */ +#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */ +#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */ +#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */ +#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */ +#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */ +#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */ +#define EM_SVX 73 /* Silicon Graphics SVx */ +#define EM_AT19 74 /* STMicroelectronics ST19 8 bit mc */ +#define EM_VAX 75 /* Digital VAX */ +#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ +#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */ +#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */ +#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */ +#define EM_MMIX 80 /* Donald Knuth's educational 64-bit processor */ +#define EM_HUANY 81 /* Harvard University machine-independent object files */ +#define EM_PRISM 82 /* SiTera Prism */ +#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */ +#define EM_FR30 84 /* Fujitsu FR30 */ +#define EM_D10V 85 /* Mitsubishi D10V */ +#define EM_D30V 86 /* Mitsubishi D30V */ +#define EM_V850 87 /* NEC v850 */ +#define EM_M32R 88 /* Mitsubishi M32R */ +#define EM_MN10300 89 /* Matsushita MN10300 */ +#define EM_MN10200 90 /* Matsushita MN10200 */ +#define EM_PJ 91 /* picoJava */ +#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ +#define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */ +#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ +#define EM_NUM 95 + +/* Values for p_type. */ +#define PT_NULL 0 /* Unused entry. */ +#define PT_LOAD 1 /* Loadable segment. */ +#define PT_DYNAMIC 2 /* Dynamic linking information segment. */ +#define PT_INTERP 3 /* Pathname of interpreter. */ +#define PT_NOTE 4 /* Auxiliary information. */ +#define PT_SHLIB 5 /* Reserved (not used). */ +#define PT_PHDR 6 /* Location of program header itself. */ + +/* Values for p_flags. */ +#define PF_X 0x1 /* Executable. */ +#define PF_W 0x2 /* Writable. */ +#define PF_R 0x4 /* Readable. */ + + +#define ELF_PROGRAM_RETURNS_BIT 0x8000000 /* e_flags bit 31 */ + +#define EI_MAG0 0 +#define ELFMAG0 0x7f + +#define EI_MAG1 1 +#define ELFMAG1 'E' + +#define EI_MAG2 2 +#define ELFMAG2 'L' + +#define EI_MAG3 3 +#define ELFMAG3 'F' + +#define ELFMAG "\177ELF" + +#define EI_CLASS 4 /* File class byte index */ +#define ELFCLASSNONE 0 /* Invalid class */ +#define ELFCLASS32 1 /* 32-bit objects */ +#define ELFCLASS64 2 /* 64-bit objects */ + +#define EI_DATA 5 /* Data encodeing byte index */ +#define ELFDATANONE 0 /* Invalid data encoding */ +#define ELFDATA2LSB 1 /* 2's complement little endian */ +#define ELFDATA2MSB 2 /* 2's complement big endian */ + +#define EI_VERSION 6 /* File version byte index */ + /* Value must be EV_CURRENT */ + +#define EV_NONE 0 /* Invalid ELF Version */ +#define EV_CURRENT 1 /* Current version */ + +#define ELF32_PHDR_SIZE (8*4) /* Size of an elf program header */ + +#ifndef __ASSEMBLY__ +#include "asm/types.h" +/* + * ELF definitions common to all 32-bit architectures. + */ + +typedef uint32_t Elf32_Addr; +typedef uint16_t Elf32_Half; +typedef uint32_t Elf32_Off; +typedef int32_t Elf32_Sword; +typedef uint32_t Elf32_Word; +typedef uint32_t Elf32_Size; + +typedef uint64_t Elf64_Addr; +typedef uint16_t Elf64_Half; +typedef uint64_t Elf64_Off; +typedef int32_t Elf64_Sword; +typedef uint32_t Elf64_Word; +typedef uint64_t Elf64_Size; + +/* + * ELF header. + */ +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* File identification. */ + Elf32_Half e_type; /* File type. */ + Elf32_Half e_machine; /* Machine architecture. */ + Elf32_Word e_version; /* ELF format version. */ + Elf32_Addr e_entry; /* Entry point. */ + Elf32_Off e_phoff; /* Program header file offset. */ + Elf32_Off e_shoff; /* Section header file offset. */ + Elf32_Word e_flags; /* Architecture-specific flags. */ + Elf32_Half e_ehsize; /* Size of ELF header in bytes. */ + Elf32_Half e_phentsize; /* Size of program header entry. */ + Elf32_Half e_phnum; /* Number of program header entries. */ + Elf32_Half e_shentsize; /* Size of section header entry. */ + Elf32_Half e_shnum; /* Number of section header entries. */ + Elf32_Half e_shstrndx; /* Section name strings section. */ +} Elf32_Ehdr; + +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* File identification. */ + Elf64_Half e_type; /* File type. */ + Elf64_Half e_machine; /* Machine architecture. */ + Elf64_Word e_version; /* ELF format version. */ + Elf64_Addr e_entry; /* Entry point. */ + Elf64_Off e_phoff; /* Program header file offset. */ + Elf64_Off e_shoff; /* Section header file offset. */ + Elf64_Word e_flags; /* Architecture-specific flags. */ + Elf64_Half e_ehsize; /* Size of ELF header in bytes. */ + Elf64_Half e_phentsize; /* Size of program header entry. */ + Elf64_Half e_phnum; /* Number of program header entries. */ + Elf64_Half e_shentsize; /* Size of section header entry. */ + Elf64_Half e_shnum; /* Number of section header entries. */ + Elf64_Half e_shstrndx; /* Section name strings section. */ +} Elf64_Ehdr; + +/* + * Program header. + */ +typedef struct { + Elf32_Word p_type; /* Entry type. */ + Elf32_Off p_offset; /* File offset of contents. */ + Elf32_Addr p_vaddr; /* Virtual address (not used). */ + Elf32_Addr p_paddr; /* Physical address. */ + Elf32_Size p_filesz; /* Size of contents in file. */ + Elf32_Size p_memsz; /* Size of contents in memory. */ + Elf32_Word p_flags; /* Access permission flags. */ + Elf32_Size p_align; /* Alignment in memory and file. */ +} Elf32_Phdr; + +typedef struct { + Elf64_Word p_type; /* Entry type. */ + Elf64_Word p_flags; /* Access permission flags. */ + Elf64_Off p_offset; /* File offset of contents. */ + Elf64_Addr p_vaddr; /* Virtual address (not used). */ + Elf64_Addr p_paddr; /* Physical address. */ + Elf64_Size p_filesz; /* Size of contents in file. */ + Elf64_Size p_memsz; /* Size of contents in memory. */ + Elf64_Size p_align; /* Alignment in memory and file. */ +} Elf64_Phdr; + +#endif /* __ASSEMBLY__ */ + +#endif /* ELF_H */ Copied: trunk/openbios-devel/include/arch/common/elf_boot.h (from r692, trunk/openbios-devel/include/elf_boot.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/elf_boot.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/elf_boot.h) @@ -0,0 +1,105 @@ +#ifndef ELF_BOOT_H +#define ELF_BOOT_H + + +/* This defines the structure of a table of parameters useful for ELF + * bootable images. These parameters are all passed and generated + * by the bootloader to the booted image. For simplicity and + * consistency the Elf Note format is reused. + * + * All of the information must be Position Independent Data. + * That is it must be safe to relocate the whole ELF boot parameter + * block without changing the meaning or correctnes of the data. + * Additionally it must be safe to permute the order of the ELF notes + * to any possible permutation without changing the meaning or correctness + * of the data. + * + */ + +#define ELF_BHDR_MAGIC 0x0E1FB007 + +#ifndef __ASSEMBLY__ +typedef uint16_t Elf_Half; +typedef uint32_t Elf_Word; + +/* + * Elf boot notes... + */ + +typedef struct Elf_Bhdr +{ + Elf_Word b_signature; /* "0x0E1FB007" */ + Elf_Word b_size; + Elf_Half b_checksum; + Elf_Half b_records; +} Elf_Bhdr; + +/* + * ELF Notes. + */ + +typedef struct Elf_Nhdr +{ + Elf_Word n_namesz; /* Length of the note's name. */ + Elf_Word n_descsz; /* Length of the note's descriptor. */ + Elf_Word n_type; /* Type of the note. */ +} Elf_Nhdr; + +#endif /* __ASSEMBLY__ */ + +/* Standardized Elf image notes for booting... The name for all of these is ELFBoot */ +#define ELF_NOTE_BOOT "ELFBoot" + +#define EIN_PROGRAM_NAME 0x00000001 +/* The program in this ELF file */ +#define EIN_PROGRAM_VERSION 0x00000002 +/* The version of the program in this ELF file */ +#define EIN_PROGRAM_CHECKSUM 0x00000003 +/* ip style checksum of the memory image. */ + + +/* Linux image notes for booting... The name for all of these is Linux */ + +#define LIN_COMMAND_LINE 0x00000001 +/* The command line to pass to the loaded kernel. */ +#define LIN_ROOT_DEV 0x00000002 +/* The root dev to pass to the loaded kernel. */ +#define LIN_RAMDISK_FLAGS 0x00000003 +/* Various old ramdisk flags */ +#define LIN_INITRD_START 0x00000004 +/* Start of the ramdisk in bytes */ +#define LIN_INITRD_SIZE 0x00000005 +/* Size of the ramdisk in bytes */ + +/* Notes that are passed to a loaded image */ +/* For the standard elf boot notes n_namesz must be zero */ +#define EBN_FIRMWARE_TYPE 0x00000001 +/* ASCIZ name of the platform firmware. */ +#define EBN_BOOTLOADER_NAME 0x00000002 +/* This specifies just the ASCIZ name of the bootloader */ +#define EBN_BOOTLOADER_VERSION 0x00000003 +/* This specifies the version of the bootloader as an ASCIZ string */ +#define EBN_COMMAND_LINE 0x00000004 +/* This specifies a command line that can be set by user interaction, + * and is provided as a free form ASCIZ string to the loaded image. + */ +#define EBN_NOP 0x00000005 +/* A note nop note has no meaning, useful for inserting explicit padding */ +#define EBN_LOADED_IMAGE 0x00000006 +/* An ASCIZ string naming the loaded image */ + + +/* Etherboot specific notes */ +#define EB_PARAM_NOTE "Etherboot" +#define EB_IA64_SYSTAB 0x00000001 +#define EB_IA64_MEMMAP 0x00000002 +#define EB_IA64_FPSWA 0x00000003 +#define EB_IA64_CONINFO 0x00000004 +#define EB_BOOTP_DATA 0x00000005 +#define EB_HEADER 0x00000006 +#define EB_IA64_IMAGE_HANDLE 0x00000007 +#define EB_I386_MEMMAP 0x00000008 + +extern const struct elf_image_note elf_image_notes; + +#endif /* ELF_BOOT_H */ Copied: trunk/openbios-devel/include/arch/common/xcoff.h (from r692, trunk/openbios-devel/include/openbios/xcoff.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/xcoff.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/openbios/xcoff.h) @@ -0,0 +1,98 @@ +#ifndef XCOFF_H +#define XCOFF_H + +/* XCOFF executable loader */ + +typedef struct COFF_filehdr_t { + uint16_t f_magic; /* magic number */ + uint16_t f_nscns; /* number of sections */ + uint32_t f_timdat; /* time & date stamp */ + uint32_t f_symptr; /* file pointer to symtab */ + uint32_t f_nsyms; /* number of symtab entries */ + uint16_t f_opthdr; /* sizeof(optional hdr) */ + uint16_t f_flags; /* flags */ +} COFF_filehdr_t; + +/* IBM RS/6000 */ + +#define U802WRMAGIC 0x02DA /* writeable text segments **chh** */ +#define U802ROMAGIC 0x02DF /* readonly sharable text segments */ +#define U802TOCMAGIC 0x02E1 /* readonly text segments and TOC */ +#define U802TOMAGIC 0x01DF + +/* + * Bits for f_flags: + * + * F_RELFLG relocation info stripped from file + * F_EXEC file is executable (i.e. no unresolved external + * references) + * F_LNNO line numbers stripped from file + * F_LSYMS local symbols stripped from file + * F_MINMAL this is a minimal object file (".m") output of fextract + * F_UPDATE this is a fully bound update file, output of ogen + * F_SWABD this file has had its bytes swabbed (in names) + * F_AR16WR this file has the byte ordering of an AR16WR + * (e.g. 11/70) machine + * F_AR32WR this file has the byte ordering of an AR32WR machine + * (e.g. vax and iNTEL 386) + * F_AR32W this file has the byte ordering of an AR32W machine + * (e.g. 3b,maxi) + * F_PATCH file contains "patch" list in optional header + * F_NODF (minimal file only) no decision functions for + * replaced functions + */ + +#define COFF_F_RELFLG 0000001 +#define COFF_F_EXEC 0000002 +#define COFF_F_LNNO 0000004 +#define COFF_F_LSYMS 0000010 +#define COFF_F_MINMAL 0000020 +#define COFF_F_UPDATE 0000040 +#define COFF_F_SWABD 0000100 +#define COFF_F_AR16WR 0000200 +#define COFF_F_AR32WR 0000400 +#define COFF_F_AR32W 0001000 +#define COFF_F_PATCH 0002000 +#define COFF_F_NODF 0002000 + +typedef struct COFF_aouthdr_t { + uint16_t magic; /* type of file */ + uint16_t vstamp; /* version stamp */ + uint32_t tsize; /* text size in bytes, padded to FW bdry */ + uint32_t dsize; /* initialized data " " */ + uint32_t bsize; /* uninitialized data " " */ + uint32_t entry; /* entry pt. */ + uint32_t text_start; /* base of text used for this file */ + uint32_t data_start; /* base of data used for this file */ + uint32_t o_toc; /* address of TOC */ + uint16_t o_snentry; /* section number of entry point */ + uint16_t o_sntext; /* section number of .text section */ + uint16_t o_sndata; /* section number of .data section */ + uint16_t o_sntoc; /* section number of TOC */ + uint16_t o_snloader; /* section number of .loader section */ + uint16_t o_snbss; /* section number of .bss section */ + uint16_t o_algntext; /* .text alignment */ + uint16_t o_algndata; /* .data alignment */ + uint16_t o_modtype; /* module type (??) */ + uint16_t o_cputype; /* cpu type */ + uint32_t o_maxstack; /* max stack size (??) */ + uint32_t o_maxdata; /* max data size (??) */ + char o_resv2[12]; /* reserved */ +} COFF_aouthdr_t; + +#define AOUT_MAGIC 0x010b + +typedef struct COFF_scnhdr_t { + char s_name[8]; /* section name */ + uint32_t s_paddr; /* physical address, aliased s_nlib */ + uint32_t s_vaddr; /* virtual address */ + uint32_t s_size; /* section size */ + uint32_t s_scnptr; /* file ptr to raw data for section */ + uint32_t s_relptr; /* file ptr to relocation */ + uint32_t s_lnnoptr; /* file ptr to line numbers */ + uint16_t s_nreloc; /* number of relocation entries */ + uint16_t s_nlnno; /* number of line number entries */ + uint32_t s_flags; /* flags */ +} COFF_scnhdr_t; + +#endif /* XCOFF_H */ Modified: trunk/openbios-devel/include/libopenbios/elfload.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/elfload.h Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/include/libopenbios/elfload.h Sun Mar 14 18:06:20 2010 (r694) @@ -17,7 +17,7 @@ #ifndef _H_ELFLOAD #define _H_ELFLOAD -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" extern int is_elf( int fd, int offs ); Modified: trunk/openbios-devel/libopenbios/elf_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 18:06:20 2010 (r694) @@ -1,6 +1,6 @@ /* Support for ELF Boot Proposal as a boot image */ #include "openbios/config.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "asm/io.h" #include "libopenbios/ipchecksum.h" Modified: trunk/openbios-devel/libopenbios/elfload.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -33,7 +33,7 @@ #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "libc/diskio.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #define DEBUG 0 #define MAX_HEADERS 32 Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 18:06:20 2010 (r694) @@ -19,7 +19,7 @@ #include "packages.h" #include "libopenbios/ofmem.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" /* TODO: manage ELF notes section */ Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 18:06:20 2010 (r694) @@ -19,7 +19,7 @@ #include "packages.h" #include "libopenbios/ofmem.h" -#include "openbios/xcoff.h" +#include "arch/common/xcoff.h" //#define DEBUG_XCOFF

1 0

[commit] r692 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 drivers include/drivers include/openbios packages
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 16:19:41 2010 New Revision: 692 URL: http://tracker.coreboot.org/trac/openbios/changeset/692 Log: Move the driver header files into include/drivers to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/drivers/ trunk/openbios-devel/include/drivers/drivers.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/drivers.h trunk/openbios-devel/include/drivers/pci.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/pci.h Deleted: trunk/openbios-devel/include/openbios/drivers.h trunk/openbios-devel/include/openbios/pci.h Modified: trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/pc_kbd.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 16:19:41 2010 (r692) @@ -13,7 +13,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:19:41 2010 (r692) @@ -22,9 +22,9 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "openbios/nvram.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "qemu/qemu.h" #include "libopenbios/ofmem.h" #include "openbios-version.h" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 16:19:41 2010 (r692) @@ -20,7 +20,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/string.h" #include "qemu/qemu.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 16:19:41 2010 (r692) @@ -20,7 +20,7 @@ #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/vsprintf.h" #include "libc/string.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:19:41 2010 (r692) @@ -6,7 +6,7 @@ #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 16:19:41 2010 (r692) @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "openbios.h" #include "video_subr.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:19:41 2010 (r692) @@ -10,7 +10,7 @@ #include "openprom.h" #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libopenbios/fontdata.h" #include "openbios.h" #include "video_subr.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,12 +8,12 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "dict.h" #include "openbios/nvram.h" #include "sys_info.h" #include "openbios.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "asm/pci.h" #include "boot.h" #include "../../drivers/timer.h" // XXX Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:19:41 2010 (r692) @@ -12,8 +12,8 @@ #include "dict.h" #include "kernel/kernel.h" #include "kernel/stack.h" -#include "openbios/drivers.h" -#include "openbios/pci.h" +#include "drivers/drivers.h" +#include "drivers/pci.h" #include "sys_info.h" #include "openbios.h" #include "relocate.h" Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/cuda.c Sun Mar 14 16:19:41 2010 (r692) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/escc.c Sun Mar 14 16:19:41 2010 (r692) @@ -2,7 +2,7 @@ #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libopenbios/ofmem.h" #include "escc.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 16:19:41 2010 (r692) @@ -19,7 +19,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "asm/io.h" #include "scsi.h" #include "asm/dma.h" Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 16:19:41 2010 (r692) @@ -4,7 +4,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "timer.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 16:19:41 2010 (r692) @@ -19,7 +19,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "ide.h" #include "hdreg.h" #include "timer.h" Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/iommu.c Sun Mar 14 16:19:41 2010 (r692) @@ -6,7 +6,7 @@ **/ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "iommu.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 16:19:41 2010 (r692) @@ -14,11 +14,11 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "macio.h" #include "cuda.h" #include "escc.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #define OW_IO_NVRAM_SIZE 0x00020000 #define OW_IO_NVRAM_OFFSET 0x00060000 Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:19:41 2010 (r692) @@ -16,7 +16,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "openbios/nvram.h" #include "libopenbios/ofmem.h" #include "obio.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/vsprintf.h" /* ****************************************************************** Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/vsprintf.h" /* ****************************************************************** Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 16:19:41 2010 (r692) @@ -18,11 +18,11 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "video_subr.h" #include "timer.h" #include "pci.h" Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 16:19:41 2010 (r692) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "libc/vsprintf.h" #include "pci_database.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 16:19:41 2010 (r692) @@ -15,7 +15,7 @@ #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libopenbios/ofmem.h" #define SBUS_REGS 0x28 Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 16:19:41 2010 (r692) @@ -19,8 +19,8 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "openbios/pci.h" -#include "openbios/drivers.h" +#include "drivers/pci.h" +#include "drivers/drivers.h" #include "libopenbios/fontdata.h" #include "asm/io.h" #include "libc/vsprintf.h" Copied: trunk/openbios-devel/include/drivers/drivers.h (from r689, trunk/openbios-devel/include/openbios/drivers.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/drivers/drivers.h Sun Mar 14 16:19:41 2010 (r692, copy of r689, trunk/openbios-devel/include/openbios/drivers.h) @@ -0,0 +1,127 @@ +/* + * OpenBIOS driver prototypes + * + * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> + * + * 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 OPENBIOS_DRIVERS_H +#define OPENBIOS_DRIVERS_H + +#include "openbios/config.h" + +#ifdef CONFIG_DRIVER_PCI +/* drivers/pci.c */ +int ob_pci_init(void); +#endif + +#if defined(CONFIG_DRIVER_PCI) || defined(CONFIG_DRIVER_ESCC) +#ifdef CONFIG_PPC +extern int is_apple(void); +extern int is_oldworld(void); +extern int is_newworld(void); +#else +static inline int is_apple(void) +{ + return 0; +} +static inline int is_oldworld(void) +{ + return 0; +} +static inline int is_newworld(void) +{ + return 0; +} +#endif +#define AAPL(_cmd) do { if (is_apple()) _cmd; } while(0) +#define OLDWORLD(_cmd) do { if (is_oldworld()) _cmd; } while(0) +#define NEWWORLD(_cmd) do { if (is_newworld()) _cmd; } while(0) +#endif +#ifdef CONFIG_DRIVER_SBUS +/* drivers/sbus.c */ +int ob_sbus_init(uint64_t base, int machine_id); + +/* arch/sparc32/console.c */ +void tcx_init(uint64_t base); +void kbd_init(uint64_t base); +#endif +#ifdef CONFIG_DRIVER_IDE +/* drivers/ide.c */ +int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, + uint32_t io_port1, uint32_t ctl_port1); +int macio_ide_init(const char *path, uint32_t addr, int nb_channels); +#endif +#ifdef CONFIG_DRIVER_ESP +/* drivers/esp.c */ +int ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset, + unsigned long dmaoffset); +#endif +#ifdef CONFIG_DRIVER_OBIO +/* drivers/obio.c */ +int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, + unsigned long counter_offset, unsigned long intr_offset, + unsigned long aux1_offset, unsigned long aux2_offset); +int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, + int cpu); + +/* drivers/iommu.c */ +void ob_init_iommu(uint64_t base); +void *dvma_alloc(int size, unsigned int *pphys); + +/* drivers/sbus.c */ +extern uint16_t graphic_depth; + +/* drivers/obio.c */ +extern volatile unsigned char *power_reg; +extern volatile unsigned int *reset_reg; +extern volatile struct sun4m_timer_regs *counter_regs; + +void ob_new_obio_device(const char *name, const char *type); +unsigned long ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map); +void ob_intr(int intr); + +/* arch/sparc32/romvec.c */ +extern const char *obp_stdin_path, *obp_stdout_path; +extern char obp_stdin, obp_stdout; + +/* arch/sparc32/boot.c */ +extern uint32_t kernel_image; +extern uint32_t kernel_size; +extern uint32_t qemu_cmdline; +extern uint32_t cmdline_size; +extern char boot_device; +#endif +#ifdef CONFIG_DRIVER_FLOPPY +int ob_floppy_init(const char *path, const char *dev_name, + unsigned long io_base, unsigned long mmio_base); +#endif +#ifdef CONFIG_DRIVER_PC_KBD +void ob_pc_kbd_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr); +int pc_kbd_dataready(void); +unsigned char pc_kbd_readdata(void); +#endif +#ifdef CONFIG_DRIVER_PC_SERIAL +void ob_pc_serial_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr); +int uart_init(int port, unsigned long speed); +int uart_charav(int port); +char uart_getchar(int port); +void serial_putchar(int c); +#endif +#ifdef CONFIG_DRIVER_ESCC +int uart_init(uint64_t port, unsigned long speed); +int uart_charav(int port); +char uart_getchar(int port); +void serial_putchar(int c); +void serial_cls(void); +#ifdef CONFIG_DRIVER_ESCC_SUN +int keyboard_dataready(void); +unsigned char keyboard_readdata(void); +#endif +#endif +#endif /* OPENBIOS_DRIVERS_H */ Copied: trunk/openbios-devel/include/drivers/pci.h (from r689, trunk/openbios-devel/include/openbios/pci.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/drivers/pci.h Sun Mar 14 16:19:41 2010 (r692, copy of r689, trunk/openbios-devel/include/openbios/pci.h) @@ -0,0 +1,210 @@ +#ifndef _H_PCI +#define _H_PCI + +typedef uint32_t pci_addr; + +typedef struct pci_arch_t pci_arch_t; + +struct pci_arch_t { + const char * name; + uint16_t vendor_id; + uint16_t device_id; + unsigned long cfg_addr; + unsigned long cfg_data; + unsigned long cfg_base; + unsigned long cfg_len; + unsigned long mem_base; + unsigned long mem_len; + unsigned long io_base; + unsigned long io_len; + unsigned long rbase; + unsigned long rlen; + uint8_t irqs[4]; +}; + +extern const pci_arch_t *arch; + +/* Device tree offsets */ + +#define PCI_INT_MAP_PCI0 0 +#define PCI_INT_MAP_PCI1 1 +#define PCI_INT_MAP_PCI2 2 +#define PCI_INT_MAP_PCI_INT 3 +#define PCI_INT_MAP_PIC_HANDLE 4 +#define PCI_INT_MAP_PIC_INT 5 +#define PCI_INT_MAP_PIC_POL 6 + +/* Device classes and subclasses */ + +#define PCI_BASE_CLASS_STORAGE 0x01 +#define PCI_SUBCLASS_STORAGE_SCSI 0x00 +#define PCI_SUBCLASS_STORAGE_IDE 0x01 +#define PCI_SUBCLASS_STORAGE_FLOPPY 0x02 +#define PCI_SUBCLASS_STORAGE_IPI 0x03 +#define PCI_SUBCLASS_STORAGE_RAID 0x04 +#define PCI_SUBCLASS_STORAGE_ATA 0x05 +#define PCI_SUBCLASS_STORAGE_SAS 0x07 +#define PCI_SUBCLASS_STORAGE_OTHER 0x80 + +#define PCI_BASE_CLASS_NETWORK 0x02 +#define PCI_SUBCLASS_NETWORK_ETHERNET 0x00 +#define PCI_SUBCLASS_NETWORK_TOKEN_RING 0x01 +#define PCI_SUBCLASS_NETWORK_FDDI 0x02 +#define PCI_SUBCLASS_NETWORK_ATM 0x03 +#define PCI_SUBCLASS_NETWORK_ISDN 0x04 +#define PCI_SUBCLASS_NETWORK_WORDFIP 0x05 +#define PCI_SUBCLASS_NETWORK_PICMG214 0x06 +#define PCI_SUBCLASS_NETWORK_OTHER 0x80 + +#define PCI_BASE_CLASS_DISPLAY 0x03 +#define PCI_SUBCLASS_DISPLAY_VGA 0x00 +#define PCI_SUBCLASS_DISPLAY_XGA 0x01 +#define PCI_SUBCLASS_DISPLAY_3D 0x02 +#define PCI_SUBCLASS_DISPLAY_OTHER 0x80 + +#define PCI_BASE_CLASS_MULTIMEDIA 0x04 +#define PCI_SUBCLASS_MULTIMEDIA_VIDEO 0x00 +#define PCI_SUBCLASS_MULTIMEDIA_AUDIO 0x01 +#define PCI_SUBCLASS_MULTIMEDIA_PHONE 0x02 +#define PCI_SUBCLASS_MULTIMEDIA_OTHER 0x80 + +#define PCI_BASE_CLASS_MEMORY 0x05 +#define PCI_SUBCLASS_MEMORY_RAM 0x00 +#define PCI_SUBCLASS_MEMORY_FLASH 0x01 + +#define PCI_BASE_CLASS_BRIDGE 0x06 +#define PCI_SUBCLASS_BRIDGE_HOST 0x00 +#define PCI_SUBCLASS_BRIDGE_ISA 0x01 +#define PCI_SUBCLASS_BRIDGE_EISA 0x02 +#define PCI_SUBCLASS_BRIDGE_MC 0x03 +#define PCI_SUBCLASS_BRIDGE_PCI 0x04 +#define PCI_SUBCLASS_BRIDGE_PCMCIA 0x05 +#define PCI_SUBCLASS_BRIDGE_NUBUS 0x06 +#define PCI_SUBCLASS_BRIDGE_CARDBUS 0x07 +#define PCI_SUBCLASS_BRIDGE_RACEWAY 0x08 +#define PCI_SUBCLASS_BRIDGE_PCI_SEMITP 0x09 +#define PCI_SUBCLASS_BRIDGE_IB_PCI 0x0a +#define PCI_SUBCLASS_BRIDGE_OTHER 0x80 + +#define PCI_BASE_CLASS_COMMUNICATION 0x07 +#define PCI_SUBCLASS_COMMUNICATION_SERIAL 0x00 +#define PCI_SUBCLASS_COMMUNICATION_PARALLEL 0x01 +#define PCI_SUBCLASS_COMMUNICATION_MULTISERIAL 0x02 +#define PCI_SUBCLASS_COMMUNICATION_MODEM 0x03 +#define PCI_SUBCLASS_COMMUNICATION_GPIB 0x04 +#define PCI_SUBCLASS_COMMUNICATION_SC 0x05 +#define PCI_SUBCLASS_COMMUNICATION_OTHER 0x80 + +#define PCI_BASE_CLASS_SYSTEM 0x08 +#define PCI_SUBCLASS_SYSTEM_PIC 0x00 +#define PCI_SUBCLASS_SYSTEM_DMA 0x01 +#define PCI_SUBCLASS_SYSTEM_TIMER 0x02 +#define PCI_SUBCLASS_SYSTEM_RTC 0x03 +#define PCI_SUBCLASS_SYSTEM_PCI_HOTPLUG 0x04 +#define PCI_SUBCLASS_SYSTEM_OTHER 0x80 + +#define PCI_BASE_CLASS_INPUT 0x09 +#define PCI_SUBCLASS_INPUT_KEYBOARD 0x00 +#define PCI_SUBCLASS_INPUT_PEN 0x01 +#define PCI_SUBCLASS_INPUT_MOUSE 0x02 +#define PCI_SUBCLASS_INPUT_SCANNER 0x03 +#define PCI_SUBCLASS_INPUT_GAMEPORT 0x04 +#define PCI_SUBCLASS_INPUT_OTHER 0x80 + +#define PCI_BASE_CLASS_DOCKING 0x0a +#define PCI_SUBCLASS_DOCKING_GENERIC 0x00 +#define PCI_SUBCLASS_DOCKING_OTHER 0x80 + +#define PCI_BASE_CLASS_PROCESSOR 0x0b +#define PCI_SUBCLASS_PROCESSOR_386 0x00 +#define PCI_SUBCLASS_PROCESSOR_486 0x01 +#define PCI_SUBCLASS_PROCESSOR_PENTIUM 0x02 +#define PCI_SUBCLASS_PROCESSOR_ALPHA 0x10 +#define PCI_SUBCLASS_PROCESSOR_POWERPC 0x20 +#define PCI_SUBCLASS_PROCESSOR_MIPS 0x30 +#define PCI_SUBCLASS_PROCESSOR_CO 0x40 + +#define PCI_BASE_CLASS_SERIAL 0x0c +#define PCI_SUBCLASS_SERIAL_FIREWIRE 0x00 +#define PCI_SUBCLASS_SERIAL_ACCESS 0x01 +#define PCI_SUBCLASS_SERIAL_SSA 0x02 +#define PCI_SUBCLASS_SERIAL_USB 0x03 +#define PCI_SUBCLASS_SERIAL_FIBER 0x04 +#define PCI_SUBCLASS_SERIAL_SMBUS 0x05 +#define PCI_SUBCLASS_SERIAL_IB 0x06 +#define PCI_SUBCLASS_SERIAL_IPMI 0x07 +#define PCI_SUBCLASS_SERIAL_SERCOS 0x08 +#define PCI_SUBCLASS_SERIAL_CANBUS 0x09 + +#define PCI_BASE_CLASS_WIRELESS 0x0d +#define PCI_SUBCLASS_WIRELESS_IRDA 0x00 +#define PCI_SUBCLASS_WIRELESS_CIR 0x01 +#define PCI_SUBCLASS_WIRELESS_RF_CONTROLLER 0x10 +#define PCI_SUBCLASS_WIRELESS_BLUETOOTH 0x11 +#define PCI_SUBCLASS_WIRELESS_BROADBAND 0x12 +#define PCI_SUBCLASS_WIRELESS_OTHER 0x80 + +#define PCI_BASE_CLASS_SATELLITE 0x0f +#define PCI_SUBCLASS_SATELLITE_TV 0x00 +#define PCI_SUBCLASS_SATELLITE_AUDIO 0x01 +#define PCI_SUBCLASS_SATELLITE_VOICE 0x03 +#define PCI_SUBCLASS_SATELLITE_DATA 0x04 + +#define PCI_BASE_CLASS_CRYPT 0x10 +#define PCI_SUBCLASS_CRYPT_NETWORK 0x00 +#define PCI_SUBCLASS_CRYPT_ENTERTAINMENT 0x01 +#define PCI_SUBCLASS_CRYPT_OTHER 0x80 + +#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11 +#define PCI_SUBCLASS_SP_DPIO 0x00 +#define PCI_SUBCLASS_SP_PERF 0x01 +#define PCI_SUBCLASS_SP_SYNCH 0x10 +#define PCI_SUBCLASS_SP_MANAGEMENT 0x20 +#define PCI_SUBCLASS_SP_OTHER 0x80 + +#define PCI_CLASS_OTHERS 0xff + +/* Vendors and devices. */ + +#define PCI_VENDOR_ID_ATI 0x1002 +#define PCI_DEVICE_ID_ATI_RAGE128_PF 0x5046 + +#define PCI_VENDOR_ID_DEC 0x1011 +#define PCI_DEVICE_ID_DEC_21154 0x0026 + +#define PCI_VENDOR_ID_IBM 0x1014 +#define PCI_DEVICE_ID_IBM_OPENPIC 0x0002 +#define PCI_DEVICE_ID_IBM_OPENPIC2 0xffff + +#define PCI_VENDOR_ID_MOTOROLA 0x1057 +#define PCI_DEVICE_ID_MOTOROLA_MPC106 0x0002 +#define PCI_DEVICE_ID_MOTOROLA_RAVEN 0x4801 + +#define PCI_VENDOR_ID_APPLE 0x106b +#define PCI_DEVICE_ID_APPLE_343S1201 0x0010 +#define PCI_DEVICE_ID_APPLE_343S1211 0x0017 +#define PCI_DEVICE_ID_APPLE_UNI_N_I_PCI 0x001e +#define PCI_DEVICE_ID_APPLE_UNI_N_PCI 0x001f +#define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020 +#define PCI_DEVICE_ID_APPLE_UNI_N_KEYL 0x0022 +#define PCI_DEVICE_ID_APPLE_U3_AGP 0x004b + +#define PCI_VENDOR_ID_SUN 0x108e +#define PCI_DEVICE_ID_SUN_EBUS 0x1000 +#define PCI_DEVICE_ID_SUN_SIMBA 0x5000 +#define PCI_DEVICE_ID_SUN_PBM 0x8000 +#define PCI_DEVICE_ID_SUN_SABRE 0xa000 + +#define PCI_VENDOR_ID_CMD 0x1095 +#define PCI_DEVICE_ID_CMD_646 0x0646 + +#define PCI_VENDOR_ID_REALTEK 0x10ec +#define PCI_DEVICE_ID_REALTEK_RTL8029 0x8029 + +#define PCI_VENDOR_ID_QEMU 0x1234 +#define PCI_DEVICE_ID_QEMU_VGA 0x1111 + +#define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_DEVICE_ID_INTEL_82441 0x1237 + +#endif /* _H_PCI */ Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 16:19:41 2010 (r692) @@ -18,7 +18,7 @@ #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libopenbios/ofmem.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "video_subr.h" typedef struct osi_fb_info {

1 0

[commit] r691 - in trunk/openbios-devel: arch/amd64 arch/ppc arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 arch/x86/xbox drivers fs fs/ext2 f...
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 16:05:53 2010 New Revision: 691 URL: http://tracker.coreboot.org/trac/openbios/changeset/691 Log: Move the libopenbios header files into include/libopenbios to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/ trunk/openbios-devel/include/libopenbios/bindings.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/include/libopenbios/elfload.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/elfload.h trunk/openbios-devel/include/libopenbios/fontdata.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/fontdata.h trunk/openbios-devel/include/libopenbios/ipchecksum.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/ipchecksum.h trunk/openbios-devel/include/libopenbios/of.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/of.h trunk/openbios-devel/include/libopenbios/ofmem.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/ofmem.h Deleted: trunk/openbios-devel/include/ipchecksum.h trunk/openbios-devel/include/ofmem.h trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/include/openbios/elfload.h trunk/openbios-devel/include/openbios/fontdata.h trunk/openbios-devel/include/openbios/of.h Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/briq/main.c trunk/openbios-devel/arch/ppc/briq/methods.c trunk/openbios-devel/arch/ppc/briq/tree.c trunk/openbios-devel/arch/ppc/briq/vfd.c trunk/openbios-devel/arch/ppc/kernel.c trunk/openbios-devel/arch/ppc/mol/console.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/mol/main.c trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/mol/osi-blk.c trunk/openbios-devel/arch/ppc/mol/osi-scsi.c trunk/openbios-devel/arch/ppc/mol/pseudodisk.c trunk/openbios-devel/arch/ppc/mol/tree.c trunk/openbios-devel/arch/ppc/ofmem.c trunk/openbios-devel/arch/ppc/pearpc/console.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/main.c trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/pearpc/tree.c trunk/openbios-devel/arch/ppc/pearpc/vfd.c trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/ppc/qemu/vfd.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/blk.c trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/exception.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/xbox/console.c trunk/openbios-devel/arch/x86/xbox/methods.c trunk/openbios-devel/drivers/adb_bus.c trunk/openbios-devel/drivers/adb_kbd.c trunk/openbios-devel/drivers/adb_mouse.c trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/pc_kbd.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/fs/ext2/ext2_utils.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/iso9660_mount.c trunk/openbios-devel/fs/iso9660/iso9660_read.c trunk/openbios-devel/fs/iso9660/iso9660_readdir.c trunk/openbios-devel/libc/diskio.c trunk/openbios-devel/libc/extra.c trunk/openbios-devel/libopenbios/bindings.c trunk/openbios-devel/libopenbios/client.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/libopenbios/elfload.c trunk/openbios-devel/libopenbios/elfnote.c trunk/openbios-devel/libopenbios/font_8x16.c trunk/openbios-devel/libopenbios/font_8x8.c trunk/openbios-devel/libopenbios/ipchecksum.c trunk/openbios-devel/libopenbios/linuxbios.c trunk/openbios-devel/libopenbios/ofmem_common.c trunk/openbios-devel/packages/bootinfo-loader.c trunk/openbios-devel/packages/cmdline.c trunk/openbios-devel/packages/deblocker.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/nvram.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c trunk/openbios-devel/packages/video.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #define printf printk #define debug printk Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "segment.h" Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,10 +20,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "briq/briq.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios-version.h" extern void unexpected_excep( int vector ); Modified: trunk/openbios-devel/arch/ppc/briq/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -17,13 +17,13 @@ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "briq/briq.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" static void transfer_control_to_elf( ulong entry ) Modified: trunk/openbios-devel/arch/ppc/briq/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,10 +19,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "briq/briq.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ Modified: trunk/openbios-devel/arch/ppc/briq/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" void devtree_init( void ) { Modified: trunk/openbios-devel/arch/ppc/briq/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "briq/briq.h" static int vfd_is_open; Modified: trunk/openbios-devel/arch/ppc/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,7 +19,7 @@ #include "openbios/config.h" #include "dict.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/stack.h" #include "kernel/kernel.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/mol/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,10 +16,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "osi_calls.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/mol.h" #include "boothelper_sh.h" #include "video_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,10 +16,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "mol/mol.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/prom.h" #include "openbios-version.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,13 +16,13 @@ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "mol/mol.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "osi_calls.h" #include "ablk_sh.h" #include "boothelper_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,10 +15,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "mol/mol.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/prom.h" #include "osi_calls.h" #include "kbd_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-blk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mol/mol.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-scsi.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mol/mol.h" #include "scsi_sh.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/pseudodisk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,10 +15,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "osi_calls.h" #include "libc/string.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/prom.h" #include "mol/mol.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mol/mol.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 16:05:53 2010 (r691) @@ -18,9 +18,9 @@ /* TODO: Clean up MOLisms in a decent way */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "kernel.h" #ifdef I_WANT_MOLISMS #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,9 +13,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -21,10 +21,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "pearpc/pearpc.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios-version.h" extern void unexpected_excep( int vector ); Modified: trunk/openbios-devel/arch/ppc/pearpc/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -17,13 +17,13 @@ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "pearpc/pearpc.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" static void transfer_control_to_elf( ulong entry ) Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,10 +19,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "pearpc/pearpc.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ Modified: trunk/openbios-devel/arch/ppc/pearpc/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" void devtree_init( void ) { Modified: trunk/openbios-devel/arch/ppc/pearpc/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "pearpc/pearpc.h" static int vfd_is_open; Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -12,7 +12,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -21,12 +21,12 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/pci.h" #include "openbios/nvram.h" #include "openbios/drivers.h" #include "qemu/qemu.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios-version.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ #include "qemu-dict.h" #include "openbios/config.h" #include "dict.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/stack.h" #include "kernel/kernel.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,13 +15,13 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "kernel.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,11 +19,11 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "libc/string.h" #include "qemu/qemu.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "arch/ppc/processor.h" /************************************************************************/ Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,9 +16,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "kernel.h" #include "mmutypes.h" #include "asm/processor.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,7 +19,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "qemu/qemu.h" static int vfd_is_open; Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "openbios/drivers.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/drivers.h" #include "openbios.h" #include "video_subr.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,8 +8,8 @@ */ #include "libc/vsprintf.h" -#include "openbios/bindings.h" -#include "ofmem.h" +#include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" #include "asm/asi.h" #include "pgtsrmmu.h" #include "openprom.h" Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "asm/types.h" #include "dict.h" Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "openprom.h" #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -6,10 +6,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/drivers.h" -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" #include "openbios.h" #include "video_subr.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 16:05:53 2010 (r691) @@ -4,7 +4,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "libc/vsprintf.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "spitfire.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,7 +13,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "ofmem_sparc64.h" #include "spitfire.h" Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h Sun Mar 14 16:05:53 2010 (r691) @@ -14,7 +14,7 @@ #ifndef _H_OFMEM_SPARC64 #define _H_OFMEM_SPARC64 -#include "ofmem.h" +#include "libopenbios/ofmem.h" extern void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "dict.h" #include "openbios/nvram.h" @@ -20,7 +20,7 @@ #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" #include "video_subr.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/arch/unix/blk.c ============================================================================== --- trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 16:05:53 2010 (r691) @@ -12,7 +12,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "blk.h" typedef struct { Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 16:05:53 2010 (r691) @@ -31,11 +31,11 @@ #include "dict.h" #include "kernel/stack.h" #include "arch/unix/plugins.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios-version.h" #include "blk.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define MEMORY_SIZE (4*1024*1024) /* 4M ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256k for the dictionary */ Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,8 +8,8 @@ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/exception.c ============================================================================== --- trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "asm/types.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "segment.h" Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" Modified: trunk/openbios-devel/arch/x86/xbox/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -11,7 +11,7 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" typedef struct osi_fb_info { Modified: trunk/openbios-devel/arch/x86/xbox/methods.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,9 +19,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" -// #include "ofmem.h" +// #include "libopenbios/ofmem.h" /************************************************************************/ /* stdout */ Modified: trunk/openbios-devel/drivers/adb_bus.c ============================================================================== --- trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/vsprintf.h" #include "adb_bus.h" Modified: trunk/openbios-devel/drivers/adb_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "kbd.h" Modified: trunk/openbios-devel/drivers/adb_mouse.c ============================================================================== --- trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/cuda.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/escc.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,9 +1,9 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "escc.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 16:05:53 2010 (r691) @@ -14,7 +14,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" @@ -24,7 +24,7 @@ #include "scsi.h" #include "asm/dma.h" #include "esp.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define BUFSIZE 4096 Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,7 +1,7 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 16:05:53 2010 (r691) @@ -14,7 +14,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/iommu.c Sun Mar 14 16:05:53 2010 (r691) @@ -5,10 +5,10 @@ ** This code is licensed under GNU General Public License. **/ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "iommu.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #ifdef CONFIG_DEBUG_IOMMU #define DPRINTF(fmt, args...) \ Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "openbios/nvram.h" -#include "openbios/bindings.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 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:05:53 2010 (r691) @@ -11,14 +11,14 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" #include "openbios/nvram.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "obio.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 16:05:53 2010 (r691) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 16:05:53 2010 (r691) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,7 +16,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/pci.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/pci.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 16:05:53 2010 (r691) @@ -11,12 +11,12 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define SBUS_REGS 0x28 #define SBUS_SLOTS 16 Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 16:05:53 2010 (r691) @@ -18,14 +18,14 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/pci.h" #include "openbios/drivers.h" -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" #include "asm/io.h" #include "libc/vsprintf.h" #include "video_subr.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 Modified: trunk/openbios-devel/fs/ext2/ext2_utils.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/ext2/ext2_utils.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "libext2.h" #include "ext2_utils.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "filesys.h" #include "glue.h" Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/ioglue.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" #include "os.h" Modified: trunk/openbios-devel/fs/iso9660/iso9660_mount.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ */ #include "libiso9660.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record *idr, char *buffer) Modified: trunk/openbios-devel/fs/iso9660/iso9660_read.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_read.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/iso9660/iso9660_read.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "libiso9660.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" size_t iso9660_read(iso9660_FILE *_file, char *buf, size_t count) Modified: trunk/openbios-devel/fs/iso9660/iso9660_readdir.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_readdir.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/iso9660/iso9660_readdir.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "libiso9660.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #define offsetof(t,m) ((long)&(((t *)0)->m)) Copied: trunk/openbios-devel/include/libopenbios/bindings.h (from r689, trunk/openbios-devel/include/openbios/bindings.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/bindings.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/bindings.h) @@ -0,0 +1,150 @@ +/* + * Creation Date: <2003/12/19 23:09:56 samuel> + * Time-stamp: <2004/01/07 19:36:42 samuel> + * + * <bindings.h> + * + * Forth bindings + * + * 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_BINDINGS +#define _H_BINDINGS + +#include "kernel/stack.h" +#include "kernel/kernel.h" + +#define PUSH3(a,b,c) do { PUSH((a)); PUSH((b)); PUSH((c)); } while(0) +#define PUSH2(a,b) do { PUSH((a)); PUSH((b)); } while(0) +#define RET( v ) do { PUSH(v); return; } while(0) + +/* initialization */ +extern int initialize_forth( void ); + +/* panic */ +extern int forth_segv_handler( char *segv_addr ); + +/* active package */ +extern phandle_t find_dev( const char *path ); +extern phandle_t get_cur_dev( void ); +extern phandle_t activate_device( const char *str ); +extern void device_end( void ); +extern void activate_dev( phandle_t ph ); + + +/* ihandle related */ +extern phandle_t ih_to_phandle( ihandle_t ih ); +extern ihandle_t my_parent( void ); +extern ihandle_t my_self( void ); +extern char *my_args_copy( void ); + +extern xt_t find_package_method( const char *meth, phandle_t ph ); +extern xt_t find_ih_method( const char *method, ihandle_t ih ); +extern xt_t find_parent_method( const char *method ); +extern void call_package( xt_t xt, ihandle_t ihandle ); +extern void call_parent( xt_t xt ); +extern void call_parent_method( const char *method ); + +/* package */ +extern ihandle_t open_package( const char *argstr, phandle_t ph ); +extern ihandle_t open_dev( const char *spec ); +extern void close_package( ihandle_t ih ); +extern void close_dev( ihandle_t ih ); + +/* property access */ +extern void set_property( phandle_t ph, const char *name, + const char *buf, int len ); +extern void set_int_property( phandle_t ph, const char *name, + u32 val ); +extern u32 get_int_property( phandle_t ph, const char *name, + int *retlen ); +extern char *get_property( phandle_t ph, const char *name, + int *retlen ); + +/* device tree iteration */ +extern phandle_t dt_iter_begin( void ); +extern phandle_t dt_iterate( phandle_t last_tree ); +extern phandle_t dt_iterate_type( phandle_t last_tree, + const char *type ); +static inline phandle_t dt_find_type( const char *type ) { + return dt_iterate_type( 0, type ); +} + +/* forth bindings */ +extern cell feval( const char *str ); +extern void bind_xtfunc( const char *name, xt_t xt, + ucell arg, void (*func)(void) ); +extern void bind_func( const char *name, void (*func)(void) ); +extern xt_t bind_noname_func( void (*func)(void) ); +extern void push_str( const char *str ); +extern char *pop_fstr_copy( void ); + +extern int _fword( const char *word, xt_t *cache_xt ); +extern cell _eword( const char *word, xt_t *cache_xt, int nargs ); +extern int _selfword( const char *method, xt_t *cache_xt ); +extern int _parword( const char *method, xt_t *cache_xt ); + +#define fword(w) ({ static xt_t cache_xt = 0; _fword(w, &cache_xt); }) +#define eword(w, nargs) ({ static xt_t cache_xt = 0; _eword(w, &cache_xt, nargs); }) +#define selfword(w) ({ static xt_t cache_xt = 0; _selfword(w, &cache_xt); }) +#define parword(w) ({ static xt_t cache_xt = 0; _parword(w, &cache_xt); }) + +extern void throw( int error ); + + +/* node bindings */ +extern void make_openable( int only_parents ); + + +typedef struct { + const char *name; + void *func; +} method_t; + +#define REGISTER_NAMED_NODE( name, path ) do { \ + bind_new_node( name##_flags_, name##_size_, \ + path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + +#define REGISTER_NODE_METHODS( name, path ) do { \ + const char *paths[1]; \ + \ + paths[0] = path; \ + bind_node( name##_flags_, name##_size_, \ + paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + +#define DECLARE_UNNAMED_NODE( name, flags, size ) \ +static const int name##_flags_ = flags; \ +static const int name##_size_ = size; + +#define DECLARE_NODE( name, flags, size, paths... ) \ +static const char * const name##_p[] = { paths }; \ +DECLARE_UNNAMED_NODE(name, flags, size) + +#define NODE_METHODS( name ) \ +static const method_t name##_m[] + +#define REGISTER_NODE( name ) do { \ + bind_node( name##_flags_, name##_size_, \ + name##_p, sizeof(name##_p)/sizeof(char*), \ + name##_m, sizeof(name##_m)/sizeof(method_t) ); \ + } while(0) + +extern void bind_node( int flags, int size, const char * const *paths, int npaths, + const method_t *methods, int nmethods ); + +extern void bind_new_node( int flags, int size, const char *name, + const method_t *methods, int nmethods ); + +#define INSTALL_OPEN 1 /* install trivial open and close methods */ + + + +#endif /* _H_BINDINGS */ Copied: trunk/openbios-devel/include/libopenbios/elfload.h (from r689, trunk/openbios-devel/include/openbios/elfload.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/elfload.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/elfload.h) @@ -0,0 +1,29 @@ +/* + * Creation Date: <2001/05/05 16:44:17 samuel> + * Time-stamp: <2003/10/22 23:18:42 samuel> + * + * <elfload.h> + * + * Elf loader + * + * Copyright (C) 2001, 2003 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 + * + */ + +#ifndef _H_ELFLOAD +#define _H_ELFLOAD + +#include "openbios/elf.h" +#include "asm/elf.h" + +extern int is_elf( int fd, int offs ); +extern int find_elf( int fd ); + +extern Elf32_Phdr * elf_readhdrs( int fd, int offs, Elf32_Ehdr *e ); + + +#endif /* _H_ELFLOAD */ Copied: trunk/openbios-devel/include/libopenbios/fontdata.h (from r689, trunk/openbios-devel/include/openbios/fontdata.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/fontdata.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/fontdata.h) @@ -0,0 +1,28 @@ +/* Font definitions */ + +#ifndef OPENBIOS_FONTDATA_H +#define OPENBIOS_FONTDATA_H + +#define FONTDATAMAX_8X8 2048 +#define FONT_WIDTH_8X8 8 +#define FONT_HEIGHT_8X8 8 + +extern const unsigned char fontdata_8x8[FONTDATAMAX_8X8]; + +#define FONTDATAMAX_8X16 4096 +#define FONT_WIDTH_8X16 8 +#define FONT_HEIGHT_8X16 16 + +extern const unsigned char fontdata_8x16[FONTDATAMAX_8X16]; + +#if defined(CONFIG_FONT_8X8) +#define fontdata fontdata_8x8 +#define FONT_HEIGHT FONT_HEIGHT_8X8 +#define FONT_WIDTH FONT_WIDTH_8X8 +#elif defined(CONFIG_FONT_8X16) +#define fontdata fontdata_8x16 +#define FONT_HEIGHT FONT_HEIGHT_8X16 +#define FONT_WIDTH FONT_WIDTH_8X16 +#endif + +#endif /* OPENBIOS_FONTDATA_H */ Copied: trunk/openbios-devel/include/libopenbios/ipchecksum.h (from r689, trunk/openbios-devel/include/ipchecksum.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/ipchecksum.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/ipchecksum.h) @@ -0,0 +1,7 @@ +#ifndef IPCHECKSUM_H +#define IPCHECKSUM_H + +unsigned short ipchksum(const void *data, unsigned long length); +unsigned short add_ipchksums(unsigned long offset, unsigned short sum, unsigned short new); + +#endif /* IPCHECKSUM_H */ Copied: trunk/openbios-devel/include/libopenbios/of.h (from r689, trunk/openbios-devel/include/openbios/of.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/of.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/of.h) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2004/01/07 19:19:18 samuel> + * Time-stamp: <2004/01/07 19:19:48 samuel> + * + * <of.h> + * + * OpenFirmware related defines + * + * Copyright (C) 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_OF +#define _H_OF + +extern int of_client_interface( int *params ); + +#endif /* _H_OF */ Copied: trunk/openbios-devel/include/libopenbios/ofmem.h (from r689, trunk/openbios-devel/include/ofmem.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/ofmem.h) @@ -0,0 +1,127 @@ +/* + * Creation Date: <1999/11/16 00:47:06 samuel> + * Time-stamp: <2003/10/18 13:28:14 samuel> + * + * <ofmem.h> + * + * + * + * Copyright (C) 1999, 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 + * + */ + +#ifndef _H_OFMEM +#define _H_OFMEM + +#include "kernel/stack.h" + +typedef struct alloc_desc { + struct alloc_desc *next; + ucell size; /* size (including) this struct */ +} alloc_desc_t; + +typedef struct mem_range { + struct mem_range *next; + ucell start; + ucell size; +} range_t; + +typedef struct trans { + struct trans *next; + ucell virt; /* chain is sorted by virt */ + ucell size; + ucell phys; + ucell mode; +} translation_t; + +/* ofmem private data */ +typedef struct { + ucell ramsize; + char *next_malloc; + alloc_desc_t *mfree; /* list of free malloc blocks */ + + range_t *phys_range; + range_t *virt_range; + + translation_t *trans; /* this is really a translation_t */ +} ofmem_t; + +/* TODO: temporary migration interface */ +extern ofmem_t* ofmem_arch_get_private(void); +extern void* ofmem_arch_get_malloc_base(void); +extern ucell ofmem_arch_get_heap_top(void); +extern ucell ofmem_arch_get_virt_top(void); +extern ucell ofmem_arch_default_translation_mode( ucell phys ); +extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, + ucell mode); +extern void ofmem_arch_unmap_pages(ucell virt, ucell size); +/* sparc64 uses this method */ +extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, + ucell mode ); + +/* malloc interface */ +extern void* ofmem_malloc( size_t size ); +extern void ofmem_free( void *ptr ); +extern void* ofmem_realloc( void *ptr, size_t size ); + +/* ofmem_common.c */ + +extern void ofmem_cleanup( void ); +extern void ofmem_init( void ); + +/* + * register /memory and /virtual-memory handles + * ofmem module will update "available" and "translations" properties + * using these handles + * + * to disable updating /memory properties pass zero memory handle + */ +extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); + +extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); +extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); +extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); + +extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); +extern int ofmem_unmap( ucell virt, ucell size ); + +extern void ofmem_release_phys( ucell phys, ucell size ); +extern void ofmem_release_virt( ucell virt, ucell size ); +extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); + +#ifdef CONFIG_PPC +#define PAGE_SHIFT 12 + +ulong get_ram_top( void ); +ulong get_ram_bottom( void ); + +#elif defined(CONFIG_SPARC32) +#define PAGE_SHIFT 12 + +/* arch/sparc32/lib.c */ +struct mem; +extern struct mem cdvmem; + +void mem_init(struct mem *t, char *begin, char *limit); +void *mem_alloc(struct mem *t, int size, int align); +int map_page(unsigned long va, uint64_t epa, int type); +void *map_io(uint64_t pa, int size); +#endif + +#ifdef PAGE_SHIFT +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE - 1)) +#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) +#endif + +#if defined(CONFIG_DEBUG_OFMEM) +# define OFMEM_TRACE(fmt, ...) do { printk("OFMEM: " fmt, ## __VA_ARGS__); } while (0) +#else +# define OFMEM_TRACE(fmt, ...) do {} while(0) +#endif + +#endif /* _H_OFMEM */ Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libc/diskio.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" typedef struct { Modified: trunk/openbios-devel/libc/extra.c ============================================================================== --- trunk/openbios-devel/libc/extra.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libc/extra.c Sun Mar 14 16:05:53 2010 (r691) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "libc/string.h" #include "libc/vsprintf.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" /* strncpy without 0-pad */ char * Modified: trunk/openbios-devel/libopenbios/bindings.c ============================================================================== --- trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "libc/stdlib.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/client.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,8 +15,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/of.h" +#include "libopenbios/bindings.h" +#include "libopenbios/of.h" /* Uncomment to enable debug printout of client interface calls */ //#define DEBUG_CIF Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,8 +13,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/fontdata.h" +#include "libopenbios/bindings.h" +#include "libopenbios/fontdata.h" #include "video_subr.h" #define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) Modified: trunk/openbios-devel/libopenbios/elfload.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -30,8 +30,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "libc/diskio.h" #include "openbios/elf.h" Modified: trunk/openbios-devel/libopenbios/elfnote.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfnote.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/elfnote.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,7 +3,7 @@ #include "elf_boot.h" #include "sys_info.h" #include "asm/io.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "openbios-version.h" #define printf printk #define debug printk Modified: trunk/openbios-devel/libopenbios/font_8x16.c ============================================================================== --- trunk/openbios-devel/libopenbios/font_8x16.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/font_8x16.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ * * **********************************************/ -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" const unsigned char fontdata_8x16[FONTDATAMAX_8X16] = { Modified: trunk/openbios-devel/libopenbios/font_8x8.c ============================================================================== --- trunk/openbios-devel/libopenbios/font_8x8.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/font_8x8.c Sun Mar 14 16:05:53 2010 (r691) @@ -4,7 +4,7 @@ /* */ /**********************************************/ -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" const unsigned char fontdata_8x8[FONTDATAMAX_8X8] = { Modified: trunk/openbios-devel/libopenbios/ipchecksum.c ============================================================================== --- trunk/openbios-devel/libopenbios/ipchecksum.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/ipchecksum.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,6 +1,6 @@ /* Taken from Etherboot */ -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" unsigned short ipchksum(const void *data, unsigned long length) { Modified: trunk/openbios-devel/libopenbios/linuxbios.c ============================================================================== --- trunk/openbios-devel/libopenbios/linuxbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/linuxbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -5,7 +5,7 @@ #include "asm/types.h" #include "asm/io.h" #include "linuxbios.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "sys_info.h" #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,8 +13,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "ofmem.h" +#include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" /* * define OFMEM_FILL_RANGE to claim any unclaimed virtual and Modified: trunk/openbios-devel/packages/bootinfo-loader.c ============================================================================== --- trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "libc/vsprintf.h" //#define DEBUG_BOOTINFO Modified: trunk/openbios-devel/packages/cmdline.c ============================================================================== --- trunk/openbios-devel/packages/cmdline.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/cmdline.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/packages/deblocker.c ============================================================================== --- trunk/openbios-devel/packages/deblocker.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/deblocker.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/disk-label.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mac-parts.h" #include "packages.h" Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/misc-files.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,7 +16,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/nvram.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #ifdef CONFIG_DEBUG_NVRAM Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,7 +13,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,7 +13,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios/drivers.h" #include "video_subr.h" Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios/xcoff.h"

1 0

[commit] r690 - in trunk/openbios-devel: fs fs/ext2 fs/grubfs fs/hfs fs/hfsplus fs/iso9660 include/fs include/openbios packages
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 15:33:32 2010 New Revision: 690 URL: http://tracker.coreboot.org/trac/openbios/changeset/690 Log: Move the fs header file into include/fs to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/fs/ trunk/openbios-devel/include/fs/fs.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/fs.h Deleted: trunk/openbios-devel/include/openbios/fs.h Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/packages/misc-files.c Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -8,7 +8,7 @@ #include "libext2.h" #include "ext2_utils.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/vsprintf.h" typedef struct { Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "filesys.h" #include "glue.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/vsprintf.h" #include "libhfs.h" Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libhfsp.h" #include "volume.h" #include "record.h" Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/ioglue.c Sun Mar 14 15:33:32 2010 (r690) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/diskio.h" #include "os.h" #include "hfs_mdb.h" Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -5,7 +5,7 @@ */ #include "libiso9660.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/vsprintf.h" typedef struct { Copied: trunk/openbios-devel/include/fs/fs.h (from r689, trunk/openbios-devel/include/openbios/fs.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/fs/fs.h Sun Mar 14 15:33:32 2010 (r690, copy of r689, trunk/openbios-devel/include/openbios/fs.h) @@ -0,0 +1,90 @@ +/* + * Creation Date: <2001/05/06 17:12:45 samuel> + * Time-stamp: <2003/10/22 11:43:45 samuel> + * + * <fs_loader.h> + * + * Generic file system access + * + * Copyright (C) 2001, 2002, 2003 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 + * + */ + +#ifndef _H_FS +#define _H_FS + + +typedef struct fs_ops fs_ops_t; +typedef struct opaque_struct file_desc_t; + +#define fs_open_path( fs, path ) (fs)->open_path( fs, path ) +#define fs_search_rom( fs ) (fs)->search_rom( fs ) +#define fs_search_file( fs, name ) (fs)->search_file( fs, name ) +#define fs_vol_name( fs, buf, size ) (fs)->vol_name( fs, buf, size ) + +struct fs_ops { + void *fs_data; + int fd; /* owner block device */ + int type; + + void (*close_fs)( fs_ops_t *fs ); + file_desc_t *(*open_path)( fs_ops_t *fs, const char *path ); + file_desc_t *(*search_rom)( fs_ops_t *fs ); + file_desc_t *(*search_file)( fs_ops_t *fs, const char *name ); + char *(*vol_name)( fs_ops_t *fs, char *buf, int size ); + + /* file ops */ + void (*close)( file_desc_t *file ); + int (*read)( file_desc_t *file, void *buf, size_t count ); + int (*lseek)( file_desc_t *file, off_t offset, int whence ); + char *(*get_path)( file_desc_t *file, char *buf, int len ); + void (*dir)( file_desc_t *file ); + + const char *(*get_fstype)( fs_ops_t *fs ); +}; + +extern fs_ops_t *fs_open( int fs_type, int fd ); +extern void fs_close( fs_ops_t *fs ); +const char *fs_get_name( fs_ops_t *fs ); + +#ifdef CONFIG_HFSP +extern int fs_hfsp_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_hfsp_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_HFS +extern int fs_hfs_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_hfs_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_ISO9660 +extern int fs_iso9660_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_iso9660_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_EXT2 +extern int fs_ext2_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_ext2_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_GRUBFS +extern int fs_grubfs_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_grubfs_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + + + +/* misc */ +extern char *get_hfs_vol_name( int fd, char *buf, int size ); + + +#endif /* _H_FS */ Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/packages/misc-files.c Sun Mar 14 15:33:32 2010 (r690) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/diskio.h" #include "packages.h"

1 0

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

14 Mar '10

Author: mcayland Date: Sun Mar 14 15:21:02 2010 New Revision: 689 URL: http://tracker.coreboot.org/trac/openbios/changeset/689 Log: Move the kernel header files into include/kernel to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/kernel/ trunk/openbios-devel/include/kernel/kernel.h (contents, props changed) - copied, changed from r686, trunk/openbios-devel/include/openbios/kernel.h trunk/openbios-devel/include/kernel/stack.h (props changed) - copied unchanged from r686, trunk/openbios-devel/include/openbios/stack.h Deleted: trunk/openbios-devel/include/openbios/kernel.h trunk/openbios-devel/include/openbios/stack.h Modified: trunk/openbios-devel/arch/amd64/console.c trunk/openbios-devel/arch/amd64/context.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/lib.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/loadfs.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/amd64/segment.c trunk/openbios-devel/arch/amd64/sys_info.c trunk/openbios-devel/arch/ppc/briq/briq.c trunk/openbios-devel/arch/ppc/kernel.c trunk/openbios-devel/arch/ppc/mol/mol.c trunk/openbios-devel/arch/ppc/pearpc/pearpc.c trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/loadfs.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/loadfs.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/console.c trunk/openbios-devel/arch/x86/context.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/lib.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/loadfs.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/segment.c trunk/openbios-devel/arch/x86/sys_info.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/pc_kbd.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/ofmem.h trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/dict.c trunk/openbios-devel/kernel/primitives.c trunk/openbios-devel/kernel/stack.c trunk/openbios-devel/packages/init.c Modified: trunk/openbios-devel/arch/amd64/console.c ============================================================================== --- trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 15:21:02 2010 (r689) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/amd64/context.c ============================================================================== --- trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "segment.h" #include "context.h" Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" Modified: trunk/openbios-devel/arch/amd64/lib.c ============================================================================== --- trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 15:21:02 2010 (r689) @@ -12,7 +12,7 @@ #include <stdarg.h> #include "libc/stdlib.h" #include "libc/vsprintf.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" /* Format a string and print it on the screen, just like the libc * function printf. Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 15:21:02 2010 (r689) @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/amd64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 15:21:02 2010 (r689) @@ -10,8 +10,8 @@ #include "openbios/bindings.h" #include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" +#include "kernel/kernel.h" +#include "kernel/stack.h" #include "sys_info.h" #include "openbios.h" #include "relocate.h" Modified: trunk/openbios-devel/arch/amd64/segment.c ============================================================================== --- trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "relocate.h" #include "segment.h" Modified: trunk/openbios-devel/arch/amd64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/ppc/briq/briq.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 15:21:02 2010 (r689) @@ -20,8 +20,8 @@ #include "openbios/config.h" #include "dict.h" #include "openbios/bindings.h" -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #include "libc/string.h" #include "kernel.h" Modified: trunk/openbios-devel/arch/ppc/mol/mol.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 15:21:02 2010 (r689) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/pearpc.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 15:21:02 2010 (r689) @@ -21,8 +21,8 @@ #include "openbios/config.h" #include "dict.h" #include "openbios/bindings.h" -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #include "libc/string.h" #include "kernel.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "openbios/bindings.h" #include "openbios/drivers.h" Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "a.out.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 15:21:02 2010 (r689) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "openbios.h" #include "video_subr.h" Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "context.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 15:21:02 2010 (r689) @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/sparc32/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 15:21:02 2010 (r689) @@ -11,8 +11,8 @@ #include "openbios/drivers.h" #include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" +#include "kernel/kernel.h" +#include "kernel/stack.h" #include "openbios/nvram.h" #include "../../drivers/timer.h" // XXX #include "sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "elf_boot.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "a.out.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "openbios/fontdata.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "context.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 15:21:02 2010 (r689) @@ -3,7 +3,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 15:21:02 2010 (r689) @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/sparc64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "elf_boot.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 15:21:02 2010 (r689) @@ -27,9 +27,9 @@ #include "openbios/sysinclude.h" #include "mconfig.h" #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "dict.h" -#include "openbios/stack.h" +#include "kernel/stack.h" #include "arch/unix/plugins.h" #include "openbios/bindings.h" #include "openbios-version.h" Modified: trunk/openbios-devel/arch/x86/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/console.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/console.c Sun Mar 14 15:21:02 2010 (r689) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/context.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "segment.h" #include "context.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/lib.c ============================================================================== --- trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 15:21:02 2010 (r689) @@ -12,7 +12,7 @@ #include <stdarg.h> #include "libc/stdlib.h" #include "libc/vsprintf.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" /* Format a string and print it on the screen, just like the libc * function printf. Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 15:21:02 2010 (r689) @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/x86/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 15:21:02 2010 (r689) @@ -10,8 +10,8 @@ #include "openbios/bindings.h" #include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" +#include "kernel/kernel.h" +#include "kernel/stack.h" #include "openbios/drivers.h" #include "openbios/pci.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/x86/segment.c ============================================================================== --- trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "relocate.h" #include "segment.h" Modified: trunk/openbios-devel/arch/x86/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 15:21:02 2010 (r689) @@ -15,7 +15,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 15:21:02 2010 (r689) @@ -15,7 +15,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.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 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 15:21:02 2010 (r689) @@ -12,7 +12,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/pci.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 15:21:02 2010 (r689) @@ -12,7 +12,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "openbios/pci.h" #include "openbios/drivers.h" Copied and modified: trunk/openbios-devel/include/kernel/kernel.h (from r686, trunk/openbios-devel/include/openbios/kernel.h) ============================================================================== --- trunk/openbios-devel/include/openbios/kernel.h Sat Mar 13 13:44:22 2010 (r686, copy source) +++ trunk/openbios-devel/include/kernel/kernel.h Sun Mar 14 15:21:02 2010 (r689) @@ -18,7 +18,7 @@ #ifndef _H_KERNEL #define _H_KERNEL -#include "openbios/stack.h" +#include "kernel/stack.h" #include "asm/io.h" /* Interrupt status */ Copied: trunk/openbios-devel/include/kernel/stack.h (from r686, trunk/openbios-devel/include/openbios/stack.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/kernel/stack.h Sun Mar 14 15:21:02 2010 (r689, copy of r686, trunk/openbios-devel/include/openbios/stack.h) @@ -0,0 +1,104 @@ +/* stack.h + * tag: stack and stack access functions + * + * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer + * + * See the file "COPYING" for further information about + * the copyright and warranty status of this work. + */ + +#ifndef __STACK_H +#define __STACK_H + +#define dstacksize 512 +extern int dstackcnt; +extern cell dstack[dstacksize]; + +#define rstacksize 512 +extern int rstackcnt; +extern cell rstack[rstacksize]; + +extern int dbgrstackcnt; + +//typedef struct opaque_xt *xt_t; +//typedef struct opaque_ihandle *ihandle_t; +//typedef struct opaque_phandle *phandle_t; + +typedef ucell xt_t; +typedef ucell ihandle_t; +typedef ucell phandle_t; + + + + +static inline void PUSH(ucell value) { + dstack[++dstackcnt] = (value); +} +static inline void PUSH_xt( xt_t xt ) { PUSH( (ucell)xt ); } +static inline void PUSH_ih( ihandle_t ih ) { PUSH( (ucell)ih ); } +static inline void PUSH_ph( phandle_t ph ) { PUSH( (ucell)ph ); } + +static inline ucell POP(void) { + return (ucell) dstack[dstackcnt--]; +} +static inline xt_t POP_xt( void ) { return (xt_t)POP(); } +static inline ihandle_t POP_ih( void ) { return (ihandle_t)POP(); } +static inline phandle_t POP_ph( void ) { return (phandle_t)POP(); } + +static inline void DROP(void) { + dstackcnt--; +} + +static inline void DDROP(void) { + dstackcnt -= 2; +} + +static inline void DPUSH(ducell value) { +#ifdef NEED_FAKE_INT128_T + dstack[++dstackcnt] = (cell) value.lo; + dstack[++dstackcnt] = (cell) value.hi; +#else + dstack[++dstackcnt] = (cell) value; + dstack[++dstackcnt] = (cell) (value >> bitspercell); +#endif +} + +static inline ducell DPOP(void) { +#ifdef NEED_FAKE_INT128_T + ducell du; + du.hi = (ucell) dstack[dstackcnt--]; + du.lo = (ucell) dstack[dstackcnt--]; + return du; +#else + ducell du; + du = ((ducell)(ucell) dstack[dstackcnt--]) << bitspercell; + du |= (ucell) dstack[dstackcnt--]; + return du; +#endif +} + +static inline ucell GETTOS(void) { + return dstack[dstackcnt]; +} + +#define GETITEM(number) (dstack[dstackcnt - number]) +static inline void PUSHR(ucell value) { + rstack[++rstackcnt] = (value); +} + +static inline ucell POPR(void) { + return (ucell) rstack[rstackcnt--]; +} +static inline ucell GETTORS(void) { + return rstack[rstackcnt]; +} + + +#if defined(DEBUG_DSTACK) || defined(FCOMPILER) +void printdstack(void); +#endif +#if defined(DEBUG_RSTACK) || defined(FCOMPILER) +void printrstack(void); +#endif + +#endif Modified: trunk/openbios-devel/include/ofmem.h ============================================================================== --- trunk/openbios-devel/include/ofmem.h Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/include/ofmem.h Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ #ifndef _H_OFMEM #define _H_OFMEM -#include "openbios/stack.h" +#include "kernel/stack.h" typedef struct alloc_desc { struct alloc_desc *next; Modified: trunk/openbios-devel/include/openbios/bindings.h ============================================================================== --- trunk/openbios-devel/include/openbios/bindings.h Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/include/openbios/bindings.h Sun Mar 14 15:21:02 2010 (r689) @@ -17,8 +17,8 @@ #ifndef _H_BINDINGS #define _H_BINDINGS -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #define PUSH3(a,b,c) do { PUSH((a)); PUSH((b)); PUSH((c)); } while(0) #define PUSH2(a,b) do { PUSH((a)); PUSH((b)); } while(0) Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 15:21:02 2010 (r689) @@ -22,9 +22,9 @@ #endif #include "openbios/config.h" -#include "openbios/stack.h" +#include "kernel/stack.h" #include "openbios/sysinclude.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "dict.h" #include "cross.h" #include "openbios-version.h" Modified: trunk/openbios-devel/kernel/dict.c ============================================================================== --- trunk/openbios-devel/kernel/dict.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/kernel/dict.c Sun Mar 14 15:21:02 2010 (r689) @@ -8,7 +8,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "dict.h" #ifdef BOOTSTRAP #include <string.h> Modified: trunk/openbios-devel/kernel/primitives.c ============================================================================== --- trunk/openbios-devel/kernel/primitives.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/kernel/primitives.c Sun Mar 14 15:21:02 2010 (r689) @@ -8,8 +8,8 @@ #include "openbios/config.h" #include "openbios/sysinclude.h" -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #include "dict.h" /* Modified: trunk/openbios-devel/kernel/stack.c ============================================================================== --- trunk/openbios-devel/kernel/stack.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/kernel/stack.c Sun Mar 14 15:21:02 2010 (r689) @@ -8,7 +8,7 @@ #include "openbios/config.h" -#include "openbios/stack.h" +#include "kernel/stack.h" #include "cross.h" #define dstacksize 512 Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/packages/init.c Sun Mar 14 15:21:02 2010 (r689) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "packages.h" void

1 0

[commit] r688 - in trunk/openbios-devel: arch/ppc/qemu arch/unix include/arch/ppc include/arch/unix include/ppc include/unix
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 14:54:45 2010 New Revision: 688 URL: http://tracker.coreboot.org/trac/openbios/changeset/688 Log: Finish move of architecture-specific header files, with modifications to the header paths as required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/ppc/ (props changed) - copied from r686, trunk/openbios-devel/include/ppc/ trunk/openbios-devel/include/arch/unix/ (props changed) - copied from r686, trunk/openbios-devel/include/unix/ Deleted: trunk/openbios-devel/include/ppc/ trunk/openbios-devel/include/unix/ Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/unix/unix.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 14:47:44 2010 (r687) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 14:54:45 2010 (r688) @@ -32,7 +32,7 @@ #include "libc/vsprintf.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" -#include "ppc/processor.h" +#include "arch/ppc/processor.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 14:47:44 2010 (r687) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 14:54:45 2010 (r688) @@ -24,7 +24,7 @@ #include "libc/string.h" #include "qemu/qemu.h" #include "ofmem.h" -#include "ppc/processor.h" +#include "arch/ppc/processor.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 14:47:44 2010 (r687) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 14:54:45 2010 (r688) @@ -30,7 +30,7 @@ #include "openbios/kernel.h" #include "dict.h" #include "openbios/stack.h" -#include "unix/plugins.h" +#include "arch/unix/plugins.h" #include "openbios/bindings.h" #include "openbios-version.h"

1 0

[commit] r687 - in trunk/openbios-devel: config/scripts include/amd64 include/arch include/arch/amd64 include/arch/ia64 include/arch/sparc32 include/arch/sparc64 include/arch/x86 include/ia64 inclu...
by repository service 14 Mar '10

14 Mar '10

Author: mcayland Date: Sun Mar 14 14:47:44 2010 New Revision: 687 URL: http://tracker.coreboot.org/trac/openbios/changeset/687 Log: Begin tidying up of header locations as described on the mailing list. Firstly we move all of the architecture-specific header files from include/$ARCH to include/arch/$ARCH. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/ trunk/openbios-devel/include/arch/amd64/ (props changed) - copied from r686, trunk/openbios-devel/include/amd64/ trunk/openbios-devel/include/arch/ia64/ (props changed) - copied from r686, trunk/openbios-devel/include/ia64/ trunk/openbios-devel/include/arch/sparc32/ (props changed) - copied from r686, trunk/openbios-devel/include/sparc32/ trunk/openbios-devel/include/arch/sparc64/ (props changed) - copied from r686, trunk/openbios-devel/include/sparc64/ trunk/openbios-devel/include/arch/x86/ (props changed) - copied from r686, trunk/openbios-devel/include/x86/ Deleted: trunk/openbios-devel/include/amd64/ trunk/openbios-devel/include/ia64/ trunk/openbios-devel/include/sparc32/ trunk/openbios-devel/include/sparc64/ trunk/openbios-devel/include/x86/ Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Mar 13 13:44:22 2010 (r686) +++ trunk/openbios-devel/config/scripts/switch-arch Sun Mar 14 14:47:44 2010 (r687) @@ -190,9 +190,9 @@ mkdir -p $OBJDIR/host/include mkdir -p $OBJDIR/host/kernel mkdir -p $OBJDIR/forth - ln -s ../../../include/$ARCH $OBJDIR/target/include/asm + ln -s ../../../include/arch/$ARCH $OBJDIR/target/include/asm #compile the host binary with target settings instead - #ln -s ../../../include/$HOSTARCH $OBJDIR/host/include/asm + #ln -s ../../../include/arch/$HOSTARCH $OBJDIR/host/include/asm echo "ok." cd $OBJDIR

1 0

[commit] r686 - in trunk/openbios-devel: libopenbios packages
by repository service 13 Mar '10

13 Mar '10

Author: mcayland Date: Sat Mar 13 13:44:22 2010 New Revision: 686 URL: http://tracker.coreboot.org/trac/openbios/changeset/686 Log: Add missing files from previous refactoring commit and also fix a slight error in libopenbios/build.xml. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/packages/build.xml trunk/openbios-devel/packages/cmdline.fs trunk/openbios-devel/packages/disk-label.fs Modified: trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sat Mar 13 11:58:19 2010 (r685) +++ trunk/openbios-devel/libopenbios/build.xml Sat Mar 13 13:44:22 2010 (r686) @@ -2,7 +2,6 @@ <library name="openbios" type="static" target="target"> <object source="bindings.c"/> - <object source="bootinfo-loader.c" condition="PPC"/> <object source="client.c"/> <object source="console_common.c"/> <object source="elfnote.c" condition="X86"/> Added: trunk/openbios-devel/packages/build.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/packages/build.xml Sat Mar 13 13:44:22 2010 (r686) @@ -0,0 +1,25 @@ +<build> + + <library name="packages" type="static" target="target"> + <object source="bootinfo-loader.c" condition="PPC"/> + <object source="cmdline.c" condition="CMDLINE"/> + <object source="deblocker.c" condition="DEBLOCKER"/> + <object source="disk-label.c" condition="DISK_LABEL"/> + <object source="elf-loader.c" condition="PPC"/> + <object source="elf-loader.c" condition="SPARC64"/> + <object source="init.c"/> + <object source="mac-parts.c" condition="MAC_PARTS"/> + <object source="misc-files.c" condition="FS"/> + <object source="nvram.c"/> + <object source="pc-parts.c" condition="PC_PARTS"/> + <object source="sun-parts.c" condition="SUN_PARTS"/> + <object source="video.c"/> + <object source="xcoff-loader.c" condition="PPC"/> + </library> + + <dictionary name="openbios" target="forth"> + <object source="cmdline.fs"/> + <object source="disk-label.fs"/> + </dictionary> + +</build> Added: trunk/openbios-devel/packages/cmdline.fs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/packages/cmdline.fs Sat Mar 13 13:44:22 2010 (r686) @@ -0,0 +1,41 @@ +\ tag: Utility functions +\ +\ deblocker / filesystem support +\ +\ Copyright (C) 2003, 2004 Samuel Rydh +\ +\ See the file "COPYING" for further information about +\ the copyright and warranty status of this work. +\ + +\ ------------------------------------------------------------- +\ command line editor (/packages/cmdline) +\ ------------------------------------------------------------- + +[IFDEF] CONFIG_CMDLINE + +dev /packages +new-device + " cmdline" device-name + + :noname + " " [active-package], open-package + ?dup if + " cmdline" rot $call-method + else + ." cmdline is missing!" cr + then + \ cmdline must close itself upon return + ; + + :noname + [ ['] (lit) , swap , ] to outer-interpreter + ; SYSTEM-initializer + + external + : prepare 0 to my-self ; + +finish-device + +[THEN] +device-end Added: trunk/openbios-devel/packages/disk-label.fs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/packages/disk-label.fs Sat Mar 13 13:44:22 2010 (r686) @@ -0,0 +1,89 @@ +\ tag: Utility functions +\ +\ deblocker / filesystem support +\ +\ Copyright (C) 2003, 2004 Samuel Rydh +\ +\ See the file "COPYING" for further information about +\ the copyright and warranty status of this work. +\ + +dev /packages + +\ ------------------------------------------------------------- +\ /packages/disk-label (partition handling) +\ ------------------------------------------------------------- + +[IFDEF] CONFIG_DISK_LABEL + +new-device + " disk-label" device-name + external + + variable part-handlers \ list with (probe-xt, phandle) elements + variable fs-handlers \ list with (fs-probe-xt, phandle) elements + + : find-part-handler ( block0 -- phandle | 0 ) + >r part-handlers + begin list-get while + ( nextlist dictptr ) + r@ over @ execute if + ( nextlist dictptr ) + na1+ @ r> rot 2drop exit + then + drop + repeat + r> drop 0 + ; + + : find-filesystem ( ih -- ph | 0 ) + >r fs-handlers + begin list-get while + ( nextlist dictptr ) + r@ over @ execute if + ( nextlist dictptr ) + na1+ @ r> rot 2drop exit + then + drop + repeat + r> drop 0 + ; + + : register-part-handler ( handler-ph -- ) + dup " probe" rot find-method + 0= abort" Missing probe method!" + ( phandle probe-xt ) + part-handlers list-add , , + ; + + : register-fs-handler ( handler-ph -- ) + dup " probe" rot find-method + 0= abort" Missing probe method!" + ( phandle probe-xt ) + fs-handlers list-add , , + ; +finish-device + +\ --------------------------------------------------------------------------- +\ methods to register partion and filesystem packages used by disk-label +\ --------------------------------------------------------------------------- + +device-end +: register-partition-package ( -- ) + " register-part-handler" " disk-label" $find-package-method ?dup if + active-package swap execute + else + ." [disk-label] internal error" cr + then +; + +: register-fs-package ( -- ) + " register-fs-handler" " disk-label" $find-package-method ?dup if + active-package swap execute + else + ." [misc-files] internal error" cr + then +; + +[THEN] +device-end

1 0

[commit] r685 - in trunk/openbios-devel: . arch/amd64 arch/ia64 arch/ppc arch/ppc/mol arch/ppc/pearpc arch/sparc32 arch/sparc64 arch/unix arch/x86 arch/x86/xbox config/scripts include libopenbios m...
by repository service 13 Mar '10

13 Mar '10

Author: mcayland Date: Sat Mar 13 11:58:19 2010 New Revision: 685 URL: http://tracker.coreboot.org/trac/openbios/changeset/685 Log: Refactoring of the OpenBIOS source code, as discussed on the mailing list. The primary aim of this process is to try and arrange the source files into a structure whereby it is easier to find the relationship between a forth package word and its C implementation, while also creating a libopenbios library into which more common code from the arch/ tree can eventually be moved. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/libopenbios/ (props changed) - copied from r683, trunk/openbios-devel/modules/ trunk/openbios-devel/packages/ trunk/openbios-devel/packages/bootinfo-loader.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/bootinfo-loader.c trunk/openbios-devel/packages/cmdline.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/cmdline.c trunk/openbios-devel/packages/deblocker.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/deblocker.c trunk/openbios-devel/packages/disk-label.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/disk-label.c trunk/openbios-devel/packages/elf-loader.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/elf-loader.c trunk/openbios-devel/packages/init.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/init.c trunk/openbios-devel/packages/mac-parts.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/mac-parts.c trunk/openbios-devel/packages/mac-parts.h (props changed) - copied unchanged from r683, trunk/openbios-devel/modules/mac-parts.h trunk/openbios-devel/packages/misc-files.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/filesystems.c trunk/openbios-devel/packages/nvram.c (props changed) - copied unchanged from r683, trunk/openbios-devel/modules/nvram.c trunk/openbios-devel/packages/packages.h (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/modules.h trunk/openbios-devel/packages/pc-parts.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/pc-parts.c trunk/openbios-devel/packages/sun-parts.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/sun-parts.c trunk/openbios-devel/packages/video.c (props changed) - copied unchanged from r683, trunk/openbios-devel/modules/video.c trunk/openbios-devel/packages/xcoff-loader.c (contents, props changed) - copied, changed from r683, trunk/openbios-devel/modules/xcoff-loader.c Deleted: trunk/openbios-devel/libopenbios/bootinfo-loader.c trunk/openbios-devel/libopenbios/cmdline.c trunk/openbios-devel/libopenbios/deblocker.c trunk/openbios-devel/libopenbios/disk-label.c trunk/openbios-devel/libopenbios/elf-loader.c trunk/openbios-devel/libopenbios/filesystems.c trunk/openbios-devel/libopenbios/init.c trunk/openbios-devel/libopenbios/mac-parts.c trunk/openbios-devel/libopenbios/mac-parts.h trunk/openbios-devel/libopenbios/modules.h trunk/openbios-devel/libopenbios/nvram.c trunk/openbios-devel/libopenbios/pc-parts.c trunk/openbios-devel/libopenbios/sun-parts.c trunk/openbios-devel/libopenbios/support.fs trunk/openbios-devel/libopenbios/video.c trunk/openbios-devel/libopenbios/xcoff-loader.c trunk/openbios-devel/modules/ Modified: trunk/openbios-devel/arch/amd64/Kconfig trunk/openbios-devel/arch/ia64/Kconfig trunk/openbios-devel/arch/ppc/Kconfig trunk/openbios-devel/arch/ppc/build.xml trunk/openbios-devel/arch/ppc/mol/console.c trunk/openbios-devel/arch/ppc/pearpc/console.c trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/unix/build.xml trunk/openbios-devel/arch/x86/Kconfig trunk/openbios-devel/arch/x86/build.xml trunk/openbios-devel/arch/x86/xbox/console.c trunk/openbios-devel/build.xml trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/include/video_subr.h trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/amd64/Kconfig ============================================================================== --- trunk/openbios-devel/arch/amd64/Kconfig Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/amd64/Kconfig Sat Mar 13 11:58:19 2010 (r685) @@ -44,5 +44,5 @@ source "kernel/Kconfig" source "forth/Kconfig" -source "modules/Kconfig" +source "libopenbios/Kconfig" source "drivers/Kconfig" Modified: trunk/openbios-devel/arch/ia64/Kconfig ============================================================================== --- trunk/openbios-devel/arch/ia64/Kconfig Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/ia64/Kconfig Sat Mar 13 11:58:19 2010 (r685) @@ -18,5 +18,5 @@ source "kernel/Kconfig" source "forth/Kconfig" -source "modules/Kconfig" +source "libopenbios/Kconfig" source "drivers/Kconfig" Modified: trunk/openbios-devel/arch/ppc/Kconfig ============================================================================== --- trunk/openbios-devel/arch/ppc/Kconfig Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/ppc/Kconfig Sat Mar 13 11:58:19 2010 (r685) @@ -44,5 +44,5 @@ source "kernel/Kconfig" source "forth/Kconfig" -source "modules/Kconfig" +source "libopenbios/Kconfig" source "drivers/Kconfig" Modified: trunk/openbios-devel/arch/ppc/build.xml ============================================================================== --- trunk/openbios-devel/arch/ppc/build.xml Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/ppc/build.xml Sat Mar 13 11:58:19 2010 (r685) @@ -153,7 +153,8 @@ <object source="timebase.S"/> <external-object source="libbriq.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> @@ -168,7 +169,8 @@ <object source="timebase.S"/> <external-object source="libpearpc.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> @@ -183,7 +185,8 @@ <object source="timebase.S"/> <external-object source="libqemu.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> @@ -198,7 +201,8 @@ <object source="start.S"/> <external-object source="libmol.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> Modified: trunk/openbios-devel/arch/ppc/mol/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/ppc/mol/console.c Sat Mar 13 11:58:19 2010 (r685) @@ -26,5 +26,5 @@ #define openbios_GetFBInfo(x) OSI_GetFBInfo(x) -#include "../../../modules/video.c" -#include "../../../modules/console.c" +#include "../../../packages/video.c" +#include "../../../libopenbios/console_common.c" Modified: trunk/openbios-devel/arch/ppc/pearpc/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/ppc/pearpc/console.c Sat Mar 13 11:58:19 2010 (r685) @@ -39,6 +39,5 @@ #define openbios_GetFBInfo(x) PearPC_GetFBInfo(x) -#include "../../../modules/video.c" - -#include "../../../modules/console.c" +#include "../../../packages/video.c" +#include "../../../libopenbios/console_common.c" Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/sparc32/build.xml Sat Mar 13 11:58:19 2010 (r685) @@ -32,7 +32,8 @@ <object source="plainboot.c"/> <external-object source="libsparc32.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> @@ -66,7 +67,8 @@ <external-object source="target/arch/sparc32/builtin.o"/> <external-object source="libsparc32.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> Modified: trunk/openbios-devel/arch/sparc64/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/sparc64/build.xml Sat Mar 13 11:58:19 2010 (r685) @@ -33,7 +33,8 @@ <object source="plainboot.c"/> <external-object source="libsparc64.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> @@ -68,7 +69,8 @@ <external-object source="target/arch/sparc64/builtin.o"/> <external-object source="libsparc64.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> Modified: trunk/openbios-devel/arch/unix/build.xml ============================================================================== --- trunk/openbios-devel/arch/unix/build.xml Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/unix/build.xml Sat Mar 13 11:58:19 2010 (r685) @@ -13,7 +13,8 @@ <object source="blk.c" flags="-DBOOTSTRAP"/> <object source="plugins.c" flags="-DBOOTSTRAP" condition="PLUGINS"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="libfs.a"/> <external-object source="liblibc.a"/> Modified: trunk/openbios-devel/arch/x86/Kconfig ============================================================================== --- trunk/openbios-devel/arch/x86/Kconfig Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/x86/Kconfig Sat Mar 13 11:58:19 2010 (r685) @@ -43,5 +43,5 @@ source "kernel/Kconfig" source "forth/Kconfig" -source "modules/Kconfig" +source "libopenbios/Kconfig" source "drivers/Kconfig" Modified: trunk/openbios-devel/arch/x86/build.xml ============================================================================== --- trunk/openbios-devel/arch/x86/build.xml Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/x86/build.xml Sat Mar 13 11:58:19 2010 (r685) @@ -30,7 +30,8 @@ <object source="multiboot.c"/> <external-object source="libx86.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> @@ -45,7 +46,8 @@ <object source="plainboot.c"/> <external-object source="libx86.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> @@ -79,7 +81,8 @@ <external-object source="target/arch/x86/builtin.o"/> <external-object source="libx86.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libmodules.a"/> + <external-object source="libopenbios.a"/> + <external-object source="libpackages.a"/> <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> Modified: trunk/openbios-devel/arch/x86/xbox/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/arch/x86/xbox/console.c Sat Mar 13 11:58:19 2010 (r685) @@ -19,5 +19,5 @@ int rb, w, h, depth; } osi_fb_info_t; -#include "../../../modules/video.c" -#include "../../../modules/console.c" +#include "../../../packages/video.c" +#include "../../../libopenbios/console_common.c" Modified: trunk/openbios-devel/build.xml ============================================================================== --- trunk/openbios-devel/build.xml Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/build.xml Sat Mar 13 11:58:19 2010 (r685) @@ -5,7 +5,8 @@ <include href="forth/build.xml"/> <include href="libc/build.xml"/> <include href="libgcc/build.xml"/> - <include href="modules/build.xml"/> + <include href="libopenbios/build.xml"/> + <include href="packages/build.xml"/> <include href="drivers/build.xml"/> <include href="fs/build.xml"/> <include href="arch/build.xml"/> Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Mar 13 11:58:19 2010 (r685) @@ -177,7 +177,8 @@ mkdir -p $OBJDIR/target/arch/x86/xbox mkdir -p $OBJDIR/target/libgcc mkdir -p $OBJDIR/target/kernel - mkdir -p $OBJDIR/target/modules + mkdir -p $OBJDIR/target/libopenbios + mkdir -p $OBJDIR/target/packages mkdir -p $OBJDIR/target/fs mkdir -p $OBJDIR/target/fs/grubfs mkdir -p $OBJDIR/target/fs/hfs Modified: trunk/openbios-devel/include/video_subr.h ============================================================================== --- trunk/openbios-devel/include/video_subr.h Sun Mar 7 17:36:30 2010 (r684) +++ trunk/openbios-devel/include/video_subr.h Sat Mar 13 11:58:19 2010 (r685) @@ -15,14 +15,14 @@ void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size); -/* modules/video.c */ +/* 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); -/* modules/console_common.c */ +/* libopenbios/console_common.c */ int console_draw_str(const char *str); int console_init(void); void console_close(void); Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/modules/build.xml Mon Feb 22 19:52:34 2010 (r683) +++ trunk/openbios-devel/libopenbios/build.xml Sat Mar 13 11:58:19 2010 (r685) @@ -1,38 +1,24 @@ <build> - <library name="modules" type="static" target="target"> - <object source="nvram.c"/> - <object source="init.c"/> + <library name="openbios" type="static" target="target"> <object source="bindings.c"/> + <object source="bootinfo-loader.c" condition="PPC"/> <object source="client.c"/> - <object source="ipchecksum.c"/> - <object source="video.c"/> <object source="console_common.c"/> <object source="elfnote.c" condition="X86"/> <object source="elfnote.c" condition="AMD64"/> <object source="elfnote.c" condition="SPARC32"/> <object source="elfnote.c" condition="SPARC64"/> <object source="elfload.c" condition="PPC"/> - <object source="linuxbios.c" condition="LINUXBIOS"/> - <object source="cmdline.c" condition="CMDLINE"/> - <object source="deblocker.c" condition="DEBLOCKER"/> - <object source="disk-label.c" condition="DISK_LABEL"/> - <object source="filesystems.c" condition="FS"/> - <object source="mac-parts.c" condition="MAC_PARTS"/> - <object source="pc-parts.c" condition="PC_PARTS"/> - <object source="sun-parts.c" condition="SUN_PARTS"/> <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> + <object source="ipchecksum.c"/> + <object source="linuxbios.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> - <object source="elf-loader.c" condition="PPC"/> - <object source="elf-loader.c" condition="SPARC64"/> - <object source="xcoff-loader.c" condition="PPC"/> - <object source="bootinfo-loader.c" condition="PPC"/> </library> <dictionary name="openbios" target="forth"> <object source="clib.fs"/> - <object source="support.fs"/> <object source="helpers.fs"/> </dictionary> Copied and modified: trunk/openbios-devel/packages/bootinfo-loader.c (from r683, trunk/openbios-devel/modules/bootinfo-loader.c) ============================================================================== --- trunk/openbios-devel/modules/bootinfo-loader.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/bootinfo-loader.c Sat Mar 13 11:58:19 2010 (r685) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "modules.h" +#include "packages.h" #include "ofmem.h" #include "libc/vsprintf.h" Copied and modified: trunk/openbios-devel/packages/cmdline.c (from r683, trunk/openbios-devel/modules/cmdline.c) ============================================================================== --- trunk/openbios-devel/modules/cmdline.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/cmdline.c Sat Mar 13 11:58:19 2010 (r685) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "modules.h" +#include "packages.h" #include "libc/vsprintf.h" typedef struct { Copied and modified: trunk/openbios-devel/packages/deblocker.c (from r683, trunk/openbios-devel/modules/deblocker.c) ============================================================================== --- trunk/openbios-devel/modules/deblocker.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/deblocker.c Sat Mar 13 11:58:19 2010 (r685) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "libc/diskio.h" -#include "modules.h" +#include "packages.h" typedef struct { ucell mark_hi, mark_lo; Copied and modified: trunk/openbios-devel/packages/disk-label.c (from r683, trunk/openbios-devel/modules/disk-label.c) ============================================================================== --- trunk/openbios-devel/modules/disk-label.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/disk-label.c Sat Mar 13 11:58:19 2010 (r685) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "libc/diskio.h" -#include "modules.h" +#include "packages.h" //#define DEBUG_DISK_LABEL Copied and modified: trunk/openbios-devel/packages/elf-loader.c (from r683, trunk/openbios-devel/modules/elf-loader.c) ============================================================================== --- trunk/openbios-devel/modules/elf-loader.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/elf-loader.c Sat Mar 13 11:58:19 2010 (r685) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "modules.h" +#include "packages.h" #include "ofmem.h" #include "openbios/elf.h" Copied and modified: trunk/openbios-devel/packages/init.c (from r683, trunk/openbios-devel/modules/init.c) ============================================================================== --- trunk/openbios-devel/modules/init.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/init.c Sat Mar 13 11:58:19 2010 (r685) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/kernel.h" -#include "modules.h" +#include "packages.h" void modules_init( void ) @@ -31,7 +31,7 @@ disklabel_init(); #endif #ifdef CONFIG_FS - filesystem_init(); + files_init(); #endif #ifdef CONFIG_MAC_PARTS macparts_init(); Copied and modified: trunk/openbios-devel/packages/mac-parts.c (from r683, trunk/openbios-devel/modules/mac-parts.c) ============================================================================== --- trunk/openbios-devel/modules/mac-parts.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/mac-parts.c Sat Mar 13 11:58:19 2010 (r685) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "mac-parts.h" -#include "modules.h" +#include "packages.h" #ifdef CONFIG_DEBUG_MAC_PARTS #define DPRINTF(fmt, args...) \ Copied: trunk/openbios-devel/packages/mac-parts.h (from r683, trunk/openbios-devel/modules/mac-parts.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/packages/mac-parts.h Sat Mar 13 11:58:19 2010 (r685, copy of r683, trunk/openbios-devel/modules/mac-parts.h) @@ -0,0 +1,88 @@ +/* + * Creation Date: <1999/07/06 15:45:12 samuel> + * Time-stamp: <2002/10/20 16:31:48 samuel> + * + * <partition_table.h> + * + * Headers describing the partition table + * + * Copyright (C) 1999, 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 + * + */ + +#ifndef _H_PARTITION_TABLE +#define _H_PARTITION_TABLE + +/* This information is based upon IM vol V. */ + +#define DESC_MAP_SIGNATURE 0x4552 +#define DESC_PART_SIGNATURE 0x504d + +enum { + kPartitionAUXIsValid = 0x00000001, + kPartitionAUXIsAllocated = 0x00000002, + kPartitionAUXIsInUse = 0x00000004, + kPartitionAUXIsBootValid = 0x00000008, + kPartitionAUXIsReadable = 0x00000010, + kPartitionAUXIsWriteable = 0x00000020, + kPartitionAUXIsBootCodePositionIndependent = 0x00000040, + kPartitionISMountedAtStartup = 0x40000000, + kPartitionIsStartup = 0x80000000, + kPartitionIsChainCompatible = 0x00000100, + kPartitionIsRealDeviceDriver = 0x00000200, + kPartitionCanChainToNext = 0x00000400, +}; + +typedef struct { + long ddBlock; /* first block of driver */ + short ddSize; /* driver size in blocks */ + short ddType; /* 1 & -1 for SCSI */ +} driver_entry_t; + +typedef struct { /* Block 0 of a device */ + short sbSig; /* always 0x4552 */ + short sbBlockSize; /* 512 */ + long sbBlkCount; /* #blocks on device */ + short sbDevType; /* 0 */ + short sbDevID; /* 0 */ + long sbData; /* 0 */ + short sbDrvrCount; /* #driver descriptors */ + + /* driver entries goes here */ + driver_entry_t drivers[61] __attribute__ ((packed)); + + short filler1; + long filler2; +} desc_map_t; + +typedef struct { /* Partition descriptor */ + short pmSig; /* always 0x504d 'PM' */ + short pmSigPad; /* 0 */ + ulong pmMapBlkCnt; /* #blocks in partition map */ + ulong pmPyPartStart; /* first physical block of part. */ + ulong pmPartBlkCnt; /* #blocks in partition */ + char pmPartName[32]; /* partition name */ + char pmPartType[32]; /* partition type */ + + /* these fields may or may not be used */ + ulong pmLgDataStart; + ulong pmDataCnt; + ulong pmPartStatus; + ulong pmLgBootStart; + ulong pmBootSize; + ulong pmBootLoad; + ulong pmBootLoad2; + ulong pmBootEntry; + ulong pmBootEntry2; + ulong pmBootCksum; + char pmProcessor[16]; + + char filler[376]; /* might contain extra information */ +} part_entry_t; + + +#endif /* _H_PARTITION_TABLE */ Copied and modified: trunk/openbios-devel/packages/misc-files.c (from r683, trunk/openbios-devel/modules/filesystems.c) ============================================================================== --- trunk/openbios-devel/modules/filesystems.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/misc-files.c Sat Mar 13 11:58:19 2010 (r685) @@ -19,7 +19,7 @@ #include "openbios/bindings.h" #include "openbios/fs.h" #include "libc/diskio.h" -#include "modules.h" +#include "packages.h" #define PATHBUF_SIZE 256 #define VOLNAME_SIZE 64 @@ -331,7 +331,7 @@ void -filesystem_init( void ) +files_init( void ) { REGISTER_NODE( files ); } Copied: trunk/openbios-devel/packages/nvram.c (from r683, trunk/openbios-devel/modules/nvram.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/packages/nvram.c Sat Mar 13 11:58:19 2010 (r685, copy of r683, trunk/openbios-devel/modules/nvram.c) @@ -0,0 +1,305 @@ +/* + * Creation Date: <2003/12/01 00:26:13 samuel> + * Time-stamp: <2004/01/07 19:59:53 samuel> + * + * <nvram.c> + * + * medium-level NVRAM handling + * + * 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 + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "openbios/nvram.h" + +#ifdef CONFIG_DEBUG_NVRAM +#define DPRINTF(fmt, args...) \ +do { printk("NVRAM: " fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) do {} while(0) +#endif + +#define DEF_SYSTEM_SIZE 0xc10 + +#define NV_SIG_SYSTEM 0x70 +#define NV_SIG_FREE 0x7f + + +typedef struct { + uchar signature; + uchar checksum; + uchar len_hi; + uchar len_lo; + char name[12]; + char data[0]; +} nvpart_t; + +static struct { + char *data; + int size; + + nvpart_t *config; + int config_size; +} nvram; + + +/************************************************************************/ +/* generic */ +/************************************************************************/ + +static unsigned int +nvpart_checksum( nvpart_t* hdr ) +{ + unsigned char *p = (unsigned char*)hdr; + int i, val = p[0]; + + for( i=2; i<16; i++ ) { + val += p[i]; + if( val > 255 ) + val = (val - 256 + 1) & 0xff; + } + return val; +} + +static inline int +nvpart_size( nvpart_t *p ) +{ + return (p->len_lo | ((int)p->len_hi<<8)) * 16; +} + +static int +next_nvpart( nvpart_t **p ) +{ + nvpart_t *end = (nvpart_t*)(nvram.data + nvram.size); + int len; + + if( !*p ) { + *p = (nvpart_t*)nvram.data; + return 1; + } + + if( !(len=nvpart_size(*p)) ) { + printk("invalid nvram partition length\n"); + return -1; + } + *p = (nvpart_t*)((char*)*p + len); + if( *p < end ) + return 1; + if( *p == end ) + return 0; + return -1; +} + +static void +create_free_part( char *ptr, int size ) +{ + nvpart_t *nvp = (nvpart_t*)ptr; + memset( nvp, 0, size ); + + strncpy( nvp->name, "777777777777", sizeof(nvp->name) ); + nvp->signature = NV_SIG_FREE; + nvp->len_hi = (size /16) >> 8; + nvp->len_lo = size /16; + nvp->checksum = nvpart_checksum(nvp); +} + +static int +create_nv_part( int signature, const char *name, int size ) +{ + nvpart_t *p = NULL; + int fs; + + while( next_nvpart(&p) > 0 ) { + if( p->signature != NV_SIG_FREE ) + continue; + + fs = nvpart_size( p ); + if( fs < size ) + size = fs; + p->signature = signature; + memset( p->name, 0, sizeof(p->name) ); + strncpy( p->name, name, sizeof(p->name) ); + p->len_hi = (size>>8)/16; + p->len_lo = size/16; + p->checksum = nvpart_checksum(p); + if( fs > size ) { + char *fp = (char*)p + size; + create_free_part( fp, fs-size ); + } + return size; + } + printk("create-failed\n"); + return -1; +} + +static void +zap_nvram( void ) +{ + create_free_part( nvram.data, nvram.size ); + create_nv_part( NV_SIG_SYSTEM, "common", DEF_SYSTEM_SIZE ); +} + +#if 0 +static void +show_partitions( void ) +{ + nvpart_t *p = NULL; + char buf[13]; + + while( next_nvpart(&p) > 0 ) { + memcpy( buf, p->name, sizeof(p->name) ); + buf[12] = 0; + printk("[%02x] %-13s: %03x\n", + p->signature, buf, nvpart_size(p)); + } +} +#endif + +void +update_nvram( void ) +{ + PUSH( (ucell)nvram.config->data ); + PUSH( nvram.config_size ); + fword("nvram-store-configs"); + arch_nvram_put( nvram.data ); +} + +void +nvconf_init( void ) +{ + int once=0; + + /* initialize nvram structure completely */ + nvram.config = NULL; + nvram.config_size = 0; + + nvram.size = arch_nvram_size(); + nvram.data = malloc( nvram.size ); + arch_nvram_get( nvram.data ); + + bind_func( "update-nvram", update_nvram ); + + for( ;; ) { + nvpart_t *p = NULL; + int err; + + while( (err=next_nvpart(&p)) > 0 ) { + if( nvpart_checksum(p) != p->checksum ) { + err = -1; + break; + } + if( p->signature == NV_SIG_SYSTEM ) { + nvram.config = p; + nvram.config_size = nvpart_size(p) - 0x10; + + if( !once++ ) { + PUSH( (ucell)p->data ); + PUSH( nvram.config_size ); + fword("nvram-load-configs"); + } + } + } + if( err || !nvram.config ) { + printk("nvram error detected, zapping pram\n"); + zap_nvram(); + if( !once++ ) + fword("set-defaults"); + continue; + } + break; + } +} + + +/************************************************************************/ +/* nvram */ +/************************************************************************/ + +typedef struct { + uint mark_hi; + uint mark_lo; +} nvram_ibuf_t; + +DECLARE_UNNAMED_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t )); + +/* ( pos_lo pos_hi -- status ) */ +static void +nvram_seek( nvram_ibuf_t *nd ) +{ + int pos_hi = POP(); + int pos_lo = POP(); + + DPRINTF("seek %08x %08x\n", pos_hi, pos_lo ); + nd->mark_lo = pos_lo; + nd->mark_hi = pos_hi; + + if( nd->mark_lo >= nvram.size ) { + PUSH(-1); + return; + } + + /* 0=success, -1=failure (1=legacy success) */ + PUSH(0); +} + +/* ( addr len -- actual ) */ +static void +nvram_read( nvram_ibuf_t *nd ) +{ + int len = POP(); + char *p = (char*)POP(); + int n=0; + + while( nd->mark_lo < nvram.size && n < len ) { + *p++ = nvram.data[nd->mark_lo++]; + n++; + } + PUSH(n); + DPRINTF("read %08x %x -- %x\n", (int)p, len, n); +} + +/* ( addr len -- actual ) */ +static void +nvram_write( nvram_ibuf_t *nd ) +{ + int len = POP(); + char *p = (char*)POP(); + int n=0; + + while( nd->mark_lo < nvram.size && n < len ) { + nvram.data[nd->mark_lo++] = *p++; + n++; + } + PUSH(n); + DPRINTF("write %08x %x -- %x\n", (int)p, len, n ); +} + +/* ( -- size ) */ +static void +nvram_size( __attribute__((unused)) nvram_ibuf_t *nd ) +{ + DPRINTF("nvram_size %d\n", nvram.size); + PUSH( nvram.size ); +} + +NODE_METHODS( nvram ) = { + { "size", (void*)nvram_size }, + { "read", (void*)nvram_read }, + { "write", (void*)nvram_write }, + { "seek", (void*)nvram_seek }, +}; + + +void +nvram_init( const char *path ) +{ + nvconf_init(); + + REGISTER_NAMED_NODE( nvram, path ); +} Copied and modified: trunk/openbios-devel/packages/packages.h (from r683, trunk/openbios-devel/modules/modules.h) ============================================================================== --- trunk/openbios-devel/modules/modules.h Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/packages.h Sat Mar 13 11:58:19 2010 (r685) @@ -2,9 +2,9 @@ * Creation Date: <2003/12/23 00:32:12 samuel> * Time-stamp: <2003/12/28 14:47:02 samuel> * - * <modules.h> + * <packages.h> * - * Module initialization + * Package initialization * * Copyright (C) 2003 Samuel Rydh (samuel(a)ibrium.se) * @@ -19,7 +19,7 @@ extern void deblocker_init( void ); extern void disklabel_init( void ); -extern void filesystem_init( void ); +extern void files_init( void ); extern void macparts_init( void ); extern void pcparts_init( void ); extern void sunparts_init( void ); Copied and modified: trunk/openbios-devel/packages/pc-parts.c (from r683, trunk/openbios-devel/modules/pc-parts.c) ============================================================================== --- trunk/openbios-devel/modules/pc-parts.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/pc-parts.c Sat Mar 13 11:58:19 2010 (r685) @@ -15,7 +15,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "libc/byteorder.h" -#include "modules.h" +#include "packages.h" typedef struct { ullong offs; Copied and modified: trunk/openbios-devel/packages/sun-parts.c (from r683, trunk/openbios-devel/modules/sun-parts.c) ============================================================================== --- trunk/openbios-devel/modules/sun-parts.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/sun-parts.c Sat Mar 13 11:58:19 2010 (r685) @@ -15,7 +15,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "libc/byteorder.h" -#include "modules.h" +#include "packages.h" #ifdef CONFIG_DEBUG_SUN_PARTS #define DPRINTF(fmt, args...) \ Copied: trunk/openbios-devel/packages/video.c (from r683, trunk/openbios-devel/modules/video.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/packages/video.c Sat Mar 13 11:58:19 2010 (r685, copy of r683, trunk/openbios-devel/modules/video.c) @@ -0,0 +1,347 @@ +/* + * Creation Date: <2002/10/23 20:26:40 samuel> + * Time-stamp: <2004/01/07 19:39:15 samuel> + * + * <video.c> + * + * Mac-on-Linux display node + * + * Copyright (C) 2002, 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 + * as published by the Free Software Foundation + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" +#include "ofmem.h" +#include "openbios/drivers.h" +#include "video_subr.h" + +typedef struct osi_fb_info { + unsigned long mphys; + int rb, w, h, depth; +} osi_fb_info_t; + +static struct { + int has_video; + osi_fb_info_t fb; + ulong *pal; /* 256 elements */ +} video; + + +int +video_get_res( int *w, int *h ) +{ + if( !video.has_video ) { + *w = *h = 0; + return -1; + } + *w = video.fb.w; + *h = video.fb.h; + return 0; +} + +static void +startup_splash( void ) +{ +#ifdef CONFIG_MOL + int fd, s, i, y, x, dx, dy; + int width, height; + char *pp, *p; + char buf[64]; +#endif + + /* only draw logo in 24-bit mode (for now) */ + if( video.fb.depth < 15 ) + return; +#ifdef CONFIG_MOL + for( i=0; i<2; i++ ) { + if( !BootHGetStrResInd("bootlogo", buf, sizeof(buf), 0, i) ) + return; + *(!i ? &width : &height) = atol(buf); + } + + if( (s=width * height * 3) > 0x20000 ) + return; + + if( (fd=open_io("pseudo:,bootlogo")) >= 0 ) { + p = malloc( s ); + if( read_io(fd, p, s) != s ) + printk("bootlogo size error\n"); + close_io( fd ); + + dx = (video.fb.w - width)/2; + dy = (video.fb.h - height)/3; + + pp = (char*)video.fb.mphys + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); + + for( y=0 ; y<height; y++, pp += video.fb.rb ) { + if( video.fb.depth >= 24 ) { + ulong *d = (ulong*)pp; + for( x=0; x<width; x++, p+=3, d++ ) + *d = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; + } else if( video.fb.depth == 15 ) { + ushort *d = (ushort*)pp; + for( x=0; x<width; x++, p+=3, d++ ) { + int col = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; + *d = ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); + } + } + } + free( p ); + } +#else + /* No bootlogo support yet on other platforms */ + return; +#endif +} + +static ulong +get_color( int col_ind ) +{ + ulong col; + if( !video.has_video || col_ind < 0 || col_ind > 255 ) + return 0; + if( video.fb.depth == 8 ) + return col_ind; + col = video.pal[col_ind]; + if( video.fb.depth == 24 || video.fb.depth == 32 ) + return col; + if( video.fb.depth == 15 ) + return ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); + return 0; +} + +void +draw_pixel( int x, int y, int colind ) +{ + char *p = (char*)video.fb.mphys + video.fb.rb * y; + int color, d = video.fb.depth; + + if( x < 0 || y < 0 || x >= video.fb.w || y >=video.fb.h ) + return; + color = get_color( colind ); + + if( d >= 24 ) + *((ulong*)p + x) = color; + else if( d >= 15 ) + *((short*)p + x) = color; + else + *(p + x) = color; +} + +static void +fill_rect( int col_ind, int x, int y, int w, int h ) +{ + char *pp; + ulong col = get_color(col_ind); + + if( !video.has_video || x < 0 || y < 0 || x+w > video.fb.w || y+h > video.fb.h ) + return; + + pp = (char*)video.fb.mphys + video.fb.rb * y; + for( ; h--; pp += video.fb.rb ) { + int ww = w; + if( video.fb.depth == 24 || video.fb.depth == 32 ) { + ulong *p = (ulong*)pp + x; + while( ww-- ) + *p++ = col; + } else if( video.fb.depth == 16 || video.fb.depth == 15 ) { + ushort *p = (ushort*)pp + x; + while( ww-- ) + *p++ = col; + } else { + char *p = (char *)((ushort*)pp + x); + + while( ww-- ) + *p++ = col; + } + } +} + +static void +refresh_palette( void ) +{ +#ifdef CONFIG_MOL + if( video.fb.depth == 8 ) + OSI_RefreshPalette(); +#endif +} + +void +set_color( int ind, ulong color ) +{ + if( !video.has_video || ind < 0 || ind > 255 ) + return; + video.pal[ind] = color; + +#ifdef CONFIG_MOL + if( video.fb.depth == 8 ) + OSI_SetColor( ind, color ); +#elif defined(CONFIG_SPARC32) + if( video.fb.depth == 8 ) { + dac[0] = ind << 24; + dac[1] = ((color >> 16) & 0xff) << 24; // Red + dac[1] = ((color >> 8) & 0xff) << 24; // Green + dac[1] = (color & 0xff) << 24; // Blue + } +#else + vga_set_color(ind, ((color >> 16) & 0xff), + ((color >> 8) & 0xff), + (color & 0xff)); +#endif +} + +void +video_scroll( int height ) +{ + int i, offs, size, *dest, *src; + + offs = video.fb.rb * height; + size = (video.fb.h * video.fb.rb - offs)/16; + dest = (int*)video.fb.mphys; + src = (int*)(video.fb.mphys + offs); + + for( i=0; i<size; i++ ) { + dest[0] = src[0]; + dest[1] = src[1]; + dest[2] = src[2]; + dest[3] = src[3]; + dest += 4; + src += 4; + } +} + +/************************************************************************/ +/* OF methods */ +/************************************************************************/ + +DECLARE_NODE( video, INSTALL_OPEN, 0, "Tdisplay" ); + +/* ( -- width height ) (?) */ +static void +video_dimensions( void ) +{ + int w, h; + (void) video_get_res( &w, &h ); + PUSH( w ); + PUSH( h ); +} + +/* ( table start count -- ) (?) */ +static void +video_set_colors( void ) +{ + int count = POP(); + int start = POP(); + uchar *p = (uchar*)POP(); + int i; + + for( i=0; i<count; i++, p+=3 ) { + ulong col = (p[0] << 16) | (p[1] << 8) | p[2]; + set_color( i + start, col ); + } + refresh_palette(); +} + +/* ( r g b index -- ) */ +static void +video_color_bang( void ) +{ + int index = POP(); + int b = POP(); + int g = POP(); + int r = POP(); + ulong col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); + /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ + set_color( index, col ); + refresh_palette(); +} + +/* ( color_ind x y width height -- ) (?) */ +static void +video_fill_rect( void ) +{ + int h = POP(); + int w = POP(); + int y = POP(); + int x = POP(); + int color_ind = POP(); + + fill_rect( color_ind, x, y, w, h ); +} + +/* ( addr len -- actual ) */ +static void +video_write(void) +{ + char *addr; + int len; + + len = GETTOS(); + addr = pop_fstr_copy(); + + console_draw_str(addr); + free(addr); + PUSH(len); +} + +NODE_METHODS( video ) = { + {"dimensions", video_dimensions }, + {"set-colors", video_set_colors }, + {"fill-rectangle", video_fill_rect }, + {"color!", video_color_bang }, + {"write", video_write }, +}; + + +/************************************************************************/ +/* init */ +/************************************************************************/ + +void +init_video( unsigned long fb, int width, int height, int depth, int rb ) +{ + int i, s, size; + phandle_t ph=0; + + video.fb.mphys = fb; + video.fb.w = width; + video.fb.h = height; + video.fb.depth = depth; + video.fb.rb = rb; + while( (ph=dt_iterate_type(ph, "display")) ) { + set_property( ph, "width", (char*)&video.fb.w, 4 ); + set_property( ph, "height", (char*)&video.fb.h, 4 ); + set_property( ph, "depth", (char*)&video.fb.depth, 4 ); + set_property( ph, "linebytes", (char*)&video.fb.rb, 4 ); + set_property( ph, "address", (char*)&video.fb.mphys, 4 ); + } + video.has_video = 1; + video.pal = malloc( 256 * sizeof(ulong) ); + + s = (video.fb.mphys & 0xfff); + size = ((video.fb.h * video.fb.rb + s) + 0xfff) & ~0xfff; + s = video.fb.mphys - s; + +#ifdef CONFIG_PPC + ofmem_claim_phys( video.fb.mphys, size, 0 ); + ofmem_claim_virt( video.fb.mphys, size, 0 ); + ofmem_map( video.fb.mphys, video.fb.mphys, size, -1 ); +#endif + + for( i=0; i<256; i++ ) + set_color( i, i * 0x010101 ); + + set_color( 254, 0xffffcc ); + fill_rect( 254, 0, 0, video.fb.w, video.fb.h ); + + refresh_palette(); + startup_splash(); + + REGISTER_NODE( video ); +} Copied and modified: trunk/openbios-devel/packages/xcoff-loader.c (from r683, trunk/openbios-devel/modules/xcoff-loader.c) ============================================================================== --- trunk/openbios-devel/modules/xcoff-loader.c Mon Feb 22 19:52:34 2010 (r683, copy source) +++ trunk/openbios-devel/packages/xcoff-loader.c Sat Mar 13 11:58:19 2010 (r685) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "modules.h" +#include "packages.h" #include "ofmem.h" #include "openbios/xcoff.h"

1 0

New documentation
by Programmingkid 10 Mar '10

10 Mar '10

To: Stefan Reinauer (and anyone else who wants to help) Here is the documentation I said I would make. It is about how to add words to OpenBIOS using C functions. I am not sure where exactly it should go. My suggestion is on the OpenBIOS main page. Tell me what you think of this tutorial. How to add “words” to the OpenBIOS Dictionary using the C language. In this example, we are going to implement a forth “word” in C. There are two arrays that need to be looked at. One is located in the file openbios-devel/kernel/bootstrap.c. The other array is located in the file openbios-devel/kernel/primitives.c. The two arrays are used to map a C function to a forth word. The array in bootstrap.c is where the name of the forth word would go. The array in primitives.c is where the corresponding C function would go. When adding to these arrays, make sure to add at the end of the list. This ensures everything continues to run smoothly. Here is an example on adding to the dictionary. Say you want to add a word called dog. You can define the C function like this: static void dog(void) { printk(“bark bark!”); } Add this function to a .c file. Knowing which file to pick can involve a lot of trial and error. In this example, we will use the file openbios-devel/kernel/forth.c. Be sure to include the static keyword before in the function declaration, or OpenBIOS won’t build successfully. Now we add the word dog to the end of the forth word list. Open the file bootstrap.c, then find the array called wordnames. When adding the word dog, be sure the name of the word is surrounded in double quotes. Here is how the array should look: /* the word names are used to generate the prim words in the * dictionary. This is done by the C written interpreter. */ static const char *wordnames[] = { "(semis)", "", "(lit)", "", "", "", "", "(do)", "(?do)", "(loop)", "(+loop)", "", "", "", "dup", "2dup", "?dup", "over", "2over", "pick", "drop", "2drop", "nip", "roll", "rot", "-rot", "swap", "2swap", ">r", "r>", "r@", "depth", "depth!", "rdepth", "rdepth!", "+", "-", "*", "u*", "mu/mod", "abs", "negate", "max", "min", "lshift", "rshift", ">>a", "and", "or", "xor", "invert", "d+", "d-", "m*", "um*", "@", "c@", "w@", "l@", "!", "+!", "c!", "w!", "l!", "=", ">", "<", "u>", "u<", "sp@", "move", "fill", "(emit)", "(key?)", "(key)", "execute", "here", "here!", "dobranch", "do?branch", "unaligned-w@", "unaligned-w!", "unaligned-l@", "unaligned-l!", "ioc@", "iow@", "iol@", "ioc!", "iow!", "iol!", "i", "j", "call", "sys-debug", "$include", "$encode-file", "(debug", "(debug-off)", “dog” // <------- insert here }; Next we add the C function name to the end of the function list. Open the file primitives.c and add dog (no quotes this time) to the end of the list. You may want to add a comment to the right indicating the word this c function corresponds to, but this isn’t necessary. sysdebug, /* sys-debug */ do_include, /* $include */ do_encode_file, /* $encode-file */ do_debug_xt, /* (debug */ do_debug_off, /* (debug-off) */ dog /* dog */ //<-------- insert here }; Now you should be ready to build OpenBIOS. Go to the shell and set the current directory to the root level of openbios-devel folder: cd openbios-devel Then change the build script to be able to execute: chmod 777 ./config/scripts/switch-arch Set the architure you wish to build openbios for (x86 is used in this example): ./config/scripts/switch-arch x86 Then start building OpenBIOS: make Once these commands are done, you need to be able to execute OpenBIOS. In this example we will be using the unix program version of OpenBIOS. We run the program like this: ./obj-x86/openbios-unix ./obj-x86/openbios-unix.dict We should then be greeted by the OpenBIOS Banner: Welcome to OpenBIOS v1.0 built on Mar 9 2010 21:06 Type 'help' for detailed information [unix] Booting default not supported. 0 > Type dog at the prompt and see what it says: 0 > dog bark bark! ok 0 > Congratulations, you have just taken your first step to improving OpenBIOS.

1 0

Obtaining data from input buffer
by Programmingkid 09 Mar '10

09 Mar '10

Hi, I am trying to create a word that will parse all the characters up to a '}' on the same line. Does anyone have any idea as to how I can make this word read the characters in the input buffer while the interpret word is running? I thought about changing the value of the state variable to go from compile to interpret mode, but I still don't know how to access the input buffer. Any help would be great.

2 1

[commit] r684 - trunk/openbios-devel/arch/unix
by repository service 07 Mar '10

07 Mar '10

Author: blueswirl Date: Sun Mar 7 17:36:30 2010 New Revision: 684 URL: http://tracker.coreboot.org/trac/openbios/changeset/684 Log: Fix Unix target build on PPC host Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/unix/unix.c Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Mon Feb 22 19:52:34 2010 (r683) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 7 17:36:30 2010 (r684) @@ -73,6 +73,13 @@ return 0; } +#ifdef CONFIG_PPC +extern void flush_icache_range(char *start, char *stop); + +void flush_icache_range(char *start, char *stop) +{ +} +#endif #if 0 static void write_dictionary(char *filename)

1 0

make leads to error:mingw32_nt-5.1:no such file or directory stop
by baodi zhang 01 Mar '10

01 Mar '10

I want to build ofw for qemu,I do according the instruction on https://www.openfirmware.info/Building_OFW_for_QEMU I get the error make: *** ../../../mingw32_nt-5.1:no such file or directory stop make :*** ../../../mingw32_nt-5.1/forth error2 I type the msysinfo command and get $ msysinfo msysinfo-1.3: Send this to the MSYS support list: MSYS 1.0.11(0.46/3/2) 2009-07-11 17:46 i686 unknown; targ=MINGW32 GNU bash, version 3.1.0(1)-release (i686-pc-msys); ENV=.profile GNU Make 3.81This program built for i686-pc-msys; MAKE_MODE=unix gcc.exe (GCC) 4.4.0; targ=MINGW32 GNU ld (GNU Binutils) 2.20 2009-07-12 02:34:34.000000000 +0800 /bin/msys-1.0.dll 2009-07-12 02:34:34.000000000 +0800 /bin/msys-bz2-1.dll 2009-07-31 13:14:14.000000000 +0800 /bin/msys-ltdl-7.dll 2003-01-02 08:05:27.000000000 +0800 /bin/msysltdl-3.dll 2009-07-12 02:34:33.000000000 +0800 /bin/make.exe 09-06-23 10:46:39.000000000 +0800 /mingw/bin/gcc.exe 2009-10-24 07:13:00.000000000 +0800 /mingw/bin/ld.exe HOME=/home Sysname=MINGW32_NT-5.1 OSTYPE=msys TERM=cygwin PATH=.:/usr/local/bin:/mingw/bin:/bin:/c/Program Files/CollabNet Subversion Client:/d/Perl/bin/:/c/Program Files/Java/jdk1.6.0_0 4/bin/:/d/oracle/ora92/bin:/c/Program Files/Oracle/jre/1.3.1/bin :/c/Program Files/Oracle/jre/1.1.8/bin:/c/WINDOWS/system32:/c/WI NDOWS:/c/WINDOWS/System32/Wbem:/c/PROGRA~1/Borland/Delphi6/Bin:/ c/PROGRA~1/Borland/Delphi6/Projects/Bpl:c:/tuxedo:/c/tuxedo/bin: /c/MSSQL/BINN:/d/Program Files/Common Files/Powersoft Shared:/d/ Program Files/Powersoft/PowerBuilder 5.0/Advanced Developer Tool kit/Foundation Class Library:/d/SQLANY50/win32:/d/Program Files/ Powersoft/InfoMaker 5.0:/d/Program Files/pb5i32dk:/c/Program Fil es/Microsoft SQL Server/80/Tools/BINN:/c/Program Files/Microsoft SQL Server/90/Tools/binn/:/c/Program Files/Qemu/:/c/Program Fil es/TortoiseSVN/bin:/c/Program Files/apache-maven-2.2.1/bin:/c/Su n/AppServer/bin:/mingw/bin:/c/Program Files/OpenVPN/bin $ ls -tx /home .bash_history tmp/ appreciate any help

1 0

Re: [OpenBIOS] Documentation problem in primitives.c
by Programmingkid 27 Feb '10

27 Feb '10

> > Message: 1 > Date: Wed, 24 Feb 2010 22:18:37 +0100 > From: Andreas F?rber <andreas.faerber(a)web.de> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Documentation problem in primitives.c > Message-ID: <EA271F08-3A64-4446-B0F4-BCE0B1A4DD15(a)web.de> > Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes > > > Am 24.02.2010 um 11:15 schrieb Mark Cave-Ayland: > >> Programmingkid wrote: >> >>> /* words[] is a function array of all native code functions in used >>> by >>> * the dictionary, i.e. CFAs and primitives. > > While you're at it, s/in used by/used by/ (or s/in used by/in use by/) > I'm sorry, I 'm not sure what you wrote means. What does it mean?

2 1

Re: [OpenBIOS] Help with local variables
by G 3 27 Feb '10

27 Feb '10

On Feb 26, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > On 2/25/10 4:45 PM, Programmingkid wrote: >> Thank you very much for all your help. I only wish there was >> documentation available on how to add words. Maybe I should make a >> tutorial and send it to the person in charge of the OpenBIOS website. > If you want a wiki account, let me know. > > Stefan Sure, a wiki account would be great.

2 1

c version of interpret
by Programmingkid 27 Feb '10

27 Feb '10

Adding local variable support to OpenBIOS is going to have to involve changing the interpret word. Making changes to the c version would be a lot easier than making changes to the forth version. How do I make OpenBIOS use the c version (found in bootstrap.c) instead of the forth version?

2 1

Re: [OpenBIOS] Help with local variables
by Programmingkid 25 Feb '10

25 Feb '10

Thank you very much for all your help. I only wish there was documentation available on how to add words. Maybe I should make a tutorial and send it to the person in charge of the OpenBIOS website. On Feb 24, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > Message: 5 > Date: Wed, 24 Feb 2010 10:13:23 +0000 > From: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Help with local variables > Message-ID: <4B84FBC3.4040108(a)siriusit.co.uk> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > G 3 wrote: > >> Hi, I am working on implementing local variable support in OpenBIOS. I >> have done a lot of research on the issue, but there are a few issues I >> still need help resolving. >> >> >> -Does Openbios context switch when a word is called? This is when all >> the registers are saved into a stack frame, so the currently executing >> word can use them. > > I think you are looking too low a level here - all of this is handled > automatically by the Forth engine. > >> -Could someone give me a tutorial on how to add c functions to forth and >> make them accessible to the interpreter. I want to be able to add words >> to the dictionary and be able to use them from the command line. > > The easiest way to look at this is to look at one of the existing > primitive words such as DOCOL. But in short: > > - Add the new word to the end of the wordnames array in kernel/bootstrap.c > > - Add the C function name to the end of the words array in > kernel/primitives.c > > - Add the C function to kernel/internal.c > >> - Would anyone know which register on the PowerPC would be good for >> using as a stack pointer for a new local variable stack? I think r13 is >> free and a possible candidate. > > Again, you're looking at too low a level here. What I believe you need > to do is create a word that adds a new dictionary to the search list at > the start of the function, much in the same way that a package instance > does. > > > HTH, > > 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 1

Documentation problem in primitives.c
by Programmingkid 24 Feb '10

24 Feb '10

In the file Kernel/primitives.c, it say that there is another list of forth words in the file unix.c, but there is no list. Here is the quote from primitives.c. /* words[] is a function array of all native code functions in 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 * * NOTE: THIS LIST SHALL NOT CHANGE (EXCEPT MANDATORY ADDITIONS AT * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER * BINARY DICTIONARIES. */ I think this should say the matching list is in bootstrap.c, and not in arch/unix/unix.c.

3 2

Help with local variables
by G 3 24 Feb '10

24 Feb '10

Hi, I am working on implementing local variable support in OpenBIOS. I have done a lot of research on the issue, but there are a few issues I still need help resolving. -Does Openbios context switch when a word is called? This is when all the registers are saved into a stack frame, so the currently executing word can use them. -Could someone give me a tutorial on how to add c functions to forth and make them accessible to the interpreter. I want to be able to add words to the dictionary and be able to use them from the command line. - Would anyone know which register on the PowerPC would be good for using as a stack pointer for a new local variable stack? I think r13 is free and a possible candidate. If anyone could give me a few pointers, it would really speed up my ability to improve OpenBIOS.

2 1

[PATCH 0/7] PPC64 guest fixes
by Alexander Graf 23 Feb '10

23 Feb '10

In an effort to get PPC64 guests working properly, this patch set implements all bits necessary to make PPC64 guests work with current Qemu git. If there are no strong objections to this set, I'll just commit it. Alexander Graf (7): PPC: Increase instruction cache size PPC: Get timebase and clock speed from fw_cfg PPC: Create interrupt map for PCI PPC: Fix interrupt numbers PPC: Add U3 based Mac machine PPC: Set Uninorth interrupt numbers to new Qemu values PPC: Disable host binary build arch/ppc/qemu/init.c | 41 +++++++++++++++++++++++--------------- config/examples/ppc_config.xml | 2 +- drivers/cuda.c | 7 +++++- drivers/ide.c | 29 ++++++++++++++++++++++++-- drivers/macio.c | 16 ++++++++++++++- drivers/pci.c | 42 ++++++++++++++++++++++++++++++++++++++++ drivers/pci_database.c | 10 +++++++- include/openbios/fw_cfg.h | 6 +++++ include/openbios/pci.h | 11 ++++++++++ 9 files changed, 140 insertions(+), 24 deletions(-)

3 16

[commit] r683 - trunk/openbios-devel/config/examples
by repository service 22 Feb '10

22 Feb '10

Author: agraf Date: Mon Feb 22 19:52:34 2010 New Revision: 683 URL: http://tracker.coreboot.org/trac/openbios/changeset/683 Log: PPC: Disable host binary build On PPC the host binary build always fails for me. Since I guess I'm the only one actually building OpenBIOS ppc on ppc and I don't really care that much about debugging Forth code in my Linux environment, I guess we can just disable building it by default. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/config/examples/ppc_config.xml Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Mon Feb 22 19:52:32 2010 (r682) +++ trunk/openbios-devel/config/examples/ppc_config.xml Mon Feb 22 19:52:34 2010 (r683) @@ -10,7 +10,7 @@ <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> + <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/>

1 0

[commit] r682 - in trunk/openbios-devel: arch/ppc/qemu drivers
by repository service 22 Feb '10

22 Feb '10

Author: agraf Date: Mon Feb 22 19:52:32 2010 New Revision: 682 URL: http://tracker.coreboot.org/trac/openbios/changeset/682 Log: PPC: Set Uninorth interrupt numbers to new Qemu values We changed the uninorth interrupt mapping to better reflect real hardware. OpenBIOS obviously needs to know about that. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/drivers/pci_database.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Feb 22 19:52:30 2010 (r681) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Feb 22 19:52:32 2010 (r682) @@ -93,9 +93,9 @@ [ARCH_MAC99] = { "MAC99", PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI, 0xf2800000, 0xf2c00000, - 0xf2000000, 0x02000000, 0x80000000, 0x10000000, - 0xf2000000, 0x00800000, 0x00000000, 0x01000000, - { 8, 9, 10, 11 } + 0xf2000000, 0x02000000, 0x80000000, 0x10000000, + 0xf2000000, 0x00800000, 0x00000000, 0x01000000, + { 0x1b, 0x1c, 0x1d, 0x1e } }, [ARCH_MAC99_U3] = { "MAC99_U3", PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_U3_AGP, Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Mon Feb 22 19:52:30 2010 (r681) +++ trunk/openbios-devel/drivers/pci_database.c Mon Feb 22 19:52:32 2010 (r682) @@ -289,7 +289,7 @@ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_AGP, NULL, "pci", "AAPL,UniNorth", "uni-north\0", 3, 2, 1, - NULL, NULL + host_config_cb, NULL, }, { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI, NULL,

1 0

[commit] r681 - in trunk/openbios-devel: arch/ppc/qemu drivers include/openbios
by repository service 22 Feb '10

22 Feb '10

Author: agraf Date: Mon Feb 22 19:52:30 2010 New Revision: 681 URL: http://tracker.coreboot.org/trac/openbios/changeset/681 Log: PPC: Add U3 based Mac machine Linux on PPC64 knows only so many chipsets. One of the is the U3. So we can use that when we're emulating a PPC64 machine, making Linux happy. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/include/openbios/pci.h Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Feb 22 19:52:28 2010 (r680) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Feb 22 19:52:30 2010 (r681) @@ -63,6 +63,7 @@ ARCH_PREP = 0, ARCH_MAC99, ARCH_HEATHROW, + ARCH_MAC99_U3, }; int is_apple(void) @@ -77,7 +78,8 @@ int is_newworld(void) { - return machine_id == ARCH_MAC99; + return (machine_id == ARCH_MAC99) || + (machine_id == ARCH_MAC99_U3); } static const pci_arch_t known_arch[] = { @@ -95,6 +97,13 @@ 0xf2000000, 0x00800000, 0x00000000, 0x01000000, { 8, 9, 10, 11 } }, + [ARCH_MAC99_U3] = { "MAC99_U3", PCI_VENDOR_ID_APPLE, + PCI_DEVICE_ID_APPLE_U3_AGP, + 0xf0800000, 0xf0c00000, + 0xf0000000, 0x02000000, 0x80000000, 0x10000000, + 0xf2000000, 0x00800000, 0x00000000, 0x01000000, + { 0x1b, 0x1c, 0x1d, 0x1e } + }, [ARCH_HEATHROW] = { "HEATHROW", PCI_VENDOR_ID_MOTOROLA, PCI_DEVICE_ID_MOTOROLA_MPC106, 0xfec00000, 0xfee00000, @@ -557,6 +566,7 @@ break; case ARCH_MAC99: + case ARCH_MAC99_U3: case ARCH_PREP: default: @@ -597,17 +607,6 @@ push_str("system-id"); fword("property"); - /* pci info */ - - if (machine_id == ARCH_MAC99) { - push_str("/pci"); - fword("find-device"); - push_str("u3-agp"); - fword("encode-string"); - push_str("compatible"); - fword("property"); - } - /* memory info */ push_str("/memory"); Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Mon Feb 22 19:52:28 2010 (r680) +++ trunk/openbios-devel/drivers/pci_database.c Mon Feb 22 19:52:30 2010 (r681) @@ -280,6 +280,12 @@ static const pci_dev_t hbrg_devices[] = { { + PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_U3_AGP, NULL, + "pci", "AAPL,UniNorth", "u3-agp\0", + 3, 2, 1, + host_config_cb, NULL, + }, + { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_AGP, NULL, "pci", "AAPL,UniNorth", "uni-north\0", 3, 2, 1, @@ -1084,7 +1090,7 @@ { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, "mac-io", "mac-io", "AAPL,Keylargo", "Keylargo\0", - 1, 1, 2, + 1, 1, 1, &macio_keylargo_config_cb, NULL, }, { Modified: trunk/openbios-devel/include/openbios/pci.h ============================================================================== --- trunk/openbios-devel/include/openbios/pci.h Mon Feb 22 19:52:28 2010 (r680) +++ trunk/openbios-devel/include/openbios/pci.h Mon Feb 22 19:52:30 2010 (r681) @@ -187,6 +187,7 @@ #define PCI_DEVICE_ID_APPLE_UNI_N_PCI 0x001f #define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020 #define PCI_DEVICE_ID_APPLE_UNI_N_KEYL 0x0022 +#define PCI_DEVICE_ID_APPLE_U3_AGP 0x004b #define PCI_VENDOR_ID_SUN 0x108e #define PCI_DEVICE_ID_SUN_EBUS 0x1000

1 0

[commit] r680 - trunk/openbios-devel/drivers
by repository service 22 Feb '10

22 Feb '10

Author: agraf Date: Mon Feb 22 19:52:28 2010 New Revision: 680 URL: http://tracker.coreboot.org/trac/openbios/changeset/680 Log: PPC: Fix interrupt numbers We changed several interrupt numbers in Qemu to better reflect real world hardware. Also, since we're now using proper interrupt maps, we need to make sure we specify interrupts in the way the respective map requires it. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/ide.c Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Mon Feb 22 19:52:26 2010 (r679) +++ trunk/openbios-devel/drivers/cuda.c Mon Feb 22 19:52:28 2010 (r680) @@ -197,7 +197,12 @@ set_property(ph, "reg", (char *)&props, sizeof(props)); - set_int_property(ph, "interrupts", 0x12); + /* on newworld machines the cuda is on interrupt 0x19 */ + + props[0] = 0x19; + props[1] = 0; + NEWWORLD(set_property(ph, "interrupts", (char *)props, sizeof(props))); + NEWWORLD(set_int_property(ph, "#interrupt-cells", 2)); /* we emulate an oldworld hardware, so we must use * non-standard oldworld property (needed by linux 2.6.18) Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Mon Feb 22 19:52:26 2010 (r679) +++ trunk/openbios-devel/drivers/ide.c Mon Feb 22 19:52:28 2010 (r680) @@ -1421,9 +1421,11 @@ dnode = find_dev(nodebuff); +#ifndef CONFIG_PPC props[0]=14; props[1]=0; set_property(dnode, "interrupts", (char *)&props, 2*sizeof(cell)); +#endif props[0] = __cpu_to_be32(chan->io_regs[0]); props[1] = __cpu_to_be32(1); props[2] = __cpu_to_be32(8); @@ -1578,10 +1580,31 @@ OLDWORLD(set_property(dnode, "AAPL,pio-timing", (char *)&props, 8*sizeof(cell))); - props[0] = 0x0000000d; - props[1] = 0x00000000; + /* The first interrupt entry is the ide interrupt, the second + the dbdma interrupt */ + switch (current_channel) { + case 1: + props[0] = 0x0000000d; + props[2] = 0x00000002; + break; + case 2: + props[0] = 0x0000000e; + props[2] = 0x00000003; + break; + case 3: + props[0] = 0x0000000f; + props[2] = 0x00000004; + break; + default: + props[0] = 0x00000000; + props[2] = 0x00000000; + break; + } + props[1] = 0x00000000; /* XXX level triggered on real hw */ + props[3] = 0x00000000; set_property(dnode, "interrupts", - (char *)&props, 2*sizeof(cell)); + (char *)&props, 4*sizeof(cell)); + set_int_property(dnode, "#interrupt-cells", 2); OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 2*sizeof(cell)));

1 0

[commit] r679 - in trunk/openbios-devel: drivers include/openbios
by repository service 22 Feb '10

22 Feb '10

Author: agraf Date: Mon Feb 22 19:52:26 2010 New Revision: 679 URL: http://tracker.coreboot.org/trac/openbios/changeset/679 Log: PPC: Create interrupt map for PCI There is a draft spec that defines how interrupts are supposed to be mapped from one bus to another, down to the PIC and CPU interrupt line. So far we don't implement that spec. But PPC64 Linux requires us to for PCI devices. So let's create a map here. Draft: http://playground.sun.com/1275/practice/imap/imap0_9d.pdf Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/include/openbios/pci.h Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Mon Feb 22 19:52:25 2010 (r678) +++ trunk/openbios-devel/drivers/macio.c Mon Feb 22 19:52:26 2010 (r679) @@ -18,6 +18,7 @@ #include "macio.h" #include "cuda.h" #include "escc.h" +#include "openbios/pci.h" #define OW_IO_NVRAM_SIZE 0x00020000 #define OW_IO_NVRAM_OFFSET 0x00060000 @@ -172,9 +173,13 @@ fword("finish-device"); if (is_newworld()) { + u32 *interrupt_map; + int len, i; + /* patch in interrupt parent */ dnode = find_dev(buf); - target_node = find_dev("/pci"); + + target_node = find_dev("/pci/mac-io"); set_int_property(target_node, "interrupt-parent", dnode); target_node = find_dev("/pci/mac-io/escc/ch-a"); @@ -182,6 +187,15 @@ target_node = find_dev("/pci/mac-io/escc/ch-b"); set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci"); + set_int_property(target_node, "interrupt-parent", dnode); + + interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len); + for (i = 0; i < 4; i++) { + interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode; + } + set_property(target_node, "interrupt-map", (char *)interrupt_map, len); } } Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Feb 22 19:52:25 2010 (r678) +++ trunk/openbios-devel/drivers/pci.c Mon Feb 22 19:52:26 2010 (r679) @@ -278,6 +278,47 @@ set_property(dev, "bus-range", (char *)props, 2 * sizeof(props[0])); } +static void pci_host_set_interrupt_map(const pci_config_t *config) +{ +/* XXX We currently have a hook in the MPIC init code to fill in its handle. + * If you want to have interrupt maps for your PCI host bus, add your + * architecture to the #if and make your bridge detect code fill in its + * handle too. + * + * It would be great if someone clever could come up with a more universal + * mechanism here. + */ +#if defined(CONFIG_PPC) + phandle_t dev = get_cur_dev(); + u32 props[7 * 4]; + int i; + +#if defined(CONFIG_PPC) + /* Oldworld macs do interrupt maps differently */ + if(!is_newworld()) + return; +#endif + + for (i = 0; i < (7*4); i+=7) { + props[i+PCI_INT_MAP_PCI0] = 0; + props[i+PCI_INT_MAP_PCI1] = 0; + props[i+PCI_INT_MAP_PCI2] = 0; + props[i+PCI_INT_MAP_PCI_INT] = (i / 7) + 1; // starts at PINA=1 + props[i+PCI_INT_MAP_PIC_HANDLE] = 0; // gets patched in later + props[i+PCI_INT_MAP_PIC_INT] = arch->irqs[i / 7]; + props[i+PCI_INT_MAP_PIC_POL] = 3; + } + set_property(dev, "interrupt-map", (char *)props, 7 * 4 * sizeof(props[0])); + + props[PCI_INT_MAP_PCI0] = 0; + props[PCI_INT_MAP_PCI1] = 0; + props[PCI_INT_MAP_PCI2] = 0; + props[PCI_INT_MAP_PCI_INT] = 0x7; + + set_property(dev, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); +#endif +} + static void pci_host_set_reg(const pci_config_t *config) { phandle_t dev = get_cur_dev(); @@ -344,6 +385,7 @@ pci_host_set_reg(config); pci_host_set_ranges(config); pci_set_bus_range(config); + pci_host_set_interrupt_map(config); return 0; } Modified: trunk/openbios-devel/include/openbios/pci.h ============================================================================== --- trunk/openbios-devel/include/openbios/pci.h Mon Feb 22 19:52:25 2010 (r678) +++ trunk/openbios-devel/include/openbios/pci.h Mon Feb 22 19:52:26 2010 (r679) @@ -24,6 +24,16 @@ extern const pci_arch_t *arch; +/* Device tree offsets */ + +#define PCI_INT_MAP_PCI0 0 +#define PCI_INT_MAP_PCI1 1 +#define PCI_INT_MAP_PCI2 2 +#define PCI_INT_MAP_PCI_INT 3 +#define PCI_INT_MAP_PIC_HANDLE 4 +#define PCI_INT_MAP_PIC_INT 5 +#define PCI_INT_MAP_PIC_POL 6 + /* Device classes and subclasses */ #define PCI_BASE_CLASS_STORAGE 0x01

1 0

[commit] r678 - in trunk/openbios-devel: arch/ppc/qemu include/openbios
by repository service 22 Feb '10

22 Feb '10

Author: agraf Date: Mon Feb 22 19:52:25 2010 New Revision: 678 URL: http://tracker.coreboot.org/trac/openbios/changeset/678 Log: PPC: Get timebase and clock speed from fw_cfg When running on Qemu (TCG) time goes by at a constant frequency which accidently happens to match with Linux's fallback value. As soon as we go to KVM, the time base suddenly starts going as fast as the host CPU's time base. So we need to make sure Linux knows about it, so it can do its timekeeping properly. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/include/openbios/fw_cfg.h Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Feb 22 19:52:23 2010 (r677) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Feb 22 19:52:25 2010 (r678) @@ -194,6 +194,16 @@ push_str("icache-block-size"); fword("property"); + PUSH(fw_cfg_read_i32(FW_CFG_PPC_TBFREQ)); + fword("encode-int"); + push_str("timebase-frequency"); + fword("property"); + + PUSH(fw_cfg_read_i32(FW_CFG_PPC_CPUFREQ)); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + push_str("running"); fword("encode-string"); push_str("state"); Modified: trunk/openbios-devel/include/openbios/fw_cfg.h ============================================================================== --- trunk/openbios-devel/include/openbios/fw_cfg.h Mon Feb 22 19:52:23 2010 (r677) +++ trunk/openbios-devel/include/openbios/fw_cfg.h Mon Feb 22 19:52:25 2010 (r678) @@ -36,6 +36,12 @@ #define FW_CFG_ARCH_LOCAL 0x8000 #define FW_CFG_ENTRY_MASK ~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL) +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03) +#define FW_CFG_PPC_CPUFREQ (FW_CFG_ARCH_LOCAL + 0x04) + #define FW_CFG_INVALID 0xffff #ifndef NO_QEMU_PROTOS

1 0

[commit] r677 - trunk/openbios-devel/arch/ppc/qemu
by repository service 22 Feb '10

22 Feb '10

Author: agraf Date: Mon Feb 22 19:52:23 2010 New Revision: 677 URL: http://tracker.coreboot.org/trac/openbios/changeset/677 Log: PPC: Increase instruction cache size A real 970FX has more icache, so we should reflect that. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Feb 7 21:25:32 2010 (r676) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Feb 22 19:52:23 2010 (r677) @@ -416,7 +416,7 @@ { // XXX find out real values .iu_version = 0x003C0000, .name = "PowerPC,970FX", - .icache_size = 0x8000, + .icache_size = 0x10000, .dcache_size = 0x8000, .icache_sets = 0x80, .dcache_sets = 0x80,

1 0

[PATCH] Probe PCI buses recursively
by Blue Swirl 07 Feb '10

07 Feb '10

I tried to get PCI probing work in cases where the devices are behind multiple bridges. This patch works in many cases (especially current QEMU PPC/Sparc64 setup), but not if I make some arbitrary changes to the bridging setup. The mysterious "?active-package get-package-path" piece resolves the simple /pci/pci path (which would be identical to any other bridge found) to /pci@1fe0,0/pci@1,1. Is there a better way? Other comments? Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- drivers/pci.c | 72 +++++++++++++++++++++++++++++++++++++++++++------------- drivers/pci.h | 2 + 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/drivers/pci.c b/drivers/pci.c index 7d681f1..293509b 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -877,8 +877,15 @@ ob_pci_configure(pci_addr addr, pci_config_t *config, int num_regs, int rom_bar, pci_config_write16(addr, PCI_COMMAND, cmd); } -static void ob_scan_pci_bus(int bus, unsigned long *mem_base, - unsigned long *io_base, char **path) +static struct ob_buses{ + char *path; + pci_addr addr; +} ob_buses[256]; + +static int buses, found_host; + +static int ob_scan_pci_bus(int bus, unsigned long *mem_base, + unsigned long *io_base) { int devnum, fn, is_multi, vid, did; unsigned int htype; @@ -887,8 +894,9 @@ static void ob_scan_pci_bus(int bus, unsigned long *mem_base, const pci_dev_t *pci_dev; uint32_t ccode; uint8_t class, subclass, iface, rev; - int num_bars, rom_bar; + int num_bars, rom_bar, child_buses; + child_buses = 0; activate_device("/"); for (devnum = 0; devnum < 32; devnum++) { is_multi = 0; @@ -923,10 +931,10 @@ static void ob_scan_pci_bus(int bus, unsigned long *mem_base, if (pci_dev == NULL || pci_dev->name == NULL) snprintf(config.path, sizeof(config.path), - "%s/pci%x,%x", *path, vid, did); + "%s/pci%x,%x", ob_buses[bus].path, vid, did); else snprintf(config.path, sizeof(config.path), - "%s/%s", *path, pci_dev->name); + "%s/%s", ob_buses[bus].path, pci_dev->name); #ifdef CONFIG_DEBUG_PCI printk("%s - ", config.path); #endif @@ -957,37 +965,67 @@ static void ob_scan_pci_bus(int bus, unsigned long *mem_base, (subclass == PCI_SUBCLASS_BRIDGE_HOST || subclass == PCI_SUBCLASS_BRIDGE_PCI)) { /* host or bridge */ - free(*path); - *path = strdup(config.path); + fword("?active-package"); + fword("get-package-path"); + ob_buses[buses].path = pop_fstr_copy(); + ob_buses[buses].addr = addr; + pci_config_write8(addr, PCI_PRIMARY_BUS, bus); + pci_config_write8(addr, PCI_SUBORDINATE_BUS, + 255); + /* we assume the first device found is + the host */ + if (!found_host) { + pci_config_write8(addr, + PCI_SECONDARY_BUS, + buses + 1); + } else { + pci_config_write8(addr, + PCI_SECONDARY_BUS, + buses); + } + buses++; + child_buses++; + if (!found_host) { + found_host = 1; + } else { + int ret; + + ret = ob_scan_pci_bus(buses - 1, + mem_base, + io_base); + pci_config_write8(addr, + PCI_SUBORDINATE_BUS, + buses - 1 + ret); + child_buses += ret; + } } } } device_end(); + return child_buses; } +/* Recursively scan PCI bus, starting from host bus */ int ob_pci_init(void) { int bus; unsigned long mem_base, io_base; - char *path; #ifdef CONFIG_DEBUG_PCI printk("Initializing PCI devices...\n"); #endif - /* brute force bus scan */ - - /* Find all PCI bridges */ - mem_base = arch->mem_base; /* I/O ports under 0x400 are used by devices mapped at fixed location. */ io_base = arch->io_base + 0x400; - path = strdup(""); - for (bus = 0; bus<0x100; bus++) { - ob_scan_pci_bus(bus, &mem_base, &io_base, &path); - } - free(path); + + ob_buses[0].path = strdup(""); + ob_scan_pci_bus(0, &mem_base, &io_base); + + for (bus = 0; bus < buses; bus++) { + free(ob_buses[bus].path); + } return 0; } diff --git a/drivers/pci.h b/drivers/pci.h index 3ca71f3..fc8968f 100644 --- a/drivers/pci.h +++ b/drivers/pci.h @@ -34,7 +34,9 @@ #define PCI_HEADER_TYPE_NORMAL 0x00 #define PCI_HEADER_TYPE_BRIDGE 0x01 #define PCI_HEADER_TYPE_CARDBUS 0x02 +#define PCI_PRIMARY_BUS 0x18 #define PCI_SECONDARY_BUS 0x19 +#define PCI_SUBORDINATE_BUS 0x1a #define PCI_BASE_ADDR_0 0x10 #define PCI_BASE_ADDR_1 0x14 #define PCI_BASE_ADDR_2 0x18 -- 1.6.2.4

3 4

[commit] r676 - trunk/openbios-devel/drivers
by repository service 07 Feb '10

07 Feb '10

Author: blueswirl Date: Sun Feb 7 21:25:32 2010 New Revision: 676 URL: http://tracker.coreboot.org/trac/openbios/changeset/676 Log: Add "reg" property to kb_ps2, fix device_type Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pc_kbd.c Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Feb 7 21:25:30 2010 (r675) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Feb 7 21:25:32 2010 (r676) @@ -201,7 +201,7 @@ push_str(dev_name); fword("device-name"); - push_str("keyboard"); + push_str("serial"); fword("device-type"); PUSH(-1); @@ -209,6 +209,11 @@ push_str("keyboard"); fword("property"); + PUSH(0); + fword("encode-int"); + push_str("reg"); + fword("property"); + chosen = find_dev("/chosen"); push_str(nodebuff); fword("open-dev");

1 0

[commit] r675 - trunk/openbios-devel/drivers
by repository service 07 Feb '10

07 Feb '10

Author: blueswirl Date: Sun Feb 7 21:25:30 2010 New Revision: 675 URL: http://tracker.coreboot.org/trac/openbios/changeset/675 Log: Fix wrong device_type for non-PCI bridge devices, like EBUS Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci_database.c Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Wed Feb 3 18:54:14 2010 (r674) +++ trunk/openbios-devel/drivers/pci_database.c Sun Feb 7 21:25:30 2010 (r675) @@ -362,7 +362,7 @@ static const pci_subclass_t bridg_subclass[] = { { PCI_SUBCLASS_BRIDGE_HOST, "PCI host bridge", - NULL, hbrg_devices, NULL, + "pci", hbrg_devices, NULL, NULL, NULL, }, { @@ -382,7 +382,7 @@ }, { PCI_SUBCLASS_BRIDGE_PCI, "PCI-to-PCI bridge", - NULL, PCIbrg_devices, NULL, + "pci", PCIbrg_devices, NULL, NULL, NULL, }, { @@ -1040,7 +1040,7 @@ /* 0x05 */ { "memory controller", "memory-controller", mem_subclass, }, /* 0x06 */ - { "PCI bridge", "pci", bridg_subclass, }, + { "PCI bridge", NULL, bridg_subclass, }, /* 0x07 */ { "communication device", NULL, comm_subclass,}, /* 0x08 */

1 0

[PATCH] pathres: consistently encode unit address on 64bit target
by Igor V. Kovalenko 03 Feb '10

03 Feb '10

From: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> This change fixes node unit address matching on arch where cell is not 4 byte integer (tested with sparc64.) Since we encode "reg" property chunks with encode-int we need to use the same encoding while preparing unit phys addr for comparison at path resolution time. - (exact-match): calculate phys addr length using 4 byte member encoding with /l* not cells - find-child: encode phys addr components similar to encode-int with 4 byte stores Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> --- forth/device/pathres.fs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forth/device/pathres.fs b/forth/device/pathres.fs index 4184d07..f248e8d 100644 --- a/forth/device/pathres.fs +++ b/forth/device/pathres.fs @@ -125,7 +125,7 @@ constant sinfo.size r@ common-match \ b) UNIT_PHYS nonempty? - r@ >si.unit_phys_len @ cells ?dup if + r@ >si.unit_phys_len @ /l* ?dup if \ check if unit_phys matches " reg" r@ >si.child @ get-package-property if -3 throw then ( unitbytes propaddr proplen ) @@ -191,7 +191,7 @@ constant sinfo.size ( ... a_lo ... a_hi olddepth n ) r@ >si.unit_phys >r begin 1- dup 0>= while - rot r> dup na1+ >r ! + rot r> dup la1+ >r l!-be repeat r> 2drop depth!

3 2

[commit] r674 - trunk/openbios-devel/forth/device
by repository service 03 Feb '10

03 Feb '10

Author: blueswirl Date: Wed Feb 3 18:54:14 2010 New Revision: 674 URL: http://tracker.coreboot.org/trac/openbios/changeset/674 Log: pathres: consistently encode unit address on 64bit target This change fixes node unit address matching on arch where cell is not 4 byte integer (tested with sparc64.) Since we encode "reg" property chunks with encode-int we need to use the same encoding while preparing unit phys addr for comparison at path resolution time. - (exact-match): calculate phys addr length using 4 byte member encoding with /l* not cells - find-child: encode phys addr components similar to encode-int with 4 byte stores Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/device/pathres.fs Modified: trunk/openbios-devel/forth/device/pathres.fs ============================================================================== --- trunk/openbios-devel/forth/device/pathres.fs Sun Jan 31 13:16:46 2010 (r673) +++ trunk/openbios-devel/forth/device/pathres.fs Wed Feb 3 18:54:14 2010 (r674) @@ -125,7 +125,7 @@ r@ common-match \ b) UNIT_PHYS nonempty? - r@ >si.unit_phys_len @ cells ?dup if + r@ >si.unit_phys_len @ /l* ?dup if \ check if unit_phys matches " reg" r@ >si.child @ get-package-property if -3 throw then ( unitbytes propaddr proplen ) @@ -191,7 +191,7 @@ ( ... a_lo ... a_hi olddepth n ) r@ >si.unit_phys >r begin 1- dup 0>= while - rot r> dup na1+ >r ! + rot r> dup la1+ >r l!-be repeat r> 2drop depth!

1 0

[commit] r673 - trunk/openbios-devel/arch/sparc64
by repository service 31 Jan '10

31 Jan '10

Author: blueswirl Date: Sun Jan 31 13:16:46 2010 New Revision: 673 URL: http://tracker.coreboot.org/trac/openbios/changeset/673 Log: sparc64: implement reset Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sat Jan 30 21:58:40 2010 (r672) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Jan 31 13:16:46 2010 (r673) @@ -92,6 +92,17 @@ : : "r" (addr)); } +/* Reset control register is defined in 17.2.7.3 of US IIi User Manual */ +static void +sparc64_reset_all(void) +{ + unsigned long addr = 0x1fe0000f020ULL; + unsigned long val = 1 << 29; + + asm("stxa %0, [%1] 0x15\n\t" + : : "r" (val), "r" (addr) : "memory"); +} + static void cpu_generic_init(const struct cpudef *cpu, uint32_t clock_frequency) { unsigned long iu_version; @@ -146,6 +157,11 @@ push_str("/openprom/client-services"); fword("find-device"); bind_func("SUNW,set-trap-table", set_trap_table); + + // Reset + bind_func("sparc64-reset-all", sparc64_reset_all); + push_str("' sparc64-reset-all to reset-all"); + fword("eval"); } static const struct cpudef sparc_defs[] = {

1 0

[commit] r672 - trunk/openbios-devel/drivers
by repository service 30 Jan '10

30 Jan '10

Author: blueswirl Date: Sat Jan 30 21:58:40 2010 New Revision: 672 URL: http://tracker.coreboot.org/trac/openbios/changeset/672 Log: Sparc64: Add interrupt properties to Sabre Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Jan 29 19:46:38 2010 (r671) +++ trunk/openbios-devel/drivers/pci.c Sat Jan 30 21:58:40 2010 (r672) @@ -402,6 +402,11 @@ sizeof(props[0])); set_property(dev, "#virtual-dma-addr-cells", (char *)props, sizeof(props[0])); + props[0] = 0x000007f0; + props[1] = 0x000007ee; + props[2] = 0x000007ef; + props[3] = 0x000007e5; + set_property(dev, "interrupts", (char *)props, 4 * sizeof(props[0])); return 0; }

1 0

[commit] r671 - in trunk/openbios-devel: arch/sparc64 include/sparc64
by repository service 29 Jan '10

29 Jan '10

Author: blueswirl Date: Fri Jan 29 19:46:38 2010 New Revision: 671 URL: http://tracker.coreboot.org/trac/openbios/changeset/671 Log: QEMU changed PCI/IO port byte swapping, adapt OpenBIOS to new way This requires an updated QEMU. Also use little endian access ASIs. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/entry.S trunk/openbios-devel/include/sparc64/io.h trunk/openbios-devel/include/sparc64/pci.h Modified: trunk/openbios-devel/arch/sparc64/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S Thu Jan 28 14:20:14 2010 (r670) +++ trunk/openbios-devel/arch/sparc64/entry.S Fri Jan 29 19:46:38 2010 (r671) @@ -59,7 +59,7 @@ ! Check signature "QEMU" setx CFG_ADDR, %g2, %g5 mov FW_CFG_SIGNATURE, %g2 - stha %g2, [%g5] ASI_PHYS_BYPASS_EC_E + stha %g2, [%g5] ASI_PHYS_BYPASS_EC_E_L inc %g5 lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g2 cmp %g2, 'Q' @@ -99,7 +99,7 @@ ! NB: little endian format mov FW_CFG_RAM_SIZE, %g2 dec %g5 - stha %g2, [%g5] ASI_PHYS_BYPASS_EC_E + stha %g2, [%g5] ASI_PHYS_BYPASS_EC_E_L inc %g5 lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g4 Modified: trunk/openbios-devel/include/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/sparc64/io.h Thu Jan 28 14:20:14 2010 (r670) +++ trunk/openbios-devel/include/sparc64/io.h Fri Jan 29 19:46:38 2010 (r671) @@ -56,6 +56,7 @@ /* * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. + * On Sparc64, BE versions must swap bytes using LE access ASI. */ static inline int in_8(volatile unsigned char *addr) { @@ -75,22 +76,19 @@ static inline int in_le16(volatile unsigned short *addr) { - int ret, tmp; + int ret; - // XXX __asm__ __volatile__("lduha [%1] 0x15, %0\n\t" :"=r"(ret):"r"(addr):"memory"); - tmp = (ret << 8) & 0xff00; - tmp |= (ret >> 8) & 0xff; - return tmp; + return ret; } static inline int in_be16(volatile unsigned short *addr) { int ret; - __asm__ __volatile__("lduha [%1] 0x15, %0\n\t" + __asm__ __volatile__("lduha [%1] 0x1d, %0\n\t" :"=r"(ret):"r"(addr):"memory"); return ret; @@ -98,61 +96,45 @@ static inline void out_le16(volatile unsigned short *addr, int val) { - unsigned tmp; - // XXX - tmp = (val << 8) & 0xff00; - tmp |= (val >> 8) & 0xff; __asm__ __volatile__("stha %0, [%1] 0x15\n\t" - : : "r"(tmp), "r"(addr):"memory"); + : : "r"(val), "r"(addr):"memory"); } static inline void out_be16(volatile unsigned short *addr, int val) { - __asm__ __volatile__("stha %0, [%1] 0x15\n\t" + __asm__ __volatile__("stha %0, [%1] 0x1d\n\t" : : "r"(val), "r"(addr):"memory"); } static inline unsigned in_le32(volatile unsigned *addr) { - unsigned ret, tmp; + unsigned ret; - // XXX __asm__ __volatile__("lduwa [%1] 0x15, %0\n\t" :"=r"(ret):"r"(addr):"memory"); - tmp = ret << 24; - tmp |= (ret << 8) & 0xff0000; - tmp |= (ret >> 8) & 0xff00; - tmp |= (ret >> 24) & 0xff; - return tmp; + return ret; } static inline unsigned in_be32(volatile unsigned *addr) { unsigned ret; - __asm__ __volatile__("lduwa [%1] 0x15, %0\n\t" + __asm__ __volatile__("lduwa [%1] 0x1d, %0\n\t" :"=r"(ret):"r"(addr):"memory"); - return ret; } static inline void out_le32(volatile unsigned *addr, int val) { - unsigned tmp; - // XXX - tmp = val << 24; - tmp |= (val << 8) & 0xff0000; - tmp |= (val >> 8) & 0xff00; - tmp |= (val >> 24) & 0xff; __asm__ __volatile__("stwa %0, [%1] 0x15\n\t" - : : "r"(tmp), "r"(addr):"memory"); + : : "r"(val), "r"(addr):"memory"); } static inline void out_be32(volatile unsigned *addr, int val) { - __asm__ __volatile__("stwa %0, [%1] 0x15\n\t" + __asm__ __volatile__("stwa %0, [%1] 0x1d\n\t" : : "r"(val), "r"(addr):"memory"); } Modified: trunk/openbios-devel/include/sparc64/pci.h ============================================================================== --- trunk/openbios-devel/include/sparc64/pci.h Thu Jan 28 14:20:14 2010 (r670) +++ trunk/openbios-devel/include/sparc64/pci.h Fri Jan 29 19:46:38 2010 (r671) @@ -35,14 +35,14 @@ static inline uint16_t pci_config_read16(pci_addr dev, uint8_t reg) { uint16_t res; - res = in_le16((uint16_t *)(PCI_CONFIG(dev) + reg)); + res = in_be16((uint16_t *)(PCI_CONFIG(dev) + reg)); return res; } static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg) { uint32_t res; - res = in_le32((uint32_t *)(PCI_CONFIG(dev) + reg)); + res = in_be32((uint32_t *)(PCI_CONFIG(dev) + reg)); return res; } @@ -53,12 +53,12 @@ static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val) { - out_le16((uint16_t *)(PCI_CONFIG(dev) + reg), val); + out_be16((uint16_t *)(PCI_CONFIG(dev) + reg), val); } static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val) { - out_le32((uint32_t *)(PCI_CONFIG(dev) + reg), val); + out_be32((uint32_t *)(PCI_CONFIG(dev) + reg), val); } #else /* !PCI_CONFIG_1 */ #error PCI Configuration Mechanism is not specified or implemented

1 0

FCode-utils 1.0.2 toke checksum issue
by Asif Haswarey 28 Jan '10

28 Jan '10

Hi, We have run into an issue with our FCodes tokenized using FCode-utils 1.0.2 toke, on specific SPARC (Enterprise) platforms: M4000, M9000. Power-up device probe yields the following warning message on the console: WARNING: /pci@20,600000/...: FCode checksum error; expected: 280d result: 2837 After looking at the OBP sources, I found that the routine: fcode-sum-ok? : obp/dev/pci/fcode-rom.fth calculates the checksum by adding every FCode image (excluding header) byte and doing: lwsplit + lwsplit + h# ffff and on the sum. The lwsplit + lwsplit + apparently breaks the OpenFirmware spec. OpenFirmware-1275 section 5.2.2.5 describes the checksum algorithm as: Checksum is the doublet size sum of the bytes of the program body (i.e., excluding the header), calculated using two's complement addition and ignoring overflow. FCode-utils 1.0.2 toke calculates the checksum in function: finish_fcodehdr : toke/emit.c as described in the spec. How do we deal with this? Any suggestions? Thanks for any response(s)! -Asif

2 1

r670 - trunk/fcode-utils-devel/shared
by svn＠openbios.org 28 Jan '10

28 Jan '10

Author: stepan Date: 2010-01-28 14:20:14 +0100 (Thu, 28 Jan 2010) New Revision: 670 Modified: trunk/fcode-utils-devel/shared/types.h Log: Also use the APPLE section on x86/x64 systems. Modified: trunk/fcode-utils-devel/shared/types.h =================================================================== --- trunk/fcode-utils-devel/shared/types.h 2010-01-24 13:38:28 UTC (rev 669) +++ trunk/fcode-utils-devel/shared/types.h 2010-01-28 13:20:14 UTC (rev 670) @@ -39,7 +39,7 @@ * **************************************************************************** */ -#if defined(__ppc__) && defined(__APPLE__) +#if defined(__APPLE__) #include <sys/types.h> typedef int8_t s8;

1 0

Compiling OpenBIOS on Mac OS X
by G 3 26 Jan '10

26 Jan '10

Hi, what version of GCC is needed to build OpenBIOS on Mac OS X?

1 0

r669 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 24 Jan '10

24 Jan '10

Author: blueswirl Date: 2010-01-24 14:38:28 +0100 (Sun, 24 Jan 2010) New Revision: 669 Modified: trunk/openbios-devel/arch/sparc64/openbios.c Log: Sparc64: more generic method for display and keyboard selection Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/openbios.c =================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c 2010-01-23 14:43:02 UTC (rev 668) +++ trunk/openbios-devel/arch/sparc64/openbios.c 2010-01-24 13:38:28 UTC (rev 669) @@ -387,8 +387,8 @@ if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { stdin_path = stdout_path = "ttya"; } else { - stdin_path = "/pci/pci/pci/ebus/kb_ps2"; - stdout_path = "/pci/pci/pci/QEMU,VGA"; + stdin_path = "keyboard"; + stdout_path = "screen"; } push_str(stdin_path);

1 0

Some encountered issues when compiling openbios on a ppc64 host
by Zhiyong Wu 23 Jan '10

23 Jan '10

HI, openbios guys, Today i compiled openbios on my ppc64 box, encoutered some questions: [root@945n03 openbios]# uname -a Linux 945n03 2.6.31.5-127.fc12.ppc64 #1 SMP Sat Nov 7 20:58:24 EST 2009 ppc64 ppc64 ppc64 GNU/Linux [root@945n03 openbios]# rpm -qa | grep glibc glibc-2.11-2.ppc glibc-2.11-2.ppc64 glibc-devel-2.11-2.ppc glibc-common-2.11-2.ppc glibc-headers-2.11-2.ppc [root@945n03 openbios]# rpm -qa | grep gcc libgcc-4.4.2-7.fc12.ppc64 gcc-4.4.2-7.fc12.ppc libgcc-4.4.2-7.fc12.ppc gcc-c++-4.4.2-7.fc12.ppc gcc-gfortran-4.4.2-7.fc12.ppc [root@945n03 openbios]# gcc -v Using built-in specs. Target: ppc64-redhat-linux Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --enable-plugin --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-ppl --with-cloog --enable-secureplt --with-long-double-128 --build=ppc64-redhat-linux --target=ppc64-redhat-linux --with-cpu=default32 Thread model: posix gcc version 4.4.2 20091027 (Red Hat 4.4.2-7) (GCC) [root@945n03 openbios]# ./config/scripts/switch-arch ppc Configuring OpenBIOS on ppc64 for ppc ERROR: no powerpc cross-compiler found ! When i run "setarch 32 bash", "switch-arch" can work well, but it fails to run "make" [root@945n03 openbios]# uname -a Linux 945n03 2.6.31.5-127.fc12.ppc64 #1 SMP Sat Nov 7 20:58:24 EST 2009 ppc ppc ppc GNU/Linux [root@945n03 openbios]# ./config/scripts/switch-arch ppc Configuring OpenBIOS on ppc for ppc Initializing build tree obj-ppc...ok. Creating target Makefile...ok. Creating config files...ok. Building OpenBIOS for ppc Building...error: /kvm/openbios/obj-ppc/../libc/string.c:499: undefined reference to `_restgpr_31_x' liblibc.a(vsprintf.o): In function `number': /kvm/openbios/obj-ppc/../libc/vsprintf.c:55: undefined reference to `_savegpr_19' /kvm/openbios/obj-ppc/../libc/vsprintf.c:145: undefined reference to `_restgpr_19_x' liblibc.a(vsprintf.o): In function `vsnprintf': /kvm/openbios/obj-ppc/../libc/vsprintf.c:158: undefined reference to `_savegpr_22' /kvm/openbios/obj-ppc/../libc/vsprintf.c:388: undefined reference to `_restgpr_22_x' libgcc.a(__divdi3.o): In function `__divdi3': /kvm/openbios/obj-ppc/../libgcc/__divdi3.c:8: undefined reference to `_savegpr_31' /kvm/openbios/obj-ppc/../libgcc/__divdi3.c:26: undefined reference to `_restgpr_31_x' libgcc.a(__udivmoddi4.o): In function `__udivmoddi4': /kvm/openbios/obj-ppc/../libgcc/__udivmoddi4.c:4: undefined reference to `_savegpr_26' /kvm/openbios/obj-ppc/../libgcc/__udivmoddi4.c:31: undefined reference to `_restgpr_26_x' make[1]: *** [openbios-qemu.elf] Error 1 make[1]: Leaving directory `/kvm/openbios/obj-ppc' make: *** [build] Error 1 Who can give me some advices? Cheers, Zhiyong Wu

6 10

Re: [OpenBIOS] r667 - trunk/openbios-devel/include/sparc64
by Nick Couchman 23 Jan '10

23 Jan '10

>>> On 2010/01/22 at 11:50, <svn(a)openbios.org> wrote: > Author: blueswirl > Date: 2010-01-22 19:50:54 +0100 (Fri, 22 Jan 2010) > New Revision: 667 > > Modified: > trunk/openbios-devel/include/sparc64/pci.h > Log: > Sparc64: use correct PCI probe mechanism > > Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> > Output after updating to this revision: OpenBIOS for Sparc64 Cannot manage 'multimedia device' PCI device type '<NULL>': 8e10 50 (4 6 0) Cannot manage 'multimedia device' PCI device type '<NULL>': 8e10 50 (4 6 0) Cannot manage 'undefined' PCI device type '<NULL>': 3412 1111 (0 3 0) set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle Cannot manage 'invalid PCI device' PCI device type 'invalid': 8e10 10 (80 6 0) Cannot manage 'undefined' PCI device type '<NULL>': ec10 2980 (0 2 0) set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle set_property: NULL phandle Cannot manage 'IDE controller' PCI device type 'ide': 9510 4606 (1 1 8f) Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 $call-method: instance method not found $call-method: instance method not found Input device ttya not found. Output device ttya not found. Output device ttya not found. Input device ttya not found. Output device screen not found. Type 'help' for detailed information [sparc64] Booting file 'cdrom' with parameters '' $call-method: instance method not found 0 > nick@nick0:~/Temp/qemu> -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 2

r668 - trunk/openbios-devel/arch/unix
by svn＠openbios.org 23 Jan '10

23 Jan '10

Author: blueswirl Date: 2010-01-23 15:43:02 +0100 (Sat, 23 Jan 2010) New Revision: 668 Modified: trunk/openbios-devel/arch/unix/unix.c Log: Sparc64: fix native Unix version build Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/unix/unix.c =================================================================== --- trunk/openbios-devel/arch/unix/unix.c 2010-01-22 18:50:54 UTC (rev 667) +++ trunk/openbios-devel/arch/unix/unix.c 2010-01-23 14:43:02 UTC (rev 668) @@ -35,6 +35,7 @@ #include "openbios-version.h" #include "blk.h" +#include "ofmem.h" #define MEMORY_SIZE (4*1024*1024) /* 4M ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256k for the dictionary */ @@ -67,6 +68,12 @@ int errno_int; /* implement for fs drivers, needed to build on Mac OS X */ +ucell ofmem_claim(ucell addr, ucell size, ucell align) +{ + return 0; +} + + #if 0 static void write_dictionary(char *filename) {

1 0

r667 - trunk/openbios-devel/include/sparc64
by svn＠openbios.org 22 Jan '10

22 Jan '10

Author: blueswirl Date: 2010-01-22 19:50:54 +0100 (Fri, 22 Jan 2010) New Revision: 667 Modified: trunk/openbios-devel/include/sparc64/pci.h Log: Sparc64: use correct PCI probe mechanism Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/sparc64/pci.h =================================================================== --- trunk/openbios-devel/include/sparc64/pci.h 2010-01-16 10:35:58 UTC (rev 666) +++ trunk/openbios-devel/include/sparc64/pci.h 2010-01-22 18:50:54 UTC (rev 667) @@ -12,55 +12,53 @@ /* PCI Configuration Mechanism #1 */ #define PCI_ADDR(bus, dev, fn) \ - ((pci_addr) (arch->cfg_base \ - | (uint32_t) (bus) << 16 \ + (((pci_addr) (uint32_t) (bus) << 16 \ | (uint32_t) (dev) << 11 \ | (uint32_t) (fn) << 8)) -#define PCI_BUS(pcidev) ((uint8_t) ((pcidev) >> 16)) +#define PCI_BUS(pcidev) ((uint8_t) ((pcidev) >> 16) & 0xff) #define PCI_DEV(pcidev) ((uint8_t) ((pcidev) >> 11) & 0x1f) #define PCI_FN(pcidev) ((uint8_t) ((pcidev) >> 8) & 7) +#define PCI_CONFIG(dev) (arch->cfg_addr \ + + (unsigned long)PCI_ADDR(PCI_BUS(dev), \ + PCI_DEV(dev), \ + PCI_FN(dev))) + static inline uint8_t pci_config_read8(pci_addr dev, uint8_t reg) { uint8_t res; - out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); - res = in_8((unsigned char*)(arch->cfg_data + (reg & 3))); + res = in_8((unsigned char*)(PCI_CONFIG(dev) + reg)); return res; } static inline uint16_t pci_config_read16(pci_addr dev, uint8_t reg) { uint16_t res; - out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); - res = in_le16((unsigned short*)(arch->cfg_data + (reg & 2))); + res = in_le16((uint16_t *)(PCI_CONFIG(dev) + reg)); return res; } static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg) { uint32_t res; - out_le32((unsigned *)arch->cfg_addr, dev | reg); - res = in_le32((unsigned *)(arch->cfg_data + reg)); + res = in_le32((uint32_t *)(PCI_CONFIG(dev) + reg)); return res; } static inline void pci_config_write8(pci_addr dev, uint8_t reg, uint8_t val) { - out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); - out_8((unsigned char*)(arch->cfg_data + (reg & 3)), val); + out_8((unsigned char*)(PCI_CONFIG(dev) + reg), val); } static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val) { - out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); - out_le16((unsigned short *)(arch->cfg_data + (reg & 2)), val); + out_le16((uint16_t *)(PCI_CONFIG(dev) + reg), val); } static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val) { - out_le32((unsigned *)arch->cfg_addr, dev | reg); - out_le32((unsigned *)(arch->cfg_data + reg), val); + out_le32((uint32_t *)(PCI_CONFIG(dev) + reg), val); } #else /* !PCI_CONFIG_1 */ #error PCI Configuration Mechanism is not specified or implemented

1 0