projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
463a6f4
)
refresh patches
author
Florian Fainelli
<florian@openwrt.org>
Thu, 28 May 2009 18:54:09 +0000
(18:54 +0000)
committer
Florian Fainelli
<florian@openwrt.org>
Thu, 28 May 2009 18:54:09 +0000
(18:54 +0000)
SVN-Revision: 16155
target/linux/rb532/patches/001-cmdline_hack.patch
patch
|
blob
|
history
target/linux/rb532/patches/002-rb532_nand_fixup.patch
patch
|
blob
|
history
target/linux/rb532/patches/100-check_media.patch
patch
|
blob
|
history
diff --git
a/target/linux/rb532/patches/001-cmdline_hack.patch
b/target/linux/rb532/patches/001-cmdline_hack.patch
index b17734251f33949d58954d96385dfe4772f38d6c..99c891ddad107ec94adc5f83c8b429c1adcdd072 100644
(file)
--- 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
* 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);
}
return simple_strtoul(num, 0, 10);
}
@@
-22,7
+22,7
@@
void __init prom_setup_cmdline(void)
{
char cmd_line[CL_SIZE];
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++) = ' ';
}
*(cp++) = ' ';
diff --git
a/target/linux/rb532/patches/002-rb532_nand_fixup.patch
b/target/linux/rb532/patches/002-rb532_nand_fixup.patch
index 3c7cccacba9ff11eb8f32d5ce6d855b3b56eeada..82c191295f2a70b4c67272a6649966453474260d 100644
(file)
--- 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
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
-@@ -1
19,6 +119
,19 @@ static struct platform_device cf_slot0 =
+@@ -1
40,6 +140
,19 @@ static struct platform_device cf_slot0 =
};
/* Resources and device for NAND */
};
/* Resources and device for NAND */
@@
-20,7
+20,7
@@
static int rb532_dev_ready(struct mtd_info *mtd)
{
return gpio_get_value(GPIO_RDY);
static int rb532_dev_ready(struct mtd_info *mtd)
{
return gpio_get_value(GPIO_RDY);
-@@ -2
77,6 +290
,16 @@ static void __init parse_mac_addr(char *
+@@ -2
81,6 +294
,16 @@ static void __init parse_mac_addr(char *
/* NAND definitions */
#define NAND_CHIP_DELAY 25
/* NAND definitions */
#define NAND_CHIP_DELAY 25
@@
-37,7
+37,7
@@
static void __init rb532_nand_setup(void)
{
switch (mips_machtype) {
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;
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 4180c623701054e2c21ec5e55b3fa42e4eee680d..66e731dac112d4e945511476c2187a8c9d95e613 100644
(file)
--- 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;
struct mii_if_info mii_if;
struct net_device *dev;
int phy_addr;
-@@ -66
3,6 +664
,15 @@ static void korina_check_media(struct ne
+@@ -66
4,6 +665
,15 @@ static void korina_check_media(struct ne
&lp->eth_regs->ethmac2);
}
&lp->eth_regs->ethmac2);
}
@@
-41,7
+41,7
@@
/* Disable interrupts */
disable_irq(lp->rx_irq);
disable_irq(lp->tx_irq);
/* Disable interrupts */
disable_irq(lp->rx_irq);
disable_irq(lp->tx_irq);
-@@ -117
7,6 +1190
,7 @@ static int korina_probe(struct platform_
+@@ -117
6,6 +1189
,7 @@ static int korina_probe(struct platform_
": cannot register net device %d\n", rc);
goto probe_err_register;
}
": cannot register net device %d\n", rc);
goto probe_err_register;
}