[U-Boot-Users] [Patch] envcommon

[Robert Schwebel]

ChangeLog:

* Patch by Kai-Uwe Bloem, Robert Schwebel, 13 May 2004:
  Copy data only when we _have_ a default environment,
  otherwhise set environment to 0. 

Robert
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hornemannstraße 12,  31137 Hildesheim, Germany
    Phone: +49-5121-28619-0 |  Fax: +49-5121-28619-4
-------------- next part --------------
# 
# Author:	Robert Schwebel <r.schwebel at pengutronix.de>
# 
# Description:	ChangeLog: 
#
#		* Patch by Kai-Uwe Bloem, Robert Schwebel, 13 May 2004:
#		  Copy data only when we _have_ a default environment,
#		  otherwhise set environment to 0. 
#
# State:	2004-05-13: submit
#

#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#

--- u-boot-patches/common/env_common.c~envcommon	2003-07-24 16:59:26.000000000 +0200
+++ u-boot-patches/common/env_common.c	2003-12-09 08:52:26.000000000 +0100
@@ -242,9 +242,12 @@
 		}
 
 		memset (env_ptr, 0, sizeof(env_t));
-		memcpy (env_ptr->data,
-			default_environment,
-			sizeof(default_environment));
+		if (sizeof(default_environment) > 0)
+			memcpy (env_ptr->data,
+				default_environment,
+				sizeof(default_environment));
+		else
+			env_ptr->data[0] = '\0';
 #ifdef CFG_REDUNDAND_ENVIRONMENT
 		env_ptr->flags = 0xFF;
 #endif