Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1d69a1c65b0d25739819caef6b1f0f6ddc2ab84c

Authored by Forest Bond
Committed by Greg Kroah-Hartman
1 parent 5721135408
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Staging: vt6655: Integrate drivers/staging/vt6655 into build system. 

Integrate drivers/staging/vt6655 into build system.

Signed-off-by: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 4 changed files with 46 additions and 218 deletions Side-by-side Diff

drivers/staging/Kconfig
Diff comments   View file @ 1d69a1c
... ... @@ -119,6 +119,8 @@
119 119  
120 120 source "drivers/staging/octeon/Kconfig"
121 121  
  122 +source "drivers/staging/vt6655/Kconfig"
  123 +
122 124 endif # !STAGING_EXCLUDE_BUILD
123 125 endif # STAGING
drivers/staging/Makefile
Diff comments   View file @ 1d69a1c
... ... @@ -41,4 +41,5 @@
41 41 obj-$(CONFIG_LINE6_USB) += line6/
42 42 obj-$(CONFIG_USB_SERIAL_QUATECH_ESU100) += serqt_usb/
43 43 obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
  44 +obj-$(CONFIG_VT6655) += vt6655/
drivers/staging/vt6655/Kconfig
Diff comments   View file @ 1d69a1c
  1 +config VT6655
  2 + tristate "VIA Technologies VT6655 support"
  3 + ---help---
  4 + This is a vendor-written driver for VIA VT6655.
drivers/staging/vt6655/Makefile
Diff comments   View file @ 1d69a1c
1   -#
2   -# Build options:
3   -# PRIV_OBJ := 1 for object version
4   -#
  1 +# TODO: all of these should be removed
  2 +EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -D__NO_VERSION__
  3 +EXTRA_CFLAGS += -DHOSTAP
5 4  
6   -IO_MAP := 0
7   -HOSTAP := 1
8   -PRIV_OBJ := 0
  5 +vt6655-y += device_main.o \
  6 + card.o \
  7 + mac.o \
  8 + baseband.o \
  9 + wctl.o \
  10 + 80211mgr.o \
  11 + wcmd.o \
  12 + wmgr.o \
  13 + bssdb.o \
  14 + rxtx.o \
  15 + dpc.o \
  16 + power.o \
  17 + datarate.o \
  18 + srom.o \
  19 + mib.o \
  20 + rc4.o \
  21 + tether.o \
  22 + tcrc.o \
  23 + ioctl.o \
  24 + hostap.o \
  25 + wpa.o \
  26 + key.o \
  27 + tkip.o \
  28 + michael.o \
  29 + wroute.o \
  30 + rf.o \
  31 + iwctl.o \
  32 + wpactl.o \
  33 + wpa2.o \
  34 + aes_ccmp.o \
  35 + vntwifi.o \
  36 + IEEE11h.o
