aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-04-16 09:55:30 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-04-16 09:55:30 +0000
commit4fa5a1bca94e6e8cb39410aed8973297a1e5f263 (patch)
tree68b3c2d62ee42eab6fd0cc4b066407ea6e392a1e /target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
parentba1552f84085d933646f5dcd596bb74da9833477 (diff)
downloadmaster-187ad058-4fa5a1bca94e6e8cb39410aed8973297a1e5f263.tar.gz
master-187ad058-4fa5a1bca94e6e8cb39410aed8973297a1e5f263.tar.bz2
master-187ad058-4fa5a1bca94e6e8cb39410aed8973297a1e5f263.zip
Fresh fixes from Gabor Juhos : detects RouterBoot, Bootbase, improve board specification
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6963 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.c13
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);