Changeset 9371c30 in mainline for arch

Timestamp:

2005-12-06T20:53:03Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

36e7b6c3

Parents:

090e7ea1

Message:

Completely reworked configuration system.

Location:

arch

Files:

• ia32/Makefile.inc (modified) (2 diffs)
• mips32/Makefile.inc (modified) (6 diffs)

arch/ia32/Makefile.inc

@@ -39 +39 @@
 #
 
-ifndef CPU
-        CPU = pentium4
+ifndef IA32_CPU
+        IA32_CPU = pentium4
 endif
 
-DEFS += -D_CPU=${CPU}
+DEFS += -D_CPU=${IA32_CPU}
 
 ## Accepted CPUs
 #
 
-ifeq ($(CPU),athlon-xp)
+ifeq ($(IA32_CPU),athlon-xp)
         CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow
         DEFS += -DCONFIG_FENCES_P3
@@ -54 +54 @@
         CONFIG_HT = n
 endif
-ifeq ($(CPU),athlon-mp)
+ifeq ($(IA32_CPU),athlon-mp)
         CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow
         DEFS += -DCONFIG_FENCES_P3
         CONFIG_HT = n
 endif
-ifeq ($(CPU),pentium3)
+ifeq ($(IA32_CPU),pentium3)
         CFLAGS += -march=pentium3 -mmmx -msse
         DEFS += -DCONFIG_FENCES_P3
         CONFIG_HT = n
 endif
-ifeq ($(CPU),prescott)
+ifeq ($(IA32_CPU),prescott)
         CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
         DEFS += -DCONFIG_FENCES_P4
 endif
-ifeq ($(CPU),pentium4)
+ifeq ($(IA32_CPU),pentium4)
         CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
         DEFS += -DCONFIG_FENCES_P4

arch/mips32/Makefile.inc

@@ -37 +37 @@
 #
 
-ifndef MACHINE
-        MACHINE = msim
+ifndef MIPS_MACHINE
+        MIPS_MACHINE = msim
 endif
 
@@ -45 +45 @@
 INIT_SIZE = 65536
 CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
-DEFS += -DMACHINE=${MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
+DEFS += -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Accepted MACHINEs
 #
 
-ifeq ($(MACHINE),indy)
+ifeq ($(MIPS_MACHINE),indy)
         # GCC 4.0.1 compiled for mipsEL has problems compiling in 
         # BigEndian mode with the swl/swr/lwl/lwr instructions.
@@ -62 +62 @@
         CFLAGS += -EB -DBIG_ENDIAN -DHAVE_FPU -march=r4600
 endif
-ifeq ($(MACHINE),lgxemul)
+ifeq ($(MIPS_MACHINE),lgxemul)
         BFD_NAME=elf32-tradlittlemips
         BFD = ecoff-littlemips
         CFLAGS += -DHAVE_FPU -mips3
 endif
-ifeq ($(MACHINE),bgxemul)
+ifeq ($(MIPS_MACHINE),bgxemul)
         BFD_NAME=elf32-bigmips
         BFD = ecoff-bigmips
@@ -74 +74 @@
         CFLAGS += -EB -DBIG_ENDIAN -DHAVE_FPU -mips3
 endif
-ifeq ($(MACHINE),msim4kc)
+ifeq ($(MIPS_MACHINE),msim4kc)
         # MSIM needs lwl/swl patch & 4kc instruction patch to work
         # otherwise add -mmemcpy -mips3
@@ -82 +82 @@
         CFLAGS += -mhard-float -march=4kc 
 endif
-ifeq ($(MACHINE),simics)
+ifeq ($(MIPS_MACHINE),simics)
         # SIMICS 4kc emulation is broken, although for instructions
         # that do not bother us
@@ -90 +90 @@
         CFLAGS += -mhard-float -mips3
 endif
-ifeq ($(MACHINE),msim)
+ifeq ($(MIPS_MACHINE),msim)
         BFD_NAME = elf32-tradlittlemips
         BFD = binary
         CFLAGS += -mhard-float -mips3
 endif
-
-## Own configuration directives
-#
-
-CONFIG_OFW = y
 
 ## Accepted configuration directives