diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index c610544ef..9c3fb0780 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -6,11 +6,19 @@ buildarch=2 pkgbase=linux-kirkwood _kernelname=${pkgbase#linux} _desc="Marvell Kirkwood" -pkgver=3.18.6 -pkgrel=2 +pkgver=3.19 +pkgrel=0 cryptodev_commit=6aa62a2c320b04f55fdfe0ed015c3d9b48997239 bfqver=v7r7 +### BFQ patch kernel version +#bfqkern=${pkgver:0:4} +bfqkern=3.18 + +### AUFS branch name +#aufsbranch="aufs${pkgver:0:4}" +aufsbranch="aufs3.x-rcN" + arch=('arm') url="http://www.kernel.org/" license=('GPL2') @@ -23,21 +31,22 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz" 'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php' 'usb-add-reset-resume-quirk-for-several-webcams.patch' '0001-disable-mv643xx_eth-TSO.patch' -# "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN" - "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}.1+" + "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=${aufsbranch}" "cryptodev.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz" - "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch" - "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" - "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch") + 'cryptodev_3.19-fix.patch' + "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch" + "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch" + "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch") -md5sums=('997c8492ebfdc9bb9e6ed8d4945539dd' - 'adae431c969e3fcf32aa8c315c96e02a' - 'fad0103ae663d6bacb922628f6d26fa7' +md5sums=('d3fc8316d4d4d04b65cbc2d70799e763' + '9536f8b79e105c48ec623a477ac1a6fb' + 'b295fdc2d4be88e7516b60e58a6b5b25' 'df25fccf87d246f97dac2843e22debe6' '9b5a265440abf57d2052838f31486a3a' '09d44b9f07abfaeaf4f688ee52034786' 'SKIP' 'ddf7876487c876f6676ef0e050e9d204' + '4fcbe246deb842c156307a4e111cad00' '1c7c2d0338939a9e6953a64d80861471' 'a81346cce95baeac2c56cf60d3c7e5b6' '8f2743651280f5a022e541f4e95e5546') @@ -68,9 +77,14 @@ msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types" cp "${srcdir}/mach-types" arch/arm/tools msg2 "Add BFQ patches" - patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch" - patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" - patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch" + patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch" + patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch" + patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch" + +msg2 "Fix cryptodev for kernel >=3.19" + cd "${srcdir}/cryptodev-linux-${cryptodev_commit}" + patch -p1 -i "${srcdir}/cryptodev_3.19-fix.patch" + cd "${srcdir}/linux-${pkgver}" cat "${srcdir}/config" > ./.config diff --git a/core/linux-kirkwood/archlinuxarm.patch b/core/linux-kirkwood/archlinuxarm.patch index b7510983d..0d8a005f6 100644 --- a/core/linux-kirkwood/archlinuxarm.patch +++ b/core/linux-kirkwood/archlinuxarm.patch @@ -2490,7 +2490,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g + }, + { + .name = "status:white:misc", -+ .default_trigger = "ide-disk", ++ .default_trigger = "ide-disk1", + .gpio = 40, + .active_low = 0, + } @@ -5925,7 +5925,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32 +static struct gpio_led nsa320_led_pins[] = { + { + .name = "nsa320:green:hdd2", -+ .default_trigger = "ide-disk", ++ .default_trigger = "ide-disk2", + .gpio = 12, + .active_low = 0, + }, { @@ -5960,7 +5960,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32 + .active_low = 0, + }, { + .name = "nsa320:green:hdd1", -+ .default_trigger = "ide-disk", ++ .default_trigger = "ide-disk1", + .gpio = 41, + .active_low = 0, + }, { @@ -8734,10 +8734,11 @@ diff -ruN a/drivers/ata/Kconfig b/drivers/ata/Kconfig ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST select GENERIC_PHY help + diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c ---- a/drivers/ata/sata_mv.c 2014-12-07 22:21:05.000000000 +0000 -+++ b/drivers/ata/sata_mv.c 2014-12-12 01:25:02.011863184 +0000 -@@ -72,6 +72,7 @@ +--- a/drivers/ata/sata_mv.c 2013-11-03 16:41:51.000000000 -0700 ++++ b/drivers/ata/sata_mv.c 2013-11-08 01:39:48.868014917 -0700 +@@ -71,6 +71,7 @@ #include #include #include @@ -8745,15 +8746,87 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c #define DRV_NAME "sata_mv" #define DRV_VERSION "1.28" -@@ -1170,6 +1171,8 @@ +@@ -1161,6 +1162,8 @@ { int want_ncq = (protocol == ATA_PROT_NCQ); -+ ledtrig_ide_activity(); ++ ledtrig_ide_activity(ap->port_no); + if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) { int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0); if (want_ncq != using_ncq) +diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig +--- a/drivers/leds/trigger/Kconfig 2013-11-03 16:41:51.000000000 -0700 ++++ b/drivers/leds/trigger/Kconfig 2013-11-08 01:39:48.958018410 -0700 +@@ -35,7 +35,6 @@ + + config LEDS_TRIGGER_IDE_DISK + bool "LED IDE Disk Trigger" +- depends on IDE_GD_ATA + depends on LEDS_TRIGGERS + help + This allows LEDs to be controlled by IDE disk activity. +diff -ruN a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-ide-disk. +--- a/drivers/leds/trigger/ledtrig-ide-disk.c 2014-10-05 12:23:04.000000000 -0700 ++++ b/drivers/leds/trigger/ledtrig-ide-disk.c 2014-10-09 22:04:58.000000000 -0700 +@@ -18,25 +20,36 @@ + + #define BLINK_DELAY 30 + +-DEFINE_LED_TRIGGER(ledtrig_ide); ++DEFINE_LED_TRIGGER(ledtrig_ide1); ++DEFINE_LED_TRIGGER(ledtrig_ide2); + static unsigned long ide_blink_delay = BLINK_DELAY; + +-void ledtrig_ide_activity(void) ++void ledtrig_ide_activity(int port_number) + { +- led_trigger_blink_oneshot(ledtrig_ide, +- &ide_blink_delay, &ide_blink_delay, 0); ++ switch (port_number) { ++ case 0: ++ led_trigger_blink_oneshot(ledtrig_ide1, &ide_blink_delay, &ide_blink_delay, 0); ++ break; ++ case 1: ++ led_trigger_blink_oneshot(ledtrig_ide2, &ide_blink_delay, &ide_blink_delay, 0); ++ break; ++ default: ++ break; ++ } + } + EXPORT_SYMBOL(ledtrig_ide_activity); + + static int __init ledtrig_ide_init(void) + { +- led_trigger_register_simple("ide-disk", &ledtrig_ide); ++ led_trigger_register_simple("ide-disk1", &ledtrig_ide1); ++ led_trigger_register_simple("ide-disk2", &ledtrig_ide2); + return 0; + } + + static void __exit ledtrig_ide_exit(void) + { +- led_trigger_unregister_simple(ledtrig_ide); ++ led_trigger_unregister_simple(ledtrig_ide1); ++ led_trigger_unregister_simple(ledtrig_ide2); + } + + module_init(ledtrig_ide_init); +diff -ruN a/include/linux/leds.h b/include/linux/leds.h +--- a/include/linux/leds.h 2014-10-05 12:23:04.000000000 -0700 ++++ b/include/linux/leds.h 2014-10-09 22:04:58.000000000 -0700 +@@ -215,9 +216,9 @@ + + /* Trigger specific functions */ + #ifdef CONFIG_LEDS_TRIGGER_IDE_DISK +-extern void ledtrig_ide_activity(void); ++extern void ledtrig_ide_activity(int port_number); + #else +-static inline void ledtrig_ide_activity(void) {} ++static inline void ledtrig_ide_activity(int port_number) {} + #endif + + #if defined(CONFIG_LEDS_TRIGGER_CAMERA) || defined(CONFIG_LEDS_TRIGGER_CAMERA_MODULE) diff -ruN a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm --- a/drivers/cpufreq/Kconfig.arm 2014-12-07 22:21:05.000000000 +0000 +++ b/drivers/cpufreq/Kconfig.arm 2014-12-12 01:26:17.539188086 +0000 @@ -9088,17 +9161,6 @@ diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig default y help This option enable support for LEDs found on the LaCie 2Big -diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig ---- a/drivers/leds/trigger/Kconfig 2014-12-07 22:21:05.000000000 +0000 -+++ b/drivers/leds/trigger/Kconfig 2014-12-12 01:25:02.022863959 +0000 -@@ -35,7 +35,6 @@ - - config LEDS_TRIGGER_IDE_DISK - bool "LED IDE Disk Trigger" -- depends on IDE_GD_ATA - depends on LEDS_TRIGGERS - help - This allows LEDs to be controlled by IDE disk activity. diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c --- a/drivers/mmc/core/core.c 2014-12-07 22:21:05.000000000 +0000 +++ b/drivers/mmc/core/core.c 2014-12-12 01:25:02.026864241 +0000 diff --git a/core/linux-kirkwood/config b/core/linux-kirkwood/config index 034cfd6f2..1817c787a 100644 --- a/core/linux-kirkwood/config +++ b/core/linux-kirkwood/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.18.0-2 Kernel Configuration +# Linux/arm 3.19.0-0 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -92,7 +92,6 @@ CONFIG_TASK_IO_ACCOUNTING=y # # RCU Subsystem # -CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y CONFIG_TASKS_RCU=y CONFIG_RCU_STALL_COMMON=y @@ -114,7 +113,7 @@ CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y +CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_SWAP_ENABLED=y @@ -144,6 +143,7 @@ CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y +CONFIG_INIT_FALLBACK=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -228,6 +228,7 @@ CONFIG_OLD_SIGACTION=y # GCOV-based kernel profiling # # CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -296,7 +297,6 @@ CONFIG_FREEZER=y # CONFIG_MMU=y # CONFIG_ARCH_MULTIPLATFORM is not set -# CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VERSATILE is not set # CONFIG_ARCH_AT91 is not set @@ -402,6 +402,7 @@ CONFIG_CACHE_FEROCEON_L2=y # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set # CONFIG_CACHE_L2X0 is not set CONFIG_ARM_L1_CACHE_SHIFT=5 +# CONFIG_ARM_KERNMEM_PERMS is not set # # Bus support @@ -506,6 +507,7 @@ CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set @@ -516,7 +518,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # -# ARM CPU frequency scaling drivers +# CPU frequency scaling drivers # CONFIG_ARM_KIRKWOOD_CPUFREQ=y @@ -562,7 +564,6 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_PM_SLEEP=y # CONFIG_PM_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set -CONFIG_PM_RUNTIME=y CONFIG_PM=y CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y @@ -617,6 +618,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_NET_IPVTI is not set CONFIG_NET_UDP_TUNNEL=m CONFIG_NET_FOU=m +# CONFIG_NET_FOU_IP_TUNNELS is not set CONFIG_GENEVE=m CONFIG_INET_AH=m CONFIG_INET_ESP=m @@ -712,6 +714,7 @@ CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=m CONFIG_NF_TABLES=m CONFIG_NF_TABLES_INET=m CONFIG_NFT_EXTHDR=m @@ -723,6 +726,7 @@ CONFIG_NFT_COUNTER=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m CONFIG_NFT_NAT=m CONFIG_NFT_QUEUE=m CONFIG_NFT_REJECT=m @@ -848,6 +852,7 @@ CONFIG_NF_NAT_IPV4=m CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NF_NAT_MASQUERADE_IPV4=m CONFIG_NFT_MASQ_IPV4=m +CONFIG_NFT_REDIR_IPV4=m CONFIG_NF_NAT_PROTO_GRE=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m @@ -887,6 +892,7 @@ CONFIG_NF_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1035,6 +1041,7 @@ CONFIG_NET_ACT_PEDIT=m # CONFIG_NET_ACT_SIMP is not set CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_CSUM=m +CONFIG_NET_ACT_VLAN=m # CONFIG_NET_CLS_IND is not set CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set @@ -1046,6 +1053,7 @@ CONFIG_VSOCKETS=m # CONFIG_NETLINK_DIAG is not set # CONFIG_NET_MPLS_GSO is not set # CONFIG_HSR is not set +# CONFIG_NET_SWITCHDEV is not set CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y @@ -1130,13 +1138,15 @@ CONFIG_SIGMATEL_FIR=m CONFIG_VLSI_FIR=m CONFIG_MCS_FIR=m CONFIG_BT=m -# CONFIG_BT_6LOWPAN is not set +CONFIG_BT_BREDR=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m # CONFIG_BT_BNEP_MC_FILTER is not set # CONFIG_BT_BNEP_PROTO_FILTER is not set CONFIG_BT_HIDP=m +CONFIG_BT_LE=y +# CONFIG_BT_6LOWPAN is not set # # Bluetooth device drivers @@ -1182,6 +1192,7 @@ CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_MINSTREL_HT=y +# CONFIG_MAC80211_RC_MINSTREL_VHT is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" # CONFIG_MAC80211_MESH is not set @@ -1221,7 +1232,9 @@ CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_WANT_DEV_COREDUMP=y CONFIG_ALLOW_DEV_COREDUMP=y +CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set @@ -1525,8 +1538,9 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_SCSI_QLOGIC_1280 is not set # CONFIG_SCSI_QLA_ISCSI is not set # CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_AM53C974 is not set # CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_WD719X is not set # CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_PMCRAID is not set # CONFIG_SCSI_PM8001 is not set @@ -1689,6 +1703,7 @@ CONFIG_NET_CORE=y # CONFIG_NET_TEAM is not set CONFIG_MACVLAN=m CONFIG_MACVTAP=m +CONFIG_IPVLAN=m CONFIG_VXLAN=m CONFIG_NETCONSOLE=y CONFIG_NETPOLL=y @@ -1716,6 +1731,7 @@ CONFIG_NET_DSA_MV88E6XXX=y # CONFIG_NET_DSA_MV88E6131 is not set CONFIG_NET_DSA_MV88E6123_61_65=y # CONFIG_NET_DSA_MV88E6171 is not set +# CONFIG_NET_DSA_MV88E6352 is not set # CONFIG_NET_DSA_BCM_SF2 is not set CONFIG_ETHERNET=y CONFIG_NET_VENDOR_3COM=y @@ -1742,6 +1758,7 @@ CONFIG_NET_VENDOR_ATHEROS=y # CONFIG_NET_CADENCE is not set CONFIG_NET_VENDOR_BROADCOM=y # CONFIG_B44 is not set +# CONFIG_BCMGENET is not set # CONFIG_BNX2 is not set # CONFIG_CNIC is not set # CONFIG_TIGON3 is not set @@ -1833,6 +1850,7 @@ CONFIG_NET_VENDOR_REALTEK=y CONFIG_R8169=y CONFIG_NET_VENDOR_RDC=y # CONFIG_R6040 is not set +CONFIG_NET_VENDOR_ROCKER=y # CONFIG_NET_VENDOR_SAMSUNG is not set CONFIG_NET_VENDOR_SEEQ=y CONFIG_NET_VENDOR_SILAN=y @@ -1983,6 +2001,7 @@ CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_WOW is not set CONFIG_ATH9K_RFKILL=y # CONFIG_ATH9K_CHANNEL_CONTEXT is not set +CONFIG_ATH9K_PCOEM=y CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2202,6 +2221,7 @@ CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m # CONFIG_MOUSE_CYAPA is not set +# CONFIG_MOUSE_ELAN_I2C is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOUSE_GPIO is not set CONFIG_MOUSE_SYNAPTICS_I2C=m @@ -2232,6 +2252,7 @@ CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_FUJITSU=m # CONFIG_TOUCHSCREEN_ILI210X is not set CONFIG_TOUCHSCREEN_GUNZE=m +# CONFIG_TOUCHSCREEN_ELAN is not set CONFIG_TOUCHSCREEN_ELO=m CONFIG_TOUCHSCREEN_WACOM_W8001=m # CONFIG_TOUCHSCREEN_WACOM_I2C is not set @@ -2336,6 +2357,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_BCM63XX is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set # CONFIG_SERIAL_IFX6X60 is not set @@ -2421,6 +2443,7 @@ CONFIG_I2C_ROBOTFUZZ_OSIF=m # Other I2C/SMBus bus drivers # # CONFIG_I2C_STUB is not set +# CONFIG_I2C_SLAVE is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -2499,7 +2522,6 @@ CONFIG_GPIO_SYSFS=y # Memory mapped GPIO drivers: # # CONFIG_GPIO_GENERIC_PLATFORM is not set -# CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_VX855 is not set @@ -2674,6 +2696,7 @@ CONFIG_SENSORS_LM90=m # CONFIG_SENSORS_NTC_THERMISTOR is not set # CONFIG_SENSORS_NCT6683 is not set # CONFIG_SENSORS_NCT6775 is not set +CONFIG_SENSORS_NCT7802=m # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set # CONFIG_SENSORS_SHT15 is not set @@ -2803,6 +2826,7 @@ CONFIG_MFD_CORE=m # CONFIG_MFD_DA9052_I2C is not set # CONFIG_MFD_DA9055 is not set # CONFIG_MFD_DA9063 is not set +# CONFIG_MFD_DLN2 is not set # CONFIG_MFD_MC13XXX_SPI is not set # CONFIG_MFD_MC13XXX_I2C is not set # CONFIG_HTC_EGPIO is not set @@ -2930,9 +2954,9 @@ CONFIG_RC_DEVICES=y # CONFIG_IR_MCEUSB is not set # CONFIG_IR_REDRAT3 is not set # CONFIG_IR_STREAMZAP is not set +CONFIG_IR_IGORPLUGUSB=m # CONFIG_IR_IGUANA is not set # CONFIG_IR_TTUSBIR is not set -# CONFIG_IR_IMG is not set # CONFIG_RC_LOOPBACK is not set # CONFIG_IR_GPIO_CIR is not set CONFIG_MEDIA_USB_SUPPORT=y @@ -3008,7 +3032,6 @@ CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_TLG2300=m CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160_AC97=y @@ -3130,6 +3153,7 @@ CONFIG_VIDEO_TW68=m # CONFIG_MANTIS_CORE is not set # CONFIG_DVB_NGENE is not set # CONFIG_DVB_DDBRIDGE is not set +# CONFIG_DVB_SMIPCIE is not set CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_CAFE_CCIC=m CONFIG_SOC_CAMERA=m @@ -3383,6 +3407,10 @@ CONFIG_DVB_S921=m CONFIG_DVB_DIB8000=m CONFIG_DVB_MB86A20S=m +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# + # # Digital terrestrial only tuners/PLL # @@ -3399,6 +3427,7 @@ CONFIG_DVB_LNBP22=m CONFIG_DVB_ISL6421=m CONFIG_DVB_ISL6423=m CONFIG_DVB_A8293=m +CONFIG_DVB_SP2=m CONFIG_DVB_LGS8GXX=m CONFIG_DVB_ATBM8830=m CONFIG_DVB_IX2505V=m @@ -3592,12 +3621,14 @@ CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_AK5386 is not set CONFIG_SND_SOC_ALC5623=m # CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set -# CONFIG_SND_SOC_CS4271 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set # CONFIG_SND_SOC_CS42XX8_I2C is not set # CONFIG_SND_SOC_HDMI_CODEC is not set # CONFIG_SND_SOC_ES8328 is not set @@ -3605,6 +3636,8 @@ CONFIG_SND_SOC_ALC5623=m # CONFIG_SND_SOC_PCM1792A is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_RT5631 is not set +# CONFIG_SND_SOC_RT5677_SPI is not set # CONFIG_SND_SOC_SGTL5000 is not set # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set # CONFIG_SND_SOC_SPDIF is not set @@ -3614,8 +3647,12 @@ CONFIG_SND_SOC_ALC5623=m # CONFIG_SND_SOC_STA350 is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set # CONFIG_SND_SOC_TLV320AIC31XX is not set # CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set # CONFIG_SND_SOC_WM8580 is not set @@ -3641,6 +3678,7 @@ CONFIG_AC97_BUS=m # HID support # CONFIG_HID=m +# CONFIG_HID_BATTERY_STRENGTH is not set CONFIG_HIDRAW=y CONFIG_UHID=m CONFIG_HID_GENERIC=m @@ -3682,6 +3720,7 @@ CONFIG_HID_LCPOWER=m # CONFIG_HID_LENOVO is not set CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGIG940_FF=y @@ -3702,6 +3741,7 @@ CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PLANTRONICS=m CONFIG_HID_PRIMAX=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m @@ -3977,6 +4017,7 @@ CONFIG_MMC_MVSDIO=y # CONFIG_MMC_VUB300 is not set # CONFIG_MMC_USHC is not set # CONFIG_MMC_USDHI6ROL0 is not set +# CONFIG_MMC_TOSHIBA_PCI is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -3993,6 +4034,7 @@ CONFIG_LEDS_GPIO=y # CONFIG_LEDS_LP5523 is not set # CONFIG_LEDS_LP5562 is not set # CONFIG_LEDS_LP8501 is not set +# CONFIG_LEDS_LP8860 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_DAC124S085 is not set @@ -4251,7 +4293,6 @@ CONFIG_R8188EU=m # # CONFIG_IIO_SIMPLE_DUMMY is not set CONFIG_FB_XGI=m -# CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set # @@ -4265,7 +4306,6 @@ CONFIG_FB_XGI=m # # Android # -# CONFIG_ANDROID is not set CONFIG_USB_WPAN_HCD=m # CONFIG_WIMAX_GDM72XX is not set # CONFIG_LTE_GDM724X is not set @@ -4274,11 +4314,6 @@ CONFIG_USB_WPAN_HCD=m # CONFIG_DGNC is not set # CONFIG_DGAP is not set # CONFIG_GS_FPGABOOT is not set - -# -# SOC (System On Chip) specific Drivers -# -# CONFIG_SOC_TI is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -4318,6 +4353,7 @@ CONFIG_IOMMU_SUPPORT=y # # SOC (System On Chip) specific Drivers # +# CONFIG_SOC_TI is not set # CONFIG_PM_DEVFREQ is not set # CONFIG_EXTCON is not set # CONFIG_MEMORY is not set @@ -4419,6 +4455,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # CONFIG_DHT11=m CONFIG_SI7005=m +# CONFIG_SI7020 is not set # # Inertial measurement units @@ -4464,6 +4501,7 @@ CONFIG_CM32181=m # # Pressure sensors # +# CONFIG_BMP280 is not set # CONFIG_HID_SENSOR_PRESS is not set # CONFIG_MPL115 is not set # CONFIG_MPL3115 is not set @@ -4495,6 +4533,11 @@ CONFIG_GENERIC_PHY=y # CONFIG_MCB is not set # CONFIG_THUNDERBOLT is not set +# +# Android +# +# CONFIG_ANDROID is not set + # # File systems # @@ -4636,6 +4679,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y # CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set @@ -4796,6 +4840,7 @@ CONFIG_FRAME_WARN=1024 # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_READABLE_ASM is not set # CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_PAGE_OWNER is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set @@ -4807,6 +4852,7 @@ CONFIG_DEBUG_KERNEL=y # # Memory Debugging # +# CONFIG_PAGE_EXTENSION is not set # CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set @@ -4864,7 +4910,6 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=21 -CONFIG_RCU_CPU_STALL_VERBOSE=y # CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_RCU_TRACE is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set @@ -4952,6 +4997,7 @@ CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" CONFIG_EARLY_PRINTK=y # CONFIG_ARM_KPROBES_TEST is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set +# CONFIG_CORESIGHT is not set # # Security options diff --git a/core/linux-kirkwood/cryptodev_3.19-fix.patch b/core/linux-kirkwood/cryptodev_3.19-fix.patch new file mode 100644 index 000000000..135551ab1 --- /dev/null +++ b/core/linux-kirkwood/cryptodev_3.19-fix.patch @@ -0,0 +1,27 @@ +From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado +Date: Mon, 9 Feb 2015 13:51:56 +0100 +Subject: [PATCH] ioctl.c: Fix build on 3.19 + +get_unused_fd() MACRO has been removed on kernel 3.19. Replace by the +actual output of the macro. + +Signed-off-by: Ricardo Ribalda Delgado +--- + ioctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ioctl.c b/ioctl.c +--- a/ioctl.c ++++ b/ioctl.c +@@ -546,7 +546,7 @@ + clonefd(struct file *filp) + { + int ret; +- ret = get_unused_fd(); ++ ret = get_unused_fd_flags(0); + if (ret >= 0) { + get_file(filp); + fd_install(ret, filp); +-- +2.1.4 diff --git a/core/linux-kirkwood/linux-kirkwood.install b/core/linux-kirkwood/linux-kirkwood.install index b8392e29a..19072426c 100644 --- a/core/linux-kirkwood/linux-kirkwood.install +++ b/core/linux-kirkwood/linux-kirkwood.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-kirkwood -KERNEL_VERSION=3.18.3-1-ARCH +KERNEL_VERSION=3.19.0-0-ARCH post_install () { # updating module dependencies