Mercurial > ecos-v3_0-branch

changeset 1758:696f7f5b9236

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Boot mode has no startup script
author gthomas
date Sun, 19 Sep 2004 15:05:07 +0000
parents c4a8f3019f9c
children 91e29b9a5d05
files packages/hal/powerpc/moab/current/ChangeLog packages/hal/powerpc/moab/current/src/hal_aux.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/powerpc/moab/current/ChangeLog
+++ b/packages/hal/powerpc/moab/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-19  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/hal_aux.c (cyg_plf_redboot_startup): Boot mode implies no
+	script, even if the user has set one.
+
 2004-08-24  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/moab.S: 
--- a/packages/hal/powerpc/moab/current/src/hal_aux.c
+++ b/packages/hal/powerpc/moab/current/src/hal_aux.c
@@ -9,7 +9,7 @@
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-// Copyright (C) 2002, 2003 Gary Thomas
+// Copyright (C) 2002, 2003, 2004 Gary Thomas
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -141,6 +141,8 @@ cyg_plf_redboot_startup(void)
         // Load RedBoot from NAND FLASH and execute it
         script = "fi lo RedBoot;go\n";
         script_timeout = 1;
+    } else {
+        script = (char *)0;
     }
 }
 #endif