From: Florian Fainelli Date: Tue, 12 May 2009 12:59:45 +0000 (+0000) Subject: update to 2.6.30-rc5 X-Git-Tag: reboot~23603 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f27feec22f824ff2ab0041aebb3b45852f488929;p=openwrt%2Fstaging%2Flynxis.git update to 2.6.30-rc5 SVN-Revision: 15799 --- diff --git a/target/linux/cavium-octeon/Makefile b/target/linux/cavium-octeon/Makefile index 1d5df0093d..4904a8989c 100644 --- a/target/linux/cavium-octeon/Makefile +++ b/target/linux/cavium-octeon/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk ARCH:=mips BOARD:=cavium-octeon BOARDNAME:=Cavium Networks Octeon -FEATURES:=squashfs jffs2 +FEATURES:=squashfs jffs2 pci CFLAGS:=-Os -pipe -funit-at-a-time -LINUX_VERSION:=2.6.29.2 +LINUX_VERSION:=2.6.30-rc5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cavium-octeon/config-default b/target/linux/cavium-octeon/config-default index e316da99aa..f3939da4b2 100644 --- a/target/linux/cavium-octeon/config-default +++ b/target/linux/cavium-octeon/config-default @@ -14,16 +14,19 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_ARCH_SUPPORTS_OPROFILE=y # CONFIG_ARPD is not set +# CONFIG_B3DFG is not set # CONFIG_BACKTRACE_SELF_TEST is not set CONFIG_BASE_SMALL=0 # CONFIG_BCM47XX is not set +# CONFIG_BINARY_PRINTF is not set CONFIG_BINFMT_ELF32=y CONFIG_BITREVERSE=y CONFIG_BLOCK_COMPAT=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 # CONFIG_BOOT_PRINTK_DELAY is not set -# CONFIG_BOOT_TRACER is not set # CONFIG_BRIDGE is not set CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set @@ -45,7 +48,6 @@ CONFIG_CMDLINE="console=ttyS0,115200 init=/etc/preinit" # CONFIG_COMEDI is not set CONFIG_COMPAT=y CONFIG_COMPAT_BRK=y -CONFIG_COMPAT_NET_DEV_OPS=y # CONFIG_CONFIGFS_FS is not set CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_CAVIUM_OCTEON=y @@ -92,9 +94,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y -# CONFIG_DCB is not set +CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_DEBUG_DRIVER is not set @@ -117,17 +120,19 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DECOMPRESS_LZMA=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_DETECT_HUNG_TASK=y CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DEVKMEM=y CONFIG_DEVPORT=y -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_DM9000 is not set CONFIG_DMA_COHERENT=y CONFIG_DNOTIFY=y +# CONFIG_DST is not set CONFIG_EARLY_PRINTK=y # CONFIG_ECHO is not set CONFIG_ELF_CORE=y @@ -144,7 +149,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y -# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GROUP_SCHED=y # CONFIG_HAMRADIO is not set CONFIG_HARDWARE_WATCHPOINTS=y @@ -156,8 +161,11 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_HAVE_IDE=y CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_SYSCALL_WRAPPERS=y +# CONFIG_HECI is not set # CONFIG_HIGH_RES_TIMERS is not set CONFIG_HW_HAS_PCI=y # CONFIG_HW_RANDOM is not set @@ -222,7 +230,6 @@ CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMTC is not set # CONFIG_MIPS_SIM is not set # CONFIG_MISC_DEVICES is not set -CONFIG_MISC_FILESYSTEMS=y # CONFIG_MTD_BLKDEVS is not set # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set @@ -230,14 +237,13 @@ CONFIG_MISC_FILESYSTEMS=y CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_COMPLEX_MAPPINGS is not set CONFIG_MTD_PHYSMAP=y -# CONFIG_MTD_PHYSMAP_COMPAT is not set # CONFIG_NATSEMI is not set -# CONFIG_NEC_MARKEINS is not set # CONFIG_NETFILTER is not set # CONFIG_NETLABEL is not set # CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_NET_SCHED is not set # CONFIG_NEW_LEDS is not set +CONFIG_NLATTR=y CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y @@ -249,6 +255,7 @@ CONFIG_NR_CPUS_DEFAULT_16=y CONFIG_OCTEON_ETHERNET=y CONFIG_OCTEON_MGMT=y CONFIG_PAGEFLAGS_EXTENDED=y +# CONFIG_PAGE_POISONING is not set # CONFIG_PAGE_SIZE_16KB is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set @@ -260,11 +267,14 @@ CONFIG_PCI_DOMAINS=y # CONFIG_PCI_STUB is not set # CONFIG_PCSPKR_PLATFORM is not set CONFIG_PHYS_ADDR_T_64BIT=y +# CONFIG_PLAN9AUTH is not set # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set +# CONFIG_POHMELFS is not set CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_PREEMPT=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set @@ -288,6 +298,7 @@ CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set # CONFIG_SECURITY_PATH is not set +# CONFIG_SECURITY_TOMOYO is not set # CONFIG_SERIAL_8250_EXTENDED is not set # CONFIG_SGI_IP22 is not set # CONFIG_SGI_IP27 is not set @@ -301,6 +312,7 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SIBYTE_RHONE is not set # CONFIG_SIBYTE_SENTOSA is not set # CONFIG_SIBYTE_SWARM is not set +# CONFIG_SLOW_WORK is not set CONFIG_SMP=y CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_MANUAL=y @@ -323,7 +335,7 @@ CONFIG_SYS_SUPPORTS_SMP=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y # CONFIG_TIMER_STATS is not set -# CONFIG_TRACE_BRANCH_PROFILING is not set +CONFIG_TRACING_SUPPORT=y CONFIG_UNEVICTABLE_LRU=y CONFIG_USER_SCHED=y CONFIG_USE_GENERIC_SMP_HELPERS=y diff --git a/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch b/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch index 161b1dcd33..96ff2c2bf0 100644 --- a/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch +++ b/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch @@ -55,14 +55,16 @@ diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile index 1c2a7fa..2b5f08f 100644 --- a/arch/mips/cavium-octeon/Makefile +++ b/arch/mips/cavium-octeon/Makefile -@@ -14,3 +14,7 @@ obj-y += dma-octeon.o flash_setup.o +@@ -14,5 +14,9 @@ obj-y += octeon-memcpy.o - + obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_PCI) += pci-common.o +obj-$(CONFIG_PCI) += pci.o +obj-$(CONFIG_PCI) += pcie.o +obj-$(CONFIG_PCI_MSI) += msi.o + + EXTRA_CFLAGS += -Werror diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c index 01b1ef9..af3c26f 100644 --- a/arch/mips/cavium-octeon/dma-octeon.c diff --git a/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch b/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch index ebac42ef1f..98053105bf 100644 --- a/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch +++ b/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch @@ -620,14 +620,14 @@ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 4a92305..4cbc22e 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -228,6 +228,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o - pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o +@@ -234,6 +234,7 @@ obj-$(CONFIG_MLX4_CORE) += mlx4/ obj-$(CONFIG_ENC28J60) += enc28j60.o + obj-$(CONFIG_ETHOC) += ethoc.o +obj-$(CONFIG_OCTEON_MGMT) += octeon/ - + obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o - + diff --git a/drivers/net/octeon/Makefile b/drivers/net/octeon/Makefile new file mode 100644 index 0000000..f32f394 diff --git a/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch b/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch index f08bc5311e..af2d2b1da9 100644 --- a/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch +++ b/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch @@ -19,10 +19,11 @@ index 0dcf9ca..6c2ca23 100644 + endif # !STAGING_EXCLUDE_BUILD endif # STAGING ---- a/drivers/staging/Makefile 2009-05-06 15:46:47.000000000 +0200 -+++ b/drivers/staging/Makefile 2009-05-06 15:47:33.000000000 +0200 -@@ -29,3 +29,4 @@ - obj-$(CONFIG_TRANZPORT) += frontier/ - obj-$(CONFIG_EPL) += epl/ - obj-$(CONFIG_ANDROID) += android/ +diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile +--- a/drivers/staging/Makefile 2009-05-09 02:14:14.000000000 +0200 ++++ b/drivers/staging/Makefile 2009-05-12 12:38:22.000000000 +0200 +@@ -40,3 +40,4 @@ + obj-$(CONFIG_HECI) += heci/ + obj-$(CONFIG_LINE6_USB) += line6/ + obj-$(CONFIG_USB_SERIAL_QUATECH_ESU100) += serqt_usb/ +obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ diff --git a/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch b/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch new file mode 100644 index 0000000000..bc72185f28 --- /dev/null +++ b/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch @@ -0,0 +1,31 @@ +From: Coly Li +Date: Wed, 22 Apr 2009 19:06:06 +0000 (+0800) +Subject: MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read() +X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=06a4801f5f580bb98dd813466668592943f7baea;hp=bb13f16bff55ce7ffb67d0d600bab72b9cab773b + +MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read() + +This patch modifies parameter of octeon_cvmcount_read() from 'void' to +'struct clocksource *cs', which fixes compile warning for incompatible +parameter type. + +Signed-off-by: Coly Li +Cc: David Daney +Cc: Ingo Molnar +Reviewed-by: David Daney +Signed-off-by: Ralf Baechle +--- + +diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c +index 70fd92c..96110f2 100644 +--- a/arch/mips/cavium-octeon/csrc-octeon.c ++++ b/arch/mips/cavium-octeon/csrc-octeon.c +@@ -38,7 +38,7 @@ void octeon_init_cvmcount(void) + local_irq_restore(flags); + } + +-static cycle_t octeon_cvmcount_read(void) ++static cycle_t octeon_cvmcount_read(struct clocksource *cs) + { + return read_c0_cvmcount(); + } diff --git a/target/linux/cavium-octeon/patches/015-no_werror.patch b/target/linux/cavium-octeon/patches/015-no_werror.patch new file mode 100644 index 0000000000..bb3b517788 --- /dev/null +++ b/target/linux/cavium-octeon/patches/015-no_werror.patch @@ -0,0 +1,8 @@ +--- a/arch/mips/cavium-octeon/Makefile 2009-05-12 12:43:52.000000000 +0200 ++++ b/arch/mips/cavium-octeon/Makefile 2009-05-12 12:57:04.000000000 +0200 +@@ -18,5 +18,3 @@ + obj-$(CONFIG_PCI) += pci.o + obj-$(CONFIG_PCI) += pcie.o + obj-$(CONFIG_PCI_MSI) += msi.o +- +-EXTRA_CFLAGS += -Werror