[Madwifi-cvs] revision 1795 committed

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 1795
Author      : proski (Pavel Roskin)
Date        : 2006-11-09 08:19:01 +0100 (Thu, 09 Nov 2006)

Log Message :
Remove special treatment of AHB bus.

All special treatment of AHB bus is just a bunch of obsolete hacks.

TOOLPATH works around some cross-compiler issues not specific to AHB
bus.  It may be useful, but it shouldn't be required.  INCS can be
defined on the command line just fine.

TARGET being mipsisa32-be-elf is likely incorrect.  There are new HAL
binaries for system-on-chip systems, so TARGET needs to be overridden
anyway.

KERNELPATH can be guessed just the way it's done for PCI builds.  There
is no reason why it won't work for AHB bus.

KMODPATH hardcodes a long path that would be wrong in general case.  The
default used by the PCI build is much saner.

PCI checks should check BUS to be PCI for readability if nothing else.

Affected Files:
* trunk/Makefile                                      updated             
* trunk/Makefile.inc                                  updated             


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-11-03 23:36:55 UTC (rev 1794)
+++ trunk/Makefile	2006-11-09 07:19:01 UTC (rev 1795)
@@ -170,7 +170,7 @@
 	    exit 1; \
 	fi
 	
-ifneq ($(strip $(BUS)),AHB)
+ifeq ($(strip $(BUS)),PCI)
 	@# check PCI support
 	@if [ -z "$(CONFIG_PCI)" ]; then \
 	    echo "FAILED"; \

Modified: trunk/Makefile.inc
===================================================================
--- trunk/Makefile.inc	2006-11-03 23:36:55 UTC (rev 1794)
+++ trunk/Makefile.inc	2006-11-09 07:19:01 UTC (rev 1795)
@@ -59,22 +59,6 @@
 # another kernel, set KERNELPATH manually, for example with:
 # make KERNELPATH=/path/to/kernel/source
 
-# TOOLPATH is the path which contains the crosscompile toolchain (?)
-
-ifeq ($(strip $(BUS)),AHB)
-# Bus type AHB forces the target platform to be mipsisa32.
-TARGET :=	mipsisa32-be-elf
-
-# Bus type AHB requires KERNELPATH and TOOLPATH to be set manually.
-ifndef KERNELPATH
-$(error KERNELPATH must be defined for bus type AHB.)
-endif
-ifndef TOOLPATH
-$(error TOOLPATH must be defined for bus type AHB.)
-endif
-
-else
-
 # The default KERNELPATH points to the directory where the currently
 # running kernel was compiled.  Note that the configuration and the
 # version of the kernel tree might have changed since then.
@@ -87,8 +71,6 @@
 export KERNELPATH
 endif
 
-endif
-
 # KERNELRELEASE is the target kernel's version.  It's always taken from
 # the kernel build tree.  Kernel Makefile doesn't always know the exact
 # kernel version (especially for vendor stock kernels), so we get it
@@ -130,11 +112,7 @@
 
 # KMODPATH nominates the directory where the modules will be
 # installed to
-ifeq ($(strip $(BUS)),AHB)
-KMODPATH := 	$(KERNELPATH)/arch/mips/ar531x/RAMDISK/rootdir/lib/modules/$(KERNELRELEASE)/net
-else
 KMODPATH :=	/lib/modules/$(KERNELRELEASE)/net
-endif
 
 # Recognize 2.4.x kernels to support the old build system
 ifeq ($(filter-out 2.4%,$(KERNELRELEASE)),)
@@ -184,10 +162,6 @@
 COPTS+=	-Werror
 INCS=	-include $(TOP)/include/compat.h -I$(TOP)/include
 
-ifeq ($(strip $(BUS)),AHB)
-INCS+= -isystem $(TOOLPATH)/include
-endif
-
 # TARGET defines the target platform architecture. It must match one of
 # the target platforms supported by the HAL. The default target is the
 # host machine architecture. You can override TARGET on the make command