aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-10-04 15:42:12 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-10-04 15:42:12 +0000
commit281989083994b97864e0f1fc221eae6c1ea1df2a (patch)
tree7b457900a54dcaf4ee719485958ad538dc834e9f
parent5e0df9582b1b4bfb81eefab7a4c64f66c7eb6169 (diff)
downloadupstream-281989083994b97864e0f1fc221eae6c1ea1df2a.tar.gz
upstream-281989083994b97864e0f1fc221eae6c1ea1df2a.tar.bz2
upstream-281989083994b97864e0f1fc221eae6c1ea1df2a.zip
use memcmp in mem size detection as suggested by blogic
SVN-Revision: 33619
-rw-r--r--target/linux/brcm47xx/patches-3.3/192-MIPS-BCM47XX-improve-memory-size-detection.patch10
1 files changed, 3 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/192-MIPS-BCM47XX-improve-memory-size-detection.patch b/target/linux/brcm47xx/patches-3.3/192-MIPS-BCM47XX-improve-memory-size-detection.patch
index 548178c29e..285c60c713 100644
--- a/target/linux/brcm47xx/patches-3.3/192-MIPS-BCM47XX-improve-memory-size-detection.patch
+++ b/target/linux/brcm47xx/patches-3.3/192-MIPS-BCM47XX-improve-memory-size-detection.patch
@@ -12,19 +12,16 @@
{
unsigned long mem;
unsigned long max;
-+ unsigned long off, data, off1, data1;
++ unsigned long off;
struct cpuinfo_mips *c = &current_cpu_data;
/* Figure out memory size by finding aliases.
-@@ -77,15 +79,19 @@ static __init void prom_init_mem(void)
+@@ -77,15 +79,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.
*/
- max = ((unsigned long)(prom_init) | ((128 << 20) - 1));
+ off = (unsigned long)prom_init;
-+ data = *(unsigned long *)prom_init;
-+ off1 = off + 4;
-+ data1 = *(unsigned long *)off1;
+ max = off | ((128 << 20) - 1);
for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
- if (((unsigned long)(prom_init) + mem) > max) {
@@ -35,8 +32,7 @@
}
- if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==
- *(unsigned long *)(prom_init))
-+ if ((*(unsigned long *)(off + mem) == data) &&
-+ (*(unsigned long *)(off1 + mem) == data1))
++ if (!memcmp(prom_init, prom_init + mem, 32))
break;
}