|
@@ -22,30 +22,30 @@
|
|
|
#define LAYOUT_INVALID 0
|
|
|
#define LAYOUT_LEGACY 0xff
|
|
|
|
|
|
-static int eeprom_layout; /* Implicitly LAYOUT_INVALID */
|
|
|
+static int cl_eeprom_layout; /* Implicitly LAYOUT_INVALID */
|
|
|
|
|
|
-static int cm_t3x_eeprom_read(uint offset, uchar *buf, int len)
|
|
|
+static int cl_eeprom_read(uint offset, uchar *buf, int len)
|
|
|
{
|
|
|
return i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, offset,
|
|
|
CONFIG_SYS_I2C_EEPROM_ADDR_LEN, buf, len);
|
|
|
}
|
|
|
|
|
|
-static int eeprom_setup_layout(void)
|
|
|
+static int cl_eeprom_setup_layout(void)
|
|
|
{
|
|
|
int res;
|
|
|
|
|
|
- if (eeprom_layout != LAYOUT_INVALID)
|
|
|
+ if (cl_eeprom_layout != LAYOUT_INVALID)
|
|
|
return 0;
|
|
|
|
|
|
- res = cm_t3x_eeprom_read(EEPROM_LAYOUT_VER_OFFSET,
|
|
|
- (uchar *)&eeprom_layout, 1);
|
|
|
+ res = cl_eeprom_read(EEPROM_LAYOUT_VER_OFFSET,
|
|
|
+ (uchar *)&cl_eeprom_layout, 1);
|
|
|
if (res) {
|
|
|
- eeprom_layout = LAYOUT_INVALID;
|
|
|
+ cl_eeprom_layout = LAYOUT_INVALID;
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- if (eeprom_layout == 0 || eeprom_layout >= 0x20)
|
|
|
- eeprom_layout = LAYOUT_LEGACY;
|
|
|
+ if (cl_eeprom_layout == 0 || cl_eeprom_layout >= 0x20)
|
|
|
+ cl_eeprom_layout = LAYOUT_LEGACY;
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -56,12 +56,14 @@ void get_board_serial(struct tag_serialnr *serialnr)
|
|
|
uint offset;
|
|
|
|
|
|
memset(serialnr, 0, sizeof(*serialnr));
|
|
|
- if (eeprom_setup_layout())
|
|
|
+
|
|
|
+ if (cl_eeprom_setup_layout())
|
|
|
return;
|
|
|
|
|
|
- offset = (eeprom_layout != LAYOUT_LEGACY) ?
|
|
|
- BOARD_SERIAL_OFFSET : BOARD_SERIAL_OFFSET_LEGACY;
|
|
|
- if (cm_t3x_eeprom_read(offset, (uchar *)serial, 8))
|
|
|
+ offset = (cl_eeprom_layout != LAYOUT_LEGACY) ?
|
|
|
+ BOARD_SERIAL_OFFSET : BOARD_SERIAL_OFFSET_LEGACY;
|
|
|
+
|
|
|
+ if (cl_eeprom_read(offset, (uchar *)serial, 8))
|
|
|
return;
|
|
|
|
|
|
if (serial[0] != 0xffffffff && serial[1] != 0xffffffff) {
|
|
@@ -71,45 +73,46 @@ void get_board_serial(struct tag_serialnr *serialnr)
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
- * Routine: cm_t3x_eeprom_read_mac_addr
|
|
|
+ * Routine: cl_eeprom_read_mac_addr
|
|
|
* Description: read mac address and store it in buf.
|
|
|
*/
|
|
|
-int cm_t3x_eeprom_read_mac_addr(uchar *buf)
|
|
|
+int cl_eeprom_read_mac_addr(uchar *buf)
|
|
|
{
|
|
|
uint offset;
|
|
|
|
|
|
- if (eeprom_setup_layout())
|
|
|
+ if (cl_eeprom_setup_layout())
|
|
|
return 0;
|
|
|
|
|
|
- offset = (eeprom_layout != LAYOUT_LEGACY) ?
|
|
|
+ offset = (cl_eeprom_layout != LAYOUT_LEGACY) ?
|
|
|
MAC_ADDR_OFFSET : MAC_ADDR_OFFSET_LEGACY;
|
|
|
- return cm_t3x_eeprom_read(offset, buf, 6);
|
|
|
+
|
|
|
+ return cl_eeprom_read(offset, buf, 6);
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
- * Routine: cm_t3x_eeprom_get_board_rev
|
|
|
+ * Routine: cl_eeprom_get_board_rev
|
|
|
* Description: read system revision from eeprom
|
|
|
*/
|
|
|
-u32 cm_t3x_eeprom_get_board_rev(void)
|
|
|
+u32 cl_eeprom_get_board_rev(void)
|
|
|
{
|
|
|
u32 rev = 0;
|
|
|
char str[5]; /* Legacy representation can contain at most 4 digits */
|
|
|
uint offset = BOARD_REV_OFFSET_LEGACY;
|
|
|
|
|
|
- if (eeprom_setup_layout())
|
|
|
+ if (cl_eeprom_setup_layout())
|
|
|
return 0;
|
|
|
|
|
|
- if (eeprom_layout != LAYOUT_LEGACY)
|
|
|
+ if (cl_eeprom_layout != LAYOUT_LEGACY)
|
|
|
offset = BOARD_REV_OFFSET;
|
|
|
|
|
|
- if (cm_t3x_eeprom_read(offset, (uchar *)&rev, BOARD_REV_SIZE))
|
|
|
+ if (cl_eeprom_read(offset, (uchar *)&rev, BOARD_REV_SIZE))
|
|
|
return 0;
|
|
|
|
|
|
/*
|
|
|
* Convert legacy syntactic representation to semantic
|
|
|
* representation. i.e. for rev 1.00: 0x100 --> 0x64
|
|
|
*/
|
|
|
- if (eeprom_layout == LAYOUT_LEGACY) {
|
|
|
+ if (cl_eeprom_layout == LAYOUT_LEGACY) {
|
|
|
sprintf(str, "%x", rev);
|
|
|
rev = simple_strtoul(str, NULL, 10);
|
|
|
}
|