9 37  
10   -
11   -
12   -#KSP : = 0
13   -KSP := /lib/modules/$(shell uname -r)/build \
14   -# /usr/src/linux-$(shell uname -r) \
15   -# /usr/src/linux-$(shell uname -r | sed 's/-.*//') \
16   -# /usr/src/kernel-headers-$(shell uname -r) \
17   -# /usr/src/kernel-source-$(shell uname -r) \
18   -# /usr/src/linux-$(shell uname -r | sed 's/\([0-9]*\.[0-9]*\)\..*/\1/') \
19   -# /usr/src/linux /home/plice
20   -
21   -#test_dir = $(shell [ -e $(dir)/include/linux ] && echo $(dir))
22   -
23   -#KSP := $(foreach dir, $(KSP), $(test_dir))
24   -
25   -
26   -KSRC := $(firstword $(KSP))
27   -
28   -#ifeq (,$(KSRC))
29   -# $( error Linux kernel source not found)
30   -#endif
31   -
32   -# check kernel version
33   -KVER := $(shell uname -r | cut -c1-3 | sed 's/2\.[56]/2\.6/')
34   -KERVER2=$(shell uname -r | cut -d. -f2)
35   -
36   -ifeq ($(KVER), 2.6)
37   -# 2.6 kernel
38   -TARGET = viawget.ko
39   -
40   -else
41   -TARGET = viawget.o
42   -
43   -endif
44   -
45   -INSTDIR := $(shell find /lib/modules/$(shell uname -r) -name $(TARGET) -printf "%h\n" | sort | head -1)
46   -ifeq (,$(INSTDIR))
47   - ifeq (,$(KERVER2))
48   - ifneq (,$(wildcard /lib/modules/$(shell uname -r)/kernel))
49   - INSTDIR := /lib/modules/$(shell uname -r)/kernel/drivers/net
50   - else
51   - INSTDIR := /lib/modules/$(shell uname -r)/net
52   - endif
53   - else
54   - ifneq ($(KERVER2),2)
55   - INSTDIR := /lib/modules/$(shell uname -r)/kernel/drivers/net
56   - else
57   - INSTDIR := /lib/modules/$(shell uname -r)/net
58   - endif
59   - endif
60   -endif
61   -
62   -
63   -SRC = device_main.c card.c mac.c baseband.c wctl.c 80211mgr.c \
64   - wcmd.c wmgr.c bssdb.c wpa2.c rxtx.c dpc.c power.c datarate.c \
65   - srom.c mib.c rc4.c tether.c tcrc.c ioctl.c hostap.c wpa.c key.c \
66   - tkip.c michael.c wroute.c rf.c iwctl.c wpactl.c aes_ccmp.c \
67   - vntwifi.c IEEE11h.c
68   -
69   -ifeq ($(IO_MAP), 1)
70   - EXTRA_CFLAGS += -DIO_MAP
71   -endif
72   -
73   -ifeq ($(HOSTAP), 1)
74   - EXTRA_CFLAGS += -DHOSTAP
75   -endif
76   -
77   -ifeq ($(PRIV_OBJ), 1)
78   - EXTRA_CFLAGS += -DPRIVATE_OBJ
79   -endif
80   -
81   -EXTRA_CFLAGS += -I$(PWD) -I$(PWD)/../include -I$(PWD)/../solomon
82   -
83   -EXTRA_CFLAGS += -I$(PWD)/include -I$(PWD)/solomon
84   -
85   -# build rule
86   -ifeq ($(KVER), 2.6)
87   -# 2.6 kernel
88   -
89   -ifndef KERNEL_CONF
90   -KERNEL_CONF= $(KSRC)/.config
91   -endif
92   -
93   -include ${KERNEL_CONF}
94   -
95   -obj-m += viawget.o
96   -
97   -viawget-objs := device_main.o card.o mac.o baseband.o wctl.o 80211mgr.o \
98   - wcmd.o wmgr.o bssdb.o rxtx.o dpc.o power.o datarate.o srom.o \
99   - mib.o rc4.o tether.o tcrc.o ioctl.o hostap.o wpa.o key.o tkip.o \
100   - michael.o wroute.o rf.o iwctl.o wpactl.o wpa2.o aes_ccmp.o \
101   - vntwifi.o IEEE11h.o
102   -
103   -.c.o:
104   - $(CC) $(CFLAGS) -o $@ $<
105   -
106   -default:
107   - make -C $(KSRC) SUBDIRS=$(shell pwd) modules
108   -
109   -else
110   -
111   -# 2.2/2.4 kernel
112   -OBJS := device_main.o card.o mac.o baseband.o wctl.o 80211mgr.o \
113   - wcmd.o wmgr.o bssdb.o rxtx.o dpc.o power.o datarate.o srom.o \
114   - mib.o rc4.o tether.o tcrc.o ioctl.o hostap.o wpa.o key.o tkip.o \
115   - michael.o wroute.o rf.o iwctl.o wpactl.o wpa2.o aes_ccmp.o \
116   - vntwifi.o IEEE11h.o
117   -
118   -VERSION_FILE := $(KSRC)/include/linux/version.h
119   -CONFIG_FILE := $(KSRC)/include/linux/config.h
120   -
121   -
122   -ifeq (,$(wildcard $(VERSION_FILE)))
123   - $(error Linux kernel source not configured - missing version.h)
124   -endif
125   -
126   -ifeq (,$(wildcard $(CONFIG_FILE)))
127   - $(error Linux kernel source not configured - missing config.h)
128   -endif
129   -
130   -ifneq (,$(findstring egcs-2.91.66, $(shell cat /proc/version)))
131   - CC := kgcc gcc cc
132   -else
133   - CC := gcc cc
134   -endif
135   -
136   -test_cc = $(shell which $(cc) > /dev/null 2>&1 && echo $(cc))
137   -CC := $(foreach cc, $(CC), $(test_cc))
138   -CC := $(firstword $(CC))
139   -
140   -EXTRA_CFLAGS += -Wall -DLINUX -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -D__NO_VERSION__ -O2 -pipe
141   -EXTRA_CFLAGS += -I$(KSRC)/include -Wstrict-prototypes -fomit-frame-pointer -fno-strict-aliasing
142   -EXTRA_CFLAGS += $(shell [ -f $(KSRC)/include/linux/modversions.h ] && \
143   - echo "-DMODVERSIONS -include $(KSRC)/include/linux/modversions.h")
144   -
145   -.SILENT: $(TARGET) clean
146   -
147   -
148   -# look for SMP in config.h
149   -SMP := $(shell $(CC) $(CFLAGS) -E -dM $(CONFIG_FILE) | \
150   - grep CONFIG_SMP | awk '{ print $$3 }')
151   -
152   -ifneq ($(SMP),1)
153   - SMP := 0
154   -endif
155   -
156   -
157   -ifeq ($(SMP), 1)
158   - EXTRA_CFLAGS += -D__SMP__
159   -endif
160   -
161   -
162   -ifeq ($(PRIV_OBJ), 1)
163   - EXTRA_CFLAGS += -DPRIVATE_OBJ
164   - TARGET = x86g_up.o
165   -
166   -ifeq ($(SMP), 1)
167   - TARGET = x86g_smp.o
168   -endif
169   -
170   -endif
171   -
172   -
173   -# check x86_64
174   -SUBARCH := $(shell uname -m)
175   -ifeq ($(SUBARCH),x86_64)
176   - EXTRA_CFLAGS += -mcmodel=kernel -mno-red-zone
177   -endif
178   -
179   -
180   -$(TARGET): $(filter-out $(TARGET), $(SRC:.c=.o))
181   - $(LD) -r $^ -o $@
182   - echo; echo
183   - echo "**************************************************"
184   - echo "Build options:"
185   - echo " VERSION $(KVER)"
186   - echo -n " SMP "
187   - if [ "$(SMP)" = "1" ]; \
188   - then echo "Enabled"; else echo "Disabled"; fi
189   -
190   -
191   -
192   -endif # ifeq ($(KVER),2.6)
193   -
194   -
195   -ifeq ($(KVER), 2.6)
196   -install: default
197   -else
198   -install: clean $(TARGET)
199   -endif
200   - mkdir -p $(MOD_ROOT)$(INSTDIR)
201   - install -m 644 -o root $(TARGET) $(MOD_ROOT)$(INSTDIR)
202   -
203   -ifeq (,$(MOD_ROOT))
204   - /sbin/depmod -a || true
205   -else
206   - /sbin/depmod -b $(MOD_ROOT) -a || true
207   -endif
208   -
209   -
210   -uninstall:
211   - rm -f $(INSTDIR)/$(TARGET)
212   - /sbin/depmod -a
213   -
214   -clean:
215   - rm -f $(TARGET) $(SRC:.c=.o) *.o *~
216   - rm -f .*.o.d .*.o.cmd .*.ko.cmd *.mod.c *.mod.o
217   -
218   --include .depend.mak
  38 +obj-$(CONFIG_VT6655) += vt6655.o