Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ea3df1 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18 

* v3.18/topic/configs:
  linaro/configs: remove options already present in base defconfig
  linaro/configs: removed unused config fragments
parents e49d192f e80e30b3

linaro/configs/arndale.conf

+21 −55
Original line number Original line Diff line number Diff line 
CONFIG_KALLSYMS_ALL=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_BSD_DISKLABEL=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_ARCH_EXYNOS=y

CONFIG_S3C_LOWLEVEL_UART_PORT=2

CONFIG_ARCH_EXYNOS5=y

# CONFIG_EXYNOS_ATAGS is not set

CONFIG_MACH_EXYNOS4_DT=y

CONFIG_VMSPLIT_2G=y

CONFIG_NR_CPUS=2

CONFIG_HIGHMEM=y

# CONFIG_COMPACTION is not set

# CONFIG_COMPACTION is not set

CONFIG_ARM_APPENDED_DTB=y

# CONFIG_EXYNOS_ATAGS is not set

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init= mem=256M"

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_PM_RUNTIME=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_ATA=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_SATA_EXYNOS=y

CONFIG_AX88796=y

CONFIG_AX88796=y

CONFIG_AX88796_93CX6=y

CONFIG_AX88796_93CX6=y

CONFIG_INPUT_EVDEV=y

CONFIG_BSD_DISKLABEL=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_CHR_DEV_SG=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init= mem=256M"

CONFIG_SERIAL_8250=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_SERIAL_SAMSUNG=y

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_S3C2410=y

CONFIG_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_DEBUG_INFO=y

CONFIG_MFD_SEC_CORE=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_REGULATOR=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_DEBUG_USER=y

CONFIG_REGULATOR_S5M8767=y

CONFIG_DRM=y

CONFIG_DRM_LOAD_EDID_FIRMWARE=y

CONFIG_DRM_EXYNOS=y

CONFIG_DRM_EXYNOS=y

CONFIG_DRM_EXYNOS_DMABUF=y

CONFIG_DRM_EXYNOS_DMABUF=y

CONFIG_DRM_EXYNOS_HDMI=y

CONFIG_DRM_EXYNOS_HDMI=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_DRM_LOAD_EDID_FIRMWARE=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_HW_RANDOM=y

CONFIG_KALLSYMS_ALL=y

CONFIG_LOGO=y

CONFIG_LOGO=y

CONFIG_MMC=y

CONFIG_MACH_EXYNOS4_DT=y

CONFIG_MMC_UNSAFE_RESUME=y

CONFIG_MMC_DW=y

CONFIG_MMC_DW_IDMAC=y

CONFIG_MMC_DW_IDMAC=y

CONFIG_MMC_DW_EXYNOS=y

CONFIG_MMC_UNSAFE_RESUME=y

CONFIG_RTC_CLASS=y

CONFIG_NR_CPUS=2

CONFIG_RTC_DRV_S3C=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_INFO=y

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_DEBUG_USER=y

CONFIG_RTC_DRV_S3C=y

CONFIG_S3C_LOWLEVEL_UART_PORT=2

CONFIG_SATA_EXYNOS=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_TUN=y

CONFIG_TUN=y

CONFIG_VMSPLIT_2G=y

linaro/configs/debug.conf

deleted100644 → 0
+0 −1
Original line number Original line Diff line number Diff line 
CONFIG_PROVE_LOCKING=y

linaro/configs/distribution.conf

+30 −34
Original line number Original line Diff line number Diff line 
# CONFIG_COMPAT_BRK is not set

# CONFIG_DEVKMEM is not set

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_AUTOFS4_FS=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_BRIDGE=m

CONFIG_BRIDGE_EBT_MARK_T=m

CONFIG_BRIDGE_NETFILTER=y

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_CC_STACKPROTECTOR=y

CONFIG_CGROUPS=y

CONFIG_CGROUPS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=32768

CONFIG_DEFAULT_MMAP_MIN_ADDR=32768

CONFIG_SECCOMP=y

CONFIG_DEFAULT_SECURITY_APPARMOR=y

CONFIG_CC_STACKPROTECTOR=y

CONFIG_HUGETLBFS=y

CONFIG_SYN_COOKIES=y

CONFIG_HUGETLB_PAGE=y

CONFIG_INPUT_UINPUT=y

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IPV6=y

CONFIG_IPV6=y

CONFIG_NETLABEL=y

CONFIG_IP_NF_FILTER=m

CONFIG_BRIDGE_NETFILTER=y

CONFIG_IP_NF_IPTABLES=m

CONFIG_NF_CONNTRACK=m

CONFIG_IP_NF_MANGLE=m

CONFIG_LSM_MMAP_MIN_ADDR=0

CONFIG_NETFILTER_XT_CONNMARK=m

CONFIG_NETFILTER_XT_CONNMARK=m

CONFIG_NETFILTER_XT_MARK=m

CONFIG_NETFILTER_XT_MARK=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETLABEL=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_NAT_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_NAT_IPV4=m

CONFIG_NF_NAT_IPV6=m

CONFIG_NF_NAT_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_SECCOMP=y

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_MARK_T=m

CONFIG_BRIDGE=m

CONFIG_TUN=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_INPUT_MISC=y

CONFIG_INPUT_UINPUT=y

# CONFIG_DEVKMEM is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_AUTOFS4_FS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_STRICT_DEVMEM=y

CONFIG_SECURITY=y

CONFIG_SECURITY=y

CONFIG_LSM_MMAP_MIN_ADDR=0

CONFIG_SECURITY_APPARMOR=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_APPARMOR=y

CONFIG_STRICT_DEVMEM=y

CONFIG_DEFAULT_SECURITY_APPARMOR=y

