r3811 - developers/sameo/patches/ar6k-atheros-2.0
sameo at sita.openmoko.org
sameo at sita.openmoko.org
Thu Jan 10 15:30:11 CET 2008
Author: sameo
Date: 2008-01-10 15:30:08 +0100 (Thu, 10 Jan 2008)
New Revision: 3811
Modified:
developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch
Log:
ar6k-atheros-2.0: Remove ugly and useless Makefiles.
Modified: developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch 2008-01-10 14:03:16 UTC (rev 3810)
+++ developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch 2008-01-10 14:30:08 UTC (rev 3811)
@@ -3,7 +3,6 @@
drivers/sdio/function/Makefile | 1
drivers/sdio/function/wlan/Makefile | 4
drivers/sdio/function/wlan/ar6000/Makefile | 38
- drivers/sdio/function/wlan/ar6000/ar6000/Makefile | 103
drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c | 3070 +++++++
drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h | 361
drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c | 439 +
@@ -19,7 +18,6 @@
drivers/sdio/function/wlan/ar6000/bmi/bmi.c | 657 +
drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h | 45
drivers/sdio/function/wlan/ar6000/bmi/makefile | 4
- drivers/sdio/function/wlan/ar6000/hif/Makefile | 57
drivers/sdio/function/wlan/ar6000/hif/hif.c | 818 ++
drivers/sdio/function/wlan/ar6000/hif/hif_internal.h | 102
drivers/sdio/function/wlan/ar6000/htc/ar6k.c | 991 ++
@@ -87,7 +85,7 @@
drivers/sdio/function/wlan/ar6000/wmi/wmi.c | 3918 +++++++++
drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h | 4421 +++++++++++
drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h | 71
- 88 files changed, 32663 insertions(+)
+ 86 files changed, 32503 insertions(+)
Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/Kconfig
===================================================================
@@ -7897,114 +7895,6 @@
+ return ret;
+}
+
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/Makefile 2008-01-10 13:45:45.000000000 +0100
-@@ -0,0 +1,103 @@
-+#######################################################################################
-+# AR6K Kernel Module makefile.
-+#
-+# This makefile is invoked by the master makefile in the linux kernel, the linux kernel
-+# source must be initially compiled. The top level make will invoke the main linux kernel
-+# makefile which will subsequently pick up this makefile.
-+#
-+#######################################################################################
-+
-+
-+REV ?= 2
-+
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/include
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/../include
-+# TBDXXX....handle include/AR6002
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/../include/AR6001
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/wlan/include
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/os/linux/include
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/os/
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/bmi/include
-+
-+EXTRA_CFLAGS += -DLINUX -DDEBUG -D__KERNEL__ -DHTC_RAW_INTERFACE\
-+ -DTCMD -DSEND_EVENT_TO_APP -DUSER_KEYS \
-+ -DNO_SYNC_FLUSH #\
-+ -DMULTIPLE_FRAMES_PER_INTERRUPT -DAR6000REV$(REV) \
-+ -DBLOCK_TX_PATH_FLAG \
-+
-+ifneq ($(ATH_OS_SUB_TYPE),linux_2_4)
-+# linux 2.6 and higher kernel module build settings
-+EXTRA_CFLAGS += -DKERNEL_2_6
-+obj-m += ar6000.o
-+-include $(ATH_SRC_BASE)/hif/$(ATH_HIF_TYPE)/Makefile
-+ar6000-objs += ../../htc2/AR6000/ar6k.o \
-+ ../../htc2/AR6000/ar6k_events.o \
-+ ../../htc2/htc_send.o \
-+ ../../htc2/htc_recv.o \
-+ ../../htc2/htc_services.o \
-+ ../../htc2/htc.o \
-+ ../../bmi/src/bmi.o \
-+ ar6000_drv.o \
-+ ar6000_raw_if.o \
-+ netbuf.o \
-+ wireless_ext.o \
-+ ioctl.o \
-+ ../../miscdrv/common_drv.o \
-+ ../../miscdrv/credit_dist.o \
-+ ../../wmi/wmi.o \
-+ ../../wlan/src/wlan_node.o \
-+ ../../wlan/src/wlan_recv_beacon.o \
-+ ../../wlan/src/wlan_utils.o
-+
-+endif
-+
-+ifeq ($(ATH_OS_SUB_TYPE),linux_2_4)
-+# linux 2.4 kernel module build settings
-+EXTRA_CFLAGS += -DKERNEL_2_4
-+
-+O_TARGET := ar6000.o
-+# need export line for module export
-+export-objs := ar6000_drv.o
-+-include $(ATH_SRC_BASE)/hif/$(ATH_HIF_TYPE)/Makefile
-+obj-y += $(ATH_SRC_BASE)/htc2/htc.o \
-+ $(ATH_SRC_BASE)/htc2/htc_send.o \
-+ $(ATH_SRC_BASE)/htc2/htc_recv.o \
-+ $(ATH_SRC_BASE)/htc2/htc_services.o \
-+ $(ATH_SRC_BASE)/htc2/AR6000/ar6k.o \
-+ $(ATH_SRC_BASE)/htc2/AR6000/ar6k_events.o \
-+ $(ATH_SRC_BASE)/bmi/src/bmi.o \
-+ $(ATH_SRC_BASE)/wmi/wmi.o \
-+ $(ATH_SRC_BASE)/wlan/src/wlan_node.o \
-+ $(ATH_SRC_BASE)/wlan/src/wlan_recv_beacon.o \
-+ $(ATH_SRC_BASE)/wlan/src/wlan_utils.o \
-+ $(ATH_SRC_BASE)/os/linux/ar6000_drv.o \
-+ $(ATH_SRC_BASE)/os/linux/ar6000_raw_if.o \
-+ $(ATH_SRC_BASE)/os/linux/wireless_ext.o \
-+ $(ATH_SRC_BASE)/os/linux/ioctl.o \
-+ $(ATH_SRC_BASE)/os/linux/netbuf.o \
-+ $(ATH_SRC_BASE)/miscdrv/common_drv.o \
-+ $(ATH_SRC_BASE)/miscdrv/credit_dist.o
-+
-+obj-m += htc.o \
-+ htc_send.o \
-+ htc_recv.o \
-+ htc_services.o \
-+ ar6k_events.o \
-+ ar6k.o \
-+ hif.o \
-+ bmi.o \
-+ wmi.o \
-+ wlan_node.o \
-+ wlan_recv_beacon.o \
-+ wlan_utils.o \
-+ ar6000_drv.o \
-+ ar6000_raw_if.o \
-+ common_drv.o \
-+ credit_dist.o \
-+ netbuf.o \
-+ wireless_ext.o \
-+ ioctl.o \
-+ ar6000.o
-+
-+include $(ATH_LINUXPATH)/Rules.make
-+endif
Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -12070,68 +11960,6 @@
+
+void
+delHifDevice(SDDEVICE *handle);
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/hif/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/hif/Makefile 2008-01-10 13:45:45.000000000 +0100
-@@ -0,0 +1,57 @@
-+#
-+#SDIO HIF makefile for atheros SDIO stack
-+#
-+#Copyright (c) 2004-2006 Atheros Communications Inc.
-+#
-+#$ATH_LICENSE_HOSTSDK0_MK$
-+#
-+
-+# Check for SDIO stack
-+ifdef ATH_SDIO_STACK_BASE
-+# Someone already set it on entry, the stack resides outside this tree, we will try to build it
-+_SDIO_STACK = YES
-+else
-+# Check for SDIO stack within this tree
-+_SDIO_STACK = $(shell if [ -f $(ATH_SRC_BASE)/sdiostack/src/Makefile ]; then echo "YES"; else echo "NO"; fi)
-+
-+ifeq ($(_SDIO_STACK), YES)
-+ # SDIO stack is part of the kit and will need to be compiled
-+ATH_SDIO_STACK_BASE := $(ATH_SRC_BASE)/sdiostack
-+endif
-+endif
-+
-+ifeq ($(_SDIO_STACK), YES)
-+ # Pass and translate build variables to the SDIO stack makefile
-+_SDIO_STACK_MAKE_PARAMS := CT_BUILD_TYPE=$(ATH_BUILD_TYPE) \
-+ CT_OS_TYPE=linux \
-+ CT_OS_SUB_TYPE=$(ATH_OS_SUB_TYPE) \
-+ CT_LINUXPATH=$(ATH_LINUXPATH) \
-+ CT_BUILD_TYPE=$(ATH_BUILD_TYPE) \
-+ CT_CROSS_COMPILE_TYPE=$(ATH_CROSS_COMPILE_TYPE) \
-+ CT_ARCH_CPU_TYPE=$(ATH_ARCH_CPU_TYPE) \
-+ CT_HC_DRIVERS=$(ATH_HC_DRIVERS) \
-+ CT_MAKE_INCLUDE_OVERRIDE=$(_LOCALMAKE_INCLUDE) \
-+ CT_BUILD_OUTPUT_OVERRIDE=$(COMPILED_IMAGE_OBJECTS_PATH) \
-+ BUS_BUILD=1
-+endif
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/hif/sdio/linux_athsdio/include
-+EXTRA_CFLAGS += -DSDIO
-+EXTRA_CFLAGS += -I$(ATH_SDIO_STACK_BASE)/src/include
-+
-+ifeq ($(ATH_OS_SUB_TYPE),linux_2_4)
-+obj-y += ../../hif/sdio/linux_athsdio/src/hif.o
-+endif
-+
-+ifneq ($(ATH_OS_SUB_TYPE),linux_2_4)
-+ar6000-objs := ../../hif/sdio/linux_athsdio/src/hif.o
-+endif
-+
-+all:
-+ifeq ($(_SDIO_STACK),YES)
-+ $(MAKE) $(_SDIO_STACK_MAKE_PARAMS) -C $(ATH_SDIO_STACK_BASE)/src default
-+endif
-+
-+clean:
-+ifeq ($(_SDIO_STACK),YES)
-+ $(MAKE) $(_SDIO_STACK_MAKE_PARAMS) -C $(ATH_SDIO_STACK_BASE)/src clean
-+endif
Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
More information about the commitlog
mailing list
