brcm63xx cleanups; add a watchdog driver, indent serial console driver, add support for another sst flash

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6985 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 20 insertions, 4 deletions

diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/info.c b/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/info.c
index d492aa3cd..47a855d78 100644
--- a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/info.c
+++ b/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/info.c
@@ -25,7 +25,8 @@
 static char *boot_loader_names[BOOT_LOADER_LAST+1] = {
         [BOOT_LOADER_UNKNOWN]   = "Unknown",
         [BOOT_LOADER_CFE]       = "CFE",
-        [BOOT_LOADER_REDBOOT]	= "RedBoot"
+        [BOOT_LOADER_REDBOOT]	= "RedBoot",
+	[BOOT_LOADER_CFE2]	= "CFEv2"
 };
 
 /* boot loaders specific definitions */
@@ -73,14 +74,29 @@ void __init detect_bootloader(void)
 {
 	if (detect_cfe()) {
 		boot_loader_type = BOOT_LOADER_CFE;
-		printk("Boot loader is : %s\n", boot_loader_names[boot_loader_type]);
 	}
 
 	if (detect_redboot()) {
 		boot_loader_type = BOOT_LOADER_REDBOOT;
 	}
-	else
-		boot_loader_type = BOOT_LOADER_UNKNOWN;
+	else {
+		/* Some devices are using CFE, but it is not detected as is */
+		boot_loader_type = BOOT_LOADER_CFE2;
+	}
+	printk("Boot loader is : %s\n", boot_loader_names[boot_loader_type]);
+}
+
+void __init detect_board(void)
+{
+	switch (boot_loader_type)
+	{
+		case BOOT_LOADER_CFE:
+			break;
+		case BOOT_LOADER_REDBOOT:
+			break;
+		default:
+			break;
+	}
 }
 
 EXPORT_SYMBOL(boot_loader_type);