October 2008 - U-Boot

[U-Boot] [PATCH v2] hwmon: Add LM63 support
by Dirk Eibach 15 Oct '08

15 Oct '08

This patch adds support for the National LM63 temperature sensor with integrated fan control. It's used on the GDSys Neo board (405EP) which will be submitted later. Signed-off-by: Dirk Eibach <eibach(a)gdsys.de> Acked-by: Stefan Roese <sr(a)denx.de> --- Sorry for the noise, Outlook messed up my first post. Hopefully git-send-email works better :) drivers/hwmon/Makefile | 1 + drivers/hwmon/lm63.c | 174 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dtt.h | 1 + 3 files changed, 176 insertions(+), 0 deletions(-) create mode 100644 drivers/hwmon/lm63.c diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 7f7d3db..59302fa 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -35,6 +35,7 @@ COBJS-$(CONFIG_DTT_ADT7460) += adt7460.o COBJS-$(CONFIG_DTT_DS1621) += ds1621.o COBJS-$(CONFIG_DTT_DS1722) += ds1722.o COBJS-$(CONFIG_DTT_DS1775) += ds1775.o +COBJS-$(CONFIG_DTT_LM63) += lm63.o COBJS-$(CONFIG_DTT_LM73) += lm73.o COBJS-$(CONFIG_DTT_LM75) += lm75.o COBJS-$(CONFIG_DTT_LM81) += lm81.o diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c new file mode 100644 index 0000000..03616e1 --- /dev/null +++ b/drivers/hwmon/lm63.c @@ -0,0 +1,174 @@ +/* + * (C) Copyright 2007-2008 + * Dirk Eibach, Guntermann & Drunck GmbH, eibach(a)gdsys.de + * based on lm75.c by Bill Hunter + * + * 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 + */ + +/* + * National LM63 Temperature Sensor + */ + +#include <common.h> +#include <i2c.h> +#include <dtt.h> + +#define DTT_I2C_DEV_CODE 0x4C /* National LM63 device */ + +#define DTT_READ_TEMP_RMT_MSB 0x01 +#define DTT_CONFIG 0x03 +#define DTT_READ_TEMP_RMT_LSB 0x10 +#define DTT_TACHLIM_LSB 0x48 +#define DTT_TACHLIM_MSB 0x49 +#define DTT_FAN_CONFIG 0x4A +#define DTT_PWM_FREQ 0x4D +#define DTT_PWM_LOOKUP_BASE 0x50 + +struct pwm_lookup_entry { + u8 temp; + u8 pwm; +}; + +/* + * Device code + */ + +int dtt_read(int sensor, int reg) +{ + int dlen; + uchar data[2]; + + /* + * Calculate sensor address and register. + */ + sensor = DTT_I2C_DEV_CODE; /* address of lm63 is not adjustable */ + + dlen = 1; + + /* + * Now try to read the register. + */ + if (i2c_read(sensor, reg, 1, data, dlen) != 0) + return -1; + + return (int)data[0]; +} /* dtt_read() */ + +int dtt_write(int sensor, int reg, int val) +{ + int dlen; + uchar data[2]; + + /* + * Calculate sensor address and register. + */ + sensor = DTT_I2C_DEV_CODE; /* address of lm63 is not adjustable */ + + dlen = 1; + data[0] = (char)(val & 0xff); + + /* + * Write value to register. + */ + if (i2c_write(sensor, reg, 1, data, dlen) != 0) + return 1; + + return 0; +} /* dtt_write() */ + +static int _dtt_init(int sensor) +{ + int i; + int val; + + struct pwm_lookup_entry pwm_lookup[] = CONFIG_DTT_PWM_LOOKUPTABLE; + + /* + * Set PWM Frequency to 2.5% resolution + */ + val = 20; + if (dtt_write(sensor, DTT_PWM_FREQ, val) != 0) + return 1; + + /* + * Set Tachometer Limit + */ + val = CONFIG_DTT_TACH_LIMIT; + if (dtt_write(sensor, DTT_TACHLIM_LSB, val & 0xff) != 0) + return 1; + if (dtt_write(sensor, DTT_TACHLIM_MSB, (val >> 8) & 0xff) != 0) + return 1; + + /* + * Setup PWM Lookup-Table + */ + for (i = 0; i < sizeof(pwm_lookup) / sizeof(struct pwm_lookup_entry); + i++) { + int address = DTT_PWM_LOOKUP_BASE + 2 * i; + val = pwm_lookup[i].temp; + if (dtt_write(sensor, address, val) != 0) + return 1; + val = pwm_lookup[i].pwm; + if (dtt_write(sensor, address + 1, val) != 0) + return 1; + } + + /* + * Enable PWM Lookup-Table, PWM Clock 360 kHz, Tachometer Mode 2 + */ + val = 0x02; + if (dtt_write(sensor, DTT_FAN_CONFIG, val) != 0) + return 1; + + /* + * Enable Tach input + */ + val = dtt_read(sensor, DTT_CONFIG) | 0x04; + if (dtt_write(sensor, DTT_CONFIG, val) != 0) + return 1; + + return 0; +} + +int dtt_get_temp(int sensor) +{ + s16 temp = (dtt_read(sensor, DTT_READ_TEMP_RMT_MSB) << 8) + | (dtt_read(sensor, DTT_READ_TEMP_RMT_LSB)); + + /* Ignore LSB for now, U-Boot only prints natural numbers */ + return temp >> 8; +} + +int dtt_init(void) +{ + int i; + unsigned char sensors[] = CONFIG_DTT_SENSORS; + const char *const header = "DTT: "; + + for (i = 0; i < sizeof(sensors); i++) { + if (_dtt_init(sensors[i]) != 0) + printf("%s%d FAILED INIT\n", header, i + 1); + else + printf("%s%d is %i C\n", header, i + 1, + dtt_get_temp(sensors[i])); + } + + return 0; +} diff --git a/include/dtt.h b/include/dtt.h index 0c8ee76..965e82e 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -31,6 +31,7 @@ defined(CONFIG_DTT_ADT7460) || \ defined(CONFIG_DTT_DS1621) || \ defined(CONFIG_DTT_DS1775) || \ + defined(CONFIG_DTT_LM63) || \ defined(CONFIG_DTT_LM73) || \ defined(CONFIG_DTT_LM75) || \ defined(CONFIG_DTT_LM81) -- 1.5.6.5

2 1

[U-Boot] [PATCH] Red Black Tree support v2
by Kyungmin Park 15 Oct '08

15 Oct '08

