aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-05-28 18:54:09 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-05-28 18:54:09 +0000
commite0c3e283da980da56f44eb44348e1b812de1bddb (patch)
tree1dfb90d2042100b01aba88fb7dfe82291e8ad7a3
parent463a6f4bda3a01c3c699771661f3007541a7fd68 (diff)
downloadupstream-e0c3e283da980da56f44eb44348e1b812de1bddb.tar.gz
upstream-e0c3e283da980da56f44eb44348e1b812de1bddb.tar.bz2
upstream-e0c3e283da980da56f44eb44348e1b812de1bddb.zip
refresh patches
SVN-Revision: 16155
-rw-r--r--target/linux/rb532/patches/001-cmdline_hack.patch4
-rw-r--r--target/linux/rb532/patches/002-rb532_nand_fixup.patch6
-rw-r--r--target/linux/rb532/patches/100-check_media.patch4
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/rb532/patches/001-cmdline_hack.patch b/target/linux/rb532/patches/001-cmdline_hack.patch
index b17734251f..99c891ddad 100644
--- a/target/linux/rb532/patches/001-cmdline_hack.patch
+++ b/target/linux/rb532/patches/001-cmdline_hack.patch
@@ -14,7 +14,7 @@
* Reserved space for exception handlers.
--- a/arch/mips/rb532/prom.c
+++ b/arch/mips/rb532/prom.c
-@@ -67,6 +67,7 @@
+@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char
return simple_strtoul(num, 0, 10);
}
@@ -22,7 +22,7 @@
void __init prom_setup_cmdline(void)
{
char cmd_line[CL_SIZE];
-@@ -109,6 +110,9 @@
+@@ -109,6 +110,9 @@ void __init prom_setup_cmdline(void)
}
*(cp++) = ' ';
diff --git a/target/linux/rb532/patches/002-rb532_nand_fixup.patch b/target/linux/rb532/patches/002-rb532_nand_fixup.patch
index 3c7cccacba..82c191295f 100644
--- a/target/linux/rb532/patches/002-rb532_nand_fixup.patch
+++ b/target/linux/rb532/patches/002-rb532_nand_fixup.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
-@@ -119,6 +119,19 @@ static struct platform_device cf_slot0 =
+@@ -140,6 +140,19 @@ static struct platform_device cf_slot0 =
};
/* Resources and device for NAND */
@@ -20,7 +20,7 @@
static int rb532_dev_ready(struct mtd_info *mtd)
{
return gpio_get_value(GPIO_RDY);
-@@ -277,6 +290,16 @@ static void __init parse_mac_addr(char *
+@@ -281,6 +294,16 @@ static void __init parse_mac_addr(char *
/* NAND definitions */
#define NAND_CHIP_DELAY 25
@@ -37,7 +37,7 @@
static void __init rb532_nand_setup(void)
{
switch (mips_machtype) {
-@@ -296,6 +319,8 @@ static void __init rb532_nand_setup(void
+@@ -300,6 +323,8 @@ static void __init rb532_nand_setup(void
rb532_nand_data.chip.partitions = rb532_partition_info;
rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
rb532_nand_data.chip.options = NAND_NO_AUTOINCR;
diff --git a/target/linux/rb532/patches/100-check_media.patch b/target/linux/rb532/patches/100-check_media.patch
index 4180c62370..66e731dac1 100644
--- a/target/linux/rb532/patches/100-check_media.patch
+++ b/target/linux/rb532/patches/100-check_media.patch
@@ -8,7 +8,7 @@
struct mii_if_info mii_if;
struct net_device *dev;
int phy_addr;
-@@ -663,6 +664,15 @@ static void korina_check_media(struct ne
+@@ -664,6 +665,15 @@ static void korina_check_media(struct ne
&lp->eth_regs->ethmac2);
}
@@ -41,7 +41,7 @@
/* Disable interrupts */
disable_irq(lp->rx_irq);
disable_irq(lp->tx_irq);
-@@ -1177,6 +1190,7 @@ static int korina_probe(struct platform_
+@@ -1176,6 +1189,7 @@ static int korina_probe(struct platform_
": cannot register net device %d\n", rc);
goto probe_err_register;
}