core/linux-armv5 to 3.13.1-1

This commit is contained in:
Kevin Mihelich 2014-02-02 19:20:59 +00:00
parent 3e4da134c6
commit 6c9da98cf8
3 changed files with 128 additions and 51 deletions

View file

@ -4,10 +4,10 @@
buildarch=2
pkgbase=linux-armv5
_srcname=linux-3.12
_srcname=linux-3.13
_kernelname=${pkgbase#linux}
_desc="ARMv5 based platforms"
pkgver=3.12.8
pkgver=3.13.1
pkgrel=1
arch=('armv7h')
url="http://www.kernel.org/"
@ -18,14 +18,12 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${_srcname#linux-}"
'config'
'imx23-olinuxino.patch'
'http://archlinuxarm.org/builder/src/aufs3-mmap-3.12.7.patch')
md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
'03d34842e3a1197d17055610f62627b8'
'imx23-olinuxino.patch')
md5sums=('0ecbaf65c00374eb4a826c2f9f37606f'
'675692f24410f375055d422e7886f3d8'
'SKIP'
'b4a6a10dc7b92eec86c46100b5178555'
'33adadea6932b7fa3b78a570418696fe'
'48e1fe9f41205c09b01abe710f453571')
'fb7c8b9146c9d9cb2b901e5b93793de4'
'c3abaa939372af7a07ae5c2196263110')
prepare() {
cd "${srcdir}/${_srcname}"
@ -43,8 +41,7 @@ prepare() {
patch -Np1 -i ../aufs3-standalone/aufs3-kbuild.patch
patch -Np1 -i ../aufs3-standalone/aufs3-base.patch
#patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch
patch -Np1 -i ../aufs3-mmap-3.12.7.patch
patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch
patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch
cat "${srcdir}/config" > ./.config

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.12.8-1 Kernel Configuration
# Linux/arm 3.13.1-1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -77,6 +77,7 @@ CONFIG_HIGH_RES_TIMERS=y
# CPU/Task time and stats accounting
#
CONFIG_TICK_CPU_ACCOUNTING=y
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_IRQ_TIME_ACCOUNTING is not set
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
@ -188,11 +189,14 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_MODULES_USE_ELF_REL=y
@ -208,6 +212,7 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@ -298,7 +303,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCH_S5PC100 is not set
# CONFIG_ARCH_S5PV210 is not set
# CONFIG_ARCH_EXYNOS is not set
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP1 is not set
@ -315,6 +319,7 @@ CONFIG_ARCH_MULTI_V4_V5=y
# CONFIG_ARCH_MULTI_V6 is not set
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MULTI_CPU_AUTO=y
# CONFIG_ARCH_BCM is not set
# CONFIG_GPIO_PCA953X is not set
# CONFIG_ARCH_MXC is not set
CONFIG_SOC_IMX23=y
@ -417,6 +422,8 @@ CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
CONFIG_SECCOMP=y
# CONFIG_CC_STACKPROTECTOR is not set
CONFIG_SWIOTLB=y
CONFIG_IOMMU_HELPER=y
#
# Boot options
@ -531,7 +538,6 @@ CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
CONFIG_IPV6=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_OPTIMISTIC_DAD=y
@ -545,6 +551,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
# CONFIG_IPV6_VTI is not set
CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
@ -571,7 +578,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_MARK=y
# CONFIG_NF_CONNTRACK_ZONES is not set
CONFIG_NF_CONNTRACK_ZONES=y
CONFIG_NF_CONNTRACK_PROCFS=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_TIMEOUT=y
@ -606,6 +613,18 @@ CONFIG_NF_NAT_FTP=m
CONFIG_NF_NAT_IRC=m
CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_TFTP=m
CONFIG_NETFILTER_SYNPROXY=m
CONFIG_NF_TABLES=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_CT=m
CONFIG_NFT_RBTREE=m
CONFIG_NFT_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_NAT=m
CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XTABLES=m
#
@ -695,7 +714,9 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m
@ -707,6 +728,11 @@ CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@ -714,7 +740,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
# CONFIG_IP_NF_TARGET_SYNPROXY is not set
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@ -738,6 +764,9 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@ -751,12 +780,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@ -826,6 +856,7 @@ CONFIG_DNS_RESOLVER=y
# CONFIG_NETLINK_MMAP is not set
# CONFIG_NETLINK_DIAG is not set
# CONFIG_NET_MPLS_GSO is not set
# CONFIG_HSR is not set
# CONFIG_NETPRIO_CGROUP is not set
CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
@ -1125,7 +1156,9 @@ CONFIG_OF_NET=y
CONFIG_OF_MDIO=y
CONFIG_OF_MTD=y
# CONFIG_PARPORT is not set
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_NULL_BLK is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
@ -1190,6 +1223,14 @@ CONFIG_EEPROM_93CX6=m
#
# CONFIG_ALTERA_STAPL is not set
#
# Intel MIC Host Driver
#
#
# Intel MIC Card Driver
#
#
# SCSI device support
#
@ -1256,8 +1297,8 @@ CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
# CONFIG_DM_CACHE is not set
CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m
# CONFIG_DM_LOG_USERSPACE is not set
CONFIG_DM_RAID=m
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
@ -1390,6 +1431,7 @@ CONFIG_USB_NET_AX88179_178A=y
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
# CONFIG_USB_NET_CDC_MBIM is not set
CONFIG_USB_NET_DM9601=m
# CONFIG_USB_NET_SR9700 is not set
@ -1450,6 +1492,7 @@ CONFIG_ATH6KL_USB=m
# CONFIG_ATH6KL_TRACING is not set
CONFIG_AR5523=m
# CONFIG_ATH10K is not set
# CONFIG_WCN36XX is not set
CONFIG_B43=m
CONFIG_B43_SSB=y
# CONFIG_B43_SDIO is not set
@ -1597,7 +1640,9 @@ CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_TSC2007=m
# CONFIG_TOUCHSCREEN_W90X900 is not set
# CONFIG_TOUCHSCREEN_ST1232 is not set
# CONFIG_TOUCHSCREEN_SUR40 is not set
# CONFIG_TOUCHSCREEN_TPS6507X is not set
# CONFIG_TOUCHSCREEN_ZFORCE is not set
# CONFIG_INPUT_MISC is not set
#
@ -1637,6 +1682,7 @@ CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
# CONFIG_SERIAL_SH_SCI is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_SCCNXP is not set
@ -1680,8 +1726,10 @@ CONFIG_I2C_MXS=y
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PXA_PCI is not set
# CONFIG_I2C_SH_MOBILE is not set
# CONFIG_I2C_SIMTEC is not set
# CONFIG_I2C_XILINX is not set
# CONFIG_I2C_RCAR is not set
#
# External I2C/SMBus adapter drivers
@ -1709,7 +1757,6 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_BITBANG=m
CONFIG_SPI_GPIO=m
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PL022 is not set
# CONFIG_SPI_PXA2XX_PCI is not set
@ -1765,8 +1812,8 @@ CONFIG_PINCTRL_IMX28=y
# CONFIG_PINCTRL_SINGLE is not set
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIO_DEVRES=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVRES=y
CONFIG_OF_GPIO=y
CONFIG_DEBUG_GPIO=y
CONFIG_GPIO_SYSFS=y
@ -1816,6 +1863,7 @@ CONFIG_GPIO_MXS=y
#
# MODULbus GPIO expanders:
#
# CONFIG_GPIO_BCM_KONA is not set
#
# USB GPIO expanders:
@ -1840,6 +1888,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_CHARGER_MANAGER is not set
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set
# CONFIG_CHARGER_BQ24735 is not set
# CONFIG_CHARGER_SMB347 is not set
# CONFIG_POWER_RESET is not set
# CONFIG_POWER_RESET_RESTART is not set
@ -1888,6 +1937,7 @@ CONFIG_BCMA_POSSIBLE=y
#
CONFIG_MFD_CORE=m
# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_PMIC_ADP5520 is not set
# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_CROS_EC is not set
@ -1957,7 +2007,6 @@ CONFIG_MFD_CORE=m
# CONFIG_VEXPRESS_CONFIG is not set
CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
# CONFIG_REGULATOR_DUMMY is not set
CONFIG_REGULATOR_FIXED_VOLTAGE=y
# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
@ -2272,7 +2321,7 @@ CONFIG_VIDEO_MT9V011=m
#
#
# Miscelaneous helper chips
# Miscellaneous helper chips
#
#
@ -2421,8 +2470,8 @@ CONFIG_DVB_AF9033=m
#
# Graphics support
#
# CONFIG_DRM is not set
# CONFIG_TEGRA_HOST1X is not set
# CONFIG_DRM is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_VIDEOMODE_HELPERS=y
@ -2482,7 +2531,7 @@ CONFIG_BACKLIGHT_GENERIC=y
CONFIG_BACKLIGHT_PWM=y
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
# CONFIG_BACKLIGHT_LM3630 is not set
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_GPIO is not set
@ -2630,6 +2679,7 @@ CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
# CONFIG_SONY_FF is not set
CONFIG_HID_SPEEDLINK=m
CONFIG_HID_STEELSERIES=m
CONFIG_HID_SUNPLUS=m
@ -2895,6 +2945,7 @@ CONFIG_LEDS_GPIO=y
# CONFIG_LEDS_LP8501 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PCA9685 is not set
# CONFIG_LEDS_DAC124S085 is not set
CONFIG_LEDS_PWM=y
# CONFIG_LEDS_REGULATOR is not set
@ -3194,6 +3245,7 @@ CONFIG_USB_WPAN_HCD=m
# CONFIG_LTE_GDM724X is not set
# CONFIG_CED1401 is not set
# CONFIG_DGRP is not set
# CONFIG_MTD_SPINAND_MT29F is not set
# CONFIG_USB_DWC2 is not set
# CONFIG_LUSTRE_FS is not set
# CONFIG_USB_BTMTK is not set
@ -3217,6 +3269,7 @@ CONFIG_CLKSRC_MMIO=y
# CONFIG_MAILBOX is not set
CONFIG_IOMMU_SUPPORT=y
CONFIG_OF_IOMMU=y
# CONFIG_SHMOBILE_IOMMU is not set
#
# Remoteproc drivers
@ -3258,6 +3311,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_EXYNOS_ADC is not set
# CONFIG_MAX1363 is not set
# CONFIG_MCP320X is not set
# CONFIG_MCP3422 is not set
# CONFIG_NAU7802 is not set
# CONFIG_TI_ADC081C is not set
@ -3328,14 +3382,19 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
#
# CONFIG_ADJD_S311 is not set
# CONFIG_APDS9300 is not set
# CONFIG_CM36651 is not set
# CONFIG_GP2AP020A00F is not set
# CONFIG_HID_SENSOR_ALS is not set
# CONFIG_TCS3472 is not set
# CONFIG_SENSORS_TSL2563 is not set
# CONFIG_TSL4531 is not set
# CONFIG_VCNL4000 is not set
#
# Magnetometer sensors
#
# CONFIG_AK8975 is not set
# CONFIG_MAG3110 is not set
# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
# CONFIG_IIO_ST_MAGN_3AXIS is not set
@ -3363,6 +3422,14 @@ CONFIG_IRQCHIP=y
# CONFIG_RESET_CONTROLLER is not set
# CONFIG_FMC is not set
#
# PHY Subsystem
#
# CONFIG_GENERIC_PHY is not set
# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
# CONFIG_POWERCAP is not set
#
# File systems
#
@ -3499,6 +3566,11 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_LOGFS is not set
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_FILE_CACHE=y
# CONFIG_SQUASHFS_FILE_DIRECT is not set
CONFIG_SQUASHFS_DECOMP_SINGLE=y
# CONFIG_SQUASHFS_DECOMP_MULTI is not set
# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
CONFIG_SQUASHFS_LZO=y
@ -3521,6 +3593,7 @@ CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
# CONFIG_F2FS_CHECK_FS is not set
CONFIG_AUFS_FS=y
CONFIG_AUFS_BRANCH_MAX_127=y
# CONFIG_AUFS_BRANCH_MAX_511 is not set
@ -3662,6 +3735,7 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_SECTION_MISMATCH is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
CONFIG_DEBUG_KERNEL=y
#
@ -3778,6 +3852,7 @@ CONFIG_PROBE_EVENTS=y
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_RBTREE_TEST is not set
# CONFIG_INTERVAL_TREE_TEST is not set
# CONFIG_PERCPU_TEST is not set
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_ASYNC_RAID6_TEST is not set
# CONFIG_TEST_STRING_HELPERS is not set
@ -3801,6 +3876,8 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
# Security options
#
CONFIG_KEYS=y
# CONFIG_PERSISTENT_KEYRINGS is not set
# CONFIG_BIG_KEYS is not set
# CONFIG_ENCRYPTED_KEYS is not set
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
# CONFIG_SECURITY_DMESG_RESTRICT is not set
@ -3845,7 +3922,7 @@ CONFIG_CRYPTO_AUTHENC=m
#
# Authenticated Encryption with Associated Data
#
# CONFIG_CRYPTO_CCM is not set
CONFIG_CRYPTO_CCM=m
# CONFIG_CRYPTO_GCM is not set
CONFIG_CRYPTO_SEQIV=y
@ -3940,6 +4017,7 @@ CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IO=y
CONFIG_STMP_DEVICE=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y
@ -3953,6 +4031,7 @@ CONFIG_CRC32_SLICEBY8=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=y
# CONFIG_CRC8 is not set
# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
@ -3979,6 +4058,7 @@ CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y

View file

@ -1,6 +1,6 @@
diff -urN a/arch/arm/boot/dts/imx23-audio.dts b/arch/arm/boot/dts/imx23-audio.dts
--- a/arch/arm/boot/dts/imx23-audio.dts 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/boot/dts/imx23-audio.dts 2014-01-09 10:36:34.788266593 -0700
+++ b/arch/arm/boot/dts/imx23-audio.dts 2014-02-02 11:04:58.873165215 -0700
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
@ -156,11 +156,11 @@ diff -urN a/arch/arm/boot/dts/imx23-audio.dts b/arch/arm/boot/dts/imx23-audio.dt
+ };
+};
diff -urN a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
--- a/arch/arm/boot/dts/imx23.dtsi 2013-11-03 16:41:51.000000000 -0700
+++ b/arch/arm/boot/dts/imx23.dtsi 2014-01-09 10:36:13.163357197 -0700
@@ -306,6 +306,39 @@
fsl,voltage = <1>;
fsl,pull-up = <1>;
--- a/arch/arm/boot/dts/imx23.dtsi 2014-01-19 19:40:07.000000000 -0700
+++ b/arch/arm/boot/dts/imx23.dtsi 2014-02-02 11:04:58.873165215 -0700
@@ -307,6 +307,39 @@
fsl,voltage = <MXS_VOLTAGE_HIGH>;
fsl,pull-up = <MXS_PULL_ENABLE>;
};
+
+ i2c0_pins_a: i2c0@0 {
@ -198,7 +198,7 @@ diff -urN a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
};
digctl@8001c000 {
@@ -377,7 +410,7 @@
@@ -378,7 +411,7 @@
reg = <0x80038000 0x2000>;
status = "disabled";
};
@ -207,7 +207,7 @@ diff -urN a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
apbx@80040000 {
compatible = "simple-bus";
@@ -439,8 +472,14 @@
@@ -441,8 +474,14 @@
status = "disabled";
};
@ -224,8 +224,8 @@ diff -urN a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
dma-names = "rx-tx";
status = "disabled";
diff -urN a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
--- a/arch/arm/boot/dts/imx23-olinuxino.dts 2013-11-03 16:41:51.000000000 -0700
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts 2014-01-09 10:38:05.332887229 -0700
--- a/arch/arm/boot/dts/imx23-olinuxino.dts 2014-01-19 19:40:07.000000000 -0700
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts 2014-02-02 11:04:58.878165195 -0700
@@ -29,6 +29,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
@ -328,8 +328,8 @@ diff -urN a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olin
+ };
};
diff -urN a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
--- a/drivers/mmc/host/mxs-mmc.c 2013-11-03 16:41:51.000000000 -0700
+++ b/drivers/mmc/host/mxs-mmc.c 2014-01-09 10:36:13.188357092 -0700
--- a/drivers/mmc/host/mxs-mmc.c 2014-01-19 19:40:07.000000000 -0700
+++ b/drivers/mmc/host/mxs-mmc.c 2014-02-02 11:04:58.878165195 -0700
@@ -94,6 +94,9 @@
static int mxs_mmc_get_cd(struct mmc_host *mmc)
@ -351,8 +351,8 @@ diff -urN a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
mmc->f_max = 288000000;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
diff -urN a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
--- a/sound/soc/codecs/Kconfig 2013-11-03 16:41:51.000000000 -0700
+++ b/sound/soc/codecs/Kconfig 2014-01-09 10:36:29.623288233 -0700
--- a/sound/soc/codecs/Kconfig 2014-01-19 19:40:07.000000000 -0700
+++ b/sound/soc/codecs/Kconfig 2014-02-02 11:04:58.878165195 -0700
@@ -132,6 +132,7 @@
select SND_SOC_WM9705 if SND_SOC_AC97_BUS
select SND_SOC_WM9712 if SND_SOC_AC97_BUS
@ -372,8 +372,8 @@ diff -urN a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
config SND_SOC_LM4857
tristate
diff -urN a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
--- a/sound/soc/codecs/Makefile 2013-11-03 16:41:51.000000000 -0700
+++ b/sound/soc/codecs/Makefile 2014-01-09 10:36:29.623288233 -0700
--- a/sound/soc/codecs/Makefile 2014-01-19 19:40:07.000000000 -0700
+++ b/sound/soc/codecs/Makefile 2014-02-02 11:04:58.878165195 -0700
@@ -124,6 +124,7 @@
snd-soc-wm9712-objs := wm9712.o
snd-soc-wm9713-objs := wm9713.o
@ -392,7 +392,7 @@ diff -urN a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
diff -urN a/sound/soc/codecs/mxs-builtin-codec.c b/sound/soc/codecs/mxs-builtin-codec.c
--- a/sound/soc/codecs/mxs-builtin-codec.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/codecs/mxs-builtin-codec.c 2014-01-09 10:36:29.628288212 -0700
+++ b/sound/soc/codecs/mxs-builtin-codec.c 2014-02-02 11:04:58.883165175 -0700
@@ -0,0 +1,1128 @@
+/*
+ * mxs-builtin-codec.c -- i.MX233 built-in codec ALSA Soc Audio driver
@ -1524,7 +1524,7 @@ diff -urN a/sound/soc/codecs/mxs-builtin-codec.c b/sound/soc/codecs/mxs-builtin-
+MODULE_LICENSE("GPL");
diff -urN a/sound/soc/codecs/mxs-builtin-codec.h b/sound/soc/codecs/mxs-builtin-codec.h
--- a/sound/soc/codecs/mxs-builtin-codec.h 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/codecs/mxs-builtin-codec.h 2014-01-09 10:36:29.628288212 -0700
+++ b/sound/soc/codecs/mxs-builtin-codec.h 2014-02-02 11:04:58.883165175 -0700
@@ -0,0 +1,825 @@
+#ifndef __MXS_ADC_CODEC_H
+
@ -2352,8 +2352,8 @@ diff -urN a/sound/soc/codecs/mxs-builtin-codec.h b/sound/soc/codecs/mxs-builtin-
+
+#endif /* __MXS_ADC_CODEC_H */
diff -urN a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
--- a/sound/soc/mxs/Kconfig 2013-11-03 16:41:51.000000000 -0700
+++ b/sound/soc/mxs/Kconfig 2014-01-09 10:36:29.628288212 -0700
--- a/sound/soc/mxs/Kconfig 2014-01-19 19:40:07.000000000 -0700
+++ b/sound/soc/mxs/Kconfig 2014-02-02 11:04:58.883165175 -0700
@@ -19,3 +19,13 @@
a sgtl5000 codec.
@ -2369,8 +2369,8 @@ diff -urN a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
+ Say Y or M if you want to add support for codecs attached to
+ the MXS SAIF interface.
diff -urN a/sound/soc/mxs/Makefile b/sound/soc/mxs/Makefile
--- a/sound/soc/mxs/Makefile 2013-11-03 16:41:51.000000000 -0700
+++ b/sound/soc/mxs/Makefile 2014-01-09 10:36:29.628288212 -0700
--- a/sound/soc/mxs/Makefile 2014-01-19 19:40:07.000000000 -0700
+++ b/sound/soc/mxs/Makefile 2014-02-02 11:04:58.888165155 -0700
@@ -8,3 +8,12 @@
snd-soc-mxs-sgtl5000-objs := mxs-sgtl5000.o
@ -2386,7 +2386,7 @@ diff -urN a/sound/soc/mxs/Makefile b/sound/soc/mxs/Makefile
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-audio.o
diff -urN a/sound/soc/mxs/mxs-builtin-audio.c b/sound/soc/mxs/mxs-builtin-audio.c
--- a/sound/soc/mxs/mxs-builtin-audio.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/mxs/mxs-builtin-audio.c 2014-01-09 10:36:29.628288212 -0700
+++ b/sound/soc/mxs/mxs-builtin-audio.c 2014-02-02 11:04:58.888165155 -0700
@@ -0,0 +1,120 @@
+/*
+ * mxs-builtin-audio.c -- i.MX233 built-in codec ALSA Soc Audio driver
@ -2510,7 +2510,7 @@ diff -urN a/sound/soc/mxs/mxs-builtin-audio.c b/sound/soc/mxs/mxs-builtin-audio.
+MODULE_LICENSE("GPL");
diff -urN a/sound/soc/mxs/mxs-builtin-dai.c b/sound/soc/mxs/mxs-builtin-dai.c
--- a/sound/soc/mxs/mxs-builtin-dai.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/mxs/mxs-builtin-dai.c 2014-01-09 10:36:29.633288191 -0700
+++ b/sound/soc/mxs/mxs-builtin-dai.c 2014-02-02 11:04:58.888165155 -0700
@@ -0,0 +1,588 @@
+/*
+ * mxs-builtin-dai.c -- i.MX233 built-in codec ALSA Soc Audio driver
@ -3102,7 +3102,7 @@ diff -urN a/sound/soc/mxs/mxs-builtin-dai.c b/sound/soc/mxs/mxs-builtin-dai.c
+MODULE_LICENSE("GPL");
diff -urN a/sound/soc/mxs/mxs-builtin-pcm.c b/sound/soc/mxs/mxs-builtin-pcm.c
--- a/sound/soc/mxs/mxs-builtin-pcm.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/mxs/mxs-builtin-pcm.c 2014-01-09 10:36:29.633288191 -0700
+++ b/sound/soc/mxs/mxs-builtin-pcm.c 2014-02-02 11:04:58.888165155 -0700
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
@ -3175,7 +3175,7 @@ diff -urN a/sound/soc/mxs/mxs-builtin-pcm.c b/sound/soc/mxs/mxs-builtin-pcm.c
+MODULE_LICENSE("GPL");
diff -urN a/sound/soc/mxs/mxs-builtin-pcm.h b/sound/soc/mxs/mxs-builtin-pcm.h
--- a/sound/soc/mxs/mxs-builtin-pcm.h 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/mxs/mxs-builtin-pcm.h 2014-01-09 10:36:29.633288191 -0700
+++ b/sound/soc/mxs/mxs-builtin-pcm.h 2014-02-02 11:04:58.888165155 -0700
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.