RB-tree support on U-Boot Now it's used at UBI module. Of course other modules can use it. If you want to use it, please define CONFIG_RBTREE Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h new file mode 100644 index 0000000..a4956c4 --- /dev/null +++ b/include/linux/rbtree.h @@ -0,0 +1,160 @@ +/* + Red Black Trees + (C) 1999 Andrea Arcangeli <andrea(a)suse.de> + + 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 + + linux/include/linux/rbtree.h + + To use rbtrees you'll have to implement your own insert and search cores. + This will avoid us to use callbacks and to drop drammatically performances. + I know it's not the cleaner way, but in C (not in C++) to get + performances and genericity... + + Some example of insert and search follows here. The search is a plain + normal search over an ordered tree. The insert instead must be implemented + int two steps: as first thing the code must insert the element in + order as a red leaf in the tree, then the support library function + rb_insert_color() must be called. Such function will do the + not trivial work to rebalance the rbtree if necessary. + +----------------------------------------------------------------------- +static inline struct page * rb_search_page_cache(struct inode * inode, + unsigned long offset) +{ + struct rb_node * n = inode->i_rb_page_cache.rb_node; + struct page * page; + + while (n) + { + page = rb_entry(n, struct page, rb_page_cache); + + if (offset < page->offset) + n = n->rb_left; + else if (offset > page->offset) + n = n->rb_right; + else + return page; + } + return NULL; +} + +static inline struct page * __rb_insert_page_cache(struct inode * inode, + unsigned long offset, + struct rb_node * node) +{ + struct rb_node ** p = &inode->i_rb_page_cache.rb_node; + struct rb_node * parent = NULL; + struct page * page; + + while (*p) + { + parent = *p; + page = rb_entry(parent, struct page, rb_page_cache); + + if (offset < page->offset) + p = &(*p)->rb_left; + else if (offset > page->offset) + p = &(*p)->rb_right; + else + return page; + } + + rb_link_node(node, parent, p); + + return NULL; +} + +static inline struct page * rb_insert_page_cache(struct inode * inode, + unsigned long offset, + struct rb_node * node) +{ + struct page * ret; + if ((ret = __rb_insert_page_cache(inode, offset, node))) + goto out; + rb_insert_color(node, &inode->i_rb_page_cache); + out: + return ret; +} +----------------------------------------------------------------------- +*/ + +#ifndef _LINUX_RBTREE_H +#define _LINUX_RBTREE_H + +#include <linux/stddef.h> + +struct rb_node +{ + unsigned long rb_parent_color; +#define RB_RED 0 +#define RB_BLACK 1 + struct rb_node *rb_right; + struct rb_node *rb_left; +} __attribute__((aligned(sizeof(long)))); + /* The alignment might seem pointless, but allegedly CRIS needs it */ + +struct rb_root +{ + struct rb_node *rb_node; +}; + + +#define rb_parent(r) ((struct rb_node *)((r)->rb_parent_color & ~3)) +#define rb_color(r) ((r)->rb_parent_color & 1) +#define rb_is_red(r) (!rb_color(r)) +#define rb_is_black(r) rb_color(r) +#define rb_set_red(r) do { (r)->rb_parent_color &= ~1; } while (0) +#define rb_set_black(r) do { (r)->rb_parent_color |= 1; } while (0) + +static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p) +{ + rb->rb_parent_color = (rb->rb_parent_color & 3) | (unsigned long)p; +} +static inline void rb_set_color(struct rb_node *rb, int color) +{ + rb->rb_parent_color = (rb->rb_parent_color & ~1) | color; +} + +#define RB_ROOT (struct rb_root) { NULL, } +#define rb_entry(ptr, type, member) container_of(ptr, type, member) + +#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL) +#define RB_EMPTY_NODE(node) (rb_parent(node) == node) +#define RB_CLEAR_NODE(node) (rb_set_parent(node, node)) + +extern void rb_insert_color(struct rb_node *, struct rb_root *); +extern void rb_erase(struct rb_node *, struct rb_root *); + +/* Find logical next and previous nodes in a tree */ +extern struct rb_node *rb_next(struct rb_node *); +extern struct rb_node *rb_prev(struct rb_node *); +extern struct rb_node *rb_first(struct rb_root *); +extern struct rb_node *rb_last(struct rb_root *); + +/* Fast replacement of a single node without remove/rebalance/add/rebalance */ +extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, + struct rb_root *root); + +static inline void rb_link_node(struct rb_node * node, struct rb_node * parent, + struct rb_node ** rb_link) +{ + node->rb_parent_color = (unsigned long )parent; + node->rb_left = node->rb_right = NULL; + + *rb_link = node; +} + +#endif /* _LINUX_RBTREE_H */ diff --git a/lib_generic/Makefile b/lib_generic/Makefile index 7df5a2c..83b41ca 100644 --- a/lib_generic/Makefile +++ b/lib_generic/Makefile @@ -45,6 +45,7 @@ COBJS-y += string.o COBJS-y += strmhz.o COBJS-y += vsprintf.o COBJS-y += zlib.o +COBJS-$(CONFIG_RBTREE) += rbtree.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/lib_generic/rbtree.c b/lib_generic/rbtree.c new file mode 100644 index 0000000..da7c090 --- /dev/null +++ b/lib_generic/rbtree.c @@ -0,0 +1,390 @@ +/* + Red Black Trees + (C) 1999 Andrea Arcangeli <andrea(a)suse.de> + (C) 2002 David Woodhouse <dwmw2(a)infradead.org> + + 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 + + linux/lib/rbtree.c +*/ + +#include <ubi_uboot.h> +#include <linux/rbtree.h> + +static void __rb_rotate_left(struct rb_node *node, struct rb_root *root) +{ + struct rb_node *right = node->rb_right; + struct rb_node *parent = rb_parent(node); + + if ((node->rb_right = right->rb_left)) + rb_set_parent(right->rb_left, node); + right->rb_left = node; + + rb_set_parent(right, parent); + + if (parent) + { + if (node == parent->rb_left) + parent->rb_left = right; + else + parent->rb_right = right; + } + else + root->rb_node = right; + rb_set_parent(node, right); +} + +static void __rb_rotate_right(struct rb_node *node, struct rb_root *root) +{ + struct rb_node *left = node->rb_left; + struct rb_node *parent = rb_parent(node); + + if ((node->rb_left = left->rb_right)) + rb_set_parent(left->rb_right, node); + left->rb_right = node; + + rb_set_parent(left, parent); + + if (parent) + { + if (node == parent->rb_right) + parent->rb_right = left; + else + parent->rb_left = left; + } + else + root->rb_node = left; + rb_set_parent(node, left); +} + +void rb_insert_color(struct rb_node *node, struct rb_root *root) +{ + struct rb_node *parent, *gparent; + + while ((parent = rb_parent(node)) && rb_is_red(parent)) + { + gparent = rb_parent(parent); + + if (parent == gparent->rb_left) + { + { + register struct rb_node *uncle = gparent->rb_right; + if (uncle && rb_is_red(uncle)) + { + rb_set_black(uncle); + rb_set_black(parent); + rb_set_red(gparent); + node = gparent; + continue; + } + } + + if (parent->rb_right == node) + { + register struct rb_node *tmp; + __rb_rotate_left(parent, root); + tmp = parent; + parent = node; + node = tmp; + } + + rb_set_black(parent); + rb_set_red(gparent); + __rb_rotate_right(gparent, root); + } else { + { + register struct rb_node *uncle = gparent->rb_left; + if (uncle && rb_is_red(uncle)) + { + rb_set_black(uncle); + rb_set_black(parent); + rb_set_red(gparent); + node = gparent; + continue; + } + } + + if (parent->rb_left == node) + { + register struct rb_node *tmp; + __rb_rotate_right(parent, root); + tmp = parent; + parent = node; + node = tmp; + } + + rb_set_black(parent); + rb_set_red(gparent); + __rb_rotate_left(gparent, root); + } + } + + rb_set_black(root->rb_node); +} + +static void __rb_erase_color(struct rb_node *node, struct rb_node *parent, + struct rb_root *root) +{ + struct rb_node *other; + + while ((!node || rb_is_black(node)) && node != root->rb_node) + { + if (parent->rb_left == node) + { + other = parent->rb_right; + if (rb_is_red(other)) + { + rb_set_black(other); + rb_set_red(parent); + __rb_rotate_left(parent, root); + other = parent->rb_right; + } + if ((!other->rb_left || rb_is_black(other->rb_left)) && + (!other->rb_right || rb_is_black(other->rb_right))) + { + rb_set_red(other); + node = parent; + parent = rb_parent(node); + } + else + { + if (!other->rb_right || rb_is_black(other->rb_right)) + { + struct rb_node *o_left; + if ((o_left = other->rb_left)) + rb_set_black(o_left); + rb_set_red(other); + __rb_rotate_right(other, root); + other = parent->rb_right; + } + rb_set_color(other, rb_color(parent)); + rb_set_black(parent); + if (other->rb_right) + rb_set_black(other->rb_right); + __rb_rotate_left(parent, root); + node = root->rb_node; + break; + } + } + else + { + other = parent->rb_left; + if (rb_is_red(other)) + { + rb_set_black(other); + rb_set_red(parent); + __rb_rotate_right(parent, root); + other = parent->rb_left; + } + if ((!other->rb_left || rb_is_black(other->rb_left)) && + (!other->rb_right || rb_is_black(other->rb_right))) + { + rb_set_red(other); + node = parent; + parent = rb_parent(node); + } + else + { + if (!other->rb_left || rb_is_black(other->rb_left)) + { + register struct rb_node *o_right; + if ((o_right = other->rb_right)) + rb_set_black(o_right); + rb_set_red(other); + __rb_rotate_left(other, root); + other = parent->rb_left; + } + rb_set_color(other, rb_color(parent)); + rb_set_black(parent); + if (other->rb_left) + rb_set_black(other->rb_left); + __rb_rotate_right(parent, root); + node = root->rb_node; + break; + } + } + } + if (node) + rb_set_black(node); +} + +void rb_erase(struct rb_node *node, struct rb_root *root) +{ + struct rb_node *child, *parent; + int color; + + if (!node->rb_left) + child = node->rb_right; + else if (!node->rb_right) + child = node->rb_left; + else + { + struct rb_node *old = node, *left; + + node = node->rb_right; + while ((left = node->rb_left) != NULL) + node = left; + child = node->rb_right; + parent = rb_parent(node); + color = rb_color(node); + + if (child) + rb_set_parent(child, parent); + if (parent == old) { + parent->rb_right = child; + parent = node; + } else + parent->rb_left = child; + + node->rb_parent_color = old->rb_parent_color; + node->rb_right = old->rb_right; + node->rb_left = old->rb_left; + + if (rb_parent(old)) + { + if (rb_parent(old)->rb_left == old) + rb_parent(old)->rb_left = node; + else + rb_parent(old)->rb_right = node; + } else + root->rb_node = node; + + rb_set_parent(old->rb_left, node); + if (old->rb_right) + rb_set_parent(old->rb_right, node); + goto color; + } + + parent = rb_parent(node); + color = rb_color(node); + + if (child) + rb_set_parent(child, parent); + if (parent) + { + if (parent->rb_left == node) + parent->rb_left = child; + else + parent->rb_right = child; + } + else + root->rb_node = child; + + color: + if (color == RB_BLACK) + __rb_erase_color(child, parent, root); +} + +/* + * This function returns the first node (in sort order) of the tree. + */ +struct rb_node *rb_first(struct rb_root *root) +{ + struct rb_node *n; + + n = root->rb_node; + if (!n) + return NULL; + while (n->rb_left) + n = n->rb_left; + return n; +} + +struct rb_node *rb_last(struct rb_root *root) +{ + struct rb_node *n; + + n = root->rb_node; + if (!n) + return NULL; + while (n->rb_right) + n = n->rb_right; + return n; +} + +struct rb_node *rb_next(struct rb_node *node) +{ + struct rb_node *parent; + + if (rb_parent(node) == node) + return NULL; + + /* If we have a right-hand child, go down and then left as far + as we can. */ + if (node->rb_right) { + node = node->rb_right; + while (node->rb_left) + node=node->rb_left; + return node; + } + + /* No right-hand children. Everything down and left is + smaller than us, so any 'next' node must be in the general + direction of our parent. Go up the tree; any time the + ancestor is a right-hand child of its parent, keep going + up. First time it's a left-hand child of its parent, said + parent is our 'next' node. */ + while ((parent = rb_parent(node)) && node == parent->rb_right) + node = parent; + + return parent; +} + +struct rb_node *rb_prev(struct rb_node *node) +{ + struct rb_node *parent; + + if (rb_parent(node) == node) + return NULL; + + /* If we have a left-hand child, go down and then right as far + as we can. */ + if (node->rb_left) { + node = node->rb_left; + while (node->rb_right) + node=node->rb_right; + return node; + } + + /* No left-hand children. Go up till we find an ancestor which + is a right-hand child of its parent */ + while ((parent = rb_parent(node)) && node == parent->rb_left) + node = parent; + + return parent; +} + +void rb_replace_node(struct rb_node *victim, struct rb_node *new, + struct rb_root *root) +{ + struct rb_node *parent = rb_parent(victim); + + /* Set the surrounding nodes to point to the replacement */ + if (parent) { + if (victim == parent->rb_left) + parent->rb_left = new; + else + parent->rb_right = new; + } else { + root->rb_node = new; + } + if (victim->rb_left) + rb_set_parent(victim->rb_left, new); + if (victim->rb_right) + rb_set_parent(victim->rb_right, new); + + /* Copy the pointers/colour from the victim to the replacement */ + *new = *victim; +}

