Subversion Repositories HelenOS

Rev

Go to most recent revision | Hide changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
3478 5734 d 4 h decky /branches/arm/ new arm branch  
/branches/arm
3389 5754 d 17 h jermar /trunk/contrib/toolchain/ Update amd64, arm32, ia32 and ia64 toolchains to gcc 4.3.2.  
/trunk/contrib/toolchain/toolchain.amd64.sh
/trunk/contrib/toolchain/toolchain.arm32.sh
/trunk/contrib/toolchain/toolchain.ia32.sh
/trunk/contrib/toolchain/toolchain.ia64.sh
3387 5756 d 4 h decky /trunk/ ppc32 updates  
/trunk/boot/arch/ppc32/loader/main.c
/trunk/boot/arch/ppc32/loader/ofwarch.c
/trunk/contrib/toolchain/toolchain.ppc32.sh
3369 5764 d 23 h decky /trunk/ configurable cross-compiler prefix (using CROSS_PREFIX)  
/trunk/boot/arch/arm32/loader/Makefile
/trunk/boot/arch/ia64/loader/Makefile
/trunk/boot/arch/mips32/loader/Makefile
/trunk/boot/arch/ppc32/loader/Makefile
/trunk/boot/arch/ppc64/loader/Makefile
/trunk/contrib/toolchain/toolchain.amd64.sh
/trunk/contrib/toolchain/toolchain.arm32.sh
/trunk/contrib/toolchain/toolchain.ia32.sh
/trunk/contrib/toolchain/toolchain.ia64.sh
/trunk/contrib/toolchain/toolchain.mipseb32.sh
/trunk/contrib/toolchain/toolchain.mipsel32.sh
/trunk/contrib/toolchain/toolchain.ppc32.sh
/trunk/contrib/toolchain/toolchain.ppc64.sh
/trunk/kernel/arch/amd64/Makefile.inc
/trunk/kernel/arch/arm32/Makefile.inc
/trunk/kernel/arch/ia32/Makefile.inc
/trunk/kernel/arch/ia32xen/Makefile.inc
/trunk/kernel/arch/ia64/Makefile.inc
/trunk/kernel/arch/mips32/Makefile.inc
/trunk/kernel/arch/ppc32/Makefile.inc
/trunk/kernel/arch/ppc64/Makefile.inc
/trunk/uspace/lib/libc/arch/amd64/Makefile.inc
/trunk/uspace/lib/libc/arch/arm32/Makefile.inc
/trunk/uspace/lib/libc/arch/ia32/Makefile.inc
/trunk/uspace/lib/libc/arch/ia64/Makefile.inc
/trunk/uspace/lib/libc/arch/mips32/Makefile.inc
/trunk/uspace/lib/libc/arch/mips32eb/Makefile.inc
/trunk/uspace/lib/libc/arch/ppc32/Makefile.inc
/trunk/uspace/lib/libc/arch/ppc64/Makefile.inc
3368 5764 d 23 h decky /trunk/ configurable cross-compiler prefix (using CROSS_PREFIX)  
/trunk/boot/arch/sparc64/loader/Makefile
/trunk/contrib/toolchain/toolchain.sparc64.sh
/trunk/kernel/arch/sparc64/Makefile.inc
/trunk/uspace/lib/libc/arch/sparc64/Makefile.inc
3228 5796 d 12 h decky /trunk/ physical memory detection in MSIM (discontinous regions supported)
remove Sgi Indy (ARC) support -- it was unmaintaned, untested for years and without uspace support
 
