From 25d98b3bffc5830a1e29230f0fcdde7ee20a3e08 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 25 Aug 2010 10:53:30 +0000 Subject: [malta] update to 2.6.35.3 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22791 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/malta/Makefile | 2 +- target/linux/malta/be/config-default | 33 +++++++++++++++++++++++---------- target/linux/malta/le/config-default | 33 +++++++++++++++++++++++---------- 3 files changed, 47 insertions(+), 21 deletions(-) (limited to 'target/linux/malta') diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 638329444..d98ac9e30 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -12,7 +12,7 @@ CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= -LINUX_VERSION:=2.6.32.20 +LINUX_VERSION:=2.6.35.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/malta/be/config-default b/target/linux/malta/be/config-default index 626acf8cb..e278936da 100644 --- a/target/linux/malta/be/config-default +++ b/target/linux/malta/be/config-default @@ -5,6 +5,7 @@ CONFIG_32BIT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARCH_POPULATES_NODE_MAP=y # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_ARCH_SUPPORTS_OPROFILE=y @@ -39,12 +40,11 @@ CONFIG_BROADCOM_PHY=m CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CEVT_R4K=y CONFIG_CEVT_R4K_LIB=y -CONFIG_CFG80211_DEFAULT_PS_VALUE=0 CONFIG_CHELSIO_T3_DEPENDS=y +CONFIG_CHELSIO_T4_DEPENDS=y CONFIG_CICADA_PHY=m # CONFIG_CLS_U32_MARK is not set # CONFIG_CLS_U32_PERF is not set -CONFIG_CMDLINE="console=ttyS0,115200 init=/etc/preinit" CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_CAVIUM_OCTEON is not set @@ -53,6 +53,7 @@ CONFIG_CPU_HAS_PREFETCH=y CONFIG_CPU_HAS_SYNC=y # CONFIG_CPU_LITTLE_ENDIAN is not set # CONFIG_CPU_LOONGSON2E is not set +# CONFIG_CPU_LOONGSON2F is not set CONFIG_CPU_MIPS32=y # CONFIG_CPU_MIPS32_R1 is not set CONFIG_CPU_MIPS32_R2=y @@ -91,6 +92,7 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y # CONFIG_CRYPTO_MANAGER_NO_TESTS is not set +CONFIG_CRYPTO_MANAGER_TESTS=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y @@ -103,7 +105,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DEVKMEM=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set -CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_DNOTIFY=y CONFIG_DUMMY=m @@ -128,8 +129,17 @@ CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IDE=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_OPROFILE=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -163,8 +173,6 @@ CONFIG_IPC_NS=y CONFIG_IRQ_CPU=y CONFIG_IRQ_GIC=y CONFIG_IRQ_PER_CPU=y -# CONFIG_ISDN_CAPI is not set -# CONFIG_ISDN_I4L is not set # CONFIG_IXGBE is not set CONFIG_JFFS2_FS_POSIX_ACL=y CONFIG_JFFS2_FS_SECURITY=y @@ -179,10 +187,10 @@ CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIBERTAS=m -# CONFIG_LIBERTAS_DEBUG is not set CONFIG_LOCK_KERNEL=y CONFIG_LOG_BUF_SHIFT=15 +# CONFIG_LOONGSON_MC146818 is not set +CONFIG_LOONGSON_UART_BASE=y CONFIG_LXT_PHY=m # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set @@ -202,6 +210,7 @@ CONFIG_MIPS_BONITO64=y # CONFIG_MIPS_CMP is not set # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_CPU_SCACHE=y +CONFIG_MIPS_EXTERNAL_TIMER=y CONFIG_MIPS_L1_CACHE_SHIFT=6 # CONFIG_MIPS_MACHINE is not set CONFIG_MIPS_MALTA=y @@ -225,7 +234,9 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 # CONFIG_MTD_UBI_DEBUG is not set CONFIG_MTD_UBI_GLUEBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NAMESPACES=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NETDEV_10000=y CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_MIRRED=m @@ -275,6 +286,7 @@ CONFIG_PID_NS=y # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set +# CONFIG_POWERTV is not set CONFIG_PRINT_QUOTA_WARNING=y CONFIG_PROC_PAGE_MONITOR=y # CONFIG_QFMT_V1 is not set @@ -287,6 +299,7 @@ CONFIG_QUOTACTL=y CONFIG_QUOTA_TREE=y CONFIG_REALTEK_PHY=m CONFIG_RELAY=y +CONFIG_RPS=y CONFIG_RTC_CLASS=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCHED_SMT is not set @@ -294,6 +307,7 @@ CONFIG_SCSI=y # CONFIG_SCSI_CXGB3_ISCSI is not set CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_MOD=y CONFIG_SCSI_NETLINK=y CONFIG_SCSI_SPI_ATTRS=m CONFIG_SECCOMP=y @@ -324,7 +338,6 @@ CONFIG_SMP_UP=y CONFIG_SMSC_PHY=m # CONFIG_STAGING is not set CONFIG_STOP_MACHINE=y -CONFIG_STRIP=m CONFIG_SWAP_IO_SPACE=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_SYSFS_DEPRECATED=y @@ -345,12 +358,13 @@ CONFIG_SYS_SUPPORTS_MULTITHREADING=y CONFIG_SYS_SUPPORTS_SCHED_SMT=y CONFIG_SYS_SUPPORTS_SMARTMIPS=y CONFIG_SYS_SUPPORTS_SMP=y +CONFIG_SYS_SUPPORTS_ZBOOT=y # CONFIG_TC35815 is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y # CONFIG_TEHUTI is not set +# CONFIG_TINY_RCU is not set CONFIG_TRAD_SIGNALS=y -# CONFIG_TREE_PREEMPT_RCU is not set CONFIG_TREE_RCU=y CONFIG_TUN=m # CONFIG_UBIFS_FS is not set @@ -368,4 +382,3 @@ CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VXFS_FS=y # CONFIG_VXGE is not set # CONFIG_WATCHDOG is not set -CONFIG_WLAN_PRE80211=y diff --git a/target/linux/malta/le/config-default b/target/linux/malta/le/config-default index d1336a51b..ed479a3e3 100644 --- a/target/linux/malta/le/config-default +++ b/target/linux/malta/le/config-default @@ -5,6 +5,7 @@ CONFIG_32BIT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARCH_POPULATES_NODE_MAP=y # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_ARCH_SUPPORTS_OPROFILE=y @@ -39,12 +40,11 @@ CONFIG_BROADCOM_PHY=m CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CEVT_R4K=y CONFIG_CEVT_R4K_LIB=y -CONFIG_CFG80211_DEFAULT_PS_VALUE=0 CONFIG_CHELSIO_T3_DEPENDS=y +CONFIG_CHELSIO_T4_DEPENDS=y CONFIG_CICADA_PHY=m # CONFIG_CLS_U32_MARK is not set # CONFIG_CLS_U32_PERF is not set -CONFIG_CMDLINE="console=ttyS0,115200 init=/etc/preinit" CONFIG_CONSOLE_TRANSLATIONS=y # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_CAVIUM_OCTEON is not set @@ -53,6 +53,7 @@ CONFIG_CPU_HAS_PREFETCH=y CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_LITTLE_ENDIAN=y # CONFIG_CPU_LOONGSON2E is not set +# CONFIG_CPU_LOONGSON2F is not set CONFIG_CPU_MIPS32=y # CONFIG_CPU_MIPS32_R1 is not set CONFIG_CPU_MIPS32_R2=y @@ -91,6 +92,7 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y # CONFIG_CRYPTO_MANAGER_NO_TESTS is not set +CONFIG_CRYPTO_MANAGER_TESTS=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y @@ -103,7 +105,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DEVKMEM=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set -CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y CONFIG_DNOTIFY=y CONFIG_DUMMY=m @@ -128,8 +129,17 @@ CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IDE=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_OPROFILE=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -163,8 +173,6 @@ CONFIG_IPC_NS=y CONFIG_IRQ_CPU=y CONFIG_IRQ_GIC=y CONFIG_IRQ_PER_CPU=y -# CONFIG_ISDN_CAPI is not set -# CONFIG_ISDN_I4L is not set # CONFIG_IXGBE is not set CONFIG_JFFS2_FS_POSIX_ACL=y CONFIG_JFFS2_FS_SECURITY=y @@ -179,10 +187,10 @@ CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIBERTAS=m -# CONFIG_LIBERTAS_DEBUG is not set CONFIG_LOCK_KERNEL=y CONFIG_LOG_BUF_SHIFT=15 +# CONFIG_LOONGSON_MC146818 is not set +CONFIG_LOONGSON_UART_BASE=y CONFIG_LXT_PHY=m # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set @@ -202,6 +210,7 @@ CONFIG_MIPS_BONITO64=y # CONFIG_MIPS_CMP is not set # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_CPU_SCACHE=y +CONFIG_MIPS_EXTERNAL_TIMER=y CONFIG_MIPS_L1_CACHE_SHIFT=6 # CONFIG_MIPS_MACHINE is not set CONFIG_MIPS_MALTA=y @@ -225,7 +234,9 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 # CONFIG_MTD_UBI_DEBUG is not set CONFIG_MTD_UBI_GLUEBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NAMESPACES=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NETDEV_10000=y CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_MIRRED=m @@ -275,6 +286,7 @@ CONFIG_PID_NS=y # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set +# CONFIG_POWERTV is not set CONFIG_PRINT_QUOTA_WARNING=y CONFIG_PROC_PAGE_MONITOR=y # CONFIG_QFMT_V1 is not set @@ -287,6 +299,7 @@ CONFIG_QUOTACTL=y CONFIG_QUOTA_TREE=y CONFIG_REALTEK_PHY=m CONFIG_RELAY=y +CONFIG_RPS=y CONFIG_RTC_CLASS=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCHED_SMT is not set @@ -294,6 +307,7 @@ CONFIG_SCSI=y # CONFIG_SCSI_CXGB3_ISCSI is not set CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_MOD=y CONFIG_SCSI_NETLINK=y CONFIG_SCSI_SPI_ATTRS=m CONFIG_SECCOMP=y @@ -324,7 +338,6 @@ CONFIG_SMP_UP=y CONFIG_SMSC_PHY=m # CONFIG_STAGING is not set CONFIG_STOP_MACHINE=y -CONFIG_STRIP=m CONFIG_SWAP_IO_SPACE=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_SYSFS_DEPRECATED=y @@ -345,12 +358,13 @@ CONFIG_SYS_SUPPORTS_MULTITHREADING=y CONFIG_SYS_SUPPORTS_SCHED_SMT=y CONFIG_SYS_SUPPORTS_SMARTMIPS=y CONFIG_SYS_SUPPORTS_SMP=y +CONFIG_SYS_SUPPORTS_ZBOOT=y # CONFIG_TC35815 is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y # CONFIG_TEHUTI is not set +# CONFIG_TINY_RCU is not set CONFIG_TRAD_SIGNALS=y -# CONFIG_TREE_PREEMPT_RCU is not set CONFIG_TREE_RCU=y CONFIG_TUN=m # CONFIG_UBIFS_FS is not set @@ -368,4 +382,3 @@ CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VXFS_FS=y # CONFIG_VXGE is not set # CONFIG_WATCHDOG is not set -CONFIG_WLAN_PRE80211=y -- cgit v1.2.3