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

diff --git a/ath/if_ath_ahb.h b/ath/if_ath_ahb.h
index 4129c4a21759cd277ac96b8f7f82a4116c849847..5d11939c027d8649edc860724264c8e1ccd68c64 100644 (file)
--- a/ath/if_ath_ahb.h
+++ b/ath/if_ath_ahb.h
@@ -104,12 +104,8 @@
 #define AR531X_BD_MAGIC 0x35333131   /* "5311", for all 531x platforms */
 
 /* Allow compiling on non-mips platforms for code verification */
-#ifndef __mips__
-#define CAC_ADDR(addr) (addr)
-#define UNCAC_ADDR(addr) (addr)
+#ifndef KSEG1ADDR
 #define KSEG1ADDR(addr) (addr)
-#define dma_cache_wback_inv(start,size)        \
-       do { (void) (start); (void) (size); } while (0)
 #endif
 
 #define bus_dma_sync_single    dma_sync_single_for_cpu

diff --git a/ath_hal/Makefile b/ath_hal/Makefile
index e9ab92361ddfa4a196cd904b139ef7873f7b21d0..68f49ed94c1ee2192e534282720f7daf83ce8734 100644 (file)
--- a/ath_hal/Makefile
+++ b/ath_hal/Makefile
@@ -115,6 +115,7 @@ ath_hal-objs        := \
        ar5416/ar9160_attach.o
 
 ifeq ($(strip $(BUS)),AHB)
+ifeq ($(CONFIG_64BIT)),)
 ath_hal-objs += \
        ar5312/ar5312_attach.o \
        ar5312/ar5312_eeprom.o \
@@ -125,6 +126,7 @@ ath_hal-objs += \
        ar5312/ar5312_reset.o \
        ar5312/ar5315_gpio.o
 endif
+endif
 
 ifdef LINUX24
 export-objs    := ah_os.o