diff mbox

[U-Boot,2/4] cm-t35: fix incorrect BOARD_REV_SIZE value

Message ID 1337868084-6637-3-git-send-email-grinberg@compulab.co.il
State Accepted
Commit 6f3b300c0a324725e468f496f89372388ff5ee66
Delegated to: Tom Rini
Headers show

Commit Message

Igor Grinberg May 24, 2012, 2:01 p.m. UTC 
From: Nikita Kiryanov <nikita@compulab.co.il>

Non-legacy layouts have an extended revision field,
but only the first 2 bytes are the PCB revision.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
 board/cm_t35/eeprom.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/board/cm_t35/eeprom.c b/board/cm_t35/eeprom.c
index dfa171d..6053811 100644
--- a/board/cm_t35/eeprom.c
+++ b/board/cm_t35/eeprom.c
@@ -27,8 +27,7 @@ 
 #define BOARD_SERIAL_OFFSET_LEGACY	8
 #define BOARD_REV_OFFSET		0
 #define BOARD_REV_OFFSET_LEGACY		6
-#define BOARD_REV_SIZE			4
-#define BOARD_REV_SIZE_LEGACY		2
+#define BOARD_REV_SIZE			2
 #define MAC_ADDR_OFFSET			4
 #define MAC_ADDR_OFFSET_LEGACY		0
 
@@ -107,17 +106,14 @@  u32 get_board_rev(void)
 {
 	u32 rev = 0;
 	uint offset = BOARD_REV_OFFSET_LEGACY;
-	int len = BOARD_REV_SIZE_LEGACY;
 
 	if (eeprom_setup_layout())
 		return 0;
 
-	if (eeprom_layout != LAYOUT_LEGACY) {
+	if (eeprom_layout != LAYOUT_LEGACY)
 		offset = BOARD_REV_OFFSET;
-		len = BOARD_REV_SIZE;
-	}
 
-	if (cm_t3x_eeprom_read(offset, (uchar *)&rev, len))
+	if (cm_t3x_eeprom_read(offset, (uchar *)&rev, BOARD_REV_SIZE))
 		return 0;
 
 	return rev;