2 1

[U-Boot] [PATCH] 85xx: Using proper I2C source clock divider for MPC8544
by Wolfgang Grandegger 14 Oct '08

14 Oct '08

Measurements with our MPC8544 board showed that the I2C bus frequency is wrong by a factor of 1.5. Obviously, the interpretation of the MPC85xx_PORDEVSR2_SEC_CFG bit of the cfg_sec_freq register is not correct. There seems to be an error in the 8544 RM. Signed-off-by: Wolfgang Grandegger <wg(a)grandegger.com> --- cpu/mpc85xx/speed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: u-boot/cpu/mpc85xx/speed.c =================================================================== --- u-boot.orig/cpu/mpc85xx/speed.c +++ u-boot/cpu/mpc85xx/speed.c @@ -101,9 +101,9 @@ int get_clocks (void) * PORDEVSR2_SEC_CFG bit is 0 on all 85xx boards that are not an 8544. */ if (gur->pordevsr2 & MPC85xx_PORDEVSR2_SEC_CFG) - gd->i2c1_clk = sys_info.freqSystemBus / 3; - else gd->i2c1_clk = sys_info.freqSystemBus / 2; + else + gd->i2c1_clk = sys_info.freqSystemBus / 3; #else /* Most 85xx SOCs use CCB/2, so this is the default behavior. */ gd->i2c1_clk = sys_info.freqSystemBus / 2;

2 9

[U-Boot] [PATCH] Remove unwanted ';' at end of define.
by Selvamuthukumar 14 Oct '08

14 Oct '08

Currently this is not creating any problem. But it will result in compilation error when used as below. printf("CFG_SDRAM_CFG2 - %08x\n", CFG_SDRAM_CFG2); Signed-off-by: Selvamuthukumar <selva.muthukumar(a)e-coninfotech.com> --- include/configs/MPC8313ERDB.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 55d7852..24cd94c 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -153,12 +153,12 @@ | SDRAM_CFG_32_BE ) /* 0x43080000 */ #endif -#define CFG_SDRAM_CFG2 0x00401000; +#define CFG_SDRAM_CFG2 0x00401000 /* set burst length to 8 for 32-bit data path */ #define CFG_DDR_MODE ( ( 0x4448 << SDRAM_MODE_ESD_SHIFT ) \ | ( 0x0632 << SDRAM_MODE_SD_SHIFT ) ) /* 0x44480632 */ -#define CFG_DDR_MODE_2 0x8000C000; +#define CFG_DDR_MODE_2 0x8000C000 #define CFG_DDR_CLK_CNTL DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05 /*0x02000000*/ -- 1.5.5

3 2

[U-Boot] [PATCH] ARM DaVinci: Add maintainer informations for SFFSDR board.
by Hugo Villeneuve 14 Oct '08

14 Oct '08

ARM DaVinci: Add maintainer informations for SFFSDR board. Signed-off-by: Hugo Villeneuve <hugo.villeneuve(a)lyrtech.com> --- MAINTAINERS | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 750e374..9c0d6bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -594,6 +594,10 @@ Greg Ungerer <greg.ungerer(a)opengear.com> cm4116 ks8695p cm4148 ks8695p +Hugo Villeneuve <hugo.villeneuve(a)lyrtech.com> + + SFFSDR ARM926EJS + Richard Woodruff <r-woodruff2(a)ti.com> omap2420h4 ARM1136EJS

2 1

[U-Boot] [PATCH] api: fix type mismatch
by Matthias Fuchs 14 Oct '08

14 Oct '08

This patch fixes a type mismatch and though removes a compiler warning when compiling with CONFIG_API on powerpc. Signed-off-by: Matthias Fuchs <matthias.fuchs(a)esd-electronics.com> --- api/api_platform-ppc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/api/api_platform-ppc.c b/api/api_platform-ppc.c index ca9f9a5..611a01b 100644 --- a/api/api_platform-ppc.c +++ b/api/api_platform-ppc.c @@ -66,7 +66,7 @@ int platform_sys_info(struct sys_info *si) si->bar = gd->bd->bi_bar; #undef bi_bar #else - si->bar = NULL; + si->bar = 0; #endif platform_set_mr(si, gd->bd->bi_memstart, gd->bd->bi_memsize, MR_ATTR_DRAM); -- 1.5.3

2 1

[U-Boot] [PATCH] cmd_i2c: Fix help for CONFIG_I2C_CMD_TREE && !CONFIG_I2C_MULTI_BUS
by Peter Tyser 14 Oct '08

14 Oct '08