/trunk/contrib/conf/bootindy
/trunk/kernel/arch/mips32/include/drivers/arc.h
/trunk/kernel/arch/mips32/src/drivers/arc.c
/trunk/HelenOS.config
/trunk/Makefile
/trunk/contrib/conf/msim.conf
/trunk/kernel/arch/mips32/Makefile.inc
/trunk/kernel/arch/mips32/include/drivers/msim.h
/trunk/kernel/arch/mips32/include/drivers/serial.h
/trunk/kernel/arch/mips32/include/mm/as.h
/trunk/kernel/arch/mips32/include/mm/tlb.h
/trunk/kernel/arch/mips32/src/console.c
/trunk/kernel/arch/mips32/src/drivers/msim.c
/trunk/kernel/arch/mips32/src/interrupt.c
/trunk/kernel/arch/mips32/src/mips32.c
/trunk/kernel/arch/mips32/src/mm/as.c
/trunk/kernel/arch/mips32/src/mm/frame.c
/trunk/kernel/arch/mips32/src/mm/tlb.c
/trunk/kernel/doc/arch/mips32
/trunk/kernel/generic/include/config.h
/trunk/kernel/generic/include/macros.h
/trunk/kernel/kernel.config
3177 5833 d 22 h jermar /trunk/contrib/toolchain/ Upgrade the toolchain to gcc 4.3.1.
This revealed several bugs fixed in a couple of previous commits.
The ia64 toolchain no longer requires the extra includes.
The ppc32 architecture feels a little bit broken because the console
service doesn't start for some reason.
 
/trunk/contrib/toolchain/toolchain.amd64.sh
/trunk/contrib/toolchain/toolchain.arm32.sh
/trunk/contrib/toolchain/toolchain.ia32.sh
/trunk/contrib/toolchain/toolchain.ia64.sh
/trunk/contrib/toolchain/toolchain.mipseb32.sh
/trunk/contrib/toolchain/toolchain.mipsel32.sh
/trunk/contrib/toolchain/toolchain.ppc32.sh
/trunk/contrib/toolchain/toolchain.ppc64.sh
/trunk/contrib/toolchain/toolchain.sparc64.sh
3176 5833 d 22 h jermar /trunk/contrib/conf/ Remove outdated sample configuration files or configuration files that
are strongly inspired by Simics configuration files.
 
