This patch brings the Sandburst Metrobox board support up to date.
CHANGELOG:
* Update Sandburst Metrobox board support. Remove extraneous CVS Log comments. Patch by Travis B. Sawyer, 16 Feb 2006
Regards, Travis Sawyer
diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c index 86d259f..c6efa0a 100644 --- a/board/sandburst/metrobox/metrobox.c +++ b/board/sandburst/metrobox/metrobox.c @@ -302,7 +302,9 @@ int misc_init_f (void) /************************************************************************* * misc_init_r * - * Do nothing. + * Setup second serial port for interboard access if specified. + * dump the build string. + * Check for automatic filesystem recovery request. ************************************************************************/ int misc_init_r (void) { @@ -465,7 +467,7 @@ int metroboxSetupVars(cmd_tbl_t *cmdtp, sprintf(envstr, "console=ttyS0,9600 root=/dev/nfs " "rw nfsroot=10.100.17.10:/home/metrobox/mbc%d " "nfsaddrs=10.100.60.%d:10.100.17.10:10.100.1.1" - ":255.255.0.0:metrobox%d.sandburst.com:eth0:none idebus=33", + ":255.255.0.0:metrobox60-%d.sandburst.com:eth0:none idebus=33", sernum, sernum, sernum);
setenv("bootargs_nfs", envstr); @@ -476,7 +478,7 @@ int metroboxSetupVars(cmd_tbl_t *cmdtp, */ memset(envstr, 0, 255); sprintf(envstr, "console=ttyS0,9600 root=/dev/hda2 " - "rw ip=10.100.60.%d:::255.255.0.0:metrobox%d:eth0:none idebus=33", + "rw ip=10.100.60.%d:::255.255.0.0:metrobox60-%d:eth0:none idebus=33", sernum, sernum);
setenv("bootargs_cf", envstr); @@ -511,7 +513,7 @@ int metroboxRecover(cmd_tbl_t *cmdtp, in */ memset(envstr, 0, 255); sprintf(envstr, "console=ttyS0,9600 root=/dev/ram0 " - "rw ip=10.100.60.%d:::255.255.0.0:metrobox%d:eth0:none", + "rw ip=10.100.60.%d:::255.255.0.0:metrobox60-%d:eth0:none", sernum, sernum);
setenv("bootargs", envstr); diff --git a/board/sandburst/metrobox/metrobox_version.h b/board/sandburst/metrobox/metrobox_version.h index 1b6fee5..6005011 100644 --- a/board/sandburst/metrobox/metrobox_version.h +++ b/board/sandburst/metrobox/metrobox_version.h @@ -22,6 +22,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ -#define METROBOX_U_BOOT_REL_STR "Release 2.0.3" +#define METROBOX_U_BOOT_REL_STR "Release 3.0.1"
#endif diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index b965571..d3ea7f9 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -23,79 +23,6 @@ /************************************************************************ * METROBOX.h - configuration Sandburst MetroBox ***********************************************************************/ - -/* - * $Id: METROBOX.h,v 1.21 2005/06/03 15:05:25 tsawyer Exp $ - * - * - * $Log: METROBOX.h,v $ - * Revision 1.21 2005/06/03 15:05:25 tsawyer - * MB rev 2.0.3 KA rev 0.0.7. Add CONFIG_VERSION_VARIABLE, Add fakeled to MB - * - * Revision 1.20 2005/04/11 20:51:11 tsawyer - * fix ethernet - * - * Revision 1.19 2005/04/06 15:13:36 tsawyer - * Update appropriate files to coincide with u-boot 1.1.3 - * - * Revision 1.18 2005/03/10 14:16:02 tsawyer - * add def'n for cis8201 short etch option. - * - * Revision 1.17 2005/03/09 19:49:51 tsawyer - * Remove KGDB to allow use of 2nd serial port - * - * Revision 1.16 2004/12/02 19:00:23 tsawyer - * Add misc_init_f to turn on i2c-1 and all four fans before sdram init - * - * Revision 1.15 2004/09/15 18:04:12 tsawyer - * add multiple serial port support - * - * Revision 1.14 2004/09/03 15:27:51 tsawyer - * All metrobox boards are at 66.66 sys clock - * - * Revision 1.13 2004/08/05 20:27:46 tsawyer - * Remove system ace definitions, add net console support - * - * Revision 1.12 2004/07/29 20:00:13 tsawyer - * Add i2c bus 1 - * - * Revision 1.11 2004/07/21 13:44:18 tsawyer - * SystemACE is out, CF direct to local bus is in - * - * Revision 1.10 2004/06/29 19:08:55 tsawyer - * Add CONFIG_MISC_INIT_R - * - * Revision 1.9 2004/06/28 21:30:53 tsawyer - * Fix default BOOTARGS - * - * Revision 1.8 2004/06/17 15:51:08 tsawyer - * auto complete - * - * Revision 1.7 2004/06/17 15:08:49 tsawyer - * Add autocomplete - * - * Revision 1.6 2004/06/15 12:33:57 tsawyer - * debugging checkpoint - * - * Revision 1.5 2004/06/12 19:48:28 tsawyer - * Debugging checkpoint - * - * Revision 1.4 2004/06/02 13:03:06 tsawyer - * Fix eth addrs - * - * Revision 1.3 2004/05/18 19:56:10 tsawyer - * Change default bootcommand to pImage.metrobox - * - * Revision 1.2 2004/05/18 14:13:44 tsawyer - * Add bringup values for bootargs and bootcommand. - * Remove definition of ipaddress and serverip addresses. - * - * Revision 1.1 2004/04/16 15:08:54 tsawyer - * Initial Revision - * - * - */ - #ifndef __CONFIG_H #define __CONFIG_H