Original code displayed: => help i2c i2c i2c speed [speed] - show or set I2C bus speed i2c md chip address[.0, .1, .2] [# of objects] - read from I2C device ... Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- common/cmd_i2c.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index ef3928e..ea80e8a 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -1220,12 +1220,12 @@ int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { + if (!strncmp(argv[1], "sp", 2)) + return do_i2c_bus_speed(cmdtp, flag, --argc, ++argv); #if defined(CONFIG_I2C_MULTI_BUS) if (!strncmp(argv[1], "de", 2)) return do_i2c_bus_num(cmdtp, flag, --argc, ++argv); #endif /* CONFIG_I2C_MULTI_BUS */ - if (!strncmp(argv[1], "sp", 2)) - return do_i2c_bus_speed(cmdtp, flag, --argc, ++argv); if (!strncmp(argv[1], "md", 2)) return do_i2c_md(cmdtp, flag, --argc, ++argv); if (!strncmp(argv[1], "mm", 2)) @@ -1256,10 +1256,10 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD( i2c, 6, 1, do_i2c, "i2c - I2C sub-system\n", + "speed [speed] - show or set I2C bus speed\n" #if defined(CONFIG_I2C_MULTI_BUS) - "dev [dev] - show or set current I2C bus\n" + "i2c dev [dev] - show or set current I2C bus\n" #endif /* CONFIG_I2C_MULTI_BUS */ - "i2c speed [speed] - show or set I2C bus speed\n" "i2c md chip address[.0, .1, .2] [# of objects] - read from I2C device\n" "i2c mm chip address[.0, .1, .2] - write to I2C device (auto-incrementing)\n" "i2c mw chip address[.0, .1, .2] value [count] - write to I2C device (fill)\n" -- 1.6.0.2.GIT

2 1

[U-Boot] [PATCH] Fixed lineendings in tools/img2brec.sh
by Niklaus Giger 14 Oct '08

14 Oct '08

Signed-off-by: Niklaus Giger <niklaus.giger(a)netstal.com> --- tools/img2brec.sh | 598 ++++++++++++++++++++++++++-------------------------- 1 files changed, 299 insertions(+), 299 deletions(-) diff --git a/tools/img2brec.sh b/tools/img2brec.sh index 0fcdba2..b0d7f44 100755 --- a/tools/img2brec.sh +++ b/tools/img2brec.sh @@ -3,11 +3,11 @@ # This script converts binary files (u-boot.bin) into so called # bootstrap records that are accepted by Motorola's MC9328MX1/L # (a.k.a. DragaonBall i.MX) in "Bootstrap Mode" -# +# # The code for the SynchFlash programming routines is taken from # Bootloader\Bin\SyncFlash\programBoot_b.txt contained in -# Motorolas LINUX_BSP_0_3_8.tar.gz -# +# Motorolas LINUX_BSP_0_3_8.tar.gz +# # The script could easily extended for AMD flash routines. # # 2004-06-23 - steven.scholz(a)imc-berlin.de @@ -15,34 +15,34 @@ ################################################################################# # From the posting to the U-Boot-Users mailing list, 23 Jun 2004: # =============================================================== -# I just hacked a simple script that converts u-boot.bin into a text file -# containg processor init code, SynchFlash programming code and U-Boot data in +# I just hacked a simple script that converts u-boot.bin into a text file +# containg processor init code, SynchFlash programming code and U-Boot data in # form of so called b-records. -# -# This can be used to programm U-Boot into (Synch)Flash using the Bootstrap +# +# This can be used to programm U-Boot into (Synch)Flash using the Bootstrap # Mode of the MC9328MX1/L -# +# # 0AFE1F3410202E2E2E000000002073756363656564/ # 0AFE1F44102E0A0000206661696C656420210A0000/ # 0AFE100000 # ... # MX1ADS Sync-flash Programming Utility v0.5 2002/08/21 -# +# # Source address (stored in 0x0AFE0000): 0x0A000000 # Target address (stored in 0x0AFE0004): 0x0C000000 # Size (stored in 0x0AFE0008): 0x0001A320 -# +# # Press any key to start programming ... # Erasing ... # Blank checking ... # Programming ... # Verifying flash ... succeed. -# +# # Programming finished. -# +# # So no need for a BDI2000 anymore... ;-) -# -# This is working on my MX1ADS eval board. Hope this could be useful for +# +# This is working on my MX1ADS eval board. Hope this could be useful for # someone. ################################################################################# @@ -66,41 +66,41 @@ FILESIZE=`filesize $INFILE` output_init() { echo "\ -******************************************** -* Initialize I/O Pad Driving Strength * -******************************************** -0021B80CC4000003AB -******************************************** -* Initialize SDRAM * -******************************************** -00221000C492120200 ; pre-charge command -08200000E4 ; special read - -00221000C4A2120200 ; auto-refresh command -08000000E4 ; 8 special read -08000000E4 ; 8 special read -08000000E4 ; 8 special read -08000000E4 ; 8 special read -08000000E4 ; 8 special read -08000000E4 ; 8 special read -08000000E4 ; 8 special read -08000000E4 ; 8 special read - -00221000C4B2120200 ; set mode register -08111800E4 ; special read - -00221000C482124200 ; set normal mode - " +******************************************** +* Initialize I/O Pad Driving Strength * +******************************************** +0021B80CC4000003AB +******************************************** +* Initialize SDRAM * +******************************************** +00221000C492120200 ; pre-charge command +08200000E4 ; special read + +00221000C4A2120200 ; auto-refresh command +08000000E4 ; 8 special read +08000000E4 ; 8 special read +08000000E4 ; 8 special read +08000000E4 ; 8 special read +08000000E4 ; 8 special read +08000000E4 ; 8 special read +08000000E4 ; 8 special read +08000000E4 ; 8 special read + +00221000C4B2120200 ; set mode register +08111800E4 ; special read + +00221000C482124200 ; set normal mode +" } output_uboot() { echo "\ -******************************************** -* U-Boot image as bootstrap records * -* will be stored in SDRAM at 0x0A000000 * -******************************************** - " +******************************************** +* U-Boot image as bootstrap records * +* will be stored in SDRAM at 0x0A000000 * +******************************************** +" cat $INFILE | \ hexdump -v -e "\"0A0%05.5_ax10\" 16/1 \"%02x\"\"\r\n\"" | \ @@ -110,269 +110,269 @@ tr [:lower:] [:upper:] output_flashprog() { echo "\ -******************************************** -* Address of arguments to flashProg * -* ---------------------------------------- * -* Source : 0x0A000000 * -* Destination : 0x0C000000 * " +******************************************** +* Address of arguments to flashProg * +* ---------------------------------------- * +* Source : 0x0A000000 * +* Destination : 0x0C000000 *" # get the real size of the U-Boot image printf "* Size : 0x%08X *\r\n" $FILESIZE printf "********************************************\r\n" printf "0AFE0000CC0A0000000C000000%08X\r\n" $FILESIZE -#;0AFE0000CC0A0000000C00000000006000 +#;0AFE0000CC0A0000000C00000000006000 echo "\ -******************************************** -* Flash Program * -******************************************** -0AFE10001008D09FE5AC0000EA00F0A0E1A42DFE0A -0AFE1010100080FE0A0DC0A0E100D82DE904B04CE2 -0AFE1020109820A0E318309FE5003093E5033082E0 -0AFE103010003093E5013003E2FF3003E20300A0E1 -0AFE10401000A81BE9A01DFE0A0DC0A0E100D82DE9 -0AFE10501004B04CE204D04DE20030A0E10D304BE5 -0AFE1060109820A0E330309FE5003093E5033082E0 -0AFE107010003093E5013903E2000053E3F7FFFF0A -0AFE1080104020A0E310309FE5003093E5032082E0 -0AFE1090100D305BE5003082E500A81BE9A01DFE0A -0AFE10A0100DC0A0E100D82DE904B04CE20000A0E1 -0AFE10B010D7FFFFEB0030A0E1FF3003E2000053E3 -0AFE10C010FAFFFF0A10309FE5003093E5003093E5 -0AFE10D010FF3003E20300A0E100A81BE9A01DFE0A -0AFE10E0100DC0A0E100D82DE904B04CE204D04DE2 -0AFE10F0100030A0E10D304BE50D305BE52332A0E1 -0AFE1100100E304BE50E305BE5090053E30300009A -0AFE1110100E305BE5373083E20E304BE5020000EA -0AFE1120100E305BE5303083E20E304BE50E305BE5 -0AFE1130100300A0E1C3FFFFEB0D305BE50F3003E2 -0AFE1140100E304BE50E305BE5090053E30300009A -0AFE1150100E305BE5373083E20E304BE5020000EA -0AFE1160100E305BE5303083E20E304BE50E305BE5 -0AFE1170100300A0E1B3FFFFEB00A81BE90DC0A0E1 -0AFE11801000D82DE904B04CE21CD04DE210000BE5 -0AFE11901014100BE518200BE588009FE5E50200EB -0AFE11A01010301BE51C300BE514301BE520300BE5 -0AFE11B0100030A0E324300BE524201BE518301BE5 -0AFE11C010030052E10000003A120000EA1C004BE2 -0AFE11D010002090E520104BE2003091E500C093E5 -0AFE11E010043083E2003081E5003092E5042082E2 -0AFE11F010002080E50C0053E10200000A0030A0E3 -0AFE12001028300BE5050000EA24301BE5043083E2 -0AFE12101024300BE5E7FFFFEA0130A0E328300BE5 -0AFE12201028001BE500A81BE9E81EFE0A0DC0A0E1 -0AFE12301000D82DE904B04CE214D04DE210000BE5 -0AFE12401014100BE56C009FE5BA0200EB10301BE5 -0AFE12501018300BE50030A0E31C300BE51C201BE5 -0AFE12601014301BE5030052E10000003A0D0000EA -0AFE12701018304BE2002093E5001092E5042082E2 -0AFE128010002083E5010071E30200000A0030A0E3 -0AFE12901020300BE5050000EA1C301BE5043083E2 -0AFE12A0101C300BE5ECFFFFEA0130A0E320300BE5 -0AFE12B01020001BE500A81BE9001FFE0A0DC0A0E1 -0AFE12C01000D82DE904B04CE224D04DE20130A0E3 -0AFE12D01024300BE5A4229FE58139A0E3023A83E2 -0AFE12E010003082E59820A0E390329FE5003093E5 -0AFE12F010033082E0003093E5023903E2000053E3 -0AFE1300100300001A74229FE58139A0E3033A83E2 -0AFE131010003082E568029FE5860200EBAF36A0E3 -0AFE1320100E3883E2003093E510300BE554029FE5 -0AFE133010800200EB10301BE5233CA0E1FF3003E2 -0AFE1340100300A0E165FFFFEB10301BE52338A0E1 -0AFE135010FF3003E20300A0E160FFFFEB10301BE5 -0AFE1360102334A0E1FF3003E20300A0E15BFFFFEB -0AFE13701010305BE50300A0E158FFFFEB0A00A0E3 -0AFE13801030FFFFEB0D00A0E32EFFFFEBAF36A0E3 -0AFE1390100E3883E2043083E2003093E514300BE5 -0AFE13A010E4019FE5630200EB14301BE5233CA0E1 -0AFE13B010FF3003E20300A0E148FFFFEB14301BE5 -0AFE13C0102338A0E1FF3003E20300A0E143FFFFEB -0AFE13D01014301BE52334A0E1FF3003E20300A0E1 -0AFE13E0103EFFFFEB14305BE50300A0E13BFFFFEB -0AFE13F0100A00A0E313FFFFEB0D00A0E311FFFFEB -0AFE140010AF36A0E30E3883E2083083E2003093E5 -0AFE14101018300BE574019FE5460200EB18301BE5 -0AFE142010233CA0E1FF3003E20300A0E12BFFFFEB -0AFE14301018301BE52338A0E1FF3003E20300A0E1 -0AFE14401026FFFFEB18301BE52334A0E1FF3003E2 -0AFE1450100300A0E121FFFFEB18305BE50300A0E1 -0AFE1460101EFFFFEB0A00A0E3F6FEFFEB0D00A0E3 -0AFE147010F4FEFFEBE6FEFFEB0030A0E1FF3003E2 -0AFE148010000053E30000001A020000EA03FFFFEB -0AFE1490102D004BE5F6FFFFEAF4009FE5250200EB -0AFE14A010FEFEFFEB2D004BE5CD0000EBC00000EB -0AFE14B010E0009FE51F0200EB18301BE528300BE5 -0AFE14C01014301BE52C300BE52C001BE5100100EB -0AFE14D01028301BE5013643E228300BE52C301BE5 -0AFE14E010013683E22C300BE528301BE5000053E3 -0AFE14F010F4FFFFCAAE0000EB14001BE518101BE5 -0AFE15001049FFFFEB0030A0E1FF3003E2000053E3 -0AFE151010E6FFFF0A80009FE5060200EB10001BE5 -0AFE15201014101BE518201BE5D00000EB10001BE5 -0AFE15301014101BE518201BE50FFFFFEB0030A0E1 -0AFE154010FF3003E2000053E30200000A4C009FE5 -0AFE155010F80100EB010000EA44009FE5F50100EB -0AFE156010930000EB3C009FE5F20100EB0000A0E3 -0AFE157010A4FEFFEB0030A0E30300A0E100A81BE9 -0AFE158010A01DFE0AA41DFE0AE01DFE0A0C1EFE0A -0AFE159010381EFE0A641EFE0A181FFE0A281FFE0A -0AFE15A0103C1FFE0A481FFE0AB41EFE0A0DC0A0E1 -0AFE15B01000D82DE904B04CE204D04DE210000BE5 -0AFE15C01010301BE5013043E210300BE5010073E3 -0AFE15D010FAFFFF1A00A81BE90DC0A0E100D82DE9 -0AFE15E01004B04CE208D04DE210000BE510301BE5 -0AFE15F01014300BE514301BE50300A0E100A81BE9 -0AFE1600100DC0A0E100D82DE904B04CE204D04DE2 -0AFE1610102228A0E3012A82E2042082E2E134A0E3 -0AFE162010023883E2033C83E2003082E50333A0E3 -0AFE163010053983E2003093E510300BE500A81BE9 -0AFE1640100DC0A0E100D82DE904B04CE204D04DE2 -0AFE1650102228A0E3012A82E2042082E29134A0E3 -0AFE166010023883E2033C83E2003082E5C136A0E3 -0AFE167010003093E510300BE52228A0E3012A82E2 -0AFE168010042082E2E134A0E3023883E2033C83E2 -0AFE169010003082E50333A0E3073983E20020A0E3 -0AFE16A010002083E52228A0E3012A82E2042082E2 -0AFE16B0108134A0E3023883E2033C83E2003082E5 -0AFE16C0100333A0E3003093E510300BE5CBFFFFEB -0AFE16D01010301BE50300A0E100A81BE90DC0A0E1 -0AFE16E01000D82DE904B04CE208D04DE2D3FFFFEB -0AFE16F0100030A0E110300BE510301BE5023503E2 -0AFE170010000053E30500000A10301BE5073703E2 -0AFE171010000053E30100000A10001BE5ADFFFFEB -0AFE17201010301BE5803003E2000053E30500000A -0AFE17301010301BE51C3003E2000053E30100000A -0AFE17401010001BE5A3FFFFEB10201BE50235A0E3 -0AFE175010803083E2030052E10200001A0130A0E3 -0AFE17601014300BE5010000EA0030A0E314300BE5 -0AFE17701014001BE500A81BE90DC0A0E100D82DE9 -0AFE17801004B04CE204D04DE22228A0E3012A82E2 -0AFE179010042082E29134A0E3023883E2033C83E2 -0AFE17A010003082E5C136A0E3003093E510300BE5 -0AFE17B01000A81BE90DC0A0E100D82DE904B04CE2 -0AFE17C010ECFFFFEB2228A0E3012A82E2042082E2 -0AFE17D0108134A0E3023883E2033C83E2003082E5 -0AFE17E01000A81BE90DC0A0E100D82DE904B04CE2 -0AFE17F01004D04DE22228A0E3012A82E2042082E2 -0AFE1800102238A0E3013A83E2043083E2003093E5 -0AFE181010023183E3003082E52228A0E3012A82E2 -0AFE1820102238A0E3013A83E2003093E5023183E3 -0AFE183010003082E5FA0FA0E35BFFFFEB2228A0E3 -0AFE184010012A82E2042082E2B134A0E3023883E2 -0AFE185010033C83E2003082E50333A0E3233983E2 -0AFE186010033B83E2003093E510300BE500A81BE9 -0AFE1870100DC0A0E100D82DE904B04CE21CD04DE2 -0AFE18801010000BE514100BE518200BE50030A0E3 -0AFE1890101C300BE51C201BE518301BE5030052E1 -0AFE18A0100000003A190000EAB2FFFFEB2228A0E3 -0AFE18B010012A82E2042082E2F134A0E3023883E2 -0AFE18C010033C83E2003082E514201BE51C301BE5 -0AFE18D010031082E010201BE51C301BE5033082E0 -0AFE18E010003093E5003081E57BFFFFEB0030A0E1 -0AFE18F010FF3003E2000053E3FAFFFF0AACFFFFEB -0AFE1900101C301BE5043083E21C300BE5E0FFFFEA -0AFE19101000A81BE90DC0A0E100D82DE904B04CE2 -0AFE1920100CD04DE210000BE52228A0E3012A82E2 -0AFE193010042082E28134A0E3023883E2033C83E2 -0AFE194010003082E510301BE5003093E514300BE5 -0AFE1950102228A0E3012A82E2042082E29134A0E3 -0AFE196010023883E2033C83E2003082E510301BE5 -0AFE197010003093E518300BE52228A0E3012A82E2 -0AFE198010042082E2E134A0E3023883E2033C83E2 -0AFE199010003082E50229A0E310301BE5032082E0 -0AFE19A0100030A0E3003082E52228A0E3012A82E2 -0AFE19B010042082E28134A0E3023883E2033C83E2 -0AFE19C010003082E510201BE50D3AA0E3D03083E2 -0AFE19D010033883E1003082E53FFFFFEB0030A0E1 -0AFE19E010FF3003E2000053E3FAFFFF0A70FFFFEB -0AFE19F01000A81BE90DC0A0E100D82DE904B04CE2 -0AFE1A00105CFFFFEB2228A0E3012A82E2042082E2 -0AFE1A1010E134A0E3023883E2033C83E2003082E5 -0AFE1A20100333A0E3033983E20020A0E3002083E5 -0AFE1A30102228A0E3012A82E2042082E28134A0E3 -0AFE1A4010023883E2033C83E2003082E50323A0E3 -0AFE1A5010032982E20339A0E3C03083E2033883E1 -0AFE1A6010003082E500A81BE90DC0A0E100D82DE9 -0AFE1A701004B04CE23FFFFFEB2228A0E3012A82E2 -0AFE1A8010042082E2E134A0E3023883E2033C83E2 -0AFE1A9010003082E50333A0E30A3983E20020A0E3 -0AFE1AA010002083E52228A0E3012A82E2042082E2 -0AFE1AB0108134A0E3023883E2033C83E2003082E5 -0AFE1AC0100323A0E30A2982E20339A0E3C03083E2 -0AFE1AD010033883E1003082E500A81BE90DC0A0E1 -0AFE1AE01000D82DE904B04CE28729A0E3222E82E2 -0AFE1AF0108739A0E3223E83E2003093E51E3CC3E3 -0AFE1B0010003082E58729A0E38E2F82E28739A0E3 -0AFE1B10108E3F83E2003093E51E3CC3E3003082E5 -0AFE1B20108139A0E3823D83E20520A0E3002083E5 -0AFE1B30108129A0E3822D82E2042082E20139A0E3 -0AFE1B4010273083E2003082E58139A0E3823D83E2 -0AFE1B50100C3083E20120A0E3002083E58129A0E3 -0AFE1B6010822D82E2102082E22A3DA0E3013083E2 -0AFE1B7010003082E58139A0E3823D83E2243083E2 -0AFE1B80100F20A0E3002083E58139A0E3823D83E2 -0AFE1B9010283083E28A20A0E3002083E58139A0E3 -0AFE1BA010823D83E22C3083E20820A0E3002083E5 -0AFE1BB01000A81BE90DC0A0E100D82DE904B04CE2 -0AFE1BC0108139A0E3823D83E2183083E2003093E5 -0AFE1BD010013003E2FF3003E20300A0E100A81BE9 -0AFE1BE0100DC0A0E100D82DE904B04CE204D04DE2 -0AFE1BF0100030A0E10D304BE58139A0E3823D83E2 -0AFE1C0010183083E2003093E5013903E2000053E3 -0AFE1C1010F8FFFF0A8139A0E3813D83E20D205BE5 -0AFE1C2010002083E50D305BE50A0053E30A00001A -0AFE1C30108139A0E3823D83E2183083E2003093E5 -0AFE1C4010013903E2000053E3F8FFFF0A8139A0E3 -0AFE1C5010813D83E20D20A0E3002083E500A81BE9 -0AFE1C60100DC0A0E100D82DE904B04CE20000A0E1 -0AFE1C7010CFFFFFEB0030A0E1FF3003E2000053E3 -0AFE1C8010FAFFFF0A8139A0E3023A83E2003093E5 -0AFE1C9010FF3003E20300A0E100A81BE90DC0A0E1 -0AFE1CA01000D82DE904B04CE204D04DE20030A0E1 -0AFE1CB0100D304BE50D305BE52332A0E10E304BE5 -0AFE1CC0100E305BE5090053E30300009A0E305BE5 -0AFE1CD010373083E20E304BE5020000EA0E305BE5 -0AFE1CE010303083E20E304BE50E305BE50300A0E1 -0AFE1CF010BAFFFFEB0D305BE50F3003E20E304BE5 -0AFE1D00100E305BE5090053E30300009A0E305BE5 -0AFE1D1010373083E20E304BE5020000EA0E305BE5 -0AFE1D2010303083E20E304BE50E305BE50300A0E1 -0AFE1D3010AAFFFFEB00A81BE90DC0A0E100D82DE9 -0AFE1D401004B04CE204D04DE210000BE510301BE5 -0AFE1D50100030D3E5000053E30000001A080000EA -0AFE1D601010104BE2003091E50320A0E10020D2E5 -0AFE1D7010013083E2003081E50200A0E197FFFFEB -0AFE1D8008F1FFFFEA00A81BE9 -0AFE1DA4100A0D4D58314144532053796E632D666C -0AFE1DB4106173682050726F6772616D6D696E6720 -0AFE1DC4105574696C6974792076302E3520323030 -0AFE1DD410322F30382F32310A0D000000536F7572 -0AFE1DE41063652061646472657373202873746F72 -0AFE1DF410656420696E2030783041464530303030 -0AFE1E0410293A2030780000005461726765742061 -0AFE1E1410646472657373202873746F7265642069 -0AFE1E24106E2030783041464530303034293A2030 -0AFE1E34107800000053697A652020202020202020 -0AFE1E44102020202873746F72656420696E203078 -0AFE1E54103041464530303038293A203078000000 -0AFE1E6410507265737320616E79206B657920746F -0AFE1E74102073746172742070726F6772616D6D69 -0AFE1E84106E67202E2E2E00000A0D45726173696E -0AFE1E94106720666C617368202E2E2E000A0D5072 -0AFE1EA4106F6772616D6D696E67202E2E2E000000 -0AFE1EB4100A0D50726F6772616D6D696E67206669 -0AFE1EC4106E69736865642E0A0D50726573732027 -0AFE1ED410612720746F20636F6E74696E7565202E -0AFE1EE4102E2E2E000A0D566572696679696E6720 -0AFE1EF410666C617368202E2E2E0000000A0D426C -0AFE1F0410616E6B20636865636B696E67202E2E2E -0AFE1F1410000000000A45726173696E67202E2E2E -0AFE1F2410000000000A50726F6772616D6D696E67 -0AFE1F3410202E2E2E000000002073756363656564 -0AFE1F44102E0A0000206661696C656420210A0000 -0AFE100000 - " +******************************************** +* Flash Program * +******************************************** +0AFE10001008D09FE5AC0000EA00F0A0E1A42DFE0A +0AFE1010100080FE0A0DC0A0E100D82DE904B04CE2 +0AFE1020109820A0E318309FE5003093E5033082E0 +0AFE103010003093E5013003E2FF3003E20300A0E1 +0AFE10401000A81BE9A01DFE0A0DC0A0E100D82DE9 +0AFE10501004B04CE204D04DE20030A0E10D304BE5 +0AFE1060109820A0E330309FE5003093E5033082E0 +0AFE107010003093E5013903E2000053E3F7FFFF0A +0AFE1080104020A0E310309FE5003093E5032082E0 +0AFE1090100D305BE5003082E500A81BE9A01DFE0A +0AFE10A0100DC0A0E100D82DE904B04CE20000A0E1 +0AFE10B010D7FFFFEB0030A0E1FF3003E2000053E3 +0AFE10C010FAFFFF0A10309FE5003093E5003093E5 +0AFE10D010FF3003E20300A0E100A81BE9A01DFE0A +0AFE10E0100DC0A0E100D82DE904B04CE204D04DE2 +0AFE10F0100030A0E10D304BE50D305BE52332A0E1 +0AFE1100100E304BE50E305BE5090053E30300009A +0AFE1110100E305BE5373083E20E304BE5020000EA +0AFE1120100E305BE5303083E20E304BE50E305BE5 +0AFE1130100300A0E1C3FFFFEB0D305BE50F3003E2 +0AFE1140100E304BE50E305BE5090053E30300009A +0AFE1150100E305BE5373083E20E304BE5020000EA +0AFE1160100E305BE5303083E20E304BE50E305BE5 +0AFE1170100300A0E1B3FFFFEB00A81BE90DC0A0E1 +0AFE11801000D82DE904B04CE21CD04DE210000BE5 +0AFE11901014100BE518200BE588009FE5E50200EB +0AFE11A01010301BE51C300BE514301BE520300BE5 +0AFE11B0100030A0E324300BE524201BE518301BE5 +0AFE11C010030052E10000003A120000EA1C004BE2 +0AFE11D010002090E520104BE2003091E500C093E5 +0AFE11E010043083E2003081E5003092E5042082E2 +0AFE11F010002080E50C0053E10200000A0030A0E3 +0AFE12001028300BE5050000EA24301BE5043083E2 +0AFE12101024300BE5E7FFFFEA0130A0E328300BE5 +0AFE12201028001BE500A81BE9E81EFE0A0DC0A0E1 +0AFE12301000D82DE904B04CE214D04DE210000BE5 +0AFE12401014100BE56C009FE5BA0200EB10301BE5 +0AFE12501018300BE50030A0E31C300BE51C201BE5 +0AFE12601014301BE5030052E10000003A0D0000EA +0AFE12701018304BE2002093E5001092E5042082E2 +0AFE128010002083E5010071E30200000A0030A0E3 +0AFE12901020300BE5050000EA1C301BE5043083E2 +0AFE12A0101C300BE5ECFFFFEA0130A0E320300BE5 +0AFE12B01020001BE500A81BE9001FFE0A0DC0A0E1 +0AFE12C01000D82DE904B04CE224D04DE20130A0E3 +0AFE12D01024300BE5A4229FE58139A0E3023A83E2 +0AFE12E010003082E59820A0E390329FE5003093E5 +0AFE12F010033082E0003093E5023903E2000053E3 +0AFE1300100300001A74229FE58139A0E3033A83E2 +0AFE131010003082E568029FE5860200EBAF36A0E3 +0AFE1320100E3883E2003093E510300BE554029FE5 +0AFE133010800200EB10301BE5233CA0E1FF3003E2 +0AFE1340100300A0E165FFFFEB10301BE52338A0E1 +0AFE135010FF3003E20300A0E160FFFFEB10301BE5 +0AFE1360102334A0E1FF3003E20300A0E15BFFFFEB +0AFE13701010305BE50300A0E158FFFFEB0A00A0E3 +0AFE13801030FFFFEB0D00A0E32EFFFFEBAF36A0E3 +0AFE1390100E3883E2043083E2003093E514300BE5 +0AFE13A010E4019FE5630200EB14301BE5233CA0E1 +0AFE13B010FF3003E20300A0E148FFFFEB14301BE5 +0AFE13C0102338A0E1FF3003E20300A0E143FFFFEB +0AFE13D01014301BE52334A0E1FF3003E20300A0E1 +0AFE13E0103EFFFFEB14305BE50300A0E13BFFFFEB +0AFE13F0100A00A0E313FFFFEB0D00A0E311FFFFEB +0AFE140010AF36A0E30E3883E2083083E2003093E5 +0AFE14101018300BE574019FE5460200EB18301BE5 +0AFE142010233CA0E1FF3003E20300A0E12BFFFFEB +0AFE14301018301BE52338A0E1FF3003E20300A0E1 +0AFE14401026FFFFEB18301BE52334A0E1FF3003E2 +0AFE1450100300A0E121FFFFEB18305BE50300A0E1 +0AFE1460101EFFFFEB0A00A0E3F6FEFFEB0D00A0E3 +0AFE147010F4FEFFEBE6FEFFEB0030A0E1FF3003E2 +0AFE148010000053E30000001A020000EA03FFFFEB +0AFE1490102D004BE5F6FFFFEAF4009FE5250200EB +0AFE14A010FEFEFFEB2D004BE5CD0000EBC00000EB +0AFE14B010E0009FE51F0200EB18301BE528300BE5 +0AFE14C01014301BE52C300BE52C001BE5100100EB +0AFE14D01028301BE5013643E228300BE52C301BE5 +0AFE14E010013683E22C300BE528301BE5000053E3 +0AFE14F010F4FFFFCAAE0000EB14001BE518101BE5 +0AFE15001049FFFFEB0030A0E1FF3003E2000053E3 +0AFE151010E6FFFF0A80009FE5060200EB10001BE5 +0AFE15201014101BE518201BE5D00000EB10001BE5 +0AFE15301014101BE518201BE50FFFFFEB0030A0E1 +0AFE154010FF3003E2000053E30200000A4C009FE5 +0AFE155010F80100EB010000EA44009FE5F50100EB +0AFE156010930000EB3C009FE5F20100EB0000A0E3 +0AFE157010A4FEFFEB0030A0E30300A0E100A81BE9 +0AFE158010A01DFE0AA41DFE0AE01DFE0A0C1EFE0A +0AFE159010381EFE0A641EFE0A181FFE0A281FFE0A +0AFE15A0103C1FFE0A481FFE0AB41EFE0A0DC0A0E1 +0AFE15B01000D82DE904B04CE204D04DE210000BE5 +0AFE15C01010301BE5013043E210300BE5010073E3 +0AFE15D010FAFFFF1A00A81BE90DC0A0E100D82DE9 +0AFE15E01004B04CE208D04DE210000BE510301BE5 +0AFE15F01014300BE514301BE50300A0E100A81BE9 +0AFE1600100DC0A0E100D82DE904B04CE204D04DE2 +0AFE1610102228A0E3012A82E2042082E2E134A0E3 +0AFE162010023883E2033C83E2003082E50333A0E3 +0AFE163010053983E2003093E510300BE500A81BE9 +0AFE1640100DC0A0E100D82DE904B04CE204D04DE2 +0AFE1650102228A0E3012A82E2042082E29134A0E3 +0AFE166010023883E2033C83E2003082E5C136A0E3 +0AFE167010003093E510300BE52228A0E3012A82E2 +0AFE168010042082E2E134A0E3023883E2033C83E2 +0AFE169010003082E50333A0E3073983E20020A0E3 +0AFE16A010002083E52228A0E3012A82E2042082E2 +0AFE16B0108134A0E3023883E2033C83E2003082E5 +0AFE16C0100333A0E3003093E510300BE5CBFFFFEB +0AFE16D01010301BE50300A0E100A81BE90DC0A0E1 +0AFE16E01000D82DE904B04CE208D04DE2D3FFFFEB +0AFE16F0100030A0E110300BE510301BE5023503E2 +0AFE170010000053E30500000A10301BE5073703E2 +0AFE171010000053E30100000A10001BE5ADFFFFEB +0AFE17201010301BE5803003E2000053E30500000A +0AFE17301010301BE51C3003E2000053E30100000A +0AFE17401010001BE5A3FFFFEB10201BE50235A0E3 +0AFE175010803083E2030052E10200001A0130A0E3 +0AFE17601014300BE5010000EA0030A0E314300BE5 +0AFE17701014001BE500A81BE90DC0A0E100D82DE9 +0AFE17801004B04CE204D04DE22228A0E3012A82E2 +0AFE179010042082E29134A0E3023883E2033C83E2 +0AFE17A010003082E5C136A0E3003093E510300BE5 +0AFE17B01000A81BE90DC0A0E100D82DE904B04CE2 +0AFE17C010ECFFFFEB2228A0E3012A82E2042082E2 +0AFE17D0108134A0E3023883E2033C83E2003082E5 +0AFE17E01000A81BE90DC0A0E100D82DE904B04CE2 +0AFE17F01004D04DE22228A0E3012A82E2042082E2 +0AFE1800102238A0E3013A83E2043083E2003093E5 +0AFE181010023183E3003082E52228A0E3012A82E2 +0AFE1820102238A0E3013A83E2003093E5023183E3 +0AFE183010003082E5FA0FA0E35BFFFFEB2228A0E3 +0AFE184010012A82E2042082E2B134A0E3023883E2 +0AFE185010033C83E2003082E50333A0E3233983E2 +0AFE186010033B83E2003093E510300BE500A81BE9 +0AFE1870100DC0A0E100D82DE904B04CE21CD04DE2 +0AFE18801010000BE514100BE518200BE50030A0E3 +0AFE1890101C300BE51C201BE518301BE5030052E1 +0AFE18A0100000003A190000EAB2FFFFEB2228A0E3 +0AFE18B010012A82E2042082E2F134A0E3023883E2 +0AFE18C010033C83E2003082E514201BE51C301BE5 +0AFE18D010031082E010201BE51C301BE5033082E0 +0AFE18E010003093E5003081E57BFFFFEB0030A0E1 +0AFE18F010FF3003E2000053E3FAFFFF0AACFFFFEB +0AFE1900101C301BE5043083E21C300BE5E0FFFFEA +0AFE19101000A81BE90DC0A0E100D82DE904B04CE2 +0AFE1920100CD04DE210000BE52228A0E3012A82E2 +0AFE193010042082E28134A0E3023883E2033C83E2 +0AFE194010003082E510301BE5003093E514300BE5 +0AFE1950102228A0E3012A82E2042082E29134A0E3 +0AFE196010023883E2033C83E2003082E510301BE5 +0AFE197010003093E518300BE52228A0E3012A82E2 +0AFE198010042082E2E134A0E3023883E2033C83E2 +0AFE199010003082E50229A0E310301BE5032082E0 +0AFE19A0100030A0E3003082E52228A0E3012A82E2 +0AFE19B010042082E28134A0E3023883E2033C83E2 +0AFE19C010003082E510201BE50D3AA0E3D03083E2 +0AFE19D010033883E1003082E53FFFFFEB0030A0E1 +0AFE19E010FF3003E2000053E3FAFFFF0A70FFFFEB +0AFE19F01000A81BE90DC0A0E100D82DE904B04CE2 +0AFE1A00105CFFFFEB2228A0E3012A82E2042082E2 +0AFE1A1010E134A0E3023883E2033C83E2003082E5 +0AFE1A20100333A0E3033983E20020A0E3002083E5 +0AFE1A30102228A0E3012A82E2042082E28134A0E3 +0AFE1A4010023883E2033C83E2003082E50323A0E3 +0AFE1A5010032982E20339A0E3C03083E2033883E1 +0AFE1A6010003082E500A81BE90DC0A0E100D82DE9 +0AFE1A701004B04CE23FFFFFEB2228A0E3012A82E2 +0AFE1A8010042082E2E134A0E3023883E2033C83E2 +0AFE1A9010003082E50333A0E30A3983E20020A0E3 +0AFE1AA010002083E52228A0E3012A82E2042082E2 +0AFE1AB0108134A0E3023883E2033C83E2003082E5 +0AFE1AC0100323A0E30A2982E20339A0E3C03083E2 +0AFE1AD010033883E1003082E500A81BE90DC0A0E1 +0AFE1AE01000D82DE904B04CE28729A0E3222E82E2 +0AFE1AF0108739A0E3223E83E2003093E51E3CC3E3 +0AFE1B0010003082E58729A0E38E2F82E28739A0E3 +0AFE1B10108E3F83E2003093E51E3CC3E3003082E5 +0AFE1B20108139A0E3823D83E20520A0E3002083E5 +0AFE1B30108129A0E3822D82E2042082E20139A0E3 +0AFE1B4010273083E2003082E58139A0E3823D83E2 +0AFE1B50100C3083E20120A0E3002083E58129A0E3 +0AFE1B6010822D82E2102082E22A3DA0E3013083E2 +0AFE1B7010003082E58139A0E3823D83E2243083E2 +0AFE1B80100F20A0E3002083E58139A0E3823D83E2 +0AFE1B9010283083E28A20A0E3002083E58139A0E3 +0AFE1BA010823D83E22C3083E20820A0E3002083E5 +0AFE1BB01000A81BE90DC0A0E100D82DE904B04CE2 +0AFE1BC0108139A0E3823D83E2183083E2003093E5 +0AFE1BD010013003E2FF3003E20300A0E100A81BE9 +0AFE1BE0100DC0A0E100D82DE904B04CE204D04DE2 +0AFE1BF0100030A0E10D304BE58139A0E3823D83E2 +0AFE1C0010183083E2003093E5013903E2000053E3 +0AFE1C1010F8FFFF0A8139A0E3813D83E20D205BE5 +0AFE1C2010002083E50D305BE50A0053E30A00001A +0AFE1C30108139A0E3823D83E2183083E2003093E5 +0AFE1C4010013903E2000053E3F8FFFF0A8139A0E3 +0AFE1C5010813D83E20D20A0E3002083E500A81BE9 +0AFE1C60100DC0A0E100D82DE904B04CE20000A0E1 +0AFE1C7010CFFFFFEB0030A0E1FF3003E2000053E3 +0AFE1C8010FAFFFF0A8139A0E3023A83E2003093E5 +0AFE1C9010FF3003E20300A0E100A81BE90DC0A0E1 +0AFE1CA01000D82DE904B04CE204D04DE20030A0E1 +0AFE1CB0100D304BE50D305BE52332A0E10E304BE5 +0AFE1CC0100E305BE5090053E30300009A0E305BE5 +0AFE1CD010373083E20E304BE5020000EA0E305BE5 +0AFE1CE010303083E20E304BE50E305BE50300A0E1 +0AFE1CF010BAFFFFEB0D305BE50F3003E20E304BE5 +0AFE1D00100E305BE5090053E30300009A0E305BE5 +0AFE1D1010373083E20E304BE5020000EA0E305BE5 +0AFE1D2010303083E20E304BE50E305BE50300A0E1 +0AFE1D3010AAFFFFEB00A81BE90DC0A0E100D82DE9 +0AFE1D401004B04CE204D04DE210000BE510301BE5 +0AFE1D50100030D3E5000053E30000001A080000EA +0AFE1D601010104BE2003091E50320A0E10020D2E5 +0AFE1D7010013083E2003081E50200A0E197FFFFEB +0AFE1D8008F1FFFFEA00A81BE9 +0AFE1DA4100A0D4D58314144532053796E632D666C +0AFE1DB4106173682050726F6772616D6D696E6720 +0AFE1DC4105574696C6974792076302E3520323030 +0AFE1DD410322F30382F32310A0D000000536F7572 +0AFE1DE41063652061646472657373202873746F72 +0AFE1DF410656420696E2030783041464530303030 +0AFE1E0410293A2030780000005461726765742061 +0AFE1E1410646472657373202873746F7265642069 +0AFE1E24106E2030783041464530303034293A2030 +0AFE1E34107800000053697A652020202020202020 +0AFE1E44102020202873746F72656420696E203078 +0AFE1E54103041464530303038293A203078000000 +0AFE1E6410507265737320616E79206B657920746F +0AFE1E74102073746172742070726F6772616D6D69 +0AFE1E84106E67202E2E2E00000A0D45726173696E +0AFE1E94106720666C617368202E2E2E000A0D5072 +0AFE1EA4106F6772616D6D696E67202E2E2E000000 +0AFE1EB4100A0D50726F6772616D6D696E67206669 +0AFE1EC4106E69736865642E0A0D50726573732027 +0AFE1ED410612720746F20636F6E74696E7565202E +0AFE1EE4102E2E2E000A0D566572696679696E6720 +0AFE1EF410666C617368202E2E2E0000000A0D426C +0AFE1F0410616E6B20636865636B696E67202E2E2E +0AFE1F1410000000000A45726173696E67202E2E2E +0AFE1F2410000000000A50726F6772616D6D696E67 +0AFE1F3410202E2E2E000000002073756363656564 +0AFE1F44102E0A0000206661696C656420210A0000 +0AFE100000 +" } ######################################################### -- 1.5.4.3

2 1

[U-Boot] [PATCH] mgsuvd: add common directory to Makefile.
by Heiko Schocher 14 Oct '08

14 Oct '08

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- board/keymile/mgsuvd/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/keymile/mgsuvd/Makefile b/board/keymile/mgsuvd/Makefile index af0d400..0326608 100644 --- a/board/keymile/mgsuvd/Makefile +++ b/board/keymile/mgsuvd/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS = $(BOARD).o +COBJS = $(BOARD).o ../common/common.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) -- 1.5.6.1 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH] mgcoge, mgsuvd: added support for the IVM EEprom.
by Heiko Schocher 14 Oct '08

