Allow compilation with BUS=AHB in 64-bit systems

Don't enable AHB support in HAL on 64-bit systems, it's not 64-bit clean
and is not meant to be.  Provide replacement definition for KSEG1ADDR
when it's not defined (that includes 64-bit mips).  Remove other
replacement definitions, they are not needed anymore.


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4064 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2009-06-26 02:06:16 +00:00
parent e0712b8175
commit f1873dba18
2 changed files with 3 additions and 5 deletions

View File

@ -104,12 +104,8 @@
#define AR531X_BD_MAGIC 0x35333131 /* "5311", for all 531x platforms */ #define AR531X_BD_MAGIC 0x35333131 /* "5311", for all 531x platforms */
/* Allow compiling on non-mips platforms for code verification */ /* Allow compiling on non-mips platforms for code verification */
#ifndef __mips__ #ifndef KSEG1ADDR
#define CAC_ADDR(addr) (addr)
#define UNCAC_ADDR(addr) (addr)
#define KSEG1ADDR(addr) (addr) #define KSEG1ADDR(addr) (addr)
#define dma_cache_wback_inv(start,size) \
do { (void) (start); (void) (size); } while (0)
#endif #endif
#define bus_dma_sync_single dma_sync_single_for_cpu #define bus_dma_sync_single dma_sync_single_for_cpu

View File

@ -115,6 +115,7 @@ ath_hal-objs := \
ar5416/ar9160_attach.o ar5416/ar9160_attach.o
ifeq ($(strip $(BUS)),AHB) ifeq ($(strip $(BUS)),AHB)
ifeq ($(CONFIG_64BIT)),)
ath_hal-objs += \ ath_hal-objs += \
ar5312/ar5312_attach.o \ ar5312/ar5312_attach.o \
ar5312/ar5312_eeprom.o \ ar5312/ar5312_eeprom.o \
@ -125,6 +126,7 @@ ath_hal-objs += \
ar5312/ar5312_reset.o \ ar5312/ar5312_reset.o \
ar5312/ar5315_gpio.o ar5312/ar5315_gpio.o
endif endif
endif
ifdef LINUX24 ifdef LINUX24
export-objs := ah_os.o export-objs := ah_os.o