aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-06-03 18:32:32 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-06-03 18:32:32 +0000
commit1c929ef068b369ac886a9f450fde3b640d7ba231 (patch)
tree8800481f209dba4c1070b4060d2a42bb902daca6 /target/linux
parentb8b3fe08cba0cb67cc7d1430a1b80da0c5780cf7 (diff)
downloadmaster-187ad058-1c929ef068b369ac886a9f450fde3b640d7ba231.tar.gz
master-187ad058-1c929ef068b369ac886a9f450fde3b640d7ba231.tar.bz2
master-187ad058-1c929ef068b369ac886a9f450fde3b640d7ba231.zip
[ar71xx] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16312 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/patches-2.6.29/104-mtd_m25p80_add_redboot_parser.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.29/105-mtd_m25p80_add_mx25lxxx_support.patch6
-rw-r--r--target/linux/ar71xx/patches-2.6.29/106-mtd_m25p80_add_xxxs33b_support.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.30/101-ksz8041_phy_driver.patch4
-rw-r--r--target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch2
6 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/ar71xx/patches-2.6.29/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.29/104-mtd_m25p80_add_redboot_parser.patch
index 462ae68791..6464a3e9b7 100644
--- a/target/linux/ar71xx/patches-2.6.29/104-mtd_m25p80_add_redboot_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.29/104-mtd_m25p80_add_redboot_parser.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -722,6 +722,9 @@ static int __devinit m25p_probe(struct s
+@@ -723,6 +723,9 @@ static int __devinit m25p_probe(struct s
#ifdef CONFIG_MTD_MYLOADER_PARTS
"MyLoader",
#endif
diff --git a/target/linux/ar71xx/patches-2.6.29/105-mtd_m25p80_add_mx25lxxx_support.patch b/target/linux/ar71xx/patches-2.6.29/105-mtd_m25p80_add_mx25lxxx_support.patch
index 9456ac4314..ab2a18ff2e 100644
--- a/target/linux/ar71xx/patches-2.6.29/105-mtd_m25p80_add_mx25lxxx_support.patch
+++ b/target/linux/ar71xx/patches-2.6.29/105-mtd_m25p80_add_mx25lxxx_support.patch
@@ -1,8 +1,8 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -507,6 +507,11 @@ static struct flash_info __devinitdata m
- /* EON -- en25px */
- { "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
+@@ -508,6 +508,11 @@ static struct flash_info __devinitdata m
+ { "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
+ { "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
+ /* Macronix -- mx25lxxx */
+ { "mx25l32", 0xc22016, 0, 64 * 1024, 64, },
diff --git a/target/linux/ar71xx/patches-2.6.29/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/ar71xx/patches-2.6.29/106-mtd_m25p80_add_xxxs33b_support.patch
index e4e01637d6..40e5c407fd 100644
--- a/target/linux/ar71xx/patches-2.6.29/106-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/ar71xx/patches-2.6.29/106-mtd_m25p80_add_xxxs33b_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -512,6 +512,11 @@ static struct flash_info __devinitdata m
+@@ -513,6 +513,11 @@ static struct flash_info __devinitdata m
{ "mx25l64", 0xc22017, 0, 64 * 1024, 128, },
{ "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
diff --git a/target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch
index 0a2d2e7936..40fcd51894 100644
--- a/target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch
+++ b/target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -603,6 +603,13 @@ else
+@@ -610,6 +610,13 @@ else
load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000
endif
diff --git a/target/linux/ar71xx/patches-2.6.30/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.30/101-ksz8041_phy_driver.patch
index 0de88532b8..828a3f9b9a 100644
--- a/target/linux/ar71xx/patches-2.6.30/101-ksz8041_phy_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.30/101-ksz8041_phy_driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -100,6 +100,11 @@ config AR8216_PHY
+@@ -104,6 +104,11 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG
@@ -14,7 +14,7 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
+@@ -19,6 +19,7 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
diff --git a/target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch
index 31de67686f..cbe4d68251 100644
--- a/target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch
+++ b/target/linux/ar71xx/patches-2.6.30/300-mips_fw_myloader.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -165,6 +165,7 @@ endif
+@@ -172,6 +172,7 @@ endif
#
libs-$(CONFIG_ARC) += arch/mips/fw/arc/
libs-$(CONFIG_CFE) += arch/mips/fw/cfe/