Index: kernel/arch/amd64/Makefile.inc
===================================================================
--- kernel/arch/amd64/Makefile.inc	(revision 912ee7cc7683564facff764984003a32d6ea1a7f)
+++ kernel/arch/amd64/Makefile.inc	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
@@ -30,8 +30,4 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 BFD_NAME = elf64-x86-64
 BFD_ARCH = i386:x86-64
@@ -46,5 +42,5 @@
 SUNCC_CFLAGS += -m64 -xmodel=kernel
 
-DEFS += -DMACHINE=$(MACHINE) -D__64_BITS__
+DEFS += -D__64_BITS__
 
 ## Accepted CPUs
@@ -56,77 +52,39 @@
 	ICC_CFLAGS += $(CMN2)
 	SUNCC_CFLAGS += -xtarget=opteron
-	DEFS += -DFENCES=p4
-endif
-
-## Own configuration directives
-#
-
-CONFIG_ACPI = y
-
-## Compile with hierarchical page tables support.
-#
-
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-
-## Compile with i8042 support.
-#
-
-CONFIG_I8042 = y
-DEFS += -DCONFIG_I8042
-
-## Compile with EGA support
-#
-
-CONFIG_EGA = y
-DEFS += -DCONFIG_EGA
-
-## Accepted configuration directives
-#
-
-ifeq ($(CONFIG_SMP),y)
-	DEFS += -DCONFIG_SMP
-endif
-ifeq ($(CONFIG_HT),y)
-	DEFS += -DCONFIG_HT
-endif
-
-ifeq ($(CONFIG_SIMICS_FIX),y)
-	DEFS += -DCONFIG_SIMICS_FIX
 endif
 
 ARCH_SOURCES = \
-	arch/$(ARCH)/src/fpu_context.c \
-	arch/$(ARCH)/src/boot/boot.S \
-	arch/$(ARCH)/src/boot/memmap.c \
-	arch/$(ARCH)/src/pm.c \
-	arch/$(ARCH)/src/context.S \
-	arch/$(ARCH)/src/ddi/ddi.c \
-	arch/$(ARCH)/src/drivers/vesa.c \
-	arch/$(ARCH)/src/drivers/i8254.c \
-	arch/$(ARCH)/src/drivers/i8259.c \
-	arch/$(ARCH)/src/delay.S \
-	arch/$(ARCH)/src/amd64.c \
-	arch/$(ARCH)/src/bios/bios.c \
-	arch/$(ARCH)/src/interrupt.c \
-	arch/$(ARCH)/src/mm/as.c \
-	arch/$(ARCH)/src/mm/frame.c \
-	arch/$(ARCH)/src/mm/page.c \
-	arch/$(ARCH)/src/mm/tlb.c \
-	arch/$(ARCH)/src/asm_utils.S \
-	arch/$(ARCH)/src/cpu/cpu.c \
-	arch/$(ARCH)/src/proc/scheduler.c \
-	arch/$(ARCH)/src/proc/task.c \
-	arch/$(ARCH)/src/proc/thread.c \
-	arch/$(ARCH)/src/userspace.c \
-	arch/$(ARCH)/src/syscall.c \
-	arch/$(ARCH)/src/debugger.c
+	arch/$(KARCH)/src/fpu_context.c \
+	arch/$(KARCH)/src/boot/boot.S \
+	arch/$(KARCH)/src/boot/memmap.c \
+	arch/$(KARCH)/src/pm.c \
+	arch/$(KARCH)/src/context.S \
+	arch/$(KARCH)/src/ddi/ddi.c \
+	arch/$(KARCH)/src/drivers/vesa.c \
+	arch/$(KARCH)/src/drivers/i8254.c \
+	arch/$(KARCH)/src/drivers/i8259.c \
+	arch/$(KARCH)/src/delay.S \
+	arch/$(KARCH)/src/amd64.c \
+	arch/$(KARCH)/src/bios/bios.c \
+	arch/$(KARCH)/src/interrupt.c \
+	arch/$(KARCH)/src/mm/as.c \
+	arch/$(KARCH)/src/mm/frame.c \
+	arch/$(KARCH)/src/mm/page.c \
+	arch/$(KARCH)/src/mm/tlb.c \
+	arch/$(KARCH)/src/asm_utils.S \
+	arch/$(KARCH)/src/cpu/cpu.c \
+	arch/$(KARCH)/src/proc/scheduler.c \
+	arch/$(KARCH)/src/proc/task.c \
+	arch/$(KARCH)/src/proc/thread.c \
+	arch/$(KARCH)/src/userspace.c \
+	arch/$(KARCH)/src/syscall.c \
+	arch/$(KARCH)/src/debugger.c
 
 ifeq ($(CONFIG_SMP),y)
 	ARCH_SOURCES += \
