Merge pull request #1066 from pmattern/master

core/linux-sun7i: re-enable WLAN on Cubietruck, minor improvements
This commit is contained in:
Kevin Mihelich 2015-01-16 06:14:22 -07:00
commit 0bc06684bf
2 changed files with 15 additions and 7 deletions

View file

@ -9,19 +9,21 @@ _srcname=linux-sunxi-${_commit}
_kernelname=${pkgbase#linux}
_desc="sun7i"
pkgver=3.4.103
pkgrel=4
pkgrel=5
arch=('armv7h')
url="https://github.com/linux-sunxi/linux-sunxi/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage' 'git')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-tools' 'git')
options=('!strip')
source=("https://github.com/linux-sunxi/linux-sunxi/archive/${_commit}.tar.gz"
"https://raw.githubusercontent.com/EddyBeaupre/ap6210/master/ap6210_module.patch"
'config'
'0001-Backport-BFP-XOR-operation.patch'
'0001-Backport-firmware-loader.patch'
'0001-Backport-msdos-partition-UUIDs.patch')
md5sums=('6cdd44f9131a854cdbf5ddad86187c57'
'22dff1aec4e1c29f7881ea863950704e'
'f74bbefcd84c7d6626e2a763c6791556'
'3d3914c6b3e80956ccc04112edc283fa'
'ca5b466850782493b99e824d6efbea4d'
'520bde63dd6803f3332e9b26cb34cff9'
'743724d560cf34dadefb8e976a31319c')
@ -34,6 +36,7 @@ prepare() {
git apply ../0001-Backport-BFP-XOR-operation.patch
git apply ../0001-Backport-firmware-loader.patch
git apply ../0001-Backport-msdos-partition-UUIDs.patch
patch -p1 < ${srcdir}/ap6210_module.patch
# add pkgrel to extraversion
sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile

View file

@ -1483,10 +1483,15 @@ CONFIG_ATH6KL=m
# CONFIG_B43LEGACY is not set
CONFIG_BCMDHD=m
CONFIG_BCM4339=m
CONFIG_BCMDHD_FW_PATH="/lib/firmware/ap6210/fw_bcmxxxx.bin"
CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/ap6210/nvram_apxxxx.txt"
CONFIG_BCMDHD_FW_PATH="/usr/lib/firmware/ap6210/fw_bcmxxxx.bin"
CONFIG_BCMDHD_NVRAM_PATH="/usr/lib/firmware/ap6210/nvram_apxxxx.txt"
# CONFIG_DHD_USE_STATIC_BUF is not set
# CONFIG_DHD_USE_SCHED_SCAN is not set
CONFIG_AP6210=m
CONFIG_AP6210_FW_PATH="/usr/lib/firmware/ap6210/fw_bcmxxxx.bin"
CONFIG_AP6210_NVRAM_PATH="/usr/lib/firmware/ap6210/nvram_apxxxx.txt"
CONFIG_AP6210_OOB=y
# CONFIG_AP6210_SDIO_IRQ is not set
CONFIG_BRCMUTIL=m
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
@ -1769,8 +1774,8 @@ CONFIG_DEVKMEM=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_SUNXI=y
CONFIG_SERIAL_8250_NR_UARTS=1
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
CONFIG_SERIAL_8250_NR_UARTS=2
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_MANY_PORTS is not set
# CONFIG_SERIAL_8250_SHARE_IRQ is not set