Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 558 → Rev 557

/shark/trunk/config/config.mk
File deleted
/shark/trunk/config/mk/linux.mk
55,7 → 55,7
ASM_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
ASM_MAC = -D__LINUX__ $(CFG_OPT)
 
LINK_OPT = -Bstatic -Ttext $(MEM_START) -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)
LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)
 
C_OPT = $(C_DEF) $(C_WARN) $(C_INC) $(C_MAC) $(C_FLAGS)
C_OUTPUT = -o $*.o
/shark/trunk/config/mk/gnu.mk
49,7 → 49,7
ASM_INC = -I$(INCL) -I$(OSLIB)
ASM_MAC = -D__GNU__ $(CFG_OPT)
 
LINK_OPT = -Bstatic -Ttext $(MEM_START) -b coff-go32 --oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)
LINK_OPT = -Bstatic -Ttext 0x1720000 -b coff-go32 --oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)
 
C_OPT = $(C_DEF) $(C_WARN) $(C_INC) $(C_MAC) $(C_FLAGS)
C_OUTPUT = -o $*.o
/shark/trunk/oslib/config.mk
File deleted
/shark/trunk/shark.cfg
3,14 → 3,6
# Oslib Configuration
#
 
# Kernel Image Start Point
# MEM_START = 0x220000
# The kernel image file will be loaded starting from this
# physical memory address. For DOS users it is important
# to set an high address (like 0x1720000) if you are using
# Smartdrive or other tools which require Extended Memory
MEM_START = 0x220000
 
# Enable the system time computation through TSC register
# Only Pentium or higher CPU class
TSC = TRUE
19,19 → 11,19
# Only P6 or higher CPU class, TSC support must be enabled
APIC = TRUE
 
# Enable TSC Read Timer Optimization
# TIMER_OPT = 1000 (For CPU < 1 GHz - Wraparound 585 years)
# TIMER_OPT = 2000 (For 1 GHz < CPU < 2 GHz - Wraparound 146 years)
# TIMER_OPT = 4000 (For 2 GHz < CPU < 4 GHz - Wraparound 36 years)
# TIMER_OPT = 8000 (For CPU < 8 GHz - Wraparound 292 years)
#Enable Read Timer Optimization
#TIMER_OPT = 1000 (For CPU < 1 GHz - Wraparound 585 years)
#TIMER_OPT = 2000 (For 1 GHz < CPU < 2 GHz - Wraparound 146 years)
#TIMER_OPT = 4000 (For 2 GHz < CPU < 4 GHz - Wraparound 36 years)
#TIMER_OPT = 8000 (For CPU < 8 GHz - Wraparound 292 years)
TIMER_OPT = 8000
 
# Select the events tracer
#Select the events tracer
# TRACER = "NO","OLD","NEW"
TRACER = "NO"
TRACER = "NEW"
 
# Select the BIOS INTERRUPT access mode
# BIOS = "X","VM86"
#Select the BIOS INTERRUPT access mode
#BIOS = "X","VM86"
# X means that you must use x.exe as shark loader
# if shark needs to call BIOS interrupt (Ex. to enable
# graphics)
38,11 → 30,11
# VM86 means that shark call the BIOS interrupts as
# Virtual Machine 86, and you can load a graphical
# demo also through GRUB. VM86 MODE IS NOT COMPATIBLE
# WITH SOME VGA CARDS (MATROX)
# WITH SOME VGA CARDS
BIOS = "X"
 
# Select the FrameBuffer Configuration
# FB = "VESA","FINDPCI","VGA16"
#Select the FrameBuffer Configuration
#FB = "VESA","FINDPCI","VGA16"
# VESA it uses the VBE interrupts to enable the
# selected video mode
# FINDPCI the FrameBuffer driver will try to find a
50,3 → 42,4
# use a specific driver to enable it
# VGA16 enable the VGA16 (4 bpp) video mode
FB = "VESA"