-		arch/$(ARCH)/src/smp/ap.S \
-		arch/$(ARCH)/src/smp/apic.c \
-		arch/$(ARCH)/src/smp/ipi.c \
-		arch/$(ARCH)/src/smp/mps.c \
-		arch/$(ARCH)/src/smp/smp.c
+		arch/$(KARCH)/src/smp/ap.S \
+		arch/$(KARCH)/src/smp/apic.c \
+		arch/$(KARCH)/src/smp/ipi.c \
+		arch/$(KARCH)/src/smp/mps.c \
+		arch/$(KARCH)/src/smp/smp.c
 endif
Index: kernel/arch/arm32/Makefile.inc
===================================================================
--- kernel/arch/arm32/Makefile.inc	(revision 912ee7cc7683564facff764984003a32d6ea1a7f)
+++ kernel/arch/arm32/Makefile.inc	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
@@ -30,8 +30,4 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm
@@ -41,8 +37,5 @@
 
 KERNEL_LOAD_ADDRESS = 0x80200000
-
-# ifeq ($(MACHINE), gxemul_testarm)
-	DMACHINE = MACHINE_GXEMUL_TESTARM
-# endif
+DMACHINE = MACHINE_GXEMUL_TESTARM
 
 ATSIGN = %
@@ -52,49 +45,22 @@
 DEFS += -D__32_BITS__ -DKERNEL_LOAD_ADDRESS=$(KERNEL_LOAD_ADDRESS) -D$(DMACHINE)
 
-# Compile with framebuffer support
-
-ifeq ($(CONFIG_FB), y)
-	DEFS += -DCONFIG_FB -DFB_INVERT_ENDIAN
-endif
-
-## Compile with hierarchical page tables support.
-#
-
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-
-## Compile with support for address space identifiers.
-#
-# no HW support for ASIDs
-#CONFIG_ASID = y
-#CONFIG_ASID_FIFO = y 
-
-## Compile with support with software division and multiplication.
-#
-
-CONFIG_SOFTINT = y
-
 ARCH_SOURCES = \
