Allow ARCH to be set to "x86". That's what it is in Linux 2.6.24 for

both i386 and x86_64.  When calculating TARGET for x86 platform, use
CONFIG_X86 and CONFIG_X86_64 rather than ARCH.


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3318 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2008-01-31 22:48:42 +00:00
parent a9788959cd
commit 89f9f3ed2a
2 changed files with 9 additions and 0 deletions

View File

@ -25,6 +25,8 @@ endif
# Determine the target (i.e. which HAL to use).
# The default is $(ARCH)-elf
TARGET-$(CONFIG_X86) = i386-elf
TARGET-$(CONFIG_X86_64) = x86_64-elf
TARGET-$(CONFIG_CPU_32v4) = armv4-$(ENDIAN)-elf
TARGET-$(CONFIG_CPU_MIPS32_R1) = mips1-$(ENDIAN)-elf
TARGET-$(CONFIG_CPU_MIPS32_R2) = mips-$(ENDIAN)-elf

View File

@ -36,6 +36,13 @@ ifeq (,$(ARCH-y))
$(Cannot determine ARCH)
endif
# Allow ARCH to be x86
ifneq (,$(CONFIG_X86))
ifeq (x86,$(ARCH))
ARCH-y = $(ARCH)
endif
endif
# Don't allow ARCH to be overridden by a different value.
ifeq (,$(ARCH))
ARCH = $(ARCH-y)