/trunk/contrib/conf/HelenOS.amd64.simics
/trunk/contrib/conf/HelenOS.ppc32.simics
/trunk/contrib/conf/HelenOS.sparc64.simics
/trunk/contrib/conf/SPMIPS.simics
/trunk/contrib/conf/dot.bochsrc
/trunk/contrib/conf/simics.conf
/trunk/contrib/conf/spmips.conf
/trunk/contrib/conf/vmware.conf
2727 5963 d 5 h decky /trunk/contrib/toolchain/ move to 4.2.3  
/trunk/contrib/toolchain/toolchain.sparc64.sh
2695 5990 d 6 h decky /trunk/contrib/conf/ make msim.conf compatible with MSIM 1.3.x  
/trunk/contrib/conf/msim.conf
2578 6068 d 21 h jermar /trunk/contrib/toolchain/ Upgrade toolchain scripts to use binutils 2.18 and gcc 4.2.2.  
/trunk/contrib/toolchain/toolchain.amd64.sh
/trunk/contrib/toolchain/toolchain.arm32.sh
/trunk/contrib/toolchain/toolchain.ia32.sh
/trunk/contrib/toolchain/toolchain.ia64.sh
/trunk/contrib/toolchain/toolchain.mipseb32.sh
/trunk/contrib/toolchain/toolchain.mipsel32.sh
/trunk/contrib/toolchain/toolchain.ppc32.sh
/trunk/contrib/toolchain/toolchain.ppc64.sh
/trunk/contrib/toolchain/toolchain.sparc64.sh
2563 6097 d 7 h vana /trunk/ Support for new gcc 4.2.1 on IA64  
/trunk/boot/arch/ia64/loader/pack
/trunk/contrib/toolchain/toolchain.ia64.sh
2551 6098 d 22 h cejka /trunk/ DevMap, VFS and FAT added to boot images for all architectures.  
/trunk/boot/arch/arm32/loader/Makefile
/trunk/boot/arch/ia32/Makefile.inc
/trunk/boot/arch/ia32/grub/menu.lst
/trunk/boot/arch/ia32xen/Makefile.inc
/trunk/boot/arch/ia32xen/grub/menu.lst
/trunk/boot/arch/ia64/loader/Makefile
/trunk/boot/arch/mips32/loader/Makefile
/trunk/boot/arch/ppc32/loader/Makefile
/trunk/boot/arch/ppc64/loader/Makefile
/trunk/boot/arch/sparc64/loader/Makefile
/trunk/contrib/conf/ski.conf
2545 6099 d 6 h cejka /trunk/contrib/conf/ Added processor type into gxemul run script.  
/trunk/contrib/conf/gxemul.sh
2506 6150 d 1 h jermar /trunk/contrib/toolchain/ Update sparc64 toolchain script for gcc 4.2.1.  
/trunk/contrib/toolchain/toolchain.sparc64.sh
2479 6196 d 2 h jermar /trunk/ New, better-structured, directory layout for uspace.  
/trunk/uspace/app
/trunk/uspace/app/init
/trunk/uspace/app/klog
/trunk/uspace/app/tester
/trunk/uspace/app/tetris
/trunk/uspace/lib
/trunk/uspace/lib/libc
/trunk/uspace/lib/softfloat
/trunk/uspace/lib/softint
/trunk/uspace/srv
/trunk/uspace/srv/console
/trunk/uspace/srv/fb
/trunk/uspace/srv/fs
/trunk/uspace/srv/kbd
/trunk/uspace/srv/ns
/trunk/uspace/srv/pci
/trunk/uspace/srv/rd
/trunk/uspace/console
/trunk/uspace/fb
/trunk/uspace/fs
/trunk/uspace/init
/trunk/uspace/kbd
/trunk/uspace/klog
/trunk/uspace/libc
/trunk/uspace/ns
/trunk/uspace/pci
/trunk/uspace/rd
/trunk/uspace/softfloat
/trunk/uspace/softint
/trunk/uspace/tester
/trunk/uspace/tetris
/trunk/boot/arch/amd64/Makefile.inc
/trunk/boot/arch/arm32/loader/Makefile
/trunk/boot/arch/ia32/Makefile.inc
/trunk/boot/arch/ia32xen/Makefile.inc
/trunk/boot/arch/mips32/loader/Makefile
/trunk/boot/arch/ppc32/loader/Makefile
/trunk/boot/arch/ppc64/loader/Makefile
/trunk/boot/arch/sparc64/loader/Makefile
/trunk/contrib/conf/ski.conf
/trunk/uspace/Makefile
/trunk/uspace/app/init/Makefile
/trunk/uspace/app/klog/Makefile
/trunk/uspace/app/tester/Makefile
/trunk/uspace/app/tetris/Makefile
/trunk/uspace/app/tetris/input.c
/trunk/uspace/app/tetris/screen.c
/trunk/uspace/lib/libc/Makefile
/trunk/uspace/lib/libc/arch/amd64/_link.ld.in
/trunk/uspace/lib/libc/arch/arm32/Makefile.inc
/trunk/uspace/lib/libc/arch/arm32/_link.ld.in
/trunk/uspace/lib/libc/arch/ia32/_link.ld.in
/trunk/uspace/lib/libc/arch/ia64/Makefile.inc
/trunk/uspace/lib/libc/arch/ia64/_link.ld.in
/trunk/uspace/lib/libc/arch/mips32/Makefile.inc
/trunk/uspace/lib/libc/arch/mips32/_link.ld.in
/trunk/uspace/lib/libc/arch/ppc32/_link.ld.in
/trunk/uspace/lib/libc/arch/ppc64/_link.ld.in
/trunk/uspace/lib/libc/arch/sparc64/_link.ld.in
/trunk/uspace/srv/console/Makefile
/trunk/uspace/srv/fb/Makefile
/trunk/uspace/srv/fs/Makefile
/trunk/uspace/srv/kbd/Makefile
/trunk/uspace/srv/ns/Makefile
/trunk/uspace/srv/pci/Makefile
/trunk/uspace/srv/pci/libpci/Makefile
/trunk/uspace/srv/rd/Makefile
2226 6271 d 10 h decky /trunk/contrib/conf/ MIPS boot image has grown  
/trunk/contrib/conf/msim.conf
2185 6274 d 3 h decky /trunk/ rename ipcc to tester  
/trunk/uspace/tester
/trunk/uspace/ipcc
/trunk/boot/arch/amd64/Makefile.inc
/trunk/boot/arch/amd64/grub/menu.lst
/trunk/boot/arch/ia32/Makefile.inc
/trunk/boot/arch/ia32/grub/menu.lst
/trunk/boot/arch/ia32xen/Makefile.inc
/trunk/boot/arch/ia32xen/grub/menu.debug.lst
/trunk/boot/arch/ia32xen/grub/menu.lst
/trunk/boot/arch/mips32/loader/Makefile
/trunk/boot/arch/ppc32/loader/Makefile
/trunk/boot/arch/ppc64/loader/Makefile
/trunk/boot/arch/sparc64/loader/Makefile
/trunk/contrib/conf/ski.conf
/trunk/kernel/generic/src/lib/objc.c
/trunk/uspace/Makefile
/trunk/uspace/tester/Makefile
2139 6283 d 17 h decky /trunk/contrib/toolchain/ move to GCC 4.1.2, make scripts really host platform independent
remove orphaned libobjc
 
