webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-25 18:32:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

compat-wireless: update to 3.5-3-snpc.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-08-13 13:39:34 -04:00
parent 337726bf3a
commit 21df33072c
4 changed files with 27 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lfs/compat-wireless
View File

@@ -26,7 +26,7 @@ include Config
VERSUFIX=ipfire$(KCFG)
VER = 3.5-1-snpc
VER = 3.5-3-snpc
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.59
@@ -47,7 +47,7 @@ objects = $(DL_FILE) asix-4.4.0.tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz
$(DL_FILE)_MD5 = 7099f748a9d2c05fffea7e5ea4f41a0b
$(DL_FILE)_MD5 = 66f27eed39aacd567f67025305273cd7
asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde
install : $(TARGET)
@@ -82,6 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# kfifo has no license info and taints kernel
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
# Build ath5k only if target has pci
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch
# Copy USB-Net drivers from Kernel...
mkdir $(DIR_APP)/drivers/net/usb/new
cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new
@@ -101,12 +104,12 @@ ifneq "$(KCFG)" "-xen"
cd $(DIR_APP) && echo export CONFIG_LIBERTAS_UAP=m >> config.mk
endif
#ifeq "$(MACHINE_TYPE)" "arm"
# # fix atomic64 functions
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.2.5-1-fix_atomic64_t_on_arm.patch
#endif
# Erase some modules that are obsolete or moved to other path
rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/bluetooth
rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/wl12*
cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
KLIB_BUILD=/lib/modules/$(KVER)-$(VERSUFIX)/build \
KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules
# Install firmware udev files...

4
make.sh
View File

@@ -441,7 +441,7 @@ buildipfire() {
# ipfiremake mISDN KCFG="-rpi"
# ipfiremake dahdi KCFG="-rpi" KMOD=1
ipfiremake cryptodev KCFG="-rpi"
# ipfiremake compat-wireless KCFG="-rpi"
ipfiremake compat-wireless KCFG="-rpi"
# ipfiremake r8169 KCFG="-rpi"
# ipfiremake r8168 KCFG="-rpi"
# ipfiremake r8101 KCFG="-rpi"
@@ -455,7 +455,7 @@ buildipfire() {
# ipfiremake mISDN KCFG="-omap"
# ipfiremake dahdi KCFG="-omap" KMOD=1
ipfiremake cryptodev KCFG="-omap"
# ipfiremake compat-wireless KCFG="-omap"
ipfiremake compat-wireless KCFG="-omap"
# ipfiremake r8169 KCFG="-omap"
# ipfiremake r8168 KCFG="-omap"
# ipfiremake r8101 KCFG="-omap"

37
src/patches/compat-wireless-3.2.5-1-fix_atomic64_t_on_arm.patch
View File

@@ -1,37 +0,0 @@
diff -Naur compat-wireless-3.2.5-1.org/compat/compat_atomic.c compat-wireless-3.2.5-1/compat/compat_atomic.c
--- compat-wireless-3.2.5-1.org/compat/compat_atomic.c 2012-02-07 04:45:51.000000000 +0100
+++ compat-wireless-3.2.5-1/compat/compat_atomic.c 2012-02-18 15:39:42.000000000 +0100
@@ -3,6 +3,8 @@
#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && (defined(CONFIG_UML) || defined(CONFIG_X86))) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))
+#include <asm-generic/atomic64.h>
+
static DEFINE_SPINLOCK(lock);
long long atomic64_read(const atomic64_t *v)
diff -Naur compat-wireless-3.2.5-1.org/compat/Makefile compat-wireless-3.2.5-1/compat/Makefile
--- compat-wireless-3.2.5-1.org/compat/Makefile 2012-02-07 05:25:54.000000000 +0100
+++ compat-wireless-3.2.5-1/compat/Makefile 2012-02-18 13:35:18.000000000 +0100
@@ -38,3 +38,9 @@
cordic.o \
crc8.o
+
+ifndef CONFIG_64BIT
+ifndef CONFIG_GENERIC_ATOMIC64
+ compat-y += compat_atomic.o
+endif
+endif
diff -Naur compat-wireless-3.2.5-1.org/net/mac80211/key.h compat-wireless-3.2.5-1/net/mac80211/key.h
--- compat-wireless-3.2.5-1.org/net/mac80211/key.h 2012-02-07 05:25:53.000000000 +0100
+++ compat-wireless-3.2.5-1/net/mac80211/key.h 2012-02-18 15:40:44.000000000 +0100
@@ -32,6 +32,8 @@
#define NUM_RX_DATA_QUEUES 16
+#include <asm-generic/atomic64.h>
+
struct ieee80211_local;
struct ieee80211_sub_if_data;
struct sta_info;

16
src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch Normal file
View File

@@ -0,0 +1,16 @@
diff -Naur compat-wireless-3.5-1-snpc.org/config.mk compat-wireless-3.5/config.mk
--- compat-wireless-3.5-1-snpc.org/config.mk 2012-07-31 17:22:29.000000000 -0400
+++ compat-wireless-3.5/config.mk 2012-08-13 13:09:55.913234600 -0400
@@ -246,10 +246,12 @@
# mac80211 test driver
export CONFIG_MAC80211_HWSIM=m
+ifdef CONFIG_PCI
export CONFIG_ATH5K=m
# export CONFIG_ATH5K_DEBUG=y
# export CONFIG_ATH5K_TRACER=y
# export CONFIG_ATH5K_AHB=y
+endif #CONFIG_PCI
export CONFIG_ATH9K=m
export CONFIG_ATH9K_HW=m