Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision b1747a566f73b656e2bbf679b8136ecb0a61b9b4) +++ kernel/Makefile (revision 4cc0c9ee2a2687bb25d47f35bb2087c5d1aa7227) @@ -31,6 +31,6 @@ # --include ../version --include Makefile.config +include ../version +-include ../Makefile.config INCLUDES = generic/include @@ -360,20 +360,13 @@ GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES))) -.PHONY: all build config distclean clean archlinks depend disasm - -all: - ../tools/config.py kernel.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG) $(MACHINE) +.PHONY: all build clean archlinks depend disasm + +all: ../Makefile.config + -rm Makefile.depend $(MAKE) -C . build build: kernel.bin disasm -config: - -rm Makefile.depend - ../tools/config.py kernel.config - -include Makefile.depend - -distclean: clean - -rm Makefile.config clean: Index: kernel/kernel.config =================================================================== --- kernel/kernel.config (revision b1747a566f73b656e2bbf679b8136ecb0a61b9b4) +++ (revision ) @@ -1,191 +1,0 @@ -# -# Copyright (c) 2006 Ondrej Palkovsky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -## General configuration directives - -# Architecture -@ "amd64" AMD64/Intel EM64T -@ "arm32" ARM 32-bit -@ "ia32" Intel IA-32 -@ "ia32xen" Intel IA-32 on Xen hypervisor -@ "ia64" Intel IA-64 -@ "mips32" MIPS 32-bit -@ "ppc32" PowerPC 32-bit -@ "ppc64" PowerPC 64-bit -@ "sparc64" Sun UltraSPARC 64-bit -! ARCH (choice) - -# Compiler -@ "gcc_cross" GCC Cross-compiler -@ "gcc_native" GCC Native -@ "icc_native" ICC Native -@ "suncc_native" Sun Studio C Compiler -! [ARCH=amd64|ARCH=ia32|ARCH=ia32xen] COMPILER (choice) - -# Compiler -@ "gcc_cross" GCC Cross-compiler -@ "gcc_native" GCC Native -@ "icc_native" ICC Native -! [ARCH=ia64] COMPILER (choice) - -# Compiler -@ "gcc_cross" GCC Cross-compiler -@ "gcc_native" GCC Native -@ "suncc_native" Sun Studio C Compiler -! [ARCH=sparc64] COMPILER (choice) - -# Compiler -@ "gcc_cross" GCC Cross-compiler -@ "gcc_native" GCC Native -! [ARCH=arm32|ARCH=mips32|ARCH=ppc32|ARCH=ppc64] COMPILER (choice) - -# CPU type -@ "pentium4" Pentium 4 -@ "pentium3" Pentium 3 -@ "core" Core Solo/Duo -@ "athlon-xp" Athlon XP -@ "athlon-mp" Athlon MP -! [ARCH=ia32|ARCH=ia32xen] MACHINE (choice) - -# CPU type -@ "opteron" Opteron -! [ARCH=amd64] MACHINE (choice) - -# CPU type -@ "us" UltraSPARC I-II subarchitecture -@ "us3" UltraSPARC III-IV subarchitecture -! [ARCH=sparc64] MACHINE (choice) - -# Machine type -@ "msim" MSIM Simulator -@ "simics" Virtutech Simics simulator -@ "lgxemul" GXEmul Little Endian -@ "bgxemul" GXEmul Big Endian -! [ARCH=mips32] MACHINE (choice) - -# Framebuffer support -! [(ARCH=mips32&MACHINE=lgxemul)|(ARCH=mips32&MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)|(ARCH=arm32)] CONFIG_FB (y/n) - -# Framebuffer width -@ "640" -@ "800" -@ "1024" -@ "1152" -@ "1280" -@ "1400" -@ "1440" -@ "1600" -@ "2048" -! [(ARCH=ia32|ARCH=amd64)&CONFIG_FB=y] CONFIG_VESA_WIDTH (choice) - -# Framebuffer height -@ "480" -@ "600" -@ "768" -@ "852" -@ "900" -@ "960" -@ "1024" -@ "1050" -@ "1200" -@ "1536" -! [(ARCH=ia32|ARCH=amd64)&CONFIG_FB=y] CONFIG_VESA_HEIGHT (choice) - -# Framebuffer depth -@ "8" -@ "16" -@ "24" -! [(ARCH=ia32|ARCH=amd64)&CONFIG_FB=y] CONFIG_VESA_BPP (choice) - -# Support for SMP -! [ARCH=ia32|ARCH=amd64|ARCH=ia32xen|ARCH=sparc64|ARCH=ia64] CONFIG_SMP (y/n) - -# Improved support for hyperthreading -! [(ARCH=ia32|ARCH=amd64|ARCH=ia32xen)&CONFIG_SMP=y] CONFIG_HT (y/n) - -# Simics BIOS AP boot fix -! [(ARCH=ia32|ARCH=amd64)&CONFIG_SMP=y] CONFIG_SIMICS_FIX (y/n) - -# Lazy FPU context switching -! [(ARCH=mips32&MACHINE!=msim&MACHINE!=simics)|ARCH=amd64|ARCH=ia32|ARCH=ia64|ARCH=sparc64|ARCH=ia32xen] CONFIG_FPU_LAZY (y/n) - -# Use VHPT -! [ARCH=ia64] CONFIG_VHPT (n/y) - -# Use TSB -! [ARCH=sparc64] CONFIG_TSB (y/n) - -# Support for Z8530 serial port -! [ARCH=sparc64] CONFIG_Z8530 (y/n) - -# Support for NS16550 serial port -! [ARCH=sparc64|(ARCH=ia64&MACHINE!=ski)] CONFIG_NS16550 (n/y) - -# Support for Serengeti console -! [ARCH=sparc64] CONFIG_SGCN (y/n) - -# IOSapic on default address support -! [ARCH=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n) - -# Interrupt-driven driver for Legacy Keyboard? -! [CONFIG_NS16550=n&CONFIG_IOSAPIC=y&MACHINE!=ski] CONFIG_I8042_INTERRUPT_DRIVEN (y/n) - -# Interrupt-driven driver for NS16550? -! [CONFIG_NS16550=y&((ARCH!=ia64)|CONFIG_IOSAPIC=y)&MACHINE!=ski] CONFIG_NS16550_INTERRUPT_DRIVEN (y/n) - -# Virtually indexed D-cache support -! [ARCH=sparc64] CONFIG_VIRT_IDX_DCACHE (y/n) - -# Support for userspace debuggers -! CONFIG_UDEBUG (n/y) - -## Debugging configuration directives - -# General debugging and assert checking -! CONFIG_DEBUG (y/n) - -# Kernel console support -! CONFIG_KCONSOLE (y/n) - -# Detailed kernel logging -! CONFIG_LOG (n/y) - -# Deadlock detection support for spinlocks -! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n) - -# Watchpoint on rewriting AS with zero -! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=ia32|ARCH=ia32xen)] CONFIG_DEBUG_AS_WATCHPOINT (y/n) - -# Save all interrupt registers -! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=mips32|ARCH=ia32|ARCH=ia32xen)] CONFIG_DEBUG_ALLREGS (y/n) - - -## Run-time configuration directives - -# Compile kernel tests -! CONFIG_TEST (y/n)