-	arch/$(ARCH)/src/start.S \
-	arch/$(ARCH)/src/asm.S \
-	arch/$(ARCH)/src/arm32.c \
-	arch/$(ARCH)/src/context.S \
-	arch/$(ARCH)/src/dummy.S \
-	arch/$(ARCH)/src/panic.S \
-	arch/$(ARCH)/src/cpu/cpu.c \
-	arch/$(ARCH)/src/ddi/ddi.c \
-	arch/$(ARCH)/src/interrupt.c \
-	arch/$(ARCH)/src/debug/print.c \
-	arch/$(ARCH)/src/console.c \
-	arch/$(ARCH)/src/exception.c \
-	arch/$(ARCH)/src/userspace.c \
-	arch/$(ARCH)/src/mm/as.c \
-	arch/$(ARCH)/src/mm/frame.c \
-	arch/$(ARCH)/src/mm/page.c \
-	arch/$(ARCH)/src/mm/tlb.c \
-	arch/$(ARCH)/src/mm/page_fault.c
-
-# ifeq ($(MACHINE), gxemul_testarm)
-	ARCH_SOURCES += arch/$(ARCH)/src/drivers/gxemul.c
-# endif
-
+	arch/$(KARCH)/src/start.S \
+	arch/$(KARCH)/src/asm.S \
+	arch/$(KARCH)/src/arm32.c \
+	arch/$(KARCH)/src/context.S \
+	arch/$(KARCH)/src/dummy.S \
+	arch/$(KARCH)/src/panic.S \
+	arch/$(KARCH)/src/cpu/cpu.c \
+	arch/$(KARCH)/src/ddi/ddi.c \
+	arch/$(KARCH)/src/interrupt.c \
+	arch/$(KARCH)/src/debug/print.c \
+	arch/$(KARCH)/src/console.c \
+	arch/$(KARCH)/src/exception.c \
+	arch/$(KARCH)/src/userspace.c \
+	arch/$(KARCH)/src/mm/as.c \
+	arch/$(KARCH)/src/mm/frame.c \
+	arch/$(KARCH)/src/mm/page.c \
+	arch/$(KARCH)/src/mm/tlb.c \
+	arch/$(KARCH)/src/mm/page_fault.c \
+	arch/$(KARCH)/src/drivers/gxemul.c
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision 912ee7cc7683564facff764984003a32d6ea1a7f)
+++ kernel/arch/ia32/Makefile.inc	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
@@ -30,8 +30,4 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 BFD_NAME = elf32-i386
 BFD_ARCH = i386
@@ -40,5 +36,5 @@
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686
 
-DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
+DEFS += -D__32_BITS__
 
 CMN1 = -m32
@@ -53,29 +49,20 @@
 	CMN2 = -march=athlon-xp
 	SUNCC_CFLAGS += -xarch=ssea
-	DEFS += -DCONFIG_FENCES_P3
-	CONFIG_SMP = n
-	CONFIG_HT = n
 endif
 ifeq ($(MACHINE),athlon-mp)
 	CMN2 = -march=athlon-mp
 	SUNCC_CFLAGS += xarch=ssea
-	DEFS += -DCONFIG_FENCES_P3
-	CONFIG_HT = n
 endif
 ifeq ($(MACHINE),pentium3)
 	CMN2 = -march=pentium3
 	SUNCC_CFLAGS += -xarch=sse
-	DEFS += -DCONFIG_FENCES_P3
-	CONFIG_HT = n
 endif
 ifeq ($(MACHINE),pentium4)
 	CMN2 = -march=pentium4
 	SUNCC_CFLAGS += -xarch=sse2
-	DEFS += -DCONFIG_FENCES_P4
 endif
 ifeq ($(MACHINE),core)
 	CMN2 = -march=prescott
 	SUNCC_CFLAGS += -xarch=sse3
-	DEFS += -DCONFIG_FENCES_P4
 endif
 
@@ -84,76 +71,35 @@
 ICC_CFLAGS += $(CMN2)
 
-## Own configuration directives
-#
-
-CONFIG_ACPI = y
-
-## Compile with hierarchical page tables support.
-#
-
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-
-## Compile with i8042 controller support
-#
-
-CONFIG_I8042 = y
-DEFS += -DCONFIG_I8042
-
-## Compile with EGA support
-#
-
-CONFIG_EGA = y
-DEFS += -DCONFIG_EGA
-
-## Accepted configuration directives
-#
-
-ifeq ($(CONFIG_SMP),y)
-	DEFS += -DCONFIG_SMP
-endif
-ifeq ($(CONFIG_HT),y)
-	DEFS += -DCONFIG_HT
-endif
-ifeq ($(CONFIG_SIMICS_FIX),y)
-	DEFS += -DCONFIG_SIMICS_FIX
-endif
-
-## Compile with support for software integer division.
-#
-
-CONFIG_SOFTINT = y
-
 ARCH_SOURCES = \
