switch to 2.6.30.1

SVN-Revision: 16896

7 files changed, 104 insertions, 30 deletions

diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
index 9800b79..812f9da 100644
--- a/target/linux/au1000/Makefile
+++ b/target/linux/au1000/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=RMI/AMD AU1x00
 FEATURES:=jffs2 usb pci
 SUBTARGETS=au1500 au1550
 
-LINUX_VERSION:=2.6.28.10
+LINUX_VERSION:=2.6.30.1
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += hostapd-mini yamonenv
diff --git a/target/linux/au1000/au1500/config-default b/target/linux/au1000/au1500/config-default
index 2b3ddb6..e459010 100644
--- a/target/linux/au1000/au1500/config-default
+++ b/target/linux/au1000/au1500/config-default
@@ -1,7 +1,6 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 CONFIG_64BIT_PHYS_ADDR=y
-# CONFIG_8139TOO is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -11,11 +10,14 @@ CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
+# CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
-CONFIG_CEVT_R4K=y
-CONFIG_CLASSIC_RCU=y
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="root=/dev/mtdblock0 rootfstype=squashfs,jffs2"
 # CONFIG_CPU_BIG_ENDIAN is not set
+# CONFIG_CPU_CAVIUM_OCTEON is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
@@ -47,31 +49,38 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRAMFS=m
 CONFIG_CRC16=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CSRC_R4K=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CSRC_R4K_LIB=y
+CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DUMMY=m
 CONFIG_ELF_CORE=y
-# CONFIG_FREEZER is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GPIOLIB=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
-# CONFIG_HAVE_AOUT is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y
+CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
@@ -84,20 +93,13 @@ CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQ_CPU=y
 CONFIG_KEXEC=y
-CONFIG_KMOD=y
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_LEDS_TRIGGERS is not set
+CONFIG_LEDS_GPIO=y
 # CONFIG_LEMOTE_FULONG is not set
 CONFIG_MACH_ALCHEMY=y
 # CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_EMMA is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
@@ -113,6 +115,7 @@ CONFIG_MIPS_AU1X00_ENET=y
 # CONFIG_MIPS_DB1200 is not set
 # CONFIG_MIPS_DB1500 is not set
 # CONFIG_MIPS_DB1550 is not set
+# CONFIG_MIPS_FPU_EMU is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set
@@ -134,24 +137,15 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-CONFIG_MTD_PHYSMAP_LEN=0
-CONFIG_MTD_PHYSMAP_START=0x8000000
 # CONFIG_NATSEMI is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PHYLIB=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
@@ -159,9 +153,7 @@ CONFIG_PHYLIB=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_PROM_EMU is not set
-# CONFIG_R6040 is not set
-CONFIG_RESOURCES_64BIT=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 CONFIG_SERIAL_8250_AU1X00=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -180,6 +172,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # 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_SOC_AU1500=y
 CONFIG_SOC_AU1X00=y
 CONFIG_SOFT_WATCHDOG=m
@@ -191,9 +184,8 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 # CONFIG_TC35815 is not set
 CONFIG_TICK_ONESHOT=y
