Changeset 41f7564 in mainline for kernel/arch/mips32/Makefile.inc

Timestamp:

2006-07-17T00:53:53Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

231fcb2

Parents:

41c4444

Message:

cleanup and unify the build system

File:

• kernel/arch/mips32/Makefile.inc (modified) (6 diffs)

kernel/arch/mips32/Makefile.inc

@@ -34 +34 @@
 TOOLCHAIN_DIR = /usr/local/mipsel/bin
 
-## Make some default assumptions
-#
-
-ifndef MIPS_MACHINE
-        MIPS_MACHINE = msim
-endif
-
 KERNEL_LOAD_ADDRESS = 0x80100000
 INIT_ADDRESS = 0x81000000
@@ -47 +40 @@
 CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
 
-DEFS += -D__32_BITS__ -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
+DEFS += -D__32_BITS__ -DMACHINE=$(MACHINE) -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Compile with hierarchical page tables support.
@@ -64 +57 @@
 #
 
-ifeq ($(MIPS_MACHINE),indy)
+ifeq ($(MACHINE),indy)
         # GCC 4.0.1 compiled for mipsEL has problems compiling in 
         # BigEndian mode with the swl/swr/lwl/lwr instructions.
@@ -78 +71 @@
         INIT_SIZE = 0
 endif
-ifeq ($(MIPS_MACHINE),lgxemul)
+ifeq ($(MACHINE),lgxemul)
         BFD_NAME = elf32-tradlittlemips
         BFD = binary
         CFLAGS += -DFB_BIG_ENDIAN -DARCH_HAS_FPU -mips3
 endif
-ifeq ($(MIPS_MACHINE),bgxemul)
+ifeq ($(MACHINE),bgxemul)
         BFD_NAME = elf32-bigmips
         BFD = ecoff-bigmips
@@ -91 +84 @@
         INIT_ADDRESS = 0x81800000
 endif
-ifeq ($(MIPS_MACHINE),simics)
+ifeq ($(MACHINE),simics)
         # SIMICS 4kc emulation is broken, although for instructions
         # that do not bother us
@@ -100 +93 @@
         TLBCNT = 16
 endif
-ifeq ($(MIPS_MACHINE),msim)
+ifeq ($(MACHINE),msim)
         BFD_NAME = elf32-tradlittlemips
         BFD = binary