brcm63xx cleanups; add a watchdog driver, indent serial console driver, add support...

[openwrt-10.03/.git] / target / linux / brcm63xx-2.6 / files / arch / mips / bcm963xx / prom.c

diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/prom.c b/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/prom.c
index af278a263ad67606d43f2223dd3a2a279680c75f..23e97200b0e37d888d10febe766389456e98e6ba 100644 (file)
--- a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/prom.c
+++ b/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/prom.c
@@ -1,6 +1,6 @@
 /*
-<:copyright-gpl
  Copyright 2004 Broadcom Corp. All Rights Reserved.
+ Copyright 2007 OpenWrt,org, Florian Fainelli <florian@openwrt.org>
 
  This program is free software; you can distribute it and/or modify it
  under the terms of the GNU General Public License (Version 2) as
@@ -14,7 +14,6 @@
  You should have received a copy of the GNU General Public License along
  with this program; if not, write to the Free Software Foundation, Inc.,
  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-:>
 */
 /*
  * prom.c: PROM library initialization code.
@@ -50,24 +49,26 @@ void __init prom_init(void)
 {
        serial_init();
 
-       printk( "%s prom init\n", get_system_type() );
+       printk("%s prom init\n", get_system_type() );
 
        PERF->IrqMask = 0;
-
+       
+       /* Detect the bootloader */
        detect_bootloader();
 
-       if (boot_loader_type == BOOT_LOADER_CFE) {
+       /* Do further initialisations depending on the bootloader */
+       if (boot_loader_type == BOOT_LOADER_CFE || boot_loader_type == BOOT_LOADER_CFE2) {
                cfe_setup(fw_arg0, fw_arg1, fw_arg2, fw_arg3);
-               add_memory_region(0, (boot_mem_map.map[0].size - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
        }
-       else
-               add_memory_region(0, (0x01000000 - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
-       
+       /* Register 16MB RAM minus the ADSL SDRAM by default */
+       add_memory_region(0, (0x01000000 - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
+
        mips_machgroup = MACH_GROUP_BRCM;
        mips_machtype = MACH_BCM;
 }
 
-void __init prom_free_prom_memory(void)
+unsigned long __init prom_free_prom_memory(void)
 {
        /* We do not have any memory to free */
+       return 0;
 }