-	arch/$(ARCH)/src/context.S \
-	arch/$(ARCH)/src/debug/panic.s \
-	arch/$(ARCH)/src/delay.s \
-	arch/$(ARCH)/src/asm.S \
-	arch/$(ARCH)/src/proc/scheduler.c \
-	arch/$(ARCH)/src/proc/task.c \
-	arch/$(ARCH)/src/proc/thread.c \
-	arch/$(ARCH)/src/bios/bios.c \
-	arch/$(ARCH)/src/smp/ap.S \
-	arch/$(ARCH)/src/smp/apic.c \
-	arch/$(ARCH)/src/smp/mps.c \
-	arch/$(ARCH)/src/smp/smp.c \
-	arch/$(ARCH)/src/atomic.S \
-	arch/$(ARCH)/src/smp/ipi.c \
-	arch/$(ARCH)/src/ia32.c \
-	arch/$(ARCH)/src/interrupt.c \
-	arch/$(ARCH)/src/pm.c \
-	arch/$(ARCH)/src/userspace.c \
-	arch/$(ARCH)/src/cpu/cpu.c \
-	arch/$(ARCH)/src/mm/as.c \
-	arch/$(ARCH)/src/mm/frame.c \
-	arch/$(ARCH)/src/mm/page.c \
-	arch/$(ARCH)/src/mm/tlb.c \
-	arch/$(ARCH)/src/ddi/ddi.c \
-	arch/$(ARCH)/src/drivers/i8254.c \
-	arch/$(ARCH)/src/drivers/i8259.c \
-	arch/$(ARCH)/src/drivers/vesa.c \
-	arch/$(ARCH)/src/boot/boot.S \
-	arch/$(ARCH)/src/boot/memmap.c \
-	arch/$(ARCH)/src/fpu_context.c \
-	arch/$(ARCH)/src/debugger.c \
-	arch/$(ARCH)/src/syscall.c
+	arch/$(KARCH)/src/context.S \
+	arch/$(KARCH)/src/debug/panic.s \
+	arch/$(KARCH)/src/delay.s \
+	arch/$(KARCH)/src/asm.S \
+	arch/$(KARCH)/src/proc/scheduler.c \
+	arch/$(KARCH)/src/proc/task.c \
+	arch/$(KARCH)/src/proc/thread.c \
+	arch/$(KARCH)/src/bios/bios.c \
+	arch/$(KARCH)/src/smp/ap.S \
+	arch/$(KARCH)/src/smp/apic.c \
+	arch/$(KARCH)/src/smp/mps.c \
+	arch/$(KARCH)/src/smp/smp.c \
+	arch/$(KARCH)/src/atomic.S \
+	arch/$(KARCH)/src/smp/ipi.c \
+	arch/$(KARCH)/src/ia32.c \
+	arch/$(KARCH)/src/interrupt.c \
+	arch/$(KARCH)/src/pm.c \
+	arch/$(KARCH)/src/userspace.c \
+	arch/$(KARCH)/src/cpu/cpu.c \
+	arch/$(KARCH)/src/mm/as.c \
+	arch/$(KARCH)/src/mm/frame.c \
+	arch/$(KARCH)/src/mm/page.c \
+	arch/$(KARCH)/src/mm/tlb.c \
+	arch/$(KARCH)/src/ddi/ddi.c \
+	arch/$(KARCH)/src/drivers/i8254.c \
+	arch/$(KARCH)/src/drivers/i8259.c \
+	arch/$(KARCH)/src/drivers/vesa.c \
+	arch/$(KARCH)/src/boot/boot.S \
+	arch/$(KARCH)/src/boot/memmap.c \
+	arch/$(KARCH)/src/fpu_context.c \
+	arch/$(KARCH)/src/debugger.c \
+	arch/$(KARCH)/src/syscall.c
Index: kernel/arch/ia64/Makefile.inc
===================================================================
--- kernel/arch/ia64/Makefile.inc	(revision 912ee7cc7683564facff764984003a32d6ea1a7f)
+++ kernel/arch/ia64/Makefile.inc	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
@@ -30,8 +30,4 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 BFD_NAME = elf64-little
 BFD_ARCH = ia64-elf64
@@ -46,45 +42,28 @@
 AFLAGS += -mconstant-gp
 