+CONFIG_TRACING_SUPPORT=y
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_SUPPORT=y
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
 CONFIG_WDT_MTX1=y
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/au1000/patches-2.6.30/001-mtx1_cmdline.patch b/target/linux/au1000/patches-2.6.30/001-mtx1_cmdline.patch
new file mode 100644
index 0000000..a458327
--- /dev/null
+++ b/target/linux/au1000/patches-2.6.30/001-mtx1_cmdline.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/alchemy/mtx-1/init.c
++++ b/arch/mips/alchemy/mtx-1/init.c
+@@ -49,7 +49,7 @@ void __init prom_init(void)
+ 	prom_argv = (char **)fw_arg1;
+ 	prom_envp = (char **)fw_arg2;
+ 
+-	prom_init_cmdline();
++	strcpy(arcs_cmdline, CONFIG_CMDLINE);
+ 
+ 	memsize_str = prom_getenv("memsize");
+ 	if (!memsize_str)
diff --git a/target/linux/au1000/patches-2.6.30/002-openwrt_rootfs.patch b/target/linux/au1000/patches-2.6.30/002-openwrt_rootfs.patch
new file mode 100644
index 0000000..e1056e9
--- /dev/null
+++ b/target/linux/au1000/patches-2.6.30/002-openwrt_rootfs.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/alchemy/mtx-1/platform.c
++++ b/arch/mips/alchemy/mtx-1/platform.c
+@@ -90,7 +90,7 @@ static struct platform_device mtx1_gpio_
+ 
+ static struct mtd_partition mtx1_mtd_partitions[] = {
+ 	{
+-		.name	= "filesystem",
++		.name	= "rootfs",
+ 		.size	= 0x01C00000,
+ 		.offset	= 0,
+ 	},
diff --git a/target/linux/au1000/patches-2.6.30/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches-2.6.30/003-au1000_eth_ioctl.patch
new file mode 100644
index 0000000..db52b0f
--- /dev/null
+++ b/target/linux/au1000/patches-2.6.30/003-au1000_eth_ioctl.patch
@@ -0,0 +1,19 @@
+Index: linux-2.6.30.1/drivers/net/au1000_eth.c
+===================================================================
+--- linux-2.6.30.1.orig/drivers/net/au1000_eth.c	2009-07-03 01:52:38.000000000 +0200
++++ linux-2.6.30.1/drivers/net/au1000_eth.c	2009-07-18 12:26:58.000000000 +0200
+@@ -1036,10 +1036,14 @@
+ 	}
+ }
+ 
++#define AU1000_KNOWN_PHY_IOCTLS	(SIOCGMIIPHY & 0xfff0)
+ static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+ {
+ 	struct au1000_private *aup = netdev_priv(dev);
+ 
++	if((cmd & AU1000_KNOWN_PHY_IOCTLS) != AU1000_KNOWN_PHY_IOCTLS)
++		return -EINVAL;
++
+ 	if (!netif_running(dev)) return -EINVAL;
+ 
+ 	if (!aup->phy_dev) return -EINVAL; // PHY not controllable
diff --git a/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch b/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch
new file mode 100644
index 0000000..e681970
--- /dev/null
+++ b/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch
@@ -0,0 +1,31 @@
+--- a/drivers/net/au1000_eth.c
++++ b/drivers/net/au1000_eth.c
+@@ -184,6 +184,15 @@ struct au1000_private *au_macs[NUM_ETH_I
+ #  undef AU1XXX_PHY1_IRQ
+ #endif
+ 
++#if defined(CONFIG_MIPS_MTX1)
++/*
++ * 4G MeshCube (MTX-1) board
++ * PHY is at address 31 on MAC0
++ * autodetect fails if not searched for highest address !
++ */
++# define AU1XXX_PHY_SEARCH_HIGHEST_ADDR
++#endif
++
+ #if defined(AU1XXX_PHY0_BUSID) && (AU1XXX_PHY0_BUSID > 0)
+ # error MAC0-associated PHY attached 2nd MACs MII bus not supported yet
+ #endif
+@@ -380,6 +389,12 @@ static int mii_probe (struct net_device 
+ 	aup->old_duplex = -1;
+ 	aup->phy_dev = phydev;
+ 
++#ifdef CONFIG_MIPS_MTX1
++	/* set up ethernet jack LEDs on the 4G MeshCube (MTX-1 board) */
++	printk(KERN_INFO "MTX-1 PHY: updating LED settings\n");
++	phy_write(phydev, 0x11, 0xff80);
++#endif
++
+ 	printk(KERN_INFO "%s: attached PHY driver [%s] "
+ 	       "(mii_bus:phy_addr=%s, irq=%d)\n",
+ 	       dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq);
diff --git a/target/linux/au1000/patches-2.6.30/006-missing_string_header.patch b/target/linux/au1000/patches-2.6.30/006-missing_string_header.patch
new file mode 100644
index 0000000..8aba202
--- /dev/null
+++ b/target/linux/au1000/patches-2.6.30/006-missing_string_header.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/alchemy/mtx-1/init.c
++++ b/arch/mips/alchemy/mtx-1/init.c
+@@ -32,6 +32,7 @@
+ #include <linux/init.h>
+ 
+ #include <asm/bootinfo.h>
++#include <asm/string.h>
+ 
+ #include <prom.h>
+