-diff -uNr atmelwlandriver.orig/Makefile.kernelv2.6 atmelwlandriver/Makefile.kernelv2.6
---- atmelwlandriver.orig/Makefile.kernelv2.6 2004-06-05 06:11:18.000000000 +0200
-+++ atmelwlandriver/Makefile.kernelv2.6 2004-07-19 10:45:29.000000000 +0200
-@@ -4,15 +4,13 @@
+diff -urN atmelwlandriver.orig/Makefile.kernelv2.6 atmelwlandriver/Makefile.kernelv2.6
+--- atmelwlandriver.orig/Makefile.kernelv2.6 2004-12-05 14:16:10.000000000 +0100
++++ atmelwlandriver/Makefile.kernelv2.6 2004-12-05 14:25:12.000000000 +0100
+@@ -5,15 +5,13 @@
SCRIPTSDIR=$(TOPDIR)/scripts
INC=$(TOPDIR)/src/includes
- VERSION=3.3.5.6
+ VERSION=3.4.1.0
-MINOR_NUMBER=$(shell uname -r | cut -d . -f 3 | cut -d - -f 1)
ID:=$(shell id -u)
tmpDIR:=/tmp/atm$(shell date +%S.%s)
WINTER = $(shell pwd)/src/apps/winter
-KERNEL_VERSION:=$(shell uname -r)
--KERNEL_SOURCE:=/usr/src/linux-$(KERNEL_VERSION)
+-KERNEL_SOURCE:=/lib/modules/$(KERNEL_VERSION)/build
+KERNEL_SOURCE:=/usr/src/linux
- PCMCIA_DES = /lib/modules/$(KERNEL_VERSION)/pcmcia
- PCI_DES = /lib/modules/$(KERNEL_VERSION)/kernel/drivers/net
- USB_DES = /lib/modules/$(KERNEL_VERSION)/kernel/drivers/usb
-@@ -99,34 +97,15 @@
+ PCMCIA_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/pcmcia
+ PCI_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/kernel/drivers/net
+ USB_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/kernel/drivers/usb
+@@ -101,34 +99,15 @@
$(all_targets): %:
@echo Building $@
@if [ ! -d $(OBJDIR)/$@ ]; then echo Bootstraping target $@; mkdir $(OBJDIR)/$@; fi
(cd $(OBJDIR)/$@/release; make) ; \
fi
-diff -uNr atmelwlandriver.orig/src/Pcmcia_Pci/Makefile atmelwlandriver/src/Pcmcia_Pci/Makefile
---- atmelwlandriver.orig/src/Pcmcia_Pci/Makefile 2004-06-05 06:11:18.000000000 +0200
-+++ atmelwlandriver/src/Pcmcia_Pci/Makefile 2004-07-19 10:54:28.066481184 +0200
-@@ -5,28 +5,15 @@
- include .lastbuild
- endif
-
--VR:=$(shell uname -r)
--ID:=$(shell id -u)
--ifneq ($(VR),$(UNAME))
--this:
--# @echo -ne "\\033[1;31m"
-- @echo -ne "Running kernel doesn't match with the source"
--# @echo -ne "\\033[0;39m"
-- @echo
--endif
--
- # Add extra compilation flags if under version 2.5 or higher
- NEWKERNFLAGS := -D__KERNEL__ -nostdinc -iwithprefix include -DMODULE -DKBUILD_BASENAME=fastvnet_cs
--MODOFLAGS := -I$(KERNEL_SRC)/include -D__KERNEL__ -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -DMODULE
- KMODNAMEFLAG := -DKBUILD_MODNAME=
-
-
--CC:=gcc
- CDEBUG:= -DPCMCIA_DEBUG=1
--DEFS := -pipe -O2 -fomit-frame-pointer -fno-strict-aliasing
-
- CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h
--CFLAGS := -DLINUX_OS -D__KERNEL__ $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
-+CFLAGS := -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
- PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include
- srcs := card.c command.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c
- pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs))
-@@ -75,7 +62,7 @@
- ld -r -o $(OBJDIR)/$(MODULE).o fastvnet_cs.o $(DEBUGORNO) $(objs)
- nm $(OBJDIR)/$(MODULE).o |sort -u >$(OBJDIR)/$(patsubst %.o,%.map,$(MODULE).o);
- ifeq '$(NEW_KERN)' 'y'
-- $(CC) $(MODOFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
-+ $(CC) $(CFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
- ld -r -o $(OBJDIR)/$(MODULE).ko $(OBJDIR)/$(MODULE).o $(OBJDIR)/$(MAGICMOD).o
- endif
-
-diff -uNr atmelwlandriver.orig/src/usb/Makefile atmelwlandriver/src/usb/Makefile
---- atmelwlandriver.orig/src/usb/Makefile 2004-06-05 06:11:18.000000000 +0200
-+++ atmelwlandriver/src/usb/Makefile 2004-07-19 10:54:28.067481032 +0200
-@@ -3,28 +3,16 @@
-
- MODULE := usbvnet.o
- CDEBUG := -DUSBDBG
--DEFS := -fno-strict-aliasing -fomit-frame-pointer -pipe
- USB_DES := $(MODULES_DES)/kernel/drivers/net
--CC=gcc
- CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h
--ifeq '$(NEW_KERN)' 'y'
--CFLAGS :=-D__KERNEL__ -O2 $(DEFS) -I$(KERNEL_SRC)/drivers/usb/core -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb -Wall $(CFLAGS_y)
--else
--CFLAGS :=-D__KERNEL__ -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb -Wall $(CFLAGS_y)
--endif
-+CFLAGS := -I$(KERNEL_SRC)/drivers/usb/core -I$(INC) -I$(INC)/usb $(CFLAGS_y)
- # Add extra compilation flags if under version 2.5 or higher
- NEWKERNFLAGS := -nostdinc -iwithprefix include -DMODULE -DKBUILD_BASENAME=vnetusba
--MODOFLAGS := -I$(KERNEL_SRC)/include -D__KERNEL__ -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -Iinclude/asm-i386/mach-default -DMODULE
- KMODNAMEFLAG := -DKBUILD_MODNAME=
- MAGICMOD:= magic.mod
-
--ifeq '$(NEW_KERN)' 'y'
- RESET_DEVICE:= reset_device.c
- MAGIC_MOD:= magic.mod.c
--else
--RESET_DEVICE:=
--MAGIC_MOD:=
--endif
-
- fws:=$(wildcard external*.h) $(wildcard internal*.h)
-
-@@ -52,7 +40,7 @@
-
- final:$(objs) vnetusba.o
- ifeq '$(NEW_KERN)' 'y'
-- $(CC) $(MODOFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
-+ $(CC) $(CFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
- ld -m elf_i386 -r -o $(OBJDIR)/$(MODULE).ko vnetusba.o $(objs) $(OBJDIR)/$(MAGICMOD).o
- @nm $(OBJDIR)/$(MODULE).ko |sort >../$(patsubst %.ko,%.map, $(MODULE).ko);
- else
-diff -uNr atmelwlandriver.orig/src/apps/cmd_line/Makefile atmelwlandriver/src/apps/cmd_line/Makefile
---- atmelwlandriver.orig/src/apps/cmd_line/Makefile 2004-06-05 06:11:18.000000000 +0200
-+++ atmelwlandriver/src/apps/cmd_line/Makefile 2004-07-19 12:16:29.080700072 +0200
-@@ -1,22 +1,8 @@
+diff -urN atmelwlandriver.orig/src/apps/cmd_line/Makefile atmelwlandriver/src/apps/cmd_line/Makefile
+--- atmelwlandriver.orig/src/apps/cmd_line/Makefile 2004-12-05 14:16:10.000000000 +0100
++++ atmelwlandriver/src/apps/cmd_line/Makefile 2004-12-05 14:56:25.000000000 +0100
+@@ -1,22 +1,9 @@
-KERNEL_VERSION_NUMBER=$(shell uname -r | cut -d . -f 2)
-
-ifeq '$(KERNEL_VERSION_NUMBER)' '4'
-include $(TOPDIR)/.config
-endif
--
+
OBJs=../../../objs
--FLAGS1:=-DATMEL_WLAN -DATMEL -O2 -g
-+FLAGS1:=-DATMEL_WLAN -DATMEL $(OPT)
+-FLAGS1:=-Wall -DATMEL_WLAN -DATMEL -O2 -g
++FLAGS1 :=-Wall -DATMEL_WLAN -DATMEL $(OPT)
FLAGS2:=-lncurses
-FLAGS3:=-DLOW_RES
-CC:=gcc
+ $(CC) $(FLAGS1) -I$(INC) -I/usr/include/ncurses -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c
@install -m 755 lvnet $(OBJs)/
-endif
+diff -urN atmelwlandriver.orig/src/apps/fw-upgrade/Makefile atmelwlandriver/src/apps/fw-upgrade/Makefile
+--- atmelwlandriver.orig/src/apps/fw-upgrade/Makefile 2004-12-05 14:16:10.000000000 +0100
++++ atmelwlandriver/src/apps/fw-upgrade/Makefile 2004-12-05 15:41:43.000000000 +0100
+@@ -3,11 +3,11 @@
+ #########################################
+
+
+-CC:=$(shell wx-config --cxx)
++CC:=$(shell wxgtk2-2.4-config --cxx)
+ CCC:=gcc
+-CFLAGS:=$(shell wx-config --cxxflags)
+-CFLAGS1:=$(shell wx-config --libs)
+-CCFLAGS:= -O2 -Wall -Wstrict-prototypes
++CFLAGS:=$(shell wxgtk2-2.4-config --cxxflags)
++CFLAGS1:=$(shell wxgtk2-2.4-config --libs)
++CCFLAGS:= $(OPT)
+ OUTDIR:="/usr/local/bin"
+
+
+@@ -34,7 +34,7 @@
+ wxconfig:
+ @config_exists=no;\
+ for path_dir in `echo $(PATH) | tr : ' '`; do\
+- if test -f $$path_dir/wx-config; then\
++ if test -f $$path_dir/wxgtk2-2.4-config; then\
+ config_exists=yes;\
+ fi\
+ done;\
+diff -urN atmelwlandriver.orig/src/apps/fw-upgrade/Makefile~ atmelwlandriver/src/apps/fw-upgrade/Makefile~
+--- atmelwlandriver.orig/src/apps/fw-upgrade/Makefile~ 1970-01-01 01:00:00.000000000 +0100
++++ atmelwlandriver/src/apps/fw-upgrade/Makefile~ 2004-12-05 15:03:14.000000000 +0100
+@@ -0,0 +1,75 @@
++#########################################
++# Makefile of Fucd #
++#########################################
++
++
++CC:=$(shell wxgtk2-2.4-config -cxx)
++CCC:=gcc
++CFLAGS:=$(shell wxgtk2-2.4-config --cxxflags)
++CFLAGS1:=$(shell wxgtk2-2.4-config --libs)
++CCFLAGS:= $(OPT)
++OUTDIR:="/usr/local/bin"
++
++
++# All object files
++COBJS:= atmelmain.o dfu.o
++OBJS:= FucdApp.o FucdLayer.o dfu.o atmel.o
++
++usage:
++ @echo -e "make clean\tRemove object files and executables"
++ @echo -e "make fucd\tBuild X upgrade utility"
++ @echo -e "make atmelup\tBuild command line upgrade utility"
++ @echo -e "make all\tBuild both utilities"
++
++all: fucd atmelup
++
++fucd: wxconfig $(OBJS: .o=.c)
++ @echo -e "Building fucd wxWidgets application..."
++ $(CC) -o fucd $(OBJS) $(CFLAGS1) -lusb
++
++atmelup: $(COBJS)
++ @echo -e "Building atmelup command-line tool..."
++ $(CCC) $(CCFLAGS) $(COBJS) -lusb -o $@
++
++wxconfig:
++ @config_exists=no;\
++ for path_dir in `echo $(PATH) | tr : ' '`; do\
++ if test -f $$path_dir/wxgtk2-2.4-config; then\
++ config_exists=yes;\
++ fi\
++ done;\
++ if test $$config_exists = 'no'; then\
++ echo 'It seems that the wxWindows library is not installed.';\
++ echo 'wx-config, the script providing information about wxWindows';\
++ echo 'installation, is missing. Please, refer to the README.linux';\
++ echo 'or visit www.wxwindows.org for further information.';\
++ echo 'We are sorry about the inconvenience.';\
++ exit -1;\
++ fi
++
++FucdApp.o: FucdApp.cpp FucdApp.h
++ $(CC) $(CFLAGS) -c $<
++
++FucdLayer.o: FucdLayer.cpp FucdLayer.h
++ $(CC) $(CFLAGS) -c $<
++
++atmel.o: atmel.c
++ $(CCC) $(CCFLAGS) -c $<
++
++dfu.o: dfu.c dfu.h
++ $(CCC) $(CCFLAGS) -c $<
++
++atmelmain.o: atmel.c
++ $(CCC) $(CCFLAGS) -DCONSOLE_APP -c $< -o $@
++
++clean:
++ @echo -e "Removing all objects and executables..."
++ @find . -name '*.o' | xargs rm -f *.o
++ @rm -f fucd atmelup
++
++
++install:
++ @echo -e "Installing fucd to $(OUTDIR)"
++ @if [ -e fucd ]; then install -m 755 fucd $(OUTDIR) ; fi
++ @echo -e "Installing atmelup to $(OUTDIR)"
++ @if [ -e atmelup ]; then install -m 755 atmelup $(OUTDIR) ; fi
+diff -urN atmelwlandriver.orig/src/Pcmcia_Pci/Makefile atmelwlandriver/src/Pcmcia_Pci/Makefile
+--- atmelwlandriver.orig/src/Pcmcia_Pci/Makefile 2004-12-05 14:16:10.000000000 +0100
++++ atmelwlandriver/src/Pcmcia_Pci/Makefile 2004-12-05 14:27:35.000000000 +0100
+@@ -5,22 +5,7 @@
+ include .lastbuild
+ endif
+
+-ARCH=$(shell uname -m)
+-VR:=$(shell uname -r)
+-ID:=$(shell id -u)
+-ifneq ($(VR),$(UNAME))
+-this:
+-# @echo -ne "\\033[1;31m"
+- @echo -ne "Running kernel doesn't match with the source"
+-# @echo -ne "\\033[0;39m"
+- @echo
+-endif
+-
+-CC:=gcc
+-CDEBUG:= -DPCMCIA_DEBUG=1
+-DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH)
+-CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h
+-CFLAGS := -DLINUX_OS -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
++CFLAGS += -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
+ PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include
+ srcs := card.c command.c common.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c
+ pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs))
+diff -urN atmelwlandriver.orig/src/usb/Makefile atmelwlandriver/src/usb/Makefile
+--- atmelwlandriver.orig/src/usb/Makefile 2004-12-05 14:16:10.000000000 +0100
++++ atmelwlandriver/src/usb/Makefile 2004-12-05 14:29:51.000000000 +0100
+@@ -1,14 +1,9 @@
+ include .lastbuild
+ include $(TOPDIR)/.config
+-ARCH=$(shell uname -m)
+ MODULE := usbvnet.o
+-CDEBUG := -DUSBDBG
+-DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH)
+ #conflicted with gcc's < 2.96: -fno-optimize-sibling-calls
+ USB_DES := $(MODULES_DES)/kernel/drivers/net
+-CC=gcc
+-CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h
+-CFLAGS :=-D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb
++CFLAGS += -I$(KERNEL_SRC)/drivers/usr/core -I$(INC) -I$(INC)/usb
+
+ $(CFLAGS_y)
+ # Add extra compilation flags if under version 2.5 or higher
projects / packages / atmelwlandriver.git / blobdiff