-DEFS += -D__64_BITS__ -D$(MACHINE)
-
-## Compile with page hash table support.
-#
-
-CONFIG_PAGE_HT = y
-DEFS += -DCONFIG_PAGE_HT
-
-## Compile with support for address space identifiers.
-#
-
-CONFIG_ASID = y
-CONFIG_ASID_FIFO = y
-
-## Compile with support for software integer division.
-#
-
-CONFIG_SOFTINT = y
+DEFS += -D__64_BITS__
 
 ARCH_SOURCES = \
-	arch/$(ARCH)/src/start.S \
-	arch/$(ARCH)/src/asm.S \
-	arch/$(ARCH)/src/dummy.s \
-	arch/$(ARCH)/src/ia64.c \
-	arch/$(ARCH)/src/fpu_context.c \
-	arch/$(ARCH)/src/context.S \
-	arch/$(ARCH)/src/cpu/cpu.c \
-	arch/$(ARCH)/src/ivt.S \
-	arch/$(ARCH)/src/interrupt.c \
-	arch/$(ARCH)/src/mm/as.c \
-	arch/$(ARCH)/src/mm/frame.c \
-	arch/$(ARCH)/src/mm/page.c \
-	arch/$(ARCH)/src/mm/tlb.c \
-	arch/$(ARCH)/src/mm/vhpt.c \
-	arch/$(ARCH)/src/proc/scheduler.c \
-	arch/$(ARCH)/src/ddi/ddi.c \
-	arch/$(ARCH)/src/smp/smp.c \
-	arch/$(ARCH)/src/drivers/it.c
+	arch/$(KARCH)/src/start.S \
+	arch/$(KARCH)/src/asm.S \
+	arch/$(KARCH)/src/dummy.s \
+	arch/$(KARCH)/src/ia64.c \
+	arch/$(KARCH)/src/fpu_context.c \
+	arch/$(KARCH)/src/context.S \
+	arch/$(KARCH)/src/cpu/cpu.c \
+	arch/$(KARCH)/src/ivt.S \
+	arch/$(KARCH)/src/interrupt.c \
+	arch/$(KARCH)/src/mm/as.c \
+	arch/$(KARCH)/src/mm/frame.c \
+	arch/$(KARCH)/src/mm/page.c \
+	arch/$(KARCH)/src/mm/tlb.c \
+	arch/$(KARCH)/src/mm/vhpt.c \
+	arch/$(KARCH)/src/proc/scheduler.c \
+	arch/$(KARCH)/src/ddi/ddi.c \
+	arch/$(KARCH)/src/smp/smp.c \
+	arch/$(KARCH)/src/drivers/it.c
 
 ifeq ($(MACHINE),ski)
-	ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c 
+	ARCH_SOURCES += arch/$(KARCH)/src/ski/ski.c
 	DEFS += -DSKI
 	BFD = binary
@@ -92,12 +71,5 @@
 
 ifeq ($(MACHINE),i460GX)
-	CONFIG_I8042 = y
-	CONFIG_EGA = y
-	DEFS += -DI460GX -DCONFIG_I8042 -DCONFIG_EGA
+	DEFS += -DI460GX
 	BFD = binary
 endif
-
-ifeq ($(CONFIG_SMP),y)
-	DEFS += -DCONFIG_SMP
-endif
-
Index: kernel/arch/mips32/Makefile.inc
===================================================================
--- kernel/arch/mips32/Makefile.inc	(revision 912ee7cc7683564facff764984003a32d6ea1a7f)
+++ kernel/arch/mips32/Makefile.inc	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
@@ -30,8 +30,4 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 BFD_ARCH = mips
 TARGET = mipsel-linux-gnu
@@ -42,17 +38,5 @@
 GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
 
-DEFS += -D__32_BITS__ -DMACHINE=$(MACHINE) -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} 
-
-## Compile with hierarchical page tables support.
-#
-
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-
-## Compile with support for address space identifiers.
-#
-
-CONFIG_ASID = y
-CONFIG_ASID_FIFO = y
+DEFS += -D__32_BITS__ -D$(MACHINE) -DKERNEL_LOAD_ADDRESS=$(KERNEL_LOAD_ADDRESS)
 
 ## Accepted MACHINEs
