From c7db9a3805fbdf4187d9309cb2aa93e45828419a Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Fri, 19 Aug 2005 00:53:02 +0200 Subject: [PATCH] Initialize serial# and ethaddr from manufacturer data in EEPROM on CMC-PU2 Patch by Martin Krause, 08 Jun 2005 --- CHANGELOG | 3 + board/cmc_pu2/Makefile | 2 +- board/cmc_pu2/load_sernum_ethaddr.c | 122 ++++++++++++++++++++++++++++ lib_arm/board.c | 4 + 4 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 board/cmc_pu2/load_sernum_ethaddr.c diff --git a/CHANGELOG b/CHANGELOG index bed0aa0d95..2f83389e4e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ Changes for U-Boot 1.1.4: ====================================================================== +* Initialize serial# and ethaddr from manufacturer data in EEPROM on CMC-PU2 + Patch by Martin Krause, 08 Jun 2005 + * Add new board specific commands for TQM5200/STK52XX - Sound commands (beep, wav, sound) - Test commands (led, can, backlight, rs232) diff --git a/board/cmc_pu2/Makefile b/board/cmc_pu2/Makefile index ba433d5bf2..7703a4a498 100644 --- a/board/cmc_pu2/Makefile +++ b/board/cmc_pu2/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = lib$(BOARD).a -OBJS := cmc_pu2.o at45.o dm9161.o flash.o +OBJS := cmc_pu2.o at45.o dm9161.o flash.o load_sernum_ethaddr.o $(LIB): $(OBJS) $(SOBJS) $(AR) crv $@ $(OBJS) $(SOBJS) diff --git a/board/cmc_pu2/load_sernum_ethaddr.c b/board/cmc_pu2/load_sernum_ethaddr.c new file mode 100644 index 0000000000..94aa30df96 --- /dev/null +++ b/board/cmc_pu2/load_sernum_ethaddr.c @@ -0,0 +1,122 @@ +/* + * (C) Copyright 2000, 2001, 2002 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * (C) Copyright 2005 + * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/* #define DEBUG */ + +#include + +#define I2C_CHIP 0x50 /* I2C bus address of onboard EEPROM */ +#define I2C_ALEN 1 /* length of EEPROM addresses in bytes */ +#define I2C_OFFSET 0x0 /* start address of manufacturere data block + * in EEPROM */ + +/* 64 Byte manufacturer data block in EEPROM */ +struct manufacturer_data { + unsigned int serial_number; /* serial number (0...999999) */ + unsigned short hardware; /* hardware version (e.g. V1.02) */ + unsigned short manuf_date; /* manufacture date (e.g. 25/02) */ + unsigned char name[20]; /* device name (in CHIP.INI) */ + unsigned char macadr[6]; /* MAC address */ + signed char a_kal[4]; /* calibration value for U */ + signed char i_kal[4]; /* calibration value for I */ + unsigned char reserve[18]; /* reserved */ + unsigned short save_nr; /* save count */ + unsigned short chksum; /* checksum */ +}; + + +int i2c_read (unsigned char chip, unsigned int addr, int alen, + unsigned char *buffer, int len); + +/*----------------------------------------------------------------------- + * Process manufacturer data block in EEPROM: + * + * If we boot on a system fresh from factory, check if the manufacturer data + * in the EEPROM is valid and save some information it contains. + * + * CMC manufacturer data is defined as follows: + * + * - located in the onboard EEPROM + * - starts at offset 0x0 + * - size 0x00000040 + * + * Internal structure: see struct definition + */ + +void load_sernum_ethaddr (void) +{ + struct manufacturer_data data; + unsigned char serial [9]; + unsigned char ethaddr[18]; + unsigned short chksum; + unsigned char *p; + unsigned short i, is, id; + +#if !defined(CONFIG_HARD_I2C) && !defined(CONFIG_SOFT_I2C) +#error you must define some I2C support (CONFIG_HARD_I2C or CONFIG_SOFT_I2C) +#endif + if (i2c_read(I2C_CHIP, I2C_OFFSET, I2C_ALEN, (unsigned char *)&data, + sizeof(data)) != 0) { + puts ("Error reading manufacturer data from EEPROM\n"); + return; + } + + /* check if manufacturer data block is valid */ + p = (unsigned char *)&data; + chksum = 0; + for (i = 0; i < (sizeof(data) - sizeof(data.chksum)); i++) + chksum += *p++; + + debug ("checksum of manufacturer data block: %#.4x\n", chksum); + + if (chksum != data.chksum) { + puts ("Error: manufacturer data block has invalid checksum\n"); + return; + } + + /* copy MAC address */ + is = 0; + id = 0; + for (i = 0; i < 6; i++) { + sprintf (ðaddr[id], "%02x", data.macadr[is++]); + id += 2; + if (is < 6) + ethaddr[id++] = ':'; + } + ethaddr[id] = '\0'; /* just to be sure */ + + /* copy serial number */ + sprintf (serial, "%d", data.serial_number); + + /* set serial# and ethaddr if not yet defined */ + if (getenv("serial#") == NULL) { + setenv ("serial#", serial); + } + + if (getenv("ethaddr") == NULL) { + setenv ("ethaddr", ethaddr); + } +} diff --git a/lib_arm/board.c b/lib_arm/board.c index ada8cc8879..a3588d693e 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -305,6 +305,10 @@ void start_armboot (void) devices_init (); /* get the devices list going. */ +#ifdef CONFIG_CMC_PU2 + load_sernum_ethaddr (); +#endif /* CONFIG_CMC_PU2 */ + jumptable_init (); console_init_r (); /* fully init console as a device */