diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-09-27 10:18:14 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-09-27 10:18:14 +0000 |
| commit | ae436c404b87c21bd715cad72df7c39a5ad6ebaf (patch) | |
| tree | 7ff10a65c46f54b033644b5b380a4d241dd311ab /target/linux/ramips | |
| parent | 0d211243f7b77b5a9707058c6b716b29fa4c9ea1 (diff) | |
| download | upstream-ae436c404b87c21bd715cad72df7c39a5ad6ebaf.tar.gz upstream-ae436c404b87c21bd715cad72df7c39a5ad6ebaf.tar.bz2 upstream-ae436c404b87c21bd715cad72df7c39a5ad6ebaf.zip | |
ramips: allow to use custom code for memory size detection
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33570 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h | 1 | ||||
| -rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/common/setup.c | 18 |
2 files changed, 13 insertions, 6 deletions
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h index 111dd06407..bb6e12bf86 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h @@ -14,6 +14,7 @@ extern unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN]; extern unsigned long ramips_mem_base; extern unsigned long ramips_mem_size_min; extern unsigned long ramips_mem_size_max; +extern unsigned long (*ramips_get_mem_size)(void); void ramips_intc_irq_init(unsigned intc_base, unsigned irq, unsigned irq_base); u32 ramips_intc_get_status(void); diff --git a/target/linux/ramips/files/arch/mips/ralink/common/setup.c b/target/linux/ramips/files/arch/mips/ralink/common/setup.c index 0d6b8d8c90..1af855e649 100644 --- a/target/linux/ramips/files/arch/mips/ralink/common/setup.c +++ b/target/linux/ramips/files/arch/mips/ralink/common/setup.c @@ -21,6 +21,7 @@ #include <asm/mach-ralink/machine.h> unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN]; +unsigned long (*ramips_get_mem_size)(void); const char *get_system_type(void) { @@ -30,13 +31,18 @@ const char *get_system_type(void) static void __init detect_mem_size(void) { unsigned long size; - void *base; - base = (void *) KSEG1ADDR(detect_mem_size); - for (size = ramips_mem_size_min; size < ramips_mem_size_max; - size <<= 1 ) { - if (!memcmp(base, base + size, 1024)) - break; + if (ramips_get_mem_size) { + size = ramips_get_mem_size(); + } else { + void *base; + + base = (void *) KSEG1ADDR(detect_mem_size); + for (size = ramips_mem_size_min; size < ramips_mem_size_max; + size <<= 1 ) { + if (!memcmp(base, base + size, 1024)) + break; + } } add_memory_region(ramips_mem_base, size, BOOT_MEM_RAM); |