Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atheros: rework to build with linux 3.10 

https://jira.digi.com/browse/DEL-673

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-09-13 18:40:10 +02:00
parent 7ee46b00d8
commit 936fcc9151
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
View File

@ -13,7 +13,7 @@ PR = "r1"
RDEPENDS_${PN} = "kmod" RDEPENDS_${PN} = "kmod"
SRCREV_external = "" SRCREV_external = ""
SRCREV_internal = "ac3a910ebc66d0eca8f4de78b513fa3636ed9e6b" SRCREV_internal = "b17616e7d69cfc6f838daa5477403d9e9c4bc997"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/atheros.git;protocol=git" SRC_URI_external = "${DIGI_GITHUB_GIT}/atheros.git;protocol=git"
@ -21,16 +21,12 @@ SRC_URI_internal = "${DIGI_LOG_GIT}linux-modules/atheros.git;protocol=git"
SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}" SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
SRC_URI += " \ SRC_URI += " \
file://atheros \ file://atheros \
file://atheros.conf \
file://Makefile \ file://Makefile \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
ATH_ONLY_INSTALL_FW = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-dey', '2.6.35.14', '', '1', d)}" EXTRA_OEMAKE = "DEL_PLATFORM=${MACHINE} KLIB_BUILD=${STAGING_KERNEL_DIR}"
ATH6KL_MOD = "${@base_conditional('ATH_ONLY_INSTALL_FW', '1' , 'ath6kl_core', 'ath6kl_sdio', d)}"
EXTRA_OEMAKE = "DEL_PLATFORM=${MACHINE} KLIB_BUILD=${STAGING_KERNEL_DIR} ATH_ONLY_INSTALL_FW=${ATH_ONLY_INSTALL_FW}"
do_configure_prepend() { do_configure_prepend() {
cp ${WORKDIR}/Makefile ${S}/ cp ${WORKDIR}/Makefile ${S}/
@ -40,8 +36,10 @@ do_install_append() {
install -d ${D}${sysconfdir}/network/if-pre-up.d install -d ${D}${sysconfdir}/network/if-pre-up.d
install -m 0755 ${WORKDIR}/atheros ${D}${sysconfdir}/network/if-pre-up.d/ install -m 0755 ${WORKDIR}/atheros ${D}${sysconfdir}/network/if-pre-up.d/
install -d ${D}${sysconfdir}/modprobe.d install -d ${D}${sysconfdir}/modprobe.d
install -m 0644 ${WORKDIR}/atheros.conf ${D}${sysconfdir}/modprobe.d/ cat >> ${D}${sysconfdir}/modprobe.d/atheros.conf <<-_EOF_
echo "options ${ATH6KL_MOD} ath6kl_p2p=1 softmac_enable=1" >> ${D}${sysconfdir}/modprobe.d/atheros.conf install ath6kl_sdio true
options ath6kl_sdio ath6kl_p2p=1 softmac_enable=1
_EOF_
} }
FILES_${PN} += " \ FILES_${PN} += " \

4
meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/Makefile
View File

@ -44,18 +44,14 @@ endif
SRC := $(shell pwd) SRC := $(shell pwd)
all: all:
ifeq ($(ATH_ONLY_INSTALL_FW),)
$(MAKE) -C $(KERNEL_SRC) M=$(SRC) $(MAKE) -C $(KERNEL_SRC) M=$(SRC)
endif
modules_install: modules_install:
ifeq ($(ATH_ONLY_INSTALL_FW),)
$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install $(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install
# Fix installation directory of the modules. # Fix installation directory of the modules.
find $(INSTALL_MOD_PATH)/lib/modules/$(KERNEL_VERSION)/extra/$(ATH_DRV_BASEDIR) -type f -name '*.ko' | \ find $(INSTALL_MOD_PATH)/lib/modules/$(KERNEL_VERSION)/extra/$(ATH_DRV_BASEDIR) -type f -name '*.ko' | \
xargs -I modfile mv -f modfile $(INSTALL_MOD_PATH)/lib/modules/$(KERNEL_VERSION)/extra/ xargs -I modfile mv -f modfile $(INSTALL_MOD_PATH)/lib/modules/$(KERNEL_VERSION)/extra/
rm -rf $(INSTALL_MOD_PATH)/lib/modules/*/extra/$(ATH_DRV_BASEDIR) rm -rf $(INSTALL_MOD_PATH)/lib/modules/*/extra/$(ATH_DRV_BASEDIR)
endif
# Install firmware # Install firmware
mkdir -p $(INSTALL_MOD_PATH)/lib/firmware/ath6k/AR6003/hw2.1.1/ mkdir -p $(INSTALL_MOD_PATH)/lib/firmware/ath6k/AR6003/hw2.1.1/
install -m 0644 $(FIRMWARE) $(INSTALL_MOD_PATH)/lib/firmware/ath6k/AR6003/hw2.1.1/ install -m 0644 $(FIRMWARE) $(INSTALL_MOD_PATH)/lib/firmware/ath6k/AR6003/hw2.1.1/

1
meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros.conf
View File

@ -1 +0,0 @@
install ath6kl_sdio true