mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-17 23:34:07 +00:00
Merge pull request #326 from moonman/master
Update linux-kirkwood to 3.6.10 and linux to 3.1.10-15
This commit is contained in:
Kevin Mihelich
commit
6cd5bf0a70
6 changed files with 4372 additions and 38 deletions
|
|
@ -7,7 +7,7 @@ pkgbase=linux-kirkwood
|
|||
pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
|
||||
#pkgname=linux-test # Build kernel with a different name
|
||||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.6.4
|
||||
_basekernel=3.6.10
|
||||
pkgver=${_basekernel}
|
||||
pkgrel=1
|
||||
cryptover=1.5
|
||||
|
|
@ -24,20 +24,21 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
|
|||
'change-default-console-loglevel.patch'
|
||||
'usb-add-reset-resume-quirk-for-several-webcams.patch'
|
||||
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5-3.6.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5/0002-block-introduce-the-BFQ-v5-I-O-sched-for-3.6.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5r1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.6.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5r1/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.6.patch"
|
||||
'aufs3-3.6.patch.xz')
|
||||
md5sums=('a9ef3e479b47ef31d5a6c71a49aacf52'
|
||||
|
||||
md5sums=('6f63873163e75b43ad81a94c0460e4d1'
|
||||
'0df0c9243fcf6465bfca27ec0ef20440'
|
||||
'f5d3635da03cb45904bedd69b47133de'
|
||||
'f42434ef074407ad7e65a62a31864ded'
|
||||
'db738bb60524b3e1f7c05e6db32effb0'
|
||||
'9506a43fff451fda36d5d7b1f5eaed04'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'd00814b57448895e65fbbc800e8a58ba'
|
||||
'3a4b8d23c1708283e29477931d63ffb8'
|
||||
'f8d5472706d94a2707dd53bad5ccd00e'
|
||||
'b5df48a60787f0abe275fe9df1bbef35'
|
||||
'c8182bf611ab1f9fb3fbc314b61dd04c')
|
||||
'5b36fdb524bc0fbc1c2dd7ff6e5f00c7'
|
||||
'ab32d82c03667836e0827158f128c755'
|
||||
'c8182bf611ab1f9fb3fbc314b61dd04c')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/linux-${_basekernel}"
|
||||
|
|
@ -55,8 +56,8 @@ build() {
|
|||
patch -Np1 -i "${srcdir}/aufs3-3.6.patch"
|
||||
|
||||
# Add BFQ patches
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5-3.6.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5-I-O-sched-for-3.6.patch"
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.6.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.6.patch"
|
||||
|
||||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.6.4-1 Kernel Configuration
|
||||
# Linux/arm 3.6.10-0 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
|
|
@ -228,10 +228,10 @@ CONFIG_IOSCHED_CFQ=y
|
|||
CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_CGROUP_BFQIO=y
|
||||
# CONFIG_DEFAULT_DEADLINE is not set
|
||||
CONFIG_DEFAULT_CFQ=y
|
||||
# CONFIG_DEFAULT_BFQ is not set
|
||||
# CONFIG_DEFAULT_CFQ is not set
|
||||
CONFIG_DEFAULT_BFQ=y
|
||||
# CONFIG_DEFAULT_NOOP is not set
|
||||
CONFIG_DEFAULT_IOSCHED="cfq"
|
||||
CONFIG_DEFAULT_IOSCHED="bfq"
|
||||
# CONFIG_INLINE_SPIN_TRYLOCK is not set
|
||||
# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
|
||||
# CONFIG_INLINE_SPIN_LOCK is not set
|
||||
|
|
@ -1076,7 +1076,8 @@ CONFIG_MTD_CMDLINE_PARTS=y
|
|||
#
|
||||
CONFIG_MTD_CHAR=y
|
||||
CONFIG_MTD_BLKDEVS=y
|
||||
CONFIG_MTD_BLOCK=y
|
||||
CONFIG_MTD_BLOCK=m
|
||||
# CONFIG_MTD_BLOCK_RO is not set
|
||||
# CONFIG_FTL is not set
|
||||
# CONFIG_NFTL is not set
|
||||
# CONFIG_INFTL is not set
|
||||
|
|
@ -1765,8 +1766,8 @@ CONFIG_ATH9K_HW=m
|
|||
CONFIG_ATH9K_COMMON=m
|
||||
CONFIG_ATH9K_BTCOEX_SUPPORT=y
|
||||
CONFIG_ATH9K=m
|
||||
# CONFIG_ATH9K_PCI is not set
|
||||
# CONFIG_ATH9K_AHB is not set
|
||||
CONFIG_ATH9K_PCI=y
|
||||
CONFIG_ATH9K_AHB=y
|
||||
# CONFIG_ATH9K_DEBUGFS is not set
|
||||
CONFIG_ATH9K_RATE_CONTROL=y
|
||||
CONFIG_ATH9K_HTC=m
|
||||
|
|
@ -1774,7 +1775,10 @@ CONFIG_ATH9K_HTC=m
|
|||
CONFIG_CARL9170=m
|
||||
CONFIG_CARL9170_LEDS=y
|
||||
CONFIG_CARL9170_WPC=y
|
||||
# CONFIG_ATH6KL is not set
|
||||
CONFIG_ATH6KL=m
|
||||
CONFIG_ATH6KL_SDIO=m
|
||||
CONFIG_ATH6KL_USB=m
|
||||
# CONFIG_ATH6KL_DEBUG is not set
|
||||
CONFIG_B43=m
|
||||
CONFIG_B43_SSB=y
|
||||
CONFIG_B43_PCI_AUTOSELECT=y
|
||||
|
|
@ -3854,22 +3858,22 @@ CONFIG_NLS_CODEPAGE_850=y
|
|||
# CONFIG_NLS_CODEPAGE_949 is not set
|
||||
# CONFIG_NLS_CODEPAGE_874 is not set
|
||||
# CONFIG_NLS_ISO8859_8 is not set
|
||||
# CONFIG_NLS_CODEPAGE_1250 is not set
|
||||
# CONFIG_NLS_CODEPAGE_1251 is not set
|
||||
CONFIG_NLS_CODEPAGE_1250=m
|
||||
CONFIG_NLS_CODEPAGE_1251=m
|
||||
# CONFIG_NLS_ASCII is not set
|
||||
CONFIG_NLS_ISO8859_1=y
|
||||
CONFIG_NLS_ISO8859_2=y
|
||||
# CONFIG_NLS_ISO8859_3 is not set
|
||||
# CONFIG_NLS_ISO8859_4 is not set
|
||||
# CONFIG_NLS_ISO8859_5 is not set
|
||||
CONFIG_NLS_ISO8859_5=m
|
||||
# CONFIG_NLS_ISO8859_6 is not set
|
||||
# CONFIG_NLS_ISO8859_7 is not set
|
||||
# CONFIG_NLS_ISO8859_9 is not set
|
||||
# CONFIG_NLS_ISO8859_13 is not set
|
||||
# CONFIG_NLS_ISO8859_14 is not set
|
||||
# CONFIG_NLS_ISO8859_15 is not set
|
||||
# CONFIG_NLS_KOI8_R is not set
|
||||
# CONFIG_NLS_KOI8_U is not set
|
||||
CONFIG_NLS_KOI8_R=m
|
||||
CONFIG_NLS_KOI8_U=m
|
||||
# CONFIG_NLS_MAC_ROMAN is not set
|
||||
# CONFIG_NLS_MAC_CELTIC is not set
|
||||
# CONFIG_NLS_MAC_CENTEURO is not set
|
||||
|
|
|
|||
|
|
@ -10,34 +10,59 @@ pkgname=('linux' 'linux-headers')
|
|||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.1
|
||||
pkgver=${_basekernel}.10
|
||||
pkgrel=14
|
||||
cryptover=1.4
|
||||
pkgrel=15
|
||||
cryptover=1.5
|
||||
arch=('arm')
|
||||
url="http://www.kernel.org/"
|
||||
license=('GPL2')
|
||||
makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage')
|
||||
options=('!strip')
|
||||
source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2"
|
||||
|
||||
"ftp://ftp.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.bz2"
|
||||
'archlinuxarm.patch'
|
||||
'pciefix.patch'
|
||||
'support.patch'
|
||||
'aufs3-kbuild.patch'
|
||||
'aufs3-base.patch'
|
||||
'aufs3-standalone.patch'
|
||||
'aufs3-git-extras.patch'
|
||||
'config'
|
||||
'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
|
||||
'mach-types'
|
||||
'change-default-console-loglevel.patch'
|
||||
'usb-add-reset-resume-quirk-for-several-webcams.patch'
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.1.0-v5r1/0001-block-prepare-I-O-context-code-for-BFQ-v5r1-for-3.1.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.1.0-v5r1/0002-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.1.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.1.0-v5r1/0003-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.1.patch"
|
||||
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz")
|
||||
|
||||
md5sums=('8d43453f8159b2332ad410b19d86a931'
|
||||
'a8e1c25a93a685ec2a1c3a808715fe9d'
|
||||
'ee2f814b8e7aded2c3eb0c04003d13ae'
|
||||
'61dbbcdb0f35032ea7f82c5b1ef7c769'
|
||||
'f5d3635da03cb45904bedd69b47133de'
|
||||
'3f64ed9d71499fe9293dc671f4e4087e'
|
||||
'29628745258df910abfb8cb24ca3ccd9'
|
||||
'c9e6e8bb0774a89f7f9bd30a13be7532'
|
||||
'55b04499a4578e586cf5a4d0b69fc5aa'
|
||||
'6ca78ea820a63a37f7650eac48321a55'
|
||||
'9506a43fff451fda36d5d7b1f5eaed04'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'd00814b57448895e65fbbc800e8a58ba'
|
||||
'583160bc10eaf89874a841b517f5e115'
|
||||
'7d33a67155bfef132b388583a73b8403'
|
||||
'af97823b3cdddf5bc65d23743820bdbd'
|
||||
'3a4b8d23c1708283e29477931d63ffb8')
|
||||
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/linux-${_basekernel}"
|
||||
|
||||
# add upstream patch
|
||||
patch -p1 -i "${srcdir}/patch-${pkgver}"
|
||||
|
||||
#Add the pci-e patch backported from 3.6.10 for kirkwoods
|
||||
patch -Np1 -i "${srcdir}/pciefix.patch"
|
||||
|
||||
# Add the USB_QUIRK_RESET_RESUME for several webcams
|
||||
# FS#26528
|
||||
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
|
||||
|
|
@ -47,6 +72,11 @@ build() {
|
|||
patch -Np1 -i "${srcdir}/support.patch"
|
||||
cp "${srcdir}/mach-types" arch/arm/tools
|
||||
|
||||
#Add BFQ I/O scheduler patches
|
||||
patch -Np1 -i "${srcdir}/0001-block-prepare-I-O-context-code-for-BFQ-v5r1-for-3.1.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.1.patch"
|
||||
patch -Np1 -i "${srcdir}/0003-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.1.patch"
|
||||
|
||||
# Add AUFS3 patches
|
||||
patch -Np1 -i "${srcdir}/aufs3-kbuild.patch"
|
||||
patch -Np1 -i "${srcdir}/aufs3-base.patch"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.1.10-13 Kernel Configuration
|
||||
# Linux/arm 3.1.10-15 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
|
|
@ -191,10 +191,13 @@ CONFIG_IOSCHED_NOOP=y
|
|||
CONFIG_IOSCHED_DEADLINE=y
|
||||
CONFIG_IOSCHED_CFQ=y
|
||||
# CONFIG_CFQ_GROUP_IOSCHED is not set
|
||||
CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_CGROUP_BFQIO=y
|
||||
# CONFIG_DEFAULT_DEADLINE is not set
|
||||
CONFIG_DEFAULT_CFQ=y
|
||||
# CONFIG_DEFAULT_CFQ is not set
|
||||
CONFIG_DEFAULT_BFQ=y
|
||||
# CONFIG_DEFAULT_NOOP is not set
|
||||
CONFIG_DEFAULT_IOSCHED="cfq"
|
||||
CONFIG_DEFAULT_IOSCHED="bfq"
|
||||
# CONFIG_INLINE_SPIN_TRYLOCK is not set
|
||||
# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
|
||||
# CONFIG_INLINE_SPIN_LOCK is not set
|
||||
|
|
@ -1502,7 +1505,7 @@ CONFIG_ATH5K_PCI=y
|
|||
CONFIG_ATH9K_HW=m
|
||||
CONFIG_ATH9K_COMMON=m
|
||||
CONFIG_ATH9K=m
|
||||
# CONFIG_ATH9K_PCI is not set
|
||||
CONFIG_ATH9K_PCI=y
|
||||
# CONFIG_ATH9K_AHB is not set
|
||||
# CONFIG_ATH9K_DEBUGFS is not set
|
||||
CONFIG_ATH9K_RATE_CONTROL=y
|
||||
|
|
@ -3534,7 +3537,7 @@ CONFIG_NLS_CODEPAGE_437=y
|
|||
# CONFIG_NLS_CODEPAGE_775 is not set
|
||||
CONFIG_NLS_CODEPAGE_850=y
|
||||
# CONFIG_NLS_CODEPAGE_852 is not set
|
||||
# CONFIG_NLS_CODEPAGE_855 is not set
|
||||
CONFIG_NLS_CODEPAGE_855=m
|
||||
# CONFIG_NLS_CODEPAGE_857 is not set
|
||||
# CONFIG_NLS_CODEPAGE_860 is not set
|
||||
# CONFIG_NLS_CODEPAGE_861 is not set
|
||||
|
|
@ -3542,7 +3545,7 @@ CONFIG_NLS_CODEPAGE_850=y
|
|||
# CONFIG_NLS_CODEPAGE_863 is not set
|
||||
# CONFIG_NLS_CODEPAGE_864 is not set
|
||||
# CONFIG_NLS_CODEPAGE_865 is not set
|
||||
# CONFIG_NLS_CODEPAGE_866 is not set
|
||||
CONFIG_NLS_CODEPAGE_866=m
|
||||
# CONFIG_NLS_CODEPAGE_869 is not set
|
||||
# CONFIG_NLS_CODEPAGE_936 is not set
|
||||
# CONFIG_NLS_CODEPAGE_950 is not set
|
||||
|
|
@ -3550,22 +3553,22 @@ CONFIG_NLS_CODEPAGE_850=y
|
|||
# CONFIG_NLS_CODEPAGE_949 is not set
|
||||
# CONFIG_NLS_CODEPAGE_874 is not set
|
||||
# CONFIG_NLS_ISO8859_8 is not set
|
||||
# CONFIG_NLS_CODEPAGE_1250 is not set
|
||||
# CONFIG_NLS_CODEPAGE_1251 is not set
|
||||
CONFIG_NLS_CODEPAGE_1250=m
|
||||
CONFIG_NLS_CODEPAGE_1251=m
|
||||
# CONFIG_NLS_ASCII is not set
|
||||
CONFIG_NLS_ISO8859_1=y
|
||||
CONFIG_NLS_ISO8859_2=y
|
||||
# CONFIG_NLS_ISO8859_3 is not set
|
||||
# CONFIG_NLS_ISO8859_4 is not set
|
||||
# CONFIG_NLS_ISO8859_5 is not set
|
||||
CONFIG_NLS_ISO8859_5=m
|
||||
# CONFIG_NLS_ISO8859_6 is not set
|
||||
# CONFIG_NLS_ISO8859_7 is not set
|
||||
# CONFIG_NLS_ISO8859_9 is not set
|
||||
# CONFIG_NLS_ISO8859_13 is not set
|
||||
# CONFIG_NLS_ISO8859_14 is not set
|
||||
# CONFIG_NLS_ISO8859_15 is not set
|
||||
# CONFIG_NLS_KOI8_R is not set
|
||||
# CONFIG_NLS_KOI8_U is not set
|
||||
CONFIG_NLS_KOI8_R=m
|
||||
CONFIG_NLS_KOI8_U=m
|
||||
CONFIG_NLS_UTF8=y
|
||||
# CONFIG_DLM is not set
|
||||
|
||||
|
|
|
|||
4259
core/linux/mach-types
Normal file
4259
core/linux/mach-types
Normal file
File diff suppressed because it is too large
Load diff
37
core/linux/pciefix.patch
Normal file
37
core/linux/pciefix.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
diff -rupN linux-3.1.old/arch/arm/Kconfig linux-3.1/arch/arm/Kconfig
|
||||
--- linux-3.1.old/arch/arm/Kconfig 2011-10-24 01:10:05.000000000 -0600
|
||||
+++ linux-3.1/arch/arm/Kconfig 2012-12-11 10:53:26.000000000 -0700
|
||||
@@ -503,6 +503,7 @@ config ARCH_KIRKWOOD
|
||||
bool "Marvell Kirkwood"
|
||||
select CPU_FEROCEON
|
||||
select PCI
|
||||
+ select PCI_QUIRKS
|
||||
select ARCH_REQUIRE_GPIOLIB
|
||||
select GENERIC_CLOCKEVENTS
|
||||
select PLAT_ORION
|
||||
diff -rupN linux-3.1.old/arch/arm/mach-kirkwood/pcie.c linux-3.1/arch/arm/mach-kirkwood/pcie.c
|
||||
--- linux-3.1.old/arch/arm/mach-kirkwood/pcie.c 2011-10-24 01:10:05.000000000 -0600
|
||||
+++ linux-3.1/arch/arm/mach-kirkwood/pcie.c 2012-12-11 10:56:22.000000000 -0700
|
||||
@@ -213,14 +213,19 @@ static int __init kirkwood_pcie_setup(in
|
||||
return 1;
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it
|
||||
+ * is operating as a root complex this needs to be switched to
|
||||
+ * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on
|
||||
+ * the device. Decoding setup is handled by the orion code.
|
||||
+ */
|
||||
static void __devinit rc_pci_fixup(struct pci_dev *dev)
|
||||
{
|
||||
- /*
|
||||
- * Prevent enumeration of root complex.
|
||||
- */
|
||||
if (dev->bus->parent == NULL && dev->devfn == 0) {
|
||||
int i;
|
||||
|
||||
+ dev->class &= 0xff;
|
||||
+ dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
|
||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
||||
dev->resource[i].start = 0;
|
||||
dev->resource[i].end = 0;
|
||||
Loading…
Reference in a new issue