Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-26 06:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

cm-t35: move the eeprom code to common place

Browse source 
Compulab boards use the same eeprom code, so move the eeprom related
code to live under board/compulab/common directory.
Also make several adjustments to eeprom functions namespace, so it will
be generic for compulab boards.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
This commit is contained in:
Igor Grinberg 2013-09-16 21:49:58 +03:00 committed by Tom Rini
parent 0178296588
commit 689be5f83c
5 changed files with 69 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
board/compulab/cm_t35/Makefile
View file

@ -11,7 +11,6 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o LIB = $(obj)lib$(BOARD).o
COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
COBJS-$(CONFIG_LCD) += display.o COBJS-$(CONFIG_LCD) += display.o
COBJS := cm_t35.o leds.o $(COBJS-y) COBJS := cm_t35.o leds.o $(COBJS-y)

7
board/compulab/cm_t35/cm_t35.c
View file

@ -33,7 +33,7 @@
#include <asm/ehci-omap.h> #include <asm/ehci-omap.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include "eeprom.h" #include "../common/eeprom.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -160,7 +160,7 @@ static u32 cm_t3x_rev;
u32 get_board_rev(void) u32 get_board_rev(void)
{ {
if (!cm_t3x_rev) if (!cm_t3x_rev)
cm_t3x_rev = cm_t3x_eeprom_get_board_rev(); cm_t3x_rev = cl_eeprom_get_board_rev();
return cm_t3x_rev; return cm_t3x_rev;
}; };
@ -509,7 +509,7 @@ static int handle_mac_address(void)
if (rc) if (rc)
return 0; return 0;
rc = cm_t3x_eeprom_read_mac_addr(enetaddr); rc = cl_eeprom_read_mac_addr(enetaddr);
if (rc) if (rc)
return rc; return rc;
@ -598,5 +598,4 @@ int ehci_hcd_stop(void)
{ {
return omap_ehci_hcd_stop(); return omap_ehci_hcd_stop();
} }
#endif /* CONFIG_USB_EHCI_OMAP */ #endif /* CONFIG_USB_EHCI_OMAP */

35
board/compulab/common/Makefile Normal file
View file

@ -0,0 +1,35 @@
#
# (C) Copyright 2011 - 2013 CompuLab, Ltd. <www.compulab.co.il>
#
# Author: Igor Grinberg <grinberg@compulab.co.il>
#
# SPDX-License-Identifier: GPL-2.0+
#
include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)board/$(VENDOR)/common)
endif
LIB = $(obj)lib$(VENDOR).o
COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
COBJS := $(COBJS-y)
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
SOBJS := $(addprefix $(obj),$(SOBJS))
all: $(LIB)
$(LIB): $(obj).depend $(OBJS) $(SOBJS)
$(call cmd_link_o_target, $(OBJS) $(SOBJS))
#########################################################################
# This is for $(obj).depend target
include $(SRCTREE)/rules.mk
sinclude $(obj).depend
#########################################################################

51
board/compulab/cm_t35/eeprom.c → board/compulab/common/eeprom.c
View file

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

8
board/compulab/cm_t35/eeprom.h → board/compulab/common/eeprom.h
View file

@ -11,14 +11,14 @@
#define _EEPROM_ #define _EEPROM_
#ifdef CONFIG_DRIVER_OMAP34XX_I2C #ifdef CONFIG_DRIVER_OMAP34XX_I2C
int cm_t3x_eeprom_read_mac_addr(uchar *buf); int cl_eeprom_read_mac_addr(uchar *buf);
u32 cm_t3x_eeprom_get_board_rev(void); u32 cl_eeprom_get_board_rev(void);
#else #else
static inline int cm_t3x_eeprom_read_mac_addr(uchar *buf) static inline int cl_eeprom_read_mac_addr(uchar *buf)
{ {
return 1; return 1;
} }
static inline u32 cm_t3x_eeprom_get_board_rev(void) static inline u32 cl_eeprom_get_board_rev(void)
{ {
return 0; return 0;
} }