diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-09-27 17:29:38 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-27 17:29:38 +0000 |
commit | 110a74dd71eaab04865568ee293f98db4fea7e08 (patch) | |
tree | ebb5af2b34fc86fa6d58f41ec6e027d5f1fd5ff8 /target/linux/uml/config | |
parent | 439669b49c78811ff8fbe5016a229e0e2c068435 (diff) | |
download | openwrt-110a74dd71eaab04865568ee293f98db4fea7e08.tar.gz openwrt-110a74dd71eaab04865568ee293f98db4fea7e08.tar.bz2 openwrt-110a74dd71eaab04865568ee293f98db4fea7e08.zip |
uml: update to linux 4.1
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47061
Diffstat (limited to 'target/linux/uml/config')
-rw-r--r-- | target/linux/uml/config/i386 | 70 | ||||
-rw-r--r-- | target/linux/uml/config/x86_64 | 25 |
2 files changed, 53 insertions, 42 deletions
diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386 index 42f2034413..9521706346 100644 --- a/target/linux/uml/config/i386 +++ b/target/linux/uml/config/i386 @@ -1,12 +1,15 @@ # CONFIG_3_LEVEL_PGTABLES is not set # CONFIG_64BIT is not set +CONFIG_ARCH_DEFCONFIG="arch/um/configs/i386_defconfig" +# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set CONFIG_ARCH_HAS_SC_SIGNALS=y +# CONFIG_ARCH_HAS_SG_CHAIN is not set CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y -CONFIG_BKL=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_BLK_DEV_COW_COMMON=y CONFIG_BLK_DEV_UBD=y CONFIG_BLK_DEV_UBD_SYNC=y -# CONFIG_CFQ_GROUP_IOSCHED is not set +CONFIG_CLONE_BACKWARDS=y CONFIG_CON_CHAN="xterm" CONFIG_CON_ZERO_CHAN="fd:0,fd:1" CONFIG_CPU_SUP_AMD=y @@ -18,42 +21,49 @@ CONFIG_CPU_SUP_UMC_32=y CONFIG_CRAMFS=y # CONFIG_CRASHLOG is not set CONFIG_CRC16=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_LZMA=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig" CONFIG_DNOTIFY=y -CONFIG_ELF_CORE=y -# CONFIG_EMBEDDED is not set # CONFIG_EARLY_PRINTK is not set +# CONFIG_EMBEDDED is not set CONFIG_EXT4_FS=y +CONFIG_FS_MBCACHE=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CPU_DEVICES=y CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_SHOW=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_AOUT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_FUTEX_CMPXCHG=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -# CONFIG_HAVE_GENERIC_HARDIRQS is not set +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_UID16=y CONFIG_HOSTAUDIO=m CONFIG_HOSTFS=y # CONFIG_HPPFS is not set +CONFIG_HZ_PERIODIC=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INIT_ENV_ARG_LIMIT=128 CONFIG_IOSCHED_CFQ=y -CONFIG_IRQ_RELEASE_METHOD=y +CONFIG_IRQ_WORK=y CONFIG_ISO9660_FS=y -CONFIG_JBD=y CONFIG_JBD2=y CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_KERNEL_STACK_ORDER=2 CONFIG_LD_SCRIPT_STATIC=y CONFIG_LEGACY_PTYS=y @@ -70,13 +80,14 @@ CONFIG_MCONSOLE=y # CONFIG_MCRUSOE is not set # CONFIG_MCYRIXIII is not set # CONFIG_MEFFICEON is not set +# CONFIG_MELAN is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set -# CONFIG_MINI_FO is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set # CONFIG_MMAPPER is not set +CONFIG_MODULES_USE_ELF_REL=y # CONFIG_MPENTIUM4 is not set CONFIG_MPENTIUMII=y # CONFIG_MPENTIUMIII is not set @@ -92,15 +103,18 @@ CONFIG_NLS=y # CONFIG_NOCONFIG_CHAN is not set CONFIG_NO_DMA=y CONFIG_NO_IOMEM=y +# CONFIG_NSC_GPIO is not set CONFIG_NULL_CHAN=y +CONFIG_OLD_SIGACTION=y +CONFIG_OLD_SIGSUSPEND3=y CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_PGTABLE_LEVELS=2 CONFIG_PORT_CHAN=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_PREEMPT_RCU is not set CONFIG_PRINT_QUOTA_WARNING=y -CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PROCESSOR_SELECT is not set +CONFIG_PROC_PAGE_MONITOR=y CONFIG_PTY_CHAN=y CONFIG_QFMT_V1=y CONFIG_QFMT_V2=y @@ -108,24 +122,25 @@ CONFIG_QUOTA=y CONFIG_QUOTACTL=y # CONFIG_QUOTA_NETLINK_INTERFACE is not set CONFIG_QUOTA_TREE=y +# CONFIG_RCU_STALL_COMMON is not set CONFIG_RD_BZIP2=y CONFIG_RD_GZIP=y CONFIG_RELAY=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_SBC8360_WDT is not set # CONFIG_SCSI_DMA is not set -# CONFIG_SMP_BROKEN is not set CONFIG_SOFT_WATCHDOG=m CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SQUASHFS_EMBEDDED=y +CONFIG_SRCU=y CONFIG_SSL=y CONFIG_SSL_CHAN="pty" -# CONFIG_STACKTRACE_SUPPORT is not set +CONFIG_STACKTRACE=y CONFIG_STATIC_LINK=y CONFIG_STDERR_CONSOLE=y -CONFIG_STDIO_CONSOLE=y +CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set CONFIG_TTY_CHAN=y CONFIG_UID16=y @@ -135,6 +150,7 @@ CONFIG_UML_NET_DAEMON=y CONFIG_UML_NET_ETHERTAP=y CONFIG_UML_NET_MCAST=y # CONFIG_UML_NET_PCAP is not set +# CONFIG_UML_NET_RANDOM_MAC is not set CONFIG_UML_NET_SLIP=y CONFIG_UML_NET_SLIRP=y CONFIG_UML_NET_TUNTAP=y @@ -145,22 +161,18 @@ CONFIG_UML_WATCHDOG=m CONFIG_UML_X86=y # CONFIG_USER_NS is not set CONFIG_VM_EVENT_COUNTERS=y +CONFIG_WATCHDOG_CORE=y CONFIG_X86_32=y -CONFIG_X86_BSWAP=y +# CONFIG_X86_64 is not set CONFIG_X86_CMOV=y -CONFIG_X86_CMPXCHG=y CONFIG_X86_CMPXCHG64=y -CONFIG_X86_CPU=y CONFIG_X86_GENERIC=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_INVLPG=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_MINIMUM_CPU_FAMILY=5 -CONFIG_X86_POPAD_OK=y CONFIG_X86_TSC=y CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_XADD=y CONFIG_XTERM_CHAN=y +CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64 index af9aaa557f..be25a2ea51 100644 --- a/target/linux/uml/config/x86_64 +++ b/target/linux/uml/config/x86_64 @@ -1,12 +1,14 @@ CONFIG_3_LEVEL_PGTABLES=y CONFIG_64BIT=y +CONFIG_ARCH_DEFCONFIG="arch/um/configs/x86_64_defconfig" +# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set # CONFIG_ARCH_HAS_SC_SIGNALS is not set +# CONFIG_ARCH_HAS_SG_CHAIN is not set # CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set CONFIG_BINFMT_MISC=m CONFIG_BLK_DEV_COW_COMMON=y CONFIG_BLK_DEV_UBD=y CONFIG_BLK_DEV_UBD_SYNC=y -# CONFIG_CFQ_GROUP_IOSCHED is not set CONFIG_CON_CHAN="xterm" CONFIG_CON_ZERO_CHAN="fd:0,fd:1" CONFIG_CPU_SUP_AMD=y @@ -19,11 +21,12 @@ CONFIG_CRC16=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y # CONFIG_CRYPTO_SALSA20_X86_64 is not set CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_SKEIN is not set -# CONFIG_CRYPTO_THREEFISH is not set # CONFIG_CRYPTO_TWOFISH_X86_64 is not set +CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DECOMPRESS_BZIP2=y @@ -31,25 +34,26 @@ CONFIG_DECOMPRESS_GZIP=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig" CONFIG_DNOTIFY=y # CONFIG_EARLY_PRINTK is not set CONFIG_EXT4_FS=y CONFIG_FS_MBCACHE=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_GENERIC_CPU is not set CONFIG_GENERIC_CPU_DEVICES=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_FUTEX_CMPXCHG=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_HAVE_NET_DSA=y CONFIG_HAVE_UID16=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HOSTAUDIO=m CONFIG_HOSTFS=y # CONFIG_HPPFS is not set @@ -59,7 +63,6 @@ CONFIG_INIT_ENV_ARG_LIMIT=128 CONFIG_IOSCHED_CFQ=y CONFIG_IRQ_WORK=y CONFIG_ISO9660_FS=y -CONFIG_JBD=y CONFIG_JBD2=y CONFIG_KALLSYMS=y CONFIG_KERNEL_STACK_ORDER=2 @@ -82,11 +85,11 @@ CONFIG_NO_DMA=y CONFIG_NO_IOMEM=y CONFIG_NULL_CHAN=y CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_PGTABLE_LEVELS=3 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_PORT_CHAN=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_PREEMPT_RCU is not set # CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PROCESSOR_SELECT is not set CONFIG_PROC_PAGE_MONITOR=y @@ -109,17 +112,16 @@ CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SQUASHFS_EMBEDDED=y +CONFIG_SRCU=y CONFIG_SSL=y CONFIG_SSL_CHAN="pty" -# CONFIG_STACKTRACE_SUPPORT is not set +CONFIG_STACKTRACE=y CONFIG_STATIC_LINK=y CONFIG_STDERR_CONSOLE=y -CONFIG_STDIO_CONSOLE=y CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set CONFIG_TTY_CHAN=y CONFIG_UID16=y -CONFIG_UIDGID_CONVERTED=y CONFIG_UML=y CONFIG_UML_NET=y CONFIG_UML_NET_DAEMON=y @@ -136,9 +138,6 @@ CONFIG_UML_SOUND=m CONFIG_UML_WATCHDOG=m CONFIG_UML_X86=y # CONFIG_UNISYSSPAR is not set -# CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_ARCH_HAS_OHCI is not set -# CONFIG_USB_ARCH_HAS_XHCI is not set # CONFIG_USER_NS is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_WATCHDOG_CORE=y |