aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-01-03 01:51:31 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-01-03 01:51:31 +0000
commit979291e9c5a2acd6c9942bbb8b846f07ec0d6050 (patch)
tree25f7032cf20cbc22e771f1afb388f6951493a9f5 /target
parent3e14ece5261f2b6f82ab1ce331338c85eaa1fa6d (diff)
downloadupstream-979291e9c5a2acd6c9942bbb8b846f07ec0d6050.tar.gz
upstream-979291e9c5a2acd6c9942bbb8b846f07ec0d6050.tar.bz2
upstream-979291e9c5a2acd6c9942bbb8b846f07ec0d6050.zip
brcm47xx: move patches already in the mainline kernel to the front
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34987 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx/patches-3.6/010-MIPS-BCM47XX-ignore-last-memory-page.patch (renamed from target/linux/brcm47xx/patches-3.6/191-MIPS-BCM47XX-ignore-last-memory-page.patch)4
-rw-r--r--target/linux/brcm47xx/patches-3.6/011-MIPS-BCM47XX-improve-memory-size-detection.patch (renamed from target/linux/brcm47xx/patches-3.6/192-MIPS-BCM47XX-improve-memory-size-detection.patch)4
-rw-r--r--target/linux/brcm47xx/patches-3.6/012-MIPS-BCM47xx-read-out-full-board-data.patch (renamed from target/linux/brcm47xx/patches-3.6/193-MIPS-BCM47xx-read-out-full-board-data.patch)0
-rw-r--r--target/linux/brcm47xx/patches-3.6/013-MIPS-BCM47XX-read-sprom-without-prefix-if-no-ieee802.patch (renamed from target/linux/brcm47xx/patches-3.6/194-MIPS-BCM47XX-read-sprom-without-prefix-if-no-ieee802.patch)2
-rw-r--r--target/linux/brcm47xx/patches-3.6/014-MIPS-BCM47xx-sprom-read-values-without-prefix-as-fal.patch (renamed from target/linux/brcm47xx/patches-3.6/195-MIPS-BCM47xx-sprom-read-values-without-prefix-as-fal.patch)6
5 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/191-MIPS-BCM47XX-ignore-last-memory-page.patch b/target/linux/brcm47xx/patches-3.6/010-MIPS-BCM47XX-ignore-last-memory-page.patch
index 9f7d5dcdb4..a2a7b9f5f7 100644
--- a/target/linux/brcm47xx/patches-3.6/191-MIPS-BCM47XX-ignore-last-memory-page.patch
+++ b/target/linux/brcm47xx/patches-3.6/010-MIPS-BCM47XX-ignore-last-memory-page.patch
@@ -8,7 +8,7 @@
#include <asm/bootinfo.h>
#include <asm/fw/cfe/cfe_api.h>
#include <asm/fw/cfe/cfe_error.h>
-@@ -59,6 +60,7 @@ static __init void prom_init_mem(void)
+@@ -127,6 +128,7 @@ static __init void prom_init_mem(void)
{
unsigned long mem;
unsigned long max;
@@ -16,7 +16,7 @@
/* Figure out memory size by finding aliases.
*
-@@ -87,6 +89,14 @@ static __init void prom_init_mem(void)
+@@ -155,6 +157,14 @@ static __init void prom_init_mem(void)
break;
}
diff --git a/target/linux/brcm47xx/patches-3.6/192-MIPS-BCM47XX-improve-memory-size-detection.patch b/target/linux/brcm47xx/patches-3.6/011-MIPS-BCM47XX-improve-memory-size-detection.patch
index 285c60c713..1d83ab665b 100644
--- a/target/linux/brcm47xx/patches-3.6/192-MIPS-BCM47XX-improve-memory-size-detection.patch
+++ b/target/linux/brcm47xx/patches-3.6/011-MIPS-BCM47XX-improve-memory-size-detection.patch
@@ -8,7 +8,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
-@@ -60,6 +61,7 @@ static __init void prom_init_mem(void)
+@@ -128,6 +129,7 @@ static __init void prom_init_mem(void)
{
unsigned long mem;
unsigned long max;
@@ -16,7 +16,7 @@
struct cpuinfo_mips *c = &current_cpu_data;
/* Figure out memory size by finding aliases.
-@@ -77,15 +79,15 @@ static __init void prom_init_mem(void)
+@@ -145,15 +147,15 @@ static __init void prom_init_mem(void)
* max contains the biggest possible address supported by the platform.
* If the method wants to try something above we assume 128MB ram.
*/
diff --git a/target/linux/brcm47xx/patches-3.6/193-MIPS-BCM47xx-read-out-full-board-data.patch b/target/linux/brcm47xx/patches-3.6/012-MIPS-BCM47xx-read-out-full-board-data.patch
index bdfc348cc7..bdfc348cc7 100644
--- a/target/linux/brcm47xx/patches-3.6/193-MIPS-BCM47xx-read-out-full-board-data.patch
+++ b/target/linux/brcm47xx/patches-3.6/012-MIPS-BCM47xx-read-out-full-board-data.patch
diff --git a/target/linux/brcm47xx/patches-3.6/194-MIPS-BCM47XX-read-sprom-without-prefix-if-no-ieee802.patch b/target/linux/brcm47xx/patches-3.6/013-MIPS-BCM47XX-read-sprom-without-prefix-if-no-ieee802.patch
index 9487d301f2..9fcebdeca3 100644
--- a/target/linux/brcm47xx/patches-3.6/194-MIPS-BCM47XX-read-sprom-without-prefix-if-no-ieee802.patch
+++ b/target/linux/brcm47xx/patches-3.6/013-MIPS-BCM47XX-read-sprom-without-prefix-if-no-ieee802.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
-@@ -206,6 +206,8 @@ static int bcm47xx_get_sprom_bcma(struct
+@@ -175,6 +175,8 @@ static int bcm47xx_get_sprom_bcma(struct
snprintf(prefix, sizeof(prefix), "sb/%u/",
core->core_index);
bcm47xx_fill_sprom(out, prefix);
diff --git a/target/linux/brcm47xx/patches-3.6/195-MIPS-BCM47xx-sprom-read-values-without-prefix-as-fal.patch b/target/linux/brcm47xx/patches-3.6/014-MIPS-BCM47xx-sprom-read-values-without-prefix-as-fal.patch
index 6b1db25805..1620dd068a 100644
--- a/target/linux/brcm47xx/patches-3.6/195-MIPS-BCM47xx-sprom-read-values-without-prefix-as-fal.patch
+++ b/target/linux/brcm47xx/patches-3.6/014-MIPS-BCM47xx-sprom-read-values-without-prefix-as-fal.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
-@@ -96,7 +96,7 @@ static int bcm47xx_get_sprom_ssb(struct
+@@ -94,7 +94,7 @@ static int bcm47xx_get_sprom_ssb(struct
snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
bus->host_pci->bus->number + 1,
PCI_SLOT(bus->host_pci->devfn));
@@ -9,7 +9,7 @@
return 0;
} else {
printk(KERN_WARNING "bcm47xx: unable to fill SPROM for given bustype.\n");
-@@ -115,7 +115,7 @@ static int bcm47xx_get_invariants(struct
+@@ -113,7 +113,7 @@ static int bcm47xx_get_invariants(struct
bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
memset(&iv->sprom, 0, sizeof(struct ssb_sprom));
@@ -18,7 +18,7 @@
if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);
-@@ -196,18 +196,17 @@ static int bcm47xx_get_sprom_bcma(struct
+@@ -165,18 +165,17 @@ static int bcm47xx_get_sprom_bcma(struct
snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
bus->host_pci->bus->number + 1,
PCI_SLOT(bus->host_pci->devfn));