14 Oct '08

The EEprom contains some Manufacturerinformation, which are read from u-boot at boot time, and saved in same Environmentvars. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- board/keymile/common/common.c | 285 +++++++++++++++++++++++++++++++++++++++++ include/configs/mgcoge.h | 5 + include/configs/mgsuvd.h | 5 + lib_ppc/board.c | 6 + 4 files changed, 301 insertions(+), 0 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index a6ed379..25c5900 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -38,6 +38,291 @@ extern int i2c_mgsuvd_read (void); #endif +int ivm_calc_crc (unsigned char *buf, int len) +{ + const unsigned short cCrc16Table[16] = { + 0x0000, 0xCC01, 0xD801, 0x1400, + 0xF001, 0x3C00, 0x2800, 0xE401, + 0xA001, 0x6C00, 0x7800, 0xB401, + 0x5000, 0x9C01, 0x8801, 0x4400}; + + unsigned short crc = 0; /* final result */ + unsigned short r1 = 0; /* temp */ + unsigned char byte = 0; /* input buffer */ + int i; + + /* calculate CRC from array data */ + for (i = 0; i < len; i++) { + byte = buf[i]; + + /* lower 4 bits */ + r1 = cCrc16Table[crc & 0xF]; + crc = ((crc) >> 4) & 0x0FFF; + crc = crc ^ r1 ^ cCrc16Table[byte & 0xF]; + + /* upper 4 bits */ + r1 = cCrc16Table[crc & 0xF]; + crc = (crc >> 4) & 0x0FFF; + crc = crc ^ r1 ^ cCrc16Table[(byte >> 4) & 0xF]; + } + return crc; +} + + +static int ivm_get_value (unsigned char *buf, int len, char *name, int off, int check) +{ + unsigned short val; + unsigned char valbuf[30]; + + if ((buf[off + 0] != buf[off + 2]) && (buf[off + 2] != buf[off + 4])) { + printf ("%s Error corrupted %s\n", __FUNCTION__, name); + val = -1; + } else { + val = buf[off + 0] + (buf[off + 1] << 8); + if ((val == 0) && (check == 1)) + val = -1; + } + sprintf ((char *)valbuf, "%x", val); + setenv (name, (char *)valbuf); + return val; +} + +#define BTChar unsigned char + +#define INVENTORYBLOCKSIZE 0x100 +#define INVENTORYDATAADDRESS 0x21 +#define INVENTORYDATASIZE (INVENTORYBLOCKSIZE - INVENTORYDATAADDRESS - 3) +typedef enum { + eSymbolShortText = 0, /* Symbol;ShortText */ + eManufId = 1, /* ManufacturerId */ + eManufSerialNumber = 2, /* ManufacturerSerialNumber */ + eManufPartNumber = 3, /* ManufacturerPartNumber */ + eManufBuildState = 4, /* ManufacturerBuildState */ + eSuplierPartNumber = 5, /* SuplierPartNumber */ + eDeliveryDate = 6, /* DeliveryDate */ + eSupplierBuildState = 7, /* SupplierBuildState */ + eCustomerId = 8, /* CustomerId */ + eCustomerProdId = 9, /* CustomerProdId */ + eChangeHistory = 10, /* ChangeHistory (not used) */ + eSymbolOnly +} InventoryData; + +static char toAscii(char c) +{ + return (c<' ' || c>'~') ? '.' : c; +} + +static int ivm_findInventoryString (InventoryData aType, BTChar* const aString, + unsigned long maxLength, unsigned char *buf) +{ + int xcode = 0; + BTChar cr = '\r'; + /* Semikolon char */ + BTChar sc = ';'; + /* Number of CR found */ + unsigned long crFound = 0; + /* Current address */ + unsigned long address = INVENTORYDATAADDRESS; + /* String length */ + unsigned long strSize = 0; + /* Number of CR to skip */ + unsigned long nbrOfCR = aType; + /* Semicolon to end */ + int endWithSemikolon = 0; + + /* initialise string */ + memset(aString, '\0', maxLength); + + switch (aType) + { + case eSymbolOnly: + nbrOfCR = 0; + endWithSemikolon = 1; + break; + default: + nbrOfCR = aType; + endWithSemikolon = 0; + } + + /* Look for the requested number of CR. */ + while ((crFound != nbrOfCR) && (address < INVENTORYDATASIZE)) + { + if ((buf[address] == cr)) { + crFound++; + } + address++; + } + + /* the expected number of CR was found until the end of the IVM + * content --> fill string */ + if (address < INVENTORYDATASIZE) + { + /* Copy the IVM string in the corresponding string */ + for (; (buf[address] != cr) && /* not cr found */ + ((buf[address] != sc) || (!endWithSemikolon)) && /* not semikolon found */ + (strSize < (maxLength-1) && + (address < INVENTORYDATASIZE)); address++) + { + strSize += sprintf((char *)aString + strSize, "%c", toAscii(buf[address])); + } + + /* copy phase is done: check if everything is ok. If not, the inventory + * data is most probably corrupted: tell the world there is a problem! */ + if (address == INVENTORYDATASIZE) + { + xcode = -1; + printf ("Error end of string not found\n"); + } else if ((strSize >= (maxLength-1)) && (buf[address] != cr)) { + xcode = -1; + printf ("string too long till next CR\n"); + } + } else { + /* some CR are missing... the inventory data is most probably corrupted */ + xcode = -1; + printf ("not enough cr found\n"); + } + return xcode; +} + +#define GET_STRING(name, which, len) \ + if (ivm_findInventoryString (which, valbuf, len, buf) == 0) { \ + setenv (name, (char *)valbuf); \ + } + +static int ivm_check_crc (unsigned char *buf, int block) +{ + unsigned long crc; + unsigned long crceeprom; + + crc = ivm_calc_crc (buf, CFG_IVM_EEPROM_PAGE_LEN - 2); + crceeprom = (buf[CFG_IVM_EEPROM_PAGE_LEN - 1] + \ + buf[CFG_IVM_EEPROM_PAGE_LEN - 2] * 256); + if (crc != crceeprom) { + printf ("Error CRC Block: %d EEprom: calculated: %lx EEprom: %lx\n", + block, crc, crceeprom); + return -1; + } + return 0; +} + +static int ivm_analyse_block2 (unsigned char *buf, int len) +{ + unsigned char valbuf[CFG_IVM_EEPROM_PAGE_LEN]; + unsigned long nbrsAdrs; + + /* IVM_MacAddress */ + sprintf ((char *)valbuf, "%02X:%02X:%02X:%02X:%02X:%02X", + buf[1], + buf[2], + buf[3], + buf[4], + buf[5], + buf[6]); + setenv ("IVM_MacAddress", (char *)valbuf); + if (getenv ("ethaddr") == NULL) + setenv ((char *)"ethaddr", (char *)valbuf); + /* IVM_MacCount */ + nbrsAdrs = (buf[10] << 24) + + (buf[11] << 16) + + (buf[12] << 8) + + buf[13]; + if (nbrsAdrs == 0xffffffff) + nbrsAdrs = 1; + sprintf ((char *)valbuf, "%lx", nbrsAdrs); + setenv ("IVM_MacCount", (char *)valbuf); + return 0; +} + +int ivm_analyse_eeprom (unsigned char *buf, int len) +{ + unsigned short val; + unsigned char valbuf[CFG_IVM_EEPROM_PAGE_LEN]; + unsigned char *tmp; + + /* used Code from ivm/src/devsrv_baseproductdata.cpp */ + if (ivm_check_crc (buf, 0) != 0) + return -1; + + ivm_get_value (buf, CFG_IVM_EEPROM_PAGE_LEN, "IVM_BoardId", 0, 1); + val = ivm_get_value (buf, CFG_IVM_EEPROM_PAGE_LEN, "IVM_HWKey", 6, 1); + if (val != 0xffff) { + sprintf ((char *)valbuf, "%x", ((val /100) % 10)); + setenv ("IVM_HWVariant", (char *)valbuf); + sprintf ((char *)valbuf, "%x", (val % 100)); + setenv ("IVM_HWVersion", (char *)valbuf); + } + ivm_get_value (buf, CFG_IVM_EEPROM_PAGE_LEN, "IVM_Functions", 12, 0); + + GET_STRING("IVM_Symbol", eSymbolOnly, 8) + GET_STRING("IVM_DeviceName", eSymbolShortText, 64) + tmp = (unsigned char *) getenv("IVM_DeviceName"); + if (tmp) { + int len = strlen ((char *)tmp); + int i = 0; + + while (i < len) { + if (tmp[i] == ';') { + setenv ("IVM_ShortText", (char *)&tmp[i + 1]); + break; + } + i++; + } + if (i >= len) + setenv ("IVM_ShortText", NULL); + } else { + setenv ("IVM_ShortText", NULL); + } + GET_STRING("IVM_ManufacturerID", eManufId, 32) + GET_STRING("IVM_ManufacturerSerialNumber", eManufSerialNumber, 20) + GET_STRING("IVM_ManufacturerPartNumber", eManufPartNumber, 32) + GET_STRING("IVM_ManufacturerBuildState", eManufBuildState, 32) + GET_STRING("IVM_SupplierPartNumber", eSuplierPartNumber, 32) + GET_STRING("IVM_DelieveryDate", eDeliveryDate, 32) + GET_STRING("IVM_SupplierBuildState", eSupplierBuildState, 32) + GET_STRING("IVM_CustomerID", eCustomerId, 32) + GET_STRING("IVM_CustomerProductID", eCustomerProdId, 32) + + if (ivm_check_crc (&buf[CFG_IVM_EEPROM_PAGE_LEN * 2], 2) != 0) + return -2; + ivm_analyse_block2 (&buf[CFG_IVM_EEPROM_PAGE_LEN * 2], CFG_IVM_EEPROM_PAGE_LEN); + + return 0; +} + +int ivm_read_eeprom(void) +{ + I2C_MUX_DEVICE *dev = NULL; + uchar i2c_buffer[CFG_IVM_EEPROM_MAX_LEN]; + uchar *buf; + unsigned dev_addr = CFG_IVM_EEPROM_ADR; + + /* First init the Bus, select the Bus */ +#if defined(CFG_I2C_IVM_BUS) + dev = i2c_mux_ident_muxstring ((uchar *)CFG_I2C_IVM_BUS); +#else + buf = (unsigned char *) getenv ("EEprom_ivm"); + if (buf != NULL) + dev = i2c_mux_ident_muxstring (buf); +#endif + if (dev == NULL) { + printf ("Error couldnt add Bus for IVM\n"); + return -1; + } + i2c_set_bus_num (dev->busid); + + buf = (unsigned char *) getenv ("EEprom_ivm_addr"); + if (buf != NULL) + dev_addr = simple_strtoul ((char *)buf, NULL, 16); + + if (eeprom_read (dev_addr, 0, i2c_buffer, CFG_IVM_EEPROM_MAX_LEN) != 0) { + printf ("Error reading EEprom\n"); + return -2; + } + + return ivm_analyse_eeprom (i2c_buffer, CFG_IVM_EEPROM_MAX_LEN); + +} + #if defined(CFG_I2C_INIT_BOARD) #define DELAY_ABORT_SEQ 62 #define DELAY_HALF_PERIOD (500 / (CFG_I2C_SPEED / 1000)) diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 6564c15..b32eb80 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -212,6 +212,11 @@ #define CFG_EEPROM_PAGE_WRITE_BITS 3 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 +/* Support the IVM EEprom */ +#define CFG_IVM_EEPROM_ADR 0x50 +#define CFG_IVM_EEPROM_MAX_LEN 0x400 +#define CFG_IVM_EEPROM_PAGE_LEN 0x100 + /* I2C SYSMON (LM75, AD7414 is almost compatible) */ #define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ #define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index 79954fe..36c7f26 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -382,6 +382,11 @@ #define CFG_EEPROM_PAGE_WRITE_BITS 3 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 +/* Support the IVM EEprom */ +#define CFG_IVM_EEPROM_ADR 0x50 +#define CFG_IVM_EEPROM_MAX_LEN 0x400 +#define CFG_IVM_EEPROM_PAGE_LEN 0x100 + /* I2C SYSMON (LM75, AD7414 is almost compatible) */ #define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ #define CONFIG_DTT_SENSORS {0, 2, 4, 6} /* Sensor addresses */ diff --git a/lib_ppc/board.c b/lib_ppc/board.c index c02ac62..9b5ff41 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -79,6 +79,9 @@ extern int update_flash_size (int flash_size); #endif +#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) +extern int ivm_read_eeprom(void); +#endif #if defined(CONFIG_SC3) extern void sc3_read_eeprom(void); #endif @@ -869,6 +872,9 @@ void board_init_r (gd_t *id, ulong dest_addr) #endif /* CONFIG_405GP, CONFIG_405EP */ #endif /* CFG_EXTBDINFO */ +#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) + ivm_read_eeprom(); +#endif #if defined(CONFIG_SC3) sc3_read_eeprom(); #endif -- 1.5.6.1 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

3 4