CONFIG_SYN_COOKIES=y

CONFIG_HUGETLBFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_HUGETLB_PAGE=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y

CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y

CONFIG_TUN=y

linaro/configs/highbank.conf

deleted100644 → 0
+0 −40
Original line number Original line Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_ARCH_HIGHBANK=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_AEABI=y

CONFIG_CMDLINE="console=ttyAMA0"

CONFIG_CPU_IDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_NET=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_SATA_HIGHBANK=y

CONFIG_NETDEVICES=y

CONFIG_NET_CALXEDA_XGMAC=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_IPMI_HANDLER=y

CONFIG_IPMI_SI=y

CONFIG_I2C=y

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_GPIO_PL061=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_HIGHBANK_MC=y

CONFIG_EDAC_HIGHBANK_L2=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PL031=y

CONFIG_DMADEVICES=y

CONFIG_PL330_DMA=y

linaro/configs/linaro-base.conf

+64 −106
Original line number Original line Diff line number Diff line 
CONFIG_SYSVIPC=y

# CONFIG_INET_LRO is not set

CONFIG_POSIX_MQUEUE=y

# CONFIG_NFS_V2 is not set

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_AUDIT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

CONFIG_HOTPLUG=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_SCHED_SMT=y

CONFIG_THUMB2_KERNEL=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPU_IDLE=y

CONFIG_BINFMT_MISC=y

CONFIG_BINFMT_MISC=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_BLK_DEV_DM=y

CONFIG_NET=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_PACKET=y

CONFIG_BTRFS_FS=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_NET_KEY_MIGRATE=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_INET_LRO is not set

CONFIG_NETFILTER=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CONNECTOR=y

CONFIG_CONNECTOR=y

CONFIG_MTD=y

CONFIG_CORESIGHT=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_CORESIGHT_LINKS_AND_SINKS=y

CONFIG_MTD_BLOCK=y

CONFIG_CORESIGHT_SOURCE_ETM=y

CONFIG_MTD_OOPS=y

CONFIG_CRAMFS=y

CONFIG_MTD_CFI=y

CONFIG_CRC7=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_CRC_CCITT=y

CONFIG_MTD_NAND=y

CONFIG_CRC_ITU_T=y

CONFIG_NETDEVICES=y

CONFIG_CRC_T10DIF=y

CONFIG_CRYPTO_MICHAEL_MIC=y

CONFIG_DEBUG_INFO=y

CONFIG_ECRYPT_FS=y

CONFIG_ENABLE_DEFAULT_TRACERS=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_BTRFS_FS=y

CONFIG_FANOTIFY=y

CONFIG_QUOTA=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_QFMT_V2=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_MSDOS_FS=y

CONFIG_FUNCTION_TRACER=y

CONFIG_VFAT_FS=y

CONFIG_HOTPLUG=y

CONFIG_TMPFS=y

CONFIG_IKCONFIG=y

CONFIG_ECRYPT_FS=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_NF_SECURITY=y

CONFIG_JFFS2_COMPRESSION_OPTIONS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_JFFS2_FS_XATTR=y

CONFIG_JFFS2_FS_XATTR=y

CONFIG_JFFS2_COMPRESSION_OPTIONS=y

CONFIG_JFFS2_LZO=y

CONFIG_JFFS2_LZO=y

CONFIG_JFFS2_RUBIN=y

CONFIG_JFFS2_RUBIN=y

CONFIG_CRAMFS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

# CONFIG_NFS_V2 is not set

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_KEYS=y

CONFIG_CRYPTO_MICHAEL_MIC=y

CONFIG_CRC_CCITT=y

CONFIG_CRC_T10DIF=y

CONFIG_CRC_ITU_T=y

CONFIG_CRC7=y

CONFIG_HW_PERF_EVENTS=y

CONFIG_FUNCTION_TRACER=y

CONFIG_ENABLE_DEFAULT_TRACERS=y

CONFIG_PROC_DEVICETREE=y

CONFIG_JUMP_LABEL=y

CONFIG_JUMP_LABEL=y

CONFIG_STRICT_DEVMEM=y

CONFIG_KGDB=y

CONFIG_KGDB=y

CONFIG_KGDB_TESTS=y

CONFIG_KGDB_TESTS=y

CONFIG_OF_IDLE_STATES=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_FTRACE=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_FUNCTION_TRACER=y

CONFIG_MD=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_MSDOS_FS=y

CONFIG_STACK_TRACER=y

CONFIG_MTD_BLOCK=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_MTD_CFI=y

CONFIG_MAILBOX=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_AUDIT=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_OOPS=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_IP_NF_SECURITY=y

CONFIG_NET_KEY=y

CONFIG_NET_KEY_MIGRATE=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_OF_IDLE_STATES=y

CONFIG_OPROFILE=y

CONFIG_POSIX_MQUEUE=y

CONFIG_PROC_DEVICETREE=y

CONFIG_PROFILING=y

CONFIG_QFMT_V2=y

CONFIG_QUOTA=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_TORTURE_TEST_RUNNABLE=n

CONFIG_SCHEDSTATS=y

CONFIG_SCHED_MC=y

CONFIG_SCHED_SMT=y

CONFIG_SECURITY=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_SLAB=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_STACK_TRACER=y

CONFIG_DEBUG_INFO=y

CONFIG_STRICT_DEVMEM=y

CONFIG_FANOTIFY=y

CONFIG_THUMB2_KERNEL=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_TIMER_STATS=y

CONFIG_RCU_TORTURE_TEST_RUNNABLE=n

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CORESIGHT=y

CONFIG_XFRM_USER=y
 
CONFIG_CORESIGHT_LINKS_AND_SINKS=y

CONFIG_CORESIGHT_SOURCE_ETM=y