diff --git a/core/linux-imx6-cubox/PKGBUILD b/core/linux-imx6-cubox/PKGBUILD index 1475a1f8a..eece0e559 100644 --- a/core/linux-imx6-cubox/PKGBUILD +++ b/core/linux-imx6-cubox/PKGBUILD @@ -15,7 +15,7 @@ _srcname=linux-imx6-${_commit} _kernelname=${pkgname#linux} _basekernel=3.0 pkgver=${_basekernel}.35 -pkgrel=15 +pkgrel=16 arch=('arm') url="http://www.kernel.org/" license=('GPL2') @@ -29,7 +29,7 @@ source=("https://github.com/solidrun/linux-imx6/archive/${_commit}.tar.gz" 'https://github.com/Freescale/linux-mainline/commit/c504dd568455ef72e44fb1ee635d645cae74d04e.diff' 'https://raw.github.com/Freescale/meta-fsl-arm/46de5ee9dec3486c3e081f9f39ac1a0f967afd54/recipes-kernel/linux/linux-imx-3.0.35/ENGR00278350-gpu-viante-4.6.9p13-kernel-part-integra.patch') md5sums=('b3ac96e3f1fb02a39d4efed0e25fbc5b' - '496ece784af085ec22b926d4145f4f7d' + '515946a03ba4b52696a9ccea83aae79b' '9d3c56a4b999c8bfbd4018089a62f662' '7a4730c2040fbd208045ce2770978fe9' '6ea378d3b95cc292cc2807a92c3904b5' diff --git a/core/linux-imx6-cubox/config b/core/linux-imx6-cubox/config index 06e19ccb4..44a14b5f4 100644 --- a/core/linux-imx6-cubox/config +++ b/core/linux-imx6-cubox/config @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.35-15 Kernel Configuration +# Linux/arm 3.0.35-16 Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -83,16 +83,21 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set -# CONFIG_CGROUP_FREEZER is not set -# CONFIG_CGROUP_DEVICE is not set -# CONFIG_CPUSETS is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y -# CONFIG_RESOURCE_COUNTERS is not set +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y -# CONFIG_BLK_CGROUP is not set +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y @@ -100,6 +105,7 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y # CONFIG_SCHED_AUTOGROUP is not set +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set # CONFIG_BLK_DEV_INITRD is not set @@ -167,6 +173,7 @@ CONFIG_BLOCK=y CONFIG_LBDAF=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set +# CONFIG_BLK_DEV_THROTTLING is not set # # IO Schedulers @@ -174,6 +181,7 @@ CONFIG_LBDAF=y CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +# CONFIG_CFQ_GROUP_IOSCHED is not set # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set @@ -1220,10 +1228,11 @@ CONFIG_ATA_BMDMA=y CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set -# CONFIG_MACVLAN is not set +CONFIG_MACVLAN=y +CONFIG_MACVTAP=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set -# CONFIG_VETH is not set +CONFIG_VETH=y CONFIG_MII=y CONFIG_PHYLIB=y