X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/07244cdc4fa4c87351dffbdaae4cbd131edf43ef..5a2708d1926dfdbbe91f5d12fab43eff55ea971f:/target/linux/ramips/files/arch/mips/ralink/common/setup.c

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 3030fcd15..0d6b8d8c9 100644
--- a/target/linux/ramips/files/arch/mips/ralink/common/setup.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/setup.c
@@ -16,14 +16,11 @@
 
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
-#include <asm/mips_machine.h>
 
 #include <asm/mach-ralink/common.h>
 #include <asm/mach-ralink/machine.h>
-#include <ralink_soc.h>
 
 unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN];
-enum ramips_mach_type ramips_mach = RAMIPS_MACH_GENERIC;
 
 const char *get_system_type(void)
 {
@@ -33,15 +30,16 @@ const char *get_system_type(void)
 static void __init detect_mem_size(void)
 {
 	unsigned long size;
+	void *base;
 
-	for (size = RALINK_SOC_MEM_SIZE_MIN; size < RALINK_SOC_MEM_SIZE_MAX;
+	base = (void *) KSEG1ADDR(detect_mem_size);
+	for (size = ramips_mem_size_min; size < ramips_mem_size_max;
 	     size <<= 1 ) {
-		if (!memcmp(detect_mem_size,
-			    detect_mem_size + size, 1024))
+		if (!memcmp(base, base + size, 1024))
 			break;
 	}
 
-	add_memory_region(RALINK_SOC_SDRAM_BASE, size, BOOT_MEM_RAM);
+	add_memory_region(ramips_mem_base, size, BOOT_MEM_RAM);
 }
 
 void __init ramips_early_serial_setup(int line, unsigned base, unsigned freq,
@@ -51,7 +49,7 @@ void __init ramips_early_serial_setup(int line, unsigned base, unsigned freq,
 	int err;
 
 	memset(&p, 0, sizeof(p));
-	p.flags		= UPF_SKIP_TEST;
+	p.flags		= UPF_SKIP_TEST | UPF_FIXED_TYPE;
 	p.iotype	= UPIO_AU;
 	p.uartclk	= freq;
 	p.regshift	= 2;
@@ -76,9 +74,11 @@ void __init plat_mem_setup(void)
 	ramips_soc_setup();
 }
 
+__setup("board=", mips_machtype_setup);
+
 static int __init ramips_machine_setup(void)
 {
-	mips_machine_setup(ramips_mach);
+	mips_machine_setup();
 	return 0;
 }
 
@@ -88,4 +88,5 @@ static void __init ramips_generic_init(void)
 {
 }
 
-MIPS_MACHINE(RAMIPS_MACH_GENERIC, "Generic Ralink board", ramips_generic_init);
+MIPS_MACHINE(RAMIPS_MACH_GENERIC, "Generic", "Generic Ralink board",
+	     ramips_generic_init);