From: Matthias Fuchs <matthias.fuchs@esd.eu>
Date: Thu, 24 Nov 2011 05:39:21 +0000 (+0000)
Subject: board/esd/cpci405/cpci405.c: Fix GCC 4.6 warning
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1affd5c195bc57ef5155426c12f81ea3fc8a37d6;p=project%2Fbcm63xx%2Fu-boot.git

board/esd/cpci405/cpci405.c: Fix GCC 4.6 warning

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
---

diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c
index 98a8584156..41b5ba0490 100644
--- a/board/esd/cpci405/cpci405.c
+++ b/board/esd/cpci405/cpci405.c
@@ -656,7 +656,6 @@ int do_onewire(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	int i;
 	unsigned char ow_id[6];
 	char str[32];
-	unsigned char ow_crc;
 
 	/*
 	 * Clear 1-wire bit (open drain with pull-up)
@@ -675,11 +674,10 @@ int do_onewire(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	OWReadByte(); /* skip family code ( == 0x01) */
 	for (i = 0; i < 6; i++)
 		ow_id[i] = OWReadByte();
-	ow_crc = OWReadByte(); /* read crc */
+	OWReadByte(); /* read crc */
 
-	sprintf(str, "%08X%04X",
-		*(unsigned int *)&ow_id[0],
-		*(unsigned short *)&ow_id[4]);
+	sprintf(str, "%02X%02X%02X%02X%02X%02X",
+		ow_id[0], ow_id[1], ow_id[2], ow_id[3], ow_id[4], ow_id[5]);
 	printf("Setting environment variable 'ow_id' to %s\n", str);
 	setenv("ow_id", str);