From: Felix Fietkau Date: Mon, 22 Dec 2014 20:46:41 +0000 (+0000) Subject: oxnas: refresh kernel config-3.1[48] X-Git-Tag: reboot~4889 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3113bf4cb88449a68d6ab6760cb133663ea54aa4;p=openwrt%2Fstaging%2Fblogic.git oxnas: refresh kernel config-3.1[48] and no longer compile-in ext4 filesystem now that sata_oxnas is also built as a module. Signed-off-by: Daniel Golle SVN-Revision: 43765 --- diff --git a/target/linux/oxnas/config-3.14 b/target/linux/oxnas/config-3.14 index 9b0f3f96174a..802244124222 100644 --- a/target/linux/oxnas/config-3.14 +++ b/target/linux/oxnas/config-3.14 @@ -12,11 +12,13 @@ CONFIG_ARCH_OXNAS=y CONFIG_ARCH_REQUIRE_GPIOLIB=y # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_LIBATA_LEDS=y CONFIG_ARM=y # CONFIG_ARM_CPU_SUSPEND is not set CONFIG_ARM_GIC=y @@ -25,6 +27,7 @@ CONFIG_ARM_NR_BANKS=8 CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y CONFIG_ARM_UNWIND=y +CONFIG_ATA_LEDS=y CONFIG_AUTO_ZRELADDR=y # CONFIG_BLK_DEV_INITRD is not set CONFIG_BLK_DEV_SD=y @@ -90,12 +93,7 @@ CONFIG_DTC=y # CONFIG_DW_DMAC_CORE is not set # CONFIG_DW_DMAC_PCI is not set CONFIG_EARLY_PRINTK=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_FIQ=y -CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y @@ -103,7 +101,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_SCHED_CLOCK=y @@ -190,7 +187,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_WORK=y # CONFIG_ISDN is not set -CONFIG_JBD2=y # CONFIG_JFFS2_FS is not set CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS=y @@ -202,7 +198,6 @@ CONFIG_KGDB_SERIAL_CONSOLE=y CONFIG_KTIME_SCALAR=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y -# CONFIG_LEDS_PWM is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_TIMER is not set @@ -215,7 +210,6 @@ CONFIG_MAILBOX=y CONFIG_MDIO_BOARDINFO=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_MIGRATION=y -# CONFIG_MLX5_CORE is not set CONFIG_MODULES_USE_ELF_REL=y # CONFIG_MODULE_STRIPPED is not set # CONFIG_MTD_CFI is not set @@ -237,9 +231,7 @@ CONFIG_MULTI_IRQ_HANDLER=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FLOW_LIMIT=y -CONFIG_NET_RX_BUSY_POLL=y CONFIG_NLS=y -CONFIG_NLS_UTF8=y CONFIG_NO_BOOTMEM=y CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y @@ -345,8 +337,6 @@ CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 -# CONFIG_ZBUD is not set CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DMA_FLAG=0 -CONFIG_ATA_LEDS=y diff --git a/target/linux/oxnas/config-3.18 b/target/linux/oxnas/config-3.18 index e255781dae44..77585afcf2d5 100644 --- a/target/linux/oxnas/config-3.18 +++ b/target/linux/oxnas/config-3.18 @@ -8,7 +8,6 @@ CONFIG_ARCH_HAS_TICK_BROADCAST=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -# CONFIG_ARCH_MSM is not set # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_ARCH_NR_GPIO=0 CONFIG_ARCH_OXNAS=y @@ -22,6 +21,7 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_LIBATA_LEDS=y CONFIG_ARM=y # CONFIG_ARM_CPU_SUSPEND is not set CONFIG_ARM_GIC=y @@ -29,7 +29,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y CONFIG_ARM_UNWIND=y -# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set +CONFIG_ATA_LEDS=y CONFIG_AUTO_ZRELADDR=y # CONFIG_BLK_DEV_INITRD is not set CONFIG_BLK_DEV_SD=y @@ -45,7 +45,6 @@ CONFIG_CLKSRC_RPS_TIMER=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="console=ttyS0,115200n8 earlyprintk=serial" CONFIG_COMMON_CLK=y -# CONFIG_COMMON_CLK_PXA is not set CONFIG_COMPACTION=y CONFIG_CONSOLE_POLL=y CONFIG_COREDUMP=y @@ -77,11 +76,8 @@ CONFIG_CRYPTO_XZ=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -# CONFIG_DEBUG_LL_UART_8250 is not set CONFIG_DEBUG_LL_UART_NONE=y -# CONFIG_DEBUG_LL_UART_PL01X is not set # CONFIG_DEBUG_UART_8250 is not set -# CONFIG_DEBUG_UART_BCM63XX is not set # CONFIG_DEBUG_UART_PL01X is not set # CONFIG_DEBUG_USER is not set CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=8 @@ -98,7 +94,6 @@ CONFIG_DTC=y # CONFIG_DW_DMAC_PCI is not set CONFIG_EARLY_PRINTK=y CONFIG_FIQ=y -# CONFIG_FSL_EDMA is not set CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -107,14 +102,12 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GLOB=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y CONFIG_GPIO_GENERIC=y @@ -222,10 +215,7 @@ CONFIG_MACH_OX820=y CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y CONFIG_MDIO_BOARDINFO=y -# CONFIG_MFD_AXP20X is not set -CONFIG_MFD_CORE=y CONFIG_MFD_SYSCON=y -CONFIG_MFD_VEXPRESS_SYSREG=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_MIGRATION=y CONFIG_MODULES_USE_ELF_REL=y @@ -246,7 +236,6 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UIMAGE_SPLIT=y CONFIG_MULTI_IRQ_HANDLER=y CONFIG_MUTEX_SPIN_ON_OWNER=y -# CONFIG_NBPFAXI_DMA is not set CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y @@ -294,8 +283,12 @@ CONFIG_PM_CLK=y # CONFIG_PM_DEBUG is not set CONFIG_PM_RUNTIME=y CONFIG_POWER_RESET=y +# CONFIG_POWER_RESET_BRCMSTB is not set CONFIG_POWER_RESET_GPIO=y -# CONFIG_POWER_RESET_VEXPRESS is not set +# CONFIG_POWER_RESET_GPIO_RESTART is not set +# CONFIG_POWER_RESET_LTC2952 is not set +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_VERSATILE is not set CONFIG_POWER_SUPPLY=y CONFIG_PPS=y # CONFIG_PREEMPT_RCU is not set @@ -324,7 +317,6 @@ CONFIG_SCSI=y CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_RUNTIME_UARTS=1 -CONFIG_SERIAL_EARLYCON=y # CONFIG_SERIAL_KGDB_NMI is not set CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SMP=y @@ -354,8 +346,6 @@ CONFIG_USB_SUPPORT=y # CONFIG_USB_UHCI_HCD is not set CONFIG_USE_OF=y CONFIG_VECTORS_BASE=0xffff0000 -# CONFIG_VEXPRESS_CONFIG is not set -# CONFIG_VEXPRESS_SYSCFG is not set # CONFIG_VFP is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_WATCHDOG_CORE=y @@ -368,4 +358,3 @@ CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DMA_FLAG=0 -CONFIG_ATA_LEDS=y