@@ -62,5 +46,5 @@
 	BFD_NAME = elf32-tradlittlemips
 	BFD = binary
-	GCC_CFLAGS += -DFB_INVERT_ENDIAN -DARCH_HAS_FPU -mips3
+	GCC_CFLAGS += -mips3
 endif
 ifeq ($(MACHINE),bgxemul)
@@ -69,5 +53,5 @@
 	TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips
 	TARGET = mips-sgi-irix5
-	GCC_CFLAGS += -EB -DBIG_ENDIAN -DARCH_HAS_FPU -mips3
+	GCC_CFLAGS += -EB -DBIG_ENDIAN -mips3
 endif
 ifeq ($(MACHINE),simics)
@@ -86,30 +70,24 @@
 endif
 
-## Compile with support for software integer division.
-#
-
-CONFIG_SOFTINT = y
-
-
 ARCH_SOURCES = \
-	arch/$(ARCH)/src/start.S \
-	arch/$(ARCH)/src/context.S \
-	arch/$(ARCH)/src/panic.S \
-	arch/$(ARCH)/src/mips32.c \
-	arch/$(ARCH)/src/dummy.S \
-	arch/$(ARCH)/src/console.c \
-	arch/$(ARCH)/src/asm.S \
-	arch/$(ARCH)/src/exception.c \
-	arch/$(ARCH)/src/interrupt.c \
-	arch/$(ARCH)/src/cache.c \
-	arch/$(ARCH)/src/debugger.c \
-	arch/$(ARCH)/src/cpu/cpu.c \
-	arch/$(ARCH)/src/mm/frame.c \
-	arch/$(ARCH)/src/mm/page.c \
-	arch/$(ARCH)/src/mm/tlb.c \
-	arch/$(ARCH)/src/mm/as.c \
-	arch/$(ARCH)/src/fpu_context.c \
-	arch/$(ARCH)/src/ddi/ddi.c \
-	arch/$(ARCH)/src/drivers/msim.c \
-	arch/$(ARCH)/src/drivers/serial.c \
-	arch/$(ARCH)/src/smp/order.c
+	arch/$(KARCH)/src/start.S \
+	arch/$(KARCH)/src/context.S \
+	arch/$(KARCH)/src/panic.S \
+	arch/$(KARCH)/src/mips32.c \
+	arch/$(KARCH)/src/dummy.S \
+	arch/$(KARCH)/src/console.c \
+	arch/$(KARCH)/src/asm.S \
+	arch/$(KARCH)/src/exception.c \
+	arch/$(KARCH)/src/interrupt.c \
+	arch/$(KARCH)/src/cache.c \
+	arch/$(KARCH)/src/debugger.c \
+	arch/$(KARCH)/src/cpu/cpu.c \
+	arch/$(KARCH)/src/mm/frame.c \
+	arch/$(KARCH)/src/mm/page.c \
+	arch/$(KARCH)/src/mm/tlb.c \
+	arch/$(KARCH)/src/mm/as.c \
+	arch/$(KARCH)/src/fpu_context.c \
+	arch/$(KARCH)/src/ddi/ddi.c \
+	arch/$(KARCH)/src/drivers/msim.c \
+	arch/$(KARCH)/src/drivers/serial.c \
+	arch/$(KARCH)/src/smp/order.c
Index: kernel/arch/ppc32/Makefile.inc
===================================================================
--- kernel/arch/ppc32/Makefile.inc	(revision 912ee7cc7683564facff764984003a32d6ea1a7f)
+++ kernel/arch/ppc32/Makefile.inc	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
@@ -30,8 +30,4 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 BFD_NAME = elf32-powerpc
 BFD_ARCH = powerpc:common
@@ -46,43 +42,21 @@
 DEFS += -D__32_BITS__
 
-## Own configuration directives
-#
-
-CONFIG_FB = y
-
-## Compile with hierarchical page tables support.
-#
-
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-
-## Compile with support for address space identifiers.
-#
-
-CONFIG_ASID = y
-CONFIG_ASID_FIFO = y
-
-## Compile with support for software integer division.
-#
-
-CONFIG_SOFTINT = y
-
 ARCH_SOURCES = \
