ramips: allow to use custom code for memory size detection

SVN-Revision: 33570
This commit is contained in:
Gabor Juhos 2012-09-27 10:18:14 +00:00
parent 4ea68a13e3
commit 80d2da9f0f
2 changed files with 13 additions and 6 deletions

View file

@ -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_base;
extern unsigned long ramips_mem_size_min; extern unsigned long ramips_mem_size_min;
extern unsigned long ramips_mem_size_max; 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); void ramips_intc_irq_init(unsigned intc_base, unsigned irq, unsigned irq_base);
u32 ramips_intc_get_status(void); u32 ramips_intc_get_status(void);

View file

@ -21,6 +21,7 @@
#include <asm/mach-ralink/machine.h> #include <asm/mach-ralink/machine.h>
unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN]; unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN];
unsigned long (*ramips_get_mem_size)(void);
const char *get_system_type(void) const char *get_system_type(void)
{ {
@ -30,13 +31,18 @@ const char *get_system_type(void)
static void __init detect_mem_size(void) static void __init detect_mem_size(void)
{ {
unsigned long size; unsigned long size;
void *base;
base = (void *) KSEG1ADDR(detect_mem_size); if (ramips_get_mem_size) {
for (size = ramips_mem_size_min; size < ramips_mem_size_max; size = ramips_get_mem_size();
size <<= 1 ) { } else {
if (!memcmp(base, base + size, 1024)) void *base;
break;
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); add_memory_region(ramips_mem_base, size, BOOT_MEM_RAM);