aboutsummaryrefslogtreecommitdiffstats
path: root/cvmx-warn.c
diff options
context:
space:
mode:
Diffstat (limited to 'cvmx-warn.c')
-rw-r--r--cvmx-warn.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/cvmx-warn.c b/cvmx-warn.c
index f0c4d1dac2e0..4f1464a94d4a 100644
--- a/cvmx-warn.c
+++ b/cvmx-warn.c
@@ -1,5 +1,5 @@
/***********************license start***************
- * Copyright (c) 2003-2010 Cavium Networks (support@cavium.com). All rights
+ * Copyright (c) 2003-2010 Cavium Inc. (support@cavium.com). All rights
* reserved.
*
*
@@ -15,7 +15,7 @@
* disclaimer in the documentation and/or other materials provided
* with the distribution.
- * * Neither the name of Cavium Networks nor the names of
+ * * Neither the name of Cavium Inc. nor the names of
* its contributors may be used to endorse or promote products
* derived from this software without specific prior written
* permission.
@@ -26,7 +26,7 @@
* countries.
* TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
- * AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR
+ * AND WITH ALL FAULTS AND CAVIUM INC. MAKES NO PROMISES, REPRESENTATIONS OR
* WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO
* THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR
* DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM
@@ -48,7 +48,7 @@
*
* Functions for warning users about errors and such.
*
- * <hr>$Revision: 49448 $<hr>
+ * <hr>$Revision: 70030 $<hr>
*
*/
#include "cvmx.h"
@@ -63,7 +63,11 @@ void cvmx_warn(const char *format, ...)
/* If the serial port is not set up yet,
** save pointer to error message (most likely a constant in flash)
** to print out once we can. */
- gd->err_msg = (void *)format;
+#ifdef U_BOOT_OLD
+ gd->err_msg = (void *)format;
+#else
+ gd->ogd.err_msg = (void *)format;
+#endif
return;
}
#endif