-	arch/$(ARCH)/src/context.S \
-	arch/$(ARCH)/src/debug/panic.s \
-	arch/$(ARCH)/src/fpu_context.S \
-	arch/$(ARCH)/src/boot/boot.S \
-	arch/$(ARCH)/src/ppc32.c \
-	arch/$(ARCH)/src/dummy.s \
-	arch/$(ARCH)/src/exception.S \
-	arch/$(ARCH)/src/interrupt.c \
-	arch/$(ARCH)/src/asm.S \
-	arch/$(ARCH)/src/cpu/cpu.c \
-	arch/$(ARCH)/src/proc/scheduler.c \
-	arch/$(ARCH)/src/ddi/ddi.c \
-	arch/$(ARCH)/src/drivers/cuda.c \
-	arch/$(ARCH)/src/mm/as.c \
-	arch/$(ARCH)/src/mm/frame.c \
-	arch/$(ARCH)/src/mm/page.c \
-	arch/$(ARCH)/src/mm/tlb.c \
-	arch/$(ARCH)/src/drivers/pic.c
+	arch/$(KARCH)/src/context.S \
+	arch/$(KARCH)/src/debug/panic.s \
+	arch/$(KARCH)/src/fpu_context.S \
+	arch/$(KARCH)/src/boot/boot.S \
+	arch/$(KARCH)/src/ppc32.c \
+	arch/$(KARCH)/src/dummy.s \
+	arch/$(KARCH)/src/exception.S \
+	arch/$(KARCH)/src/interrupt.c \
+	arch/$(KARCH)/src/asm.S \
+	arch/$(KARCH)/src/cpu/cpu.c \
+	arch/$(KARCH)/src/proc/scheduler.c \
+	arch/$(KARCH)/src/ddi/ddi.c \
+	arch/$(KARCH)/src/drivers/cuda.c \
+	arch/$(KARCH)/src/mm/as.c \
+	arch/$(KARCH)/src/mm/frame.c \
+	arch/$(KARCH)/src/mm/page.c \
+	arch/$(KARCH)/src/mm/tlb.c \
+	arch/$(KARCH)/src/drivers/pic.c
Index: kernel/arch/sparc64/Makefile.inc
===================================================================
--- kernel/arch/sparc64/Makefile.inc	(revision 912ee7cc7683564facff764984003a32d6ea1a7f)
+++ kernel/arch/sparc64/Makefile.inc	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
@@ -30,8 +30,4 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 BFD_NAME = elf64-sparc
 BFD_ARCH = sparc
@@ -47,46 +43,6 @@
 DEFS += -D__64_BITS__
 
-## Own configuration directives
-#
-
-## Compile with page hash table support.
-#
-
-CONFIG_PAGE_HT = y
-DEFS += -DCONFIG_PAGE_HT
-
-## Compile with support for address space identifiers.
-#
-
-CONFIG_ASID = y
-CONFIG_ASID_FIFO = y
-
-## Compile with support for framebuffer.
-#
-
 ifeq ($(MACHINE),us)
-	CONFIG_FB = y
-endif
-
-## Compile with support for Sun keyboard.
-#
-
-CONFIG_SUN_KBD = y
-
-## Compile with support for OpenFirmware device tree.
-#
-
-CONFIG_OFW_TREE = y
-
-ifeq ($(CONFIG_SMP),y)
-	DEFS += -DCONFIG_SMP
-endif
-
-ifeq ($(CONFIG_SGCN),y)
-        DEFS += -DCONFIG_SGCN
-endif
-
-ifeq ($(MACHINE),us)
-    DEFS += -DUS
+	DEFS += -DUS
 endif
 
@@ -96,49 +52,49 @@
 
 ARCH_SOURCES = \