/trunk/contrib/toolchain/toolchain.amd64.sh
/trunk/contrib/toolchain/toolchain.arm32.sh
/trunk/contrib/toolchain/toolchain.ia32.sh
/trunk/contrib/toolchain/toolchain.ia64.sh
/trunk/contrib/toolchain/toolchain.mipseb32.sh
/trunk/contrib/toolchain/toolchain.mipsel32.sh
/trunk/contrib/toolchain/toolchain.ppc32.sh
/trunk/contrib/toolchain/toolchain.ppc64.sh
/trunk/contrib/toolchain/toolchain.sparc64.sh
2138 6283 d 20 h decky /trunk/contrib/toolchain/ revert previous change (libobjc is actually HOST platform dependent)  
/trunk/contrib/toolchain/toolchain.ia32.sh
2128 6326 d 21 h jermar /trunk/ Add arm32 architecture. The 32 suffix is used to specify that 16-bit Thumb
instructions are not used. The arm32 code is mostly composed of placeholders
that need to be replaced by real implementation. So far, the arm32 tree
only compiles. If run under GXEmul simulator, an infinit loop at the
kernel entry point will be entered.
 
/trunk/boot/arch/arm32
/trunk/boot/arch/arm32/Makefile.inc
/trunk/contrib/toolchain/toolchain.arm32.sh
/trunk/kernel/arch/arm32
/trunk/kernel/arch/arm32/Makefile.inc
/trunk/kernel/arch/arm32/_link.ld.in
/trunk/kernel/arch/arm32/include
/trunk/kernel/arch/arm32/include/arch.h
/trunk/kernel/arch/arm32/include/arg.h
/trunk/kernel/arch/arm32/include/asm.h
/trunk/kernel/arch/arm32/include/atomic.h
/trunk/kernel/arch/arm32/include/barrier.h
/trunk/kernel/arch/arm32/include/byteorder.h
/trunk/kernel/arch/arm32/include/context.h
/trunk/kernel/arch/arm32/include/cpu.h
/trunk/kernel/arch/arm32/include/cycle.h
/trunk/kernel/arch/arm32/include/debug.h
/trunk/kernel/arch/arm32/include/elf.h
/trunk/kernel/arch/arm32/include/exception.h
/trunk/kernel/arch/arm32/include/faddr.h
/trunk/kernel/arch/arm32/include/fpu_context.h
/trunk/kernel/arch/arm32/include/interrupt.h
/trunk/kernel/arch/arm32/include/memstr.h
/trunk/kernel/arch/arm32/include/mm
/trunk/kernel/arch/arm32/include/mm/as.h
/trunk/kernel/arch/arm32/include/mm/asid.h
/trunk/kernel/arch/arm32/include/mm/frame.h
/trunk/kernel/arch/arm32/include/mm/memory_init.h
/trunk/kernel/arch/arm32/include/mm/page.h
/trunk/kernel/arch/arm32/include/mm/tlb.h
/trunk/kernel/arch/arm32/include/proc
/trunk/kernel/arch/arm32/include/proc/task.h
/trunk/kernel/arch/arm32/include/proc/thread.h
/trunk/kernel/arch/arm32/include/types.h
/trunk/kernel/arch/arm32/src
/trunk/kernel/arch/arm32/src/arm32.c
/trunk/kernel/arch/arm32/src/context.S
/trunk/kernel/arch/arm32/src/cpu
/trunk/kernel/arch/arm32/src/cpu/cpu.c
/trunk/kernel/arch/arm32/src/ddi
/trunk/kernel/arch/arm32/src/ddi/ddi.c
/trunk/kernel/arch/arm32/src/dummy.S
/trunk/kernel/arch/arm32/src/mm
/trunk/kernel/arch/arm32/src/mm/as.c
/trunk/kernel/arch/arm32/src/mm/frame.c
/trunk/kernel/arch/arm32/src/mm/page.c
/trunk/kernel/arch/arm32/src/start.S
/trunk/uspace/kbd/arch/arm32
/trunk/uspace/kbd/arch/arm32/include
/trunk/uspace/kbd/arch/arm32/include/kbd.h
/trunk/uspace/kbd/arch/arm32/src
/trunk/uspace/kbd/arch/arm32/src/kbd.c
/trunk/uspace/libc/arch/arm32
/trunk/uspace/libc/arch/arm32/Makefile.inc
/trunk/uspace/libc/arch/arm32/_link.ld.in
/trunk/uspace/libc/arch/arm32/include
/trunk/uspace/libc/arch/arm32/include/atomic.h
/trunk/uspace/libc/arch/arm32/include/config.h
/trunk/uspace/libc/arch/arm32/include/endian.h
/trunk/uspace/libc/arch/arm32/include/faddr.h
/trunk/uspace/libc/arch/arm32/include/limits.h
/trunk/uspace/libc/arch/arm32/include/psthread.h
/trunk/uspace/libc/arch/arm32/include/stackarg.h
/trunk/uspace/libc/arch/arm32/include/syscall.h
/trunk/uspace/libc/arch/arm32/include/thread.h
/trunk/uspace/libc/arch/arm32/include/types.h
/trunk/uspace/libc/arch/arm32/src
/trunk/uspace/libc/arch/arm32/src/dummy.S
/trunk/uspace/libc/arch/arm32/src/entry.s
/trunk/uspace/libc/arch/arm32/src/psthread.S
/trunk/uspace/libc/arch/arm32/src/syscall.c
/trunk/uspace/libc/arch/arm32/src/thread.c
/trunk/uspace/libc/arch/arm32/src/thread_entry.s
/trunk/uspace/softfloat/arch/arm32
/trunk/uspace/softfloat/arch/arm32/include
/trunk/uspace/softfloat/arch/arm32/include/functions.h
/trunk/HelenOS.config
/trunk/Makefile
/trunk/boot/boot.config
/trunk/kernel/generic/include/lib/elf.h
/trunk/kernel/generic/src/mm/frame.c
/trunk/kernel/kernel.config
/trunk/uspace/libc/include/ctype.h
/trunk/uspace/uspace.config
2125 6327 d 20 h decky /trunk/ experimental support for Objective C
(disabled by default)
 
