diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-12-13 19:43:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-12-13 19:43:03 +0000 |
| commit | 8ecd5b87ddd65325753a989b80a64c60294adbab (patch) | |
| tree | 0c0d0030d4b7e4468e507cdbce8121c3bdc28cfd /arch/mips/galileo-boards | |
| parent | ce0560ca5cf571fea993f6ea6f4ea19699824b92 (diff) | |
First batch of PMC Ocelot CP7000 patches.
Diffstat (limited to 'arch/mips/galileo-boards')
| -rw-r--r-- | arch/mips/galileo-boards/ev64120/setup.c | 3 | ||||
| -rw-r--r-- | arch/mips/galileo-boards/generic/cmdline.c | 5 | ||||
| -rw-r--r-- | arch/mips/galileo-boards/generic/init.c | 19 |
3 files changed, 2 insertions, 25 deletions
diff --git a/arch/mips/galileo-boards/ev64120/setup.c b/arch/mips/galileo-boards/ev64120/setup.c index 874245fa8..a746a15e7 100644 --- a/arch/mips/galileo-boards/ev64120/setup.c +++ b/arch/mips/galileo-boards/ev64120/setup.c @@ -189,7 +189,7 @@ void SetUpBootInfo(int argc, char **argv, char **envp) extern int _end; unsigned long mem_size; -int __init prom_init(int a, char **b, char **c, int *d) +void __init prom_init(int a, char **b, char **c, int *d) { unsigned long free_start, free_end, start_pfn, bootmap_size; @@ -209,7 +209,6 @@ int __init prom_init(int a, char **b, char **c, int *d) /* Free the entire available memory after the _end symbol. */ free_start += bootmap_size; free_bootmem(free_start, free_end - free_start); - return 0; } #if 0 diff --git a/arch/mips/galileo-boards/generic/cmdline.c b/arch/mips/galileo-boards/generic/cmdline.c index 3574e976c..f75c01979 100644 --- a/arch/mips/galileo-boards/generic/cmdline.c +++ b/arch/mips/galileo-boards/generic/cmdline.c @@ -2,8 +2,6 @@ * Carsten Langgaard, carstenl@mips.com * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. * - * ######################################################################## - * * 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 * published by the Free Software Foundation. @@ -17,8 +15,6 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * - * ######################################################################## - * * Kernel command line creation using the prom monitor (YAMON) argc/argv. * */ @@ -57,5 +53,4 @@ void __init prom_init_cmdline(void) if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */ --cp; *cp = '\0'; - } diff --git a/arch/mips/galileo-boards/generic/init.c b/arch/mips/galileo-boards/generic/init.c index b488cb349..593207bf3 100644 --- a/arch/mips/galileo-boards/generic/init.c +++ b/arch/mips/galileo-boards/generic/init.c @@ -1,8 +1,4 @@ /* - * - * BRIEF MODULE DESCRIPTION - * Galileo PROM library initialisation code. - * * Copyright 2000 MontaVista Software Inc. * Author: MontaVista Software, Inc. * ppopov@mvista.com or support@mvista.com @@ -131,7 +127,7 @@ int get_ethernet_addr(char *ethernet_addr) } -int __init prom_init(int argc, char **argv, char **envp, int *prom_vec) +void __init prom_init(int argc, char **argv, char **envp, int *prom_vec) { unsigned long mem_size, free_start, free_end, start_pfn, bootmap_size; @@ -142,21 +138,10 @@ int __init prom_init(int argc, char **argv, char **envp, int *prom_vec) prom_argv = argv; prom_envp = envp; - //init_serial(); - mips_machgroup = MACH_GROUP_GALILEO; -#if 0 - prom_ops = &ev96100_prom_ops; - prom_ops->printf = prom_vec[5]; -#endif - puts("Linux running"); - puts(""); prom_init_cmdline(); - //prom_meminit(); - - /* 64 MB non-upgradable */ mem_size = 64 << 20; @@ -171,6 +156,4 @@ int __init prom_init(int argc, char **argv, char **envp, int *prom_vec) /* Free the entire available memory after the _end symbol. */ free_start += bootmap_size; free_bootmem(free_start, free_end - free_start); - - return 0; } |