diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-10-04 15:42:12 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-10-04 15:42:12 +0000 |
| commit | 1f128d7c2383037440ece27caec50eddf4724460 (patch) | |
| tree | 235e8b79e82a6e9cf2d906f646535ee7fe56e8fa | |
| parent | 3e911e9ef113edaaefc1c07dc03dbd2042049f7f (diff) | |
| download | upstream-1f128d7c2383037440ece27caec50eddf4724460.tar.gz upstream-1f128d7c2383037440ece27caec50eddf4724460.tar.bz2 upstream-1f128d7c2383037440ece27caec50eddf4724460.zip | |
[brcm47xx]: use memcmp in mem size detection as suggested by blogic
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33619 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/192-MIPS-BCM47XX-improve-memory-size-detection.patch | 10 |
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 = ¤t_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; } |