-	arch/$(ARCH)/src/cpu/cpu.c \
-	arch/$(ARCH)/src/asm.S \
-	arch/$(ARCH)/src/panic.S \
-	arch/$(ARCH)/src/console.c \
-	arch/$(ARCH)/src/context.S \
-	arch/$(ARCH)/src/fpu_context.c \
-	arch/$(ARCH)/src/dummy.s \
-	arch/$(ARCH)/src/mm/as.c \
-	arch/$(ARCH)/src/mm/cache.S \
-	arch/$(ARCH)/src/mm/frame.c \
-	arch/$(ARCH)/src/mm/page.c \
-	arch/$(ARCH)/src/mm/tlb.c \
-	arch/$(ARCH)/src/sparc64.c \
-	arch/$(ARCH)/src/start.S \
-	arch/$(ARCH)/src/proc/scheduler.c \
-	arch/$(ARCH)/src/proc/thread.c \
-	arch/$(ARCH)/src/trap/mmu.S \
-	arch/$(ARCH)/src/trap/trap_table.S \
-	arch/$(ARCH)/src/trap/trap.c \
-	arch/$(ARCH)/src/trap/exception.c \
-	arch/$(ARCH)/src/trap/interrupt.c \
-	arch/$(ARCH)/src/ddi/ddi.c \
-	arch/$(ARCH)/src/drivers/tick.c \
-	arch/$(ARCH)/src/drivers/kbd.c \
-	arch/$(ARCH)/src/drivers/sgcn.c \
-	arch/$(ARCH)/src/drivers/pci.c
+	arch/$(KARCH)/src/cpu/cpu.c \
+	arch/$(KARCH)/src/asm.S \
+	arch/$(KARCH)/src/panic.S \
+	arch/$(KARCH)/src/console.c \
+	arch/$(KARCH)/src/context.S \
+	arch/$(KARCH)/src/fpu_context.c \
+	arch/$(KARCH)/src/dummy.s \
+	arch/$(KARCH)/src/mm/as.c \
+	arch/$(KARCH)/src/mm/cache.S \
+	arch/$(KARCH)/src/mm/frame.c \
+	arch/$(KARCH)/src/mm/page.c \
+	arch/$(KARCH)/src/mm/tlb.c \
+	arch/$(KARCH)/src/sparc64.c \
+	arch/$(KARCH)/src/start.S \
+	arch/$(KARCH)/src/proc/scheduler.c \
+	arch/$(KARCH)/src/proc/thread.c \
+	arch/$(KARCH)/src/trap/mmu.S \
+	arch/$(KARCH)/src/trap/trap_table.S \
+	arch/$(KARCH)/src/trap/trap.c \
+	arch/$(KARCH)/src/trap/exception.c \
+	arch/$(KARCH)/src/trap/interrupt.c \
+	arch/$(KARCH)/src/ddi/ddi.c \
+	arch/$(KARCH)/src/drivers/tick.c \
+	arch/$(KARCH)/src/drivers/kbd.c \
+	arch/$(KARCH)/src/drivers/sgcn.c \
+	arch/$(KARCH)/src/drivers/pci.c
 
 ifeq ($(CONFIG_FB),y)
 	ARCH_SOURCES += \
-		arch/$(ARCH)/src/drivers/scr.c
+		arch/$(KARCH)/src/drivers/scr.c
 endif
 
 ifeq ($(CONFIG_SMP),y)
-ARCH_SOURCES += \
-	arch/$(ARCH)/src/smp/ipi.c \
-	arch/$(ARCH)/src/smp/smp.c
+	ARCH_SOURCES += \
+		arch/$(KARCH)/src/smp/ipi.c \
+		arch/$(KARCH)/src/smp/smp.c
 endif
 
 ifeq ($(CONFIG_TSB),y)
-ARCH_SOURCES += \
-	arch/$(ARCH)/src/mm/tsb.c
+	ARCH_SOURCES += \
+		arch/$(KARCH)/src/mm/tsb.c
 endif
 
 ifdef CONFIG_Z8530
-ARCH_SOURCES += \
-	arch/$(ARCH)/src/drivers/fhc.c
+	ARCH_SOURCES += \
+		arch/$(KARCH)/src/drivers/fhc.c
 endif