X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/63b12ffd1bf4012ffb97802ca54a60a3d895903a..84fdb577b9f2afa1f1c7ffb7eff9e98047331552:/target/linux/atheros-2.6/files/arch/mips/atheros/board.c?ds=sidebyside

diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/board.c b/target/linux/atheros-2.6/files/arch/mips/atheros/board.c
index fe94c3ffc..d26eda4d0 100644
--- a/target/linux/atheros-2.6/files/arch/mips/atheros/board.c
+++ b/target/linux/atheros-2.6/files/arch/mips/atheros/board.c
@@ -106,7 +106,7 @@ int __init ar531x_find_config(char *flash_limit)
 	if (!bcfg)
 		return -ENODEV;
 
-	board_config = kmalloc(0x1000, GFP_KERNEL);
+	board_config = kzalloc(BOARD_CONFIG_BUFSZ, GFP_KERNEL);
 	memcpy(board_config, bcfg, 0x100);
 
 	/* Radio config starts 0x100 bytes after board config, regardless
@@ -116,9 +116,9 @@ int __init ar531x_find_config(char *flash_limit)
 	if (!rcfg)
 		return -ENODEV;
 
-	printk("Radio config found at offset 0x%x\n", rcfg - bcfg);
 	radio_config = board_config + 0x100 + ((rcfg - bcfg) & 0xfff);
-	rcfg_size = 0x1000 - ((rcfg - bcfg) & 0xfff);
+	printk("Radio config found at offset 0x%x(0x%x)\n", rcfg - bcfg, radio_config - board_config);
+	rcfg_size = BOARD_CONFIG_BUFSZ - ((rcfg - bcfg) & (BOARD_CONFIG_BUFSZ - 1));
 	memcpy(radio_config, rcfg, rcfg_size);
 	
 	return 0;
@@ -143,18 +143,8 @@ void __init serial_setup(unsigned long mapbase, unsigned int uartclk)
 
 void __init plat_mem_setup(void)
 {
-	switch(mips_machtype) {
-#ifdef CONFIG_ATHEROS_AR5312
-	case MACH_ATHEROS_AR5312:
-		ar5312_plat_setup();
-		break;
-#endif
-#ifdef CONFIG_ATHEROS_AR5315
-	case MACH_ATHEROS_AR5315:
-		ar5315_plat_setup();
-		break;
-#endif
-	}
+	DO_AR5312(ar5312_plat_setup();)
+	DO_AR5315(ar5315_plat_setup();)
 
 	/* Disable data watchpoints */
 	write_c0_watchlo0(0);
@@ -165,11 +155,23 @@ const char *get_system_type(void)
 	switch (mips_machtype) {
 #ifdef CONFIG_ATHEROS_AR5312
 	case MACH_ATHEROS_AR5312:
-		return "Atheros AR5312\n";
+		return "Atheros AR5312";
+
+	case MACH_ATHEROS_AR2312:
+		return "Atheros AR2312";
+		
+	case MACH_ATHEROS_AR2313:
+		return "Atheros AR2313";
 #endif
 #ifdef CONFIG_ATHEROS_AR5315
-	case MACH_ATHEROS_AR5315:
-		return "Atheros AR5315\n";
+	case MACH_ATHEROS_AR2315:
+		return "Atheros AR2315";
+	case MACH_ATHEROS_AR2316:
+		return "Atheros AR2316";
+	case MACH_ATHEROS_AR2317:
+		return "Atheros AR2317";
+	case MACH_ATHEROS_AR2318:
+		return "Atheros AR2318";
 #endif
 	}
 	return "Atheros (unknown)";