From 2b9486ed01babfa375eaa4041a38b85d63bf1f44 Mon Sep 17 00:00:00 2001 From: moonman Date: Sat, 8 Nov 2014 02:20:40 +0000 Subject: [PATCH] core/linux-imx6-cubox-dt to 3.14.23; BFQ to v7r6; config update --- core/linux-imx6-cubox-dt/PKGBUILD | 15 ++++---- core/linux-imx6-cubox-dt/config | 35 +++++++++---------- .../linux-imx6-cubox-dt.install | 2 +- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/core/linux-imx6-cubox-dt/PKGBUILD b/core/linux-imx6-cubox-dt/PKGBUILD index 66e721bd2..08353d0d7 100644 --- a/core/linux-imx6-cubox-dt/PKGBUILD +++ b/core/linux-imx6-cubox-dt/PKGBUILD @@ -10,28 +10,29 @@ buildarch=4 pkgbase=linux-imx6-cubox-dt pkgname=('linux-imx6-cubox-dt' 'linux-headers-imx6-cubox-dt') # pkgname=linux-custom # Build kernel with a different name -_commit=ee05b81a3bb964db2a854e6687c9f34c6dc02e33 +_commit=4a51bd6c987bbc5f904ff6ba1793e16a1e1a8c34 _srcname=linux-imx6-3.14-${_commit} _kernelname=${pkgname#linux} _basekernel=3.14 -pkgver=${_basekernel}.14 -pkgrel=8 +pkgver=${_basekernel}.23 +pkgrel=1 cryptodev_commit=6aa62a2c320b04f55fdfe0ed015c3d9b48997239 arch=('arm') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage' 'git' 'lzop') options=('!strip') -source=("https://github.com/SolidRun/linux-imx6-3.14/archive/${_commit}.tar.gz" +source=("https://github.com/moonman/linux-imx6-3.14/archive/${_commit}.tar.gz" "cryptodev.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz" - "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}" + "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}.21+" '0001-Bluetooth-allocate-static-minor-for-vhci.patch' 'config') -md5sums=('ff4225188d4d20e5d99a4259fb23270e' + +md5sums=('e05c4efeae630a6d99cee42119306d38' 'ddf7876487c876f6676ef0e050e9d204' 'SKIP' '1b276abe16d14e133f3f28d9c9e6bd68' - '3d9d4bb95955d4b504def4e54947f19b') + '9f54a98a237c4cce882479b8012988f7') prepare() { cd "${srcdir}/${_srcname}" diff --git a/core/linux-imx6-cubox-dt/config b/core/linux-imx6-cubox-dt/config index 7e358acd2..6201f0c26 100644 --- a/core/linux-imx6-cubox-dt/config +++ b/core/linux-imx6-cubox-dt/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.14-8 Kernel Configuration +# Linux/arm 3.14.23-2 Kernel Configuration # CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y @@ -60,7 +60,6 @@ CONFIG_GENERIC_IRQ_SHOW=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y -# CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_KTIME_SCALAR=y @@ -229,7 +228,6 @@ CONFIG_OLD_SIGACTION=y # # GCOV-based kernel profiling # -# CONFIG_GCOV_KERNEL is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 @@ -597,7 +595,7 @@ CONFIG_ATAGS=y CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 # CONFIG_ARM_APPENDED_DTB is not set -CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootwait rw console=tty1 console=ttymxc0,115200 consoleblank=0 video=mroot=/dev/mmcblk0p1 rootwait rw console=tty1 console=ttymxc0,115200 consoleblank=0 video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24,bpp=16 dmfc=3 ahci_imx.hotplug=1 pci=nomsi loop.max_part=15" +CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" CONFIG_CMDLINE_FROM_BOOTLOADER=y # CONFIG_CMDLINE_EXTEND is not set # CONFIG_CMDLINE_FORCE is not set @@ -1133,7 +1131,6 @@ CONFIG_ATM_LANE=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_L2TP=m -# CONFIG_L2TP_DEBUGFS is not set CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m @@ -1383,7 +1380,6 @@ CONFIG_CFG80211=m # CONFIG_CFG80211_REG_DEBUG is not set # CONFIG_CFG80211_CERTIFICATION_ONUS is not set CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set # CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_WEXT=y CONFIG_LIB80211=m @@ -1397,7 +1393,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set @@ -1500,8 +1495,8 @@ CONFIG_OF_NET=y CONFIG_OF_MDIO=y CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y -CONFIG_PARPORT=m CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -1974,10 +1969,8 @@ CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y CONFIG_MVMDIO=m CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_MLX4_EN is not set CONFIG_MLX4_CORE=m @@ -2182,12 +2175,10 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y -# CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_WOW is not set # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y CONFIG_CARL9170_WPC=y @@ -4580,7 +4571,6 @@ CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 @@ -4648,7 +4638,7 @@ CONFIG_MMC_UNSAFE_RESUME=y # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_SDIO_UART=m # CONFIG_MMC_TEST is not set @@ -5368,7 +5358,6 @@ CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y # CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_FS is not set CONFIG_BTRFS_FS=m @@ -5486,7 +5475,6 @@ CONFIG_UFS_FS=m # CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_F2FS_FS=y -CONFIG_F2FS_STAT_FS=y CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -5642,7 +5630,6 @@ CONFIG_DLM_DEBUG=y CONFIG_PRINTK_TIME=y CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_BOOT_PRINTK_DELAY=y -# CONFIG_DYNAMIC_DEBUG is not set # # Compile-time checks and compiler options @@ -5654,7 +5641,7 @@ CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_FS=y +# CONFIG_DEBUG_FS is not set CONFIG_HEADERS_CHECK=y # CONFIG_DEBUG_SECTION_MISMATCH is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -5741,7 +5728,6 @@ CONFIG_TRACING_SUPPORT=y # # Runtime Testing # -# CONFIG_LKDTM is not set # CONFIG_TEST_LIST_SORT is not set # CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set @@ -5932,6 +5918,17 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_FSL_CAAM=m +CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9 +CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y +CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255 +CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048 +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m +# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set +# CONFIG_CRYPTO_DEV_FSL_CAAM_SM is not set +# CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO is not set # CONFIG_CRYPTO_DEV_SAHARA is not set # CONFIG_ASYMMETRIC_KEY_TYPE is not set # CONFIG_BINARY_PRINTF is not set diff --git a/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install b/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install index 0e0f45100..20c408ce9 100644 --- a/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install +++ b/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-imx6-cubox-dt -KERNEL_VERSION=3.14.14-7-ARCH +KERNEL_VERSION=3.14.23-1-ARCH post_install () { # updating module dependencies