Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 1801 → Rev 1802

/trunk/uspace/tools/config.py
File deleted
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property
/trunk/uspace/uspace.config
8,26 → 8,13
@ "mips32eb" MIPS 32-bit Big Endian
@ "ppc32" PowerPC 32-bit
@ "ppc64" PowerPC 64-bit
@ "sparc64" Sun UltraSPARC 64-bit
! ARCH (choice)
 
# IA32 Compiler
# Compiler
@ "cross" Cross-compiler
@ "native" Native
! [ARCH=ia32] IA32_COMPILER (choice)
% [ARCH=ia32] SAVEAS IA32_COMPILER COMPILER
! COMPILER (choice)
 
# PPC32 Compiler
@ "cross" Cross-compiler
@ "native" Native
! [ARCH=ppc32] PPC32_COMPILER (choice)
% [ARCH=ppc32] SAVEAS PPC32_COMPILER COMPILER
 
# PPC64 Compiler
@ "cross" Cross-compiler
@ "native" Native
! [ARCH=ppc64] PPC64_COMPILER (choice)
% [ARCH=ppc64] SAVEAS PPC64_COMPILER COMPILER
 
# MIPS FPU support
! [ARCH=mips32|ARCH=mips32eb] CONFIG_MIPS_FPU (n/y)
 
# General debuging and assert checking
! CONFIG_DEBUG (y/n)
/trunk/uspace/Makefile
29,6 → 29,7
## Include configuration
#
 
-include ../version
-include Makefile.config
 
DIRS = \
47,12 → 48,19
ifeq ($(ARCH), amd64)
DIRS += pci
endif
 
ifeq ($(ARCH), ia32)
DIRS += pci
endif
 
CFLAGS += -DCONFIG_MIPS_FPU
ifeq ($(ARCH), mips32)
CFLAGS += -DCONFIG_MIPS_FPU
endif
 
ifeq ($(ARCH), mips32eb)
CFLAGS += -DCONFIG_MIPS_FPU
endif
 
BUILDS := $(addsuffix .build,$(DIRS))
CLEANS := $(addsuffix .clean,$(DIRS))
 
59,16 → 67,11
.PHONY: all config build $(BUILDS) $(CLEANS) clean distclean
 
all:
tools/config.py default $(NARCH)
ifdef NARCH
ifneq ($(ARCH), $(NARCH))
$(MAKE) -C . clean
endif
endif
../tools/config.py uspace.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG)
$(MAKE) -C . build
 
config:
tools/config.py
../tools/config.py uspace.config
 
build: $(BUILDS)