/trunk/kernel/generic/include/lib/objc.h
/trunk/kernel/generic/src/lib/objc.c
/trunk/contrib/toolchain/toolchain.ia32.sh
/trunk/contrib/toolchain/toolchain.sparc64.sh
/trunk/kernel/Makefile
/trunk/kernel/arch/amd64/Makefile.inc
/trunk/kernel/arch/ia32/Makefile.inc
/trunk/kernel/arch/ia32/src/mm/as.c
/trunk/kernel/arch/ia32xen/Makefile.inc
/trunk/kernel/arch/ia64/Makefile.inc
/trunk/kernel/arch/mips32/Makefile.inc
/trunk/kernel/arch/ppc32/Makefile.inc
/trunk/kernel/arch/ppc64/Makefile.inc
/trunk/kernel/arch/sparc64/Makefile.inc
/trunk/kernel/genarch/include/mm/page_pt.h
/trunk/kernel/genarch/src/mm/as_pt.c
/trunk/kernel/generic/include/memstr.h
/trunk/kernel/generic/include/mm/as.h
/trunk/kernel/generic/include/print.h
/trunk/kernel/generic/src/lib/memstr.c
/trunk/kernel/generic/src/mm/as.c
/trunk/kernel/generic/src/printf/vprintf.c
/trunk/kernel/kernel.config
2084 6348 d 2 h decky /trunk/contrib/toolchain/ get the extra headers back  
/trunk/contrib/toolchain/toolchain.ia64.sh
2077 6349 d 1 h decky /trunk/contrib/toolchain/ update toolchain scripts  
/trunk/contrib/toolchain/toolchain.ia64.sh
/trunk/contrib/toolchain/toolchain.mipseb32.sh
/trunk/contrib/toolchain/toolchain.mipsel32.sh
2074 6351 d 19 h decky /trunk/contrib/toolchain/ more toolchain scripts update  
/trunk/contrib/toolchain/toolchain.ppc32.sh
/trunk/contrib/toolchain/toolchain.ppc64.sh
/trunk/contrib/toolchain/toolchain.sparc64.sh
2073 6352 d 2 h decky /trunk/contrib/toolchain/ move to binutils 2.17, add support for Objective C, C++ and Objective C++ languages into the toolchain  
/trunk/contrib/toolchain/toolchain.amd64.sh
/trunk/contrib/toolchain/toolchain.ia32.sh
1913 6454 d 21 h jermar /trunk/contrib/conf/ Add sample configuration file for running HelenOS/sparc64 in Simics 3.0.  
/trunk/contrib/conf/HelenOS.sparc64.simics
1795 6537 d 16 h decky /trunk/contrib/ remove orphaned directory  
/trunk/contrib/arch
1794 6537 d 16 h decky /trunk/ move contrib from kernel/ to /
update Sparc64 toolchain to use Binutils 2.17 (neeeded for linking uspace)
 
/trunk/contrib
/trunk/contrib/arch/ia64
/trunk/kernel/contrib
/trunk/contrib/toolchain/toolchain.sparc64.sh
1787 6542 d 21 h decky / move kernel/trunk, uspace/trunk and boot/trunk to trunk/kernel, trunk/uspace and trunk/boot  
/trunk
/trunk/boot
/trunk/kernel
/trunk/uspace
/boot/trunk
/kernel/trunk
/uspace/trunk
1754 6564 d 4 h jermar /kernel/trunk/ Indentation and some improved comments.
Remove forgotten comment from gxemul.sh.
 
/kernel/trunk/arch/ia32/src/drivers/ega.c
/kernel/trunk/arch/ia32/src/drivers/i8254.c
/kernel/trunk/arch/ia32/src/drivers/i8259.c
/kernel/trunk/arch/ia32/src/drivers/vesa.c
/kernel/trunk/arch/mips32/src/exception.c
/kernel/trunk/contrib/conf/gxemul.sh
/kernel/trunk/genarch/src/i8042/i8042.c
1750 6565 d 17 h decky /kernel/trunk/contrib/conf/ get back -X removed by mistake  
/kernel/trunk/contrib/conf/gxemul.sh
1746 6565 d 18 h decky /kernel/trunk/ prepare GXEmul kernel to use the boot loader  
/kernel/trunk/arch/mips32/Makefile.inc
/kernel/trunk/contrib/conf/gxemul.sh
/kernel/trunk/kernel.config
1686 6574 d 5 h decky /kernel/trunk/ update mips32 boot loading API  
/kernel/trunk/arch/mips32/include/boot.h
/kernel/trunk/arch/mips32/src/mips32.c
/kernel/trunk/arch/mips32/src/start.S
/kernel/trunk/arch/ppc32/src/boot/boot.S
/kernel/trunk/contrib/conf/msim.conf
1678 6575 d 0 h jermar /kernel/trunk/ Load up to 8 userspace tasks on mips32.  
/kernel/trunk/arch/mips32/src/mips32.c
/kernel/trunk/contrib/conf/msim.conf
1635 6577 d 15 h decky /kernel/trunk/contrib/conf/ change default mouse grab hot-key (conflicting with kconsole)  
/kernel/trunk/contrib/conf/pearpc.conf
1601 6578 d 7 h jermar /kernel/trunk/ Support loading up to 8 userspace images on ia64.  
/kernel/trunk/arch/ia64/src/ia64.c
/kernel/trunk/contrib/conf/ski.conf
1541 6581 d 7 h jermar /kernel/trunk/ Modify ia64 to load 6 userspace tasks.
Tetris however makes the kernel fault on unaligned memory access in copy_from_uspace.
 
/kernel/trunk/arch/ia64/src/ia64.c
/kernel/trunk/contrib/conf/ski.conf
1537 6581 d 15 h palkovsky /kernel/trunk/ Added tetris to  
/kernel/trunk/arch/mips32/src/mips32.c
/kernel/trunk/contrib/conf/gxemul.sh
/kernel/trunk/contrib/conf/msim.conf
1527 6581 d 21 h jermar /kernel/trunk/contrib/conf/ Enable loading of kbd userspace driver in Ski sample configuration file.  
/kernel/trunk/contrib/conf/ski.conf