enable start-stop-daemon by default, i want to use this to clean up a few init script...

[openwrt/svn-archive/archive.git] / target / linux / adm5120-2.6 / files / arch / mips / adm5120 / prom.c

diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
index 97ecc99bc9e7e3550e822dbab27b4149a1097d12..2187477d0223bce0aaeabd397ead216dcb264924 100644 (file)
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
@@ -4,7 +4,7 @@
  *  ADM5120 specific prom routines
  *
  *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
+ *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -62,17 +62,19 @@ static struct board_desc common_boards[] __initdata = {
        DEFBOARD("BR-6104K",            MACH_ADM5120_BR6104K),
        DEFBOARD("BR-6104KP",           MACH_ADM5120_BR6104K),
        /* Infineon boards */
-       DEFBOARD("EASY 5120",           MACH_ADM5120_EASY5120),
-       DEFBOARD("EASY 5120-RT",        MACH_ADM5120_EASY5120RT),
        DEFBOARD("EASY 5120P-ATA",      MACH_ADM5120_EASY5120PATA),
+       DEFBOARD("EASY 5120-RT",        MACH_ADM5120_EASY5120RT),
+       DEFBOARD("EASY 5120-WVoIP",     MACH_ADM5120_EASY5120WVOIP),
        DEFBOARD("EASY 83000",          MACH_ADM5120_EASY83000),
        /* Mikrotik RouterBOARDs */
        DEFBOARD("111",                 MACH_ADM5120_RB_111),
        DEFBOARD("112",                 MACH_ADM5120_RB_112),
        DEFBOARD("133",                 MACH_ADM5120_RB_133),
        DEFBOARD("133C",                MACH_ADM5120_RB_133C),
-       DEFBOARD("miniROUTER",          MACH_ADM5120_RB_150),
+       DEFBOARD("133C3",               MACH_ADM5120_RB_133C),
+       DEFBOARD("150",                 MACH_ADM5120_RB_153), /* it's intentional */
        DEFBOARD("153",                 MACH_ADM5120_RB_153),
+       DEFBOARD("miniROUTER",          MACH_ADM5120_RB_150),
 };
 
 static unsigned long __init find_machtype_byname(char *name)
@@ -110,7 +112,7 @@ static unsigned long __init detect_machtype_generic(void)
 {
        char *name;
 
-       name = generic_prom_getenv("board");
+       name = generic_prom_getenv("board_name");
        return find_machtype_byname(name);
 }
 
@@ -228,8 +230,13 @@ static void __init prom_detect_machtype(void)
                return;
        }
 
-       adm5120_prom_type = ADM5120_PROM_GENERIC;
-       mips_machtype = detect_machtype_generic();
+       if (generic_prom_present()) {
+               adm5120_prom_type = ADM5120_PROM_GENERIC;
+               mips_machtype = detect_machtype_generic();
+               return;
+       }
+
+       mips_machtype = MACH_ADM5120_GENERIC;
 }
 
 /* TODO: this is an ugly hack for RouterBOARDS */