summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-11-13 15:55:39 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-11-13 15:55:39 +0000
commit7bb460e11acf9709381f656eb4532e3213f4aeda (patch)
tree9dd12ae37c3710b086b5ee396256f0be143cc88a
parent6974a2421ed5195743aae9c16d02e50f83b6b159 (diff)
[ar71xx] rewrite memory size detection
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13198 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/setup.c28
1 files changed, 7 insertions, 21 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
index 855497c7d..fc8652098 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
@@ -85,28 +85,14 @@ int __init ar71xx_pci_init(unsigned nr_irqs, struct ar71xx_pci_irq *map)
static void __init ar71xx_detect_mem_size(void)
{
- volatile u8 *p;
- u8 memsave;
- u32 size;
-
- p = (volatile u8 *) KSEG1ADDR(0);
- memsave = *p;
- for (size = AR71XX_MEM_SIZE_MIN;
- size <= (AR71XX_MEM_SIZE_MAX >> 1); size <<= 1) {
- volatile u8 *r;
-
- r = (p + size);
- *p = 0x55;
- if (*r == 0x55) {
- /* Mirrored data found, try another pattern */
- *p = 0xAA;
- if (*r == 0xAA) {
- /* Mirrored data found again, stop detection */
- break;
- }
- }
+ unsigned long size;
+
+ for (size = AR71XX_MEM_SIZE_MIN; size < AR71XX_MEM_SIZE_MAX;
+ size <<= 1 ) {
+ if (!memcmp(ar71xx_detect_mem_size,
+ ar71xx_detect_mem_size + size, 1024))
+ break;
}
- *p = memsave;
add_memory_region(0, size, BOOT_MEM_RAM);
}