diff options
author | Florian Fainelli <florian@openwrt.org> | 2007-04-16 09:55:30 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2007-04-16 09:55:30 +0000 |
commit | 151babe684cafa123b416a9785b2a8cef83f6d03 (patch) | |
tree | 9dff66806b8cbfbbdf0b246304d681962f24bb33 /target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c | |
parent | 0eb7f75195404e45d967be74e560d0da02dadbe2 (diff) | |
download | upstream-151babe684cafa123b416a9785b2a8cef83f6d03.tar.gz upstream-151babe684cafa123b416a9785b2a8cef83f6d03.tar.bz2 upstream-151babe684cafa123b416a9785b2a8cef83f6d03.zip |
Fresh fixes from Gabor Juhos : detects RouterBoot, Bootbase, improve board specification
SVN-Revision: 6963
Diffstat (limited to 'target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c')
-rw-r--r-- | target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c | 13 |
1 files changed, 7 insertions, 6 deletions
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 e16ac65001..63e5b8602c 100644 --- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c +++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c @@ -3,6 +3,7 @@ * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. * Copyright (C) 2003 ADMtek Incorporated. * daniell@admtek.com.tw + * Copyright (C) 2007 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 @@ -29,7 +30,7 @@ #include <asm/bootinfo.h> #include <asm/addrspace.h> -#include <adm5120_info.h> +#include <asm/mach-adm5120/adm5120_info.h> void setup_prom_printf(int); void prom_printf(char *, ...); @@ -98,18 +99,18 @@ char *prom_getenv(char *envname) return(NULL); } - + /* * initialize the prom module. */ void __init prom_init(void) { - /* you should these macros defined in include/asm/bootinfo.h */ - mips_machgroup = MACH_GROUP_ADM_GW; - mips_machtype = MACH_ADM_GW_5120; - adm5120_info_init(); + /* you should these macros defined in include/asm/bootinfo.h */ + mips_machgroup = MACH_GROUP_ADM5120; + mips_machtype = adm5120_board.mach_type; + /* init command line, register a default kernel command line */ strcpy(&(arcs_cmdline[0]), CONFIG_CMDLINE); |