June 2008 - U-Boot

[U-Boot-Users] [Patch 4/9] U-boot-V2:I2C: Introduce core
by Menon, Nishanth 18 Jun '08

18 Jun '08

First part of this patch introduces i2c-core and i2c-dev interface. The codebase is sourced from 2.6.26 rc5 kernel Signed-off-by: Nishanth Menon <x0nishan(a)ti.com> --- drivers/Kconfig | 1 drivers/Makefile | 1 drivers/i2c/Kconfig | 70 ++ drivers/i2c/Makefile | 12 drivers/i2c/busses/Kconfig | 7 drivers/i2c/busses/Makefile | 9 drivers/i2c/chips/Kconfig | 7 drivers/i2c/chips/Makefile | 16 drivers/i2c/i2c-boardinfo.c | 99 +++ drivers/i2c/i2c-core.c | 1438 ++++++++++++++++++++++++++++++++++++++++++++ drivers/i2c/i2c-core.h | 47 + drivers/i2c/i2c-dev.c | 568 +++++++++++++++++ include/driver.h | 4 include/linux/i2c-dev.h | 85 ++ include/linux/i2c-id.h | 184 +++++ include/linux/i2c.h | 564 +++++++++++++++++ 16 files changed, 3111 insertions(+), 1 deletion(-) This patch is too big to fit to mailing list size limits. Please see: http://linux.omap.com/pub/patches/rfc/u-boot-v2/i2c-20080617/004-i2c-add-co… Regards, Nishanth Menon

1 0

[U-Boot-Users] [Patch 3/9] U-boot-V2:ID: Introduce idr
by Menon, Nishanth 18 Jun '08

18 Jun '08

Introduce ID table translation library from Linux kernel Signed-off-by: Nishanth Menon <x0nishan(a)ti.com> --- include/linux/idr.h | 128 +++++++ lib/Makefile | 1 lib/idr.c | 836 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 965 insertions(+) Index: u-boot-v2.git/include/linux/idr.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-v2.git/include/linux/idr.h 2008-06-17 17:01:06.000000000 -0500 @@ -0,0 +1,128 @@ +/** + * @file + * @brief Small id to pointer translation service avoiding fixed sized + * tables. + * + * FileName: include/linux/idr.h + * + */ +/* Originally from Linux kernel. Ported to U-boot-v2. + * (C) Copyright 2008 + * Texas Instruments, <www.ti.com> + * Nishanth Menon <x0nishan(a)ti.com> + */ +/* + * + * 2002-10-18 written by Jim Houston jim.houston(a)ccur.com + * Copyright (C) 2002 by Concurrent Computer Corporation + * Distributed under the GNU GPL license version 2. + */ + +#ifndef __IDR_H__ +#define __IDR_H__ + +#include <linux/types.h> +#include <linux/bitops.h> +#include <init.h> + +#if BITS_PER_LONG == 32 +# define IDR_BITS 5 +# define IDR_FULL 0xfffffffful +/** We can only use two of the bits in the top level because there is + only one possible bit in the top level (5 bits * 7 levels = 35 + bits, but you only use 31 bits in the id). */ +# define TOP_LEVEL_FULL (IDR_FULL >> 30) +#elif BITS_PER_LONG == 64 +# define IDR_BITS 6 +# define IDR_FULL 0xfffffffffffffffful +/** We can only use two of the bits in the top level because there is + only one possible bit in the top level (6 bits * 6 levels = 36 + bits, but you only use 31 bits in the id). */ +# define TOP_LEVEL_FULL (IDR_FULL >> 62) +#else +# error "BITS_PER_LONG is not 32 or 64" +#endif + +#define IDR_SIZE (1 << IDR_BITS) +#define IDR_MASK ((1 << IDR_BITS)-1) + +#define MAX_ID_SHIFT (sizeof(int)*8 - 1) +#define MAX_ID_BIT (1U << MAX_ID_SHIFT) +#define MAX_ID_MASK (MAX_ID_BIT - 1) + +/** Leave the possibility of an incomplete final layer */ +#define MAX_LEVEL (MAX_ID_SHIFT + IDR_BITS - 1) / IDR_BITS + +/** Number of id_layer structs to leave in free list */ +#define IDR_FREE_MAX MAX_LEVEL + MAX_LEVEL + +struct idr_layer { + unsigned long bitmap; /** A zero bit means "space here" */ + struct idr_layer *ary[1 << IDR_BITS]; + int count; /** When zero, we can release it */ +}; + +struct idr { + struct idr_layer *top; + struct idr_layer *id_free; + int layers; + int id_free_cnt; +}; + +#define IDR_INIT(name) \ +{ \ + .top = NULL, \ + .id_free = NULL, \ + .layers = 0, \ + .id_free_cnt = 0, \ +} +#define DEFINE_IDR(name) struct idr name = IDR_INIT(name) + +/** + * This is what we export. + */ + +void *idr_find(struct idr *idp, int id); +int idr_pre_get(struct idr *idp); +int idr_get_new(struct idr *idp, void *ptr, int *id); +int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id); +int idr_for_each(struct idr *idp, + int (*fn)(int id, void *p, void *data), void *data); +void *idr_replace(struct idr *idp, void *ptr, int id); +void idr_remove(struct idr *idp, int id); +void idr_remove_all(struct idr *idp); +void idr_destroy(struct idr *idp); +void idr_init(struct idr *idp); + + +/** + * IDA - IDR based id allocator, use when translation from id to + * pointer isn't necessary. + */ +#define IDA_CHUNK_SIZE 128 /* 128 bytes per chunk */ +#define IDA_BITMAP_LONGS (128 / sizeof(long) - 1) +#define IDA_BITMAP_BITS (IDA_BITMAP_LONGS * sizeof(long) * 8) + +struct ida_bitmap { + long nr_busy; + unsigned long bitmap[IDA_BITMAP_LONGS]; +}; + +struct ida { + struct idr idr; + struct ida_bitmap *free_bitmap; +}; + +#define IDA_INIT(name) { .idr = IDR_INIT(name), .free_bitmap = NULL, } +#define DEFINE_IDA(name) struct ida name = IDA_INIT(name) + +int ida_pre_get(struct ida *ida); +int ida_get_new_above(struct ida *ida, int starting_id, int *p_id); +int ida_get_new(struct ida *ida, int *p_id); +void ida_remove(struct ida *ida, int id); +void ida_destroy(struct ida *ida); +void ida_init(struct ida *ida); + +void idr_init_cache(void); + +#endif /* __IDR_H__ */ Index: u-boot-v2.git/lib/idr.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-v2.git/lib/idr.c 2008-06-17 17:01:06.000000000 -0500 @@ -0,0 +1,836 @@ +/** + * @file + * @brief Small id to pointer translation service. + * + * FileName: lib/idr.c + * + * It uses a radix tree like structure as a sparse array indexed + * by the id to obtain the pointer. The bitmap makes allocating + * a new id quick. + * + * You call it to allocate an id (an int) an associate with that id a + * pointer or what ever, we treat it as a (void *). You can pass this + * id to a user for him to pass back at a later time. You then pass + * that id to this code and it returns your pointer. + + * You can release ids at any time. When all ids are released, most of + * the memory is returned (we keep IDR_FREE_MAX) in a local pool so we + * don't need to go to the memory "store" during an id allocate, just + * so you don't need to be too concerned about locking and conflicts + * with the slab allocator. + */ +/* Originally from Linux kernel. Ported to U-boot-v2. + * (C) Copyright 2008 + * Texas Instruments, <www.ti.com> + * Nishanth Menon <x0nishan(a)ti.com> + */ +/* + * 2002-10-18 written by Jim Houston jim.houston(a)ccur.com + * Copyright (C) 2002 by Concurrent Computer Corporation + * Distributed under the GNU GPL license version 2. + * + * Modified by George Anzinger to reuse immediately and to use + * find bit instructions. Also removed _irq on spinlocks. + */ + +#include <common.h> +#include <errno.h> +#include <string.h> +#include <init.h> +#include <malloc.h> +#include <linux/bitops.h> +#include <linux/idr.h> + + +static struct idr_layer *alloc_layer(struct idr *idp) +{ + struct idr_layer *p; + p = idp->id_free; + if (p) { + idp->id_free = p->ary[0]; + idp->id_free_cnt--; + p->ary[0] = NULL; + } + return(p); +} + +/* only called when idp->lock is held */ +static void __free_layer(struct idr *idp, struct idr_layer *p) +{ + p->ary[0] = idp->id_free; + idp->id_free = p; + idp->id_free_cnt++; +} + +static void free_layer(struct idr *idp, struct idr_layer *p) +{ + + /* + * Depends on the return element being zeroed. + */ + __free_layer(idp, p); +} + +static void idr_mark_full(struct idr_layer **pa, int id) +{ + struct idr_layer *p = pa[0]; + int l = 0; + + __set_bit(id & IDR_MASK, &p->bitmap); + /* + * If this layer is full mark the bit in the layer above to + * show that this part of the radix tree is full. This may + * complete the layer above and require walking up the radix + * tree. + */ + while (p->bitmap == IDR_FULL) { + p = pa[++l]; + if (!p) + break; + id = id >> IDR_BITS; + __set_bit((id & IDR_MASK), &p->bitmap); + } +} + +/** + * idr_pre_get - reserver resources for idr allocation + * @idp: idr handle + * @gfp_mask: memory allocation flags + * + * This function should be called prior to locking and calling the + * following function. It preallocates enough memory to satisfy + * the worst possible allocation. + * + * If the system is REALLY out of memory this function returns 0, + * otherwise 1. + */ +int idr_pre_get(struct idr *idp) +{ + while (idp->id_free_cnt < IDR_FREE_MAX) { + struct idr_layer *new; + new = malloc(sizeof(struct idr_layer)); + if (new == NULL) + return (0); + free_layer(idp, new); + } + return 1; +} +EXPORT_SYMBOL(idr_pre_get); + +static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa) +{ + int n, m, sh; + struct idr_layer *p, *new; + int l, id, oid; + unsigned long bm; + + id = *starting_id; + restart: + p = idp->top; + l = idp->layers; + pa[l--] = NULL; + while (1) { + /* + * We run around this while until we reach the leaf node... + */ + n = (id >> (IDR_BITS*l)) & IDR_MASK; + bm = ~p->bitmap; + m = find_next_bit(&bm, IDR_SIZE, n); + if (m == IDR_SIZE) { + /* no space available go back to previous layer. */ + l++; + oid = id; + id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; + + /* if already at the top layer, we need to grow */ + p = pa[l]; + if (!p) { + *starting_id = id; + return -2; + } + + /* If we need to go up one layer, continue the + * loop; otherwise, restart from the top. + */ + sh = IDR_BITS * (l + 1); + if (oid >> sh == id >> sh) + continue; + else + goto restart; + } + if (m != n) { + sh = IDR_BITS*l; + id = ((id >> sh) ^ n ^ m) << sh; + } + if ((id >= MAX_ID_BIT) || (id < 0)) + return -3; + if (l == 0) + break; + /* + * Create the layer below if it is missing. + */ + if (!p->ary[m]) { + new = alloc_layer(idp); + if (!new) + return -1; + p->ary[m] = new; + p->count++; + } + pa[l--] = p; + p = p->ary[m]; + } + + pa[l] = p; + return id; +} + +static int idr_get_empty_slot(struct idr *idp, int starting_id, + struct idr_layer **pa) +{ + struct idr_layer *p, *new; + int layers, v, id; + + id = starting_id; +build_up: + p = idp->top; + layers = idp->layers; + if (!p) { + p = alloc_layer(idp); + if (!p) + return -1; + layers = 1; + } + /* + * Add a new layer to the top of the tree if the requested + * id is larger than the currently allocated space. + */ + while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) { + layers++; + if (!p->count) + continue; + new = alloc_layer(idp); + if (!new) { + /* + * The allocation failed. If we built part of + * the structure tear it down. + */ + for (new = p; p && p != idp->top; new = p) { + p = p->ary[0]; + new->ary[0] = NULL; + new->bitmap = new->count = 0; + __free_layer(idp, new); + } + return -1; + } + new->ary[0] = p; + new->count = 1; + if (p->bitmap == IDR_FULL) + __set_bit(0, &new->bitmap); + p = new; + } + idp->top = p; + idp->layers = layers; + v = sub_alloc(idp, &id, pa); + if (v == -2) + goto build_up; + return(v); +} + +static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id) +{ + struct idr_layer *pa[MAX_LEVEL]; + int id; + + id = idr_get_empty_slot(idp, starting_id, pa); + if (id >= 0) { + /* + * Successfully found an empty slot. Install the user + * pointer and mark the slot full. + */ + pa[0]->ary[id & IDR_MASK] = (struct idr_layer *)ptr; + pa[0]->count++; + idr_mark_full(pa, id); + } + + return id; +} + +/** + * idr_get_new_above - allocate new idr entry above or equal to a start id + * @idp: idr handle + * @ptr: pointer you want associated with the ide + * @start_id: id to start search at + * @id: pointer to the allocated handle + * + * This is the allocate id function. It should be called with any + * required locks. + * + * If memory is required, it will return -EAGAIN, you should unlock + * and go back to the idr_pre_get() call. If the idr is full, it will + * return -ENOSPC. + * + * @id returns a value in the range 0 ... 0x7fffffff + */ +int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id) +{ + int rv; + + rv = idr_get_new_above_int(idp, ptr, starting_id); + /* + * This is a cheap hack until the IDR code can be fixed to + * return proper error values. + */ + if (rv < 0) { + if (rv == -1) + return -EAGAIN; + else /* Will be -3 */ + return -ENOSPC; + } + *id = rv; + return 0; +} +EXPORT_SYMBOL(idr_get_new_above); + +/** + * idr_get_new - allocate new idr entry + * @idp: idr handle + * @ptr: pointer you want associated with the ide + * @id: pointer to the allocated handle + * + * This is the allocate id function. It should be called with any + * required locks. + * + * If memory is required, it will return -EAGAIN, you should unlock + * and go back to the idr_pre_get() call. If the idr is full, it will + * return -ENOSPC. + * + * @id returns a value in the range 0 ... 0x7fffffff + */ +int idr_get_new(struct idr *idp, void *ptr, int *id) +{ + int rv; + + rv = idr_get_new_above_int(idp, ptr, 0); + /* + * This is a cheap hack until the IDR code can be fixed to + * return proper error values. + */ + if (rv < 0) { + if (rv == -1) + return -EAGAIN; + else /* Will be -3 */ + return -ENOSPC; + } + *id = rv; + return 0; +} +EXPORT_SYMBOL(idr_get_new); + +static void idr_remove_warning(int id) +{ + printf("idr_remove called for id=%d which is not allocated.\n", id); + hang(); +} + +static void sub_remove(struct idr *idp, int shift, int id) +{ + struct idr_layer *p = idp->top; + struct idr_layer **pa[MAX_LEVEL]; + struct idr_layer ***paa = &pa[0]; + int n; + + *paa = NULL; + *++paa = &idp->top; + + while ((shift > 0) && p) { + n = (id >> shift) & IDR_MASK; + __clear_bit(n, &p->bitmap); + *++paa = &p->ary[n]; + p = p->ary[n]; + shift -= IDR_BITS; + } + n = id & IDR_MASK; + if (p != NULL && test_bit(n, &p->bitmap)) { + __clear_bit(n, &p->bitmap); + p->ary[n] = NULL; + while (*paa && !--((**paa)->count)) { + free_layer(idp, **paa); + **paa-- = NULL; + } + if (!*paa) + idp->layers = 0; + } else + idr_remove_warning(id); +} + +/** + * idr_remove - remove the given id and free it's slot + * @idp: idr handle + * @id: unique key + */ +void idr_remove(struct idr *idp, int id) +{ + struct idr_layer *p; + + /* Mask off upper bits we don't use for the search. */ + id &= MAX_ID_MASK; + + sub_remove(idp, (idp->layers - 1) * IDR_BITS, id); + if (idp->top && idp->top->count == 1 && + (idp->layers > 1) && + idp->top->ary[0]) { + /* We can drop a layer */ + p = idp->top->ary[0]; + idp->top->bitmap = idp->top->count = 0; + free_layer(idp, idp->top); + idp->top = p; + --idp->layers; + } + while (idp->id_free_cnt >= IDR_FREE_MAX) { + p = alloc_layer(idp); + free(p); + } + return; +} +EXPORT_SYMBOL(idr_remove); + +/** + * idr_remove_all - remove all ids from the given idr tree + * @idp: idr handle + * + * idr_destroy() only frees up unused, cached idp_layers, but this + * function will remove all id mappings and leave all idp_layers + * unused. + * + * A typical clean-up sequence for objects stored in an idr tree, will + * use idr_for_each() to free all objects, if necessay, then + * idr_remove_all() to remove all ids, and idr_destroy() to free + * up the cached idr_layers. + */ +void idr_remove_all(struct idr *idp) +{ + int n, id, max; + struct idr_layer *p; + struct idr_layer *pa[MAX_LEVEL]; + struct idr_layer **paa = &pa[0]; + + n = idp->layers * IDR_BITS; + p = idp->top; + max = 1 << n; + + id = 0; + while (id < max) { + while (n > IDR_BITS && p) { + n -= IDR_BITS; + *paa++ = p; + p = p->ary[(id >> n) & IDR_MASK]; + } + + id += 1 << n; + while (n < fls(id)) { + if (p) { + memset(p, 0, sizeof *p); + free_layer(idp, p); + } + n += IDR_BITS; + p = *--paa; + } + } + idp->top = NULL; + idp->layers = 0; +} +EXPORT_SYMBOL(idr_remove_all); + +/** + * idr_destroy - release all cached layers within an idr tree + * idp: idr handle + */ +void idr_destroy(struct idr *idp) +{ + while (idp->id_free_cnt) { + struct idr_layer *p = alloc_layer(idp); + free(p); + } +} +EXPORT_SYMBOL(idr_destroy); + +/** + * idr_find - return pointer for given id + * @idp: idr handle + * @id: lookup key + * + * Return the pointer given the id it has been registered with. A %NULL + * return indicates that @id is not valid or you passed %NULL in + * idr_get_new(). + * + * The caller must serialize idr_find() vs idr_get_new() and idr_remove(). + */ +void *idr_find(struct idr *idp, int id) +{ + int n; + struct idr_layer *p; + + n = idp->layers * IDR_BITS; + p = idp->top; + + /* Mask off upper bits we don't use for the search. */ + id &= MAX_ID_MASK; + + if (id >= (1 << n)) + return NULL; + + while (n > 0 && p) { + n -= IDR_BITS; + p = p->ary[(id >> n) & IDR_MASK]; + } + return((void *)p); +} +EXPORT_SYMBOL(idr_find); + +/** + * idr_for_each - iterate through all stored pointers + * @idp: idr handle + * @fn: function to be called for each pointer + * @data: data passed back to callback function + * + * Iterate over the pointers registered with the given idr. The + * callback function will be called for each pointer currently + * registered, passing the id, the pointer and the data pointer passed + * to this function. It is not safe to modify the idr tree while in + * the callback, so functions such as idr_get_new and idr_remove are + * not allowed. + * + * We check the return of @fn each time. If it returns anything other + * than 0, we break out and return that value. + * + * The caller must serialize idr_for_each() vs idr_get_new() and idr_remove(). + */ +int idr_for_each(struct idr *idp, + int (*fn)(int id, void *p, void *data), void *data) +{ + int n, id, max, error = 0; + struct idr_layer *p; + struct idr_layer *pa[MAX_LEVEL]; + struct idr_layer **paa = &pa[0]; + + n = idp->layers * IDR_BITS; + p = idp->top; + max = 1 << n; + + id = 0; + while (id < max) { + while (n > 0 && p) { + n -= IDR_BITS; + *paa++ = p; + p = p->ary[(id >> n) & IDR_MASK]; + } + + if (p) { + error = fn(id, (void *)p, data); + if (error) + break; + } + + id += 1 << n; + while (n < fls(id)) { + n += IDR_BITS; + p = *--paa; + } + } + + return error; +} +EXPORT_SYMBOL(idr_for_each); + +/** + * idr_replace - replace pointer for given id + * @idp: idr handle + * @ptr: pointer you want associated with the id + * @id: lookup key + * + * Replace the pointer registered with an id and return the old value. + * A -ENOENT return indicates that @id was not found. + * A -EINVAL return indicates that @id was not within valid constraints. + * + * The caller must serialize vs idr_find(), idr_get_new(), and idr_remove(). + */ +void *idr_replace(struct idr *idp, void *ptr, int id) +{ + int n; + struct idr_layer *p, *old_p; + + n = idp->layers * IDR_BITS; + p = idp->top; + + id &= MAX_ID_MASK; + + if (id >= (1 << n)) + return (void *)-EINVAL; + + n -= IDR_BITS; + while ((n > 0) && p) { + p = p->ary[(id >> n) & IDR_MASK]; + n -= IDR_BITS; + } + + n = id & IDR_MASK; + if (p == NULL || !test_bit(n, &p->bitmap)) + return (void *)-ENOENT; + + old_p = p->ary[n]; + p->ary[n] = ptr; + + return old_p; +} +EXPORT_SYMBOL(idr_replace); + + +/** + * idr_init - initialize idr handle + * @idp: idr handle + * + * This function is use to set up the handle (@idp) that you will pass + * to the rest of the functions. + */ +void idr_init(struct idr *idp) +{ + memset(idp, 0, sizeof(struct idr)); +} +EXPORT_SYMBOL(idr_init); + + +/* + * IDA - IDR based ID allocator + * + * this is id allocator without id -> pointer translation. Memory + * usage is much lower than full blown idr because each id only + * occupies a bit. ida uses a custom leaf node which contains + * IDA_BITMAP_BITS slots. + * + * 2007-04-25 written by Tejun Heo <htejun(a)gmail.com> + */ + +static void free_bitmap(struct ida *ida, struct ida_bitmap *bitmap) +{ + if (!ida->free_bitmap) { + if (!ida->free_bitmap) { + ida->free_bitmap = bitmap; + bitmap = NULL; + } + } + + free(bitmap); +} + +/** + * ida_pre_get - reserve resources for ida allocation + * @ida: ida handle + * @gfp_mask: memory allocation flag + * + * This function should be called prior to locking and calling the + * following function. It preallocates enough memory to satisfy the + * worst possible allocation. + * + * If the system is REALLY out of memory this function returns 0, + * otherwise 1. + */ +int ida_pre_get(struct ida *ida) +{ + /* allocate idr_layers */ + if (!idr_pre_get(&ida->idr)) + return 0; + + /* allocate free_bitmap */ + if (!ida->free_bitmap) { + struct ida_bitmap *bitmap; + + bitmap = malloc(sizeof(struct ida_bitmap)); + if (!bitmap) + return 0; + + free_bitmap(ida, bitmap); + } + + return 1; +} +EXPORT_SYMBOL(ida_pre_get); + +/** + * ida_get_new_above - allocate new ID above or equal to a start id + * @ida: ida handle + * @staring_id: id to start search at + * @p_id: pointer to the allocated handle + * + * Allocate new ID above or equal to @ida. It should be called with + * any required locks. + * + * If memory is required, it will return -EAGAIN, you should unlock + * and go back to the ida_pre_get() call. If the ida is full, it will + * return -ENOSPC. + * + * @p_id returns a value in the range 0 ... 0x7fffffff. + */ +int ida_get_new_above(struct ida *ida, int starting_id, int *p_id) +{ + struct idr_layer *pa[MAX_LEVEL]; + struct ida_bitmap *bitmap; + int idr_id = starting_id / IDA_BITMAP_BITS; + int offset = starting_id % IDA_BITMAP_BITS; + int t, id; + + restart: + /* get vacant slot */ + t = idr_get_empty_slot(&ida->idr, idr_id, pa); + if (t < 0) { + if (t == -1) + return -EAGAIN; + else /* will be -3 */ + return -ENOSPC; + } + + if (t * IDA_BITMAP_BITS >= MAX_ID_BIT) + return -ENOSPC; + + if (t != idr_id) + offset = 0; + idr_id = t; + + /* if bitmap isn't there, create a new one */ + bitmap = (void *)pa[0]->ary[idr_id & IDR_MASK]; + if (!bitmap) { + bitmap = ida->free_bitmap; + ida->free_bitmap = NULL; + + if (!bitmap) + return -EAGAIN; + + memset(bitmap, 0, sizeof(struct ida_bitmap)); + pa[0]->ary[idr_id & IDR_MASK] = (void *)bitmap; + pa[0]->count++; + } + + /* lookup for empty slot */ + t = find_next_zero_bit(bitmap->bitmap, IDA_BITMAP_BITS, offset); + if (t == IDA_BITMAP_BITS) { + /* no empty slot after offset, continue to the next chunk */ + idr_id++; + offset = 0; + goto restart; + } + + id = idr_id * IDA_BITMAP_BITS + t; + if (id >= MAX_ID_BIT) + return -ENOSPC; + + __set_bit(t, bitmap->bitmap); + if (++bitmap->nr_busy == IDA_BITMAP_BITS) + idr_mark_full(pa, idr_id); + + *p_id = id; + + /* Each leaf node can handle nearly a thousand slots and the + * whole idea of ida is to have small memory foot print. + * Throw away extra resources one by one after each successful + * allocation. + */ + if (ida->idr.id_free_cnt || ida->free_bitmap) { + struct idr_layer *p = alloc_layer(&ida->idr); + if (p) + free(p); + } + + return 0; +} +EXPORT_SYMBOL(ida_get_new_above); + +/** + * ida_get_new - allocate new ID + * @ida: idr handle + * @p_id: pointer to the allocated handle + * + * Allocate new ID. It should be called with any required locks. + * + * If memory is required, it will return -EAGAIN, you should unlock + * and go back to the idr_pre_get() call. If the idr is full, it will + * return -ENOSPC. + * + * @id returns a value in the range 0 ... 0x7fffffff. + */ +int ida_get_new(struct ida *ida, int *p_id) +{ + return ida_get_new_above(ida, 0, p_id); +} +EXPORT_SYMBOL(ida_get_new); + +/** + * ida_remove - remove the given ID + * @ida: ida handle + * @id: ID to free + */ +void ida_remove(struct ida *ida, int id) +{ + struct idr_layer *p = ida->idr.top; + int shift = (ida->idr.layers - 1) * IDR_BITS; + int idr_id = id / IDA_BITMAP_BITS; + int offset = id % IDA_BITMAP_BITS; + int n; + struct ida_bitmap *bitmap; + + /* clear full bits while looking up the leaf idr_layer */ + while ((shift > 0) && p) { + n = (idr_id >> shift) & IDR_MASK; + __clear_bit(n, &p->bitmap); + p = p->ary[n]; + shift -= IDR_BITS; + } + + if (p == NULL) + goto err; + + n = idr_id & IDR_MASK; + __clear_bit(n, &p->bitmap); + + bitmap = (void *)p->ary[n]; + if (!test_bit(offset, bitmap->bitmap)) + goto err; + + /* update bitmap and remove it if empty */ + __clear_bit(offset, bitmap->bitmap); + if (--bitmap->nr_busy == 0) { + __set_bit(n, &p->bitmap); /* to please idr_remove() */ + idr_remove(&ida->idr, idr_id); + free_bitmap(ida, bitmap); + } + + return; + + err: + printf("ida_remove called for id=%d which is not allocated.\n", id); +} +EXPORT_SYMBOL(ida_remove); + +/** + * ida_destroy - release all cached layers within an ida tree + * ida: ida handle + */ +void ida_destroy(struct ida *ida) +{ + idr_destroy(&ida->idr); + free(ida->free_bitmap); +} +EXPORT_SYMBOL(ida_destroy); + +/** + * ida_init - initialize ida handle + * @ida: ida handle + * + * This function is use to set up the handle (@ida) that you will pass + * to the rest of the functions. + */ +void ida_init(struct ida *ida) +{ + memset(ida, 0, sizeof(struct ida)); + idr_init(&ida->idr); + +} +EXPORT_SYMBOL(ida_init); Index: u-boot-v2.git/lib/Makefile =================================================================== --- u-boot-v2.git.orig/lib/Makefile 2008-06-17 16:52:30.000000000 -0500 +++ u-boot-v2.git/lib/Makefile 2008-06-17 17:01:06.000000000 -0500 @@ -16,6 +16,7 @@ obj-y += stringlist.o obj-y += recursive_action.o obj-y += make_directory.o +obj-y += idr.o obj-$(CONFIG_BZLIB) += bzlib.o bzlib_crctable.o bzlib_decompress.o bzlib_huffman.o bzlib_randtable.o obj-$(CONFIG_ZLIB) += zlib.o gunzip.o obj-$(CONFIG_CRC32) += crc32.o

1 0

[U-Boot-Users] How do work qemu_mips image?
by Nobuhiro Iwamatsu 18 Jun '08

18 Jun '08

Hi, all. I want to use MIPS archtechtute on Qemu. I compiled qemu_mips and read doc/README.qemu_mips and was going to work it, but U-boot boot stopped. Is this right behavior? Please give me advice to work a qemu_mips image on Qemu. ------- U-boot version: Get from Git tree ( hash:a94f22f08f280905926219e568568964cb9eeb9d) use cross compiller: $ mips-linux-gnu-gcc -v Using built-in specs. Target: mips-linux-gnu Configured with: ../src/configure -v --enable-languages=c,c++,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/mips-linux-gnu/include/c++/4.2.4 --program-suffix=-4.2 --enable-clocale=gnu --enable-libstdcxx-debug --disable-libssp --enable-checking=release --program-prefix=mips-linux-gnu- --includedir=/usr/mips-linux-gnu/include --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=mips-linux-gnu Thread model: posix gcc version 4.2.4 (Debian 4.2.4-2) use Qemu version: 0.9.1 U-boot log: $ ln -s u-boot.bin mips_bios.bin $ xps-iwamatsu(iwamatsu:)$ qemu-system-mips -L . /dev/null -nographic U-Boot 1.3.3-00235-ga94f22f-dirty (Jun 16 2008 - 19:18:35) Board: Qemu -M mips CPU: 24Kf proc_id=0x19300 DRAM: 128 MB (stopped) Best regards, Nobuhiro

2 3

[U-Boot-Users] [PATCH 2/2] mpc83xx: move CPU_TYPE_ENTRY over to processor.h
by Kim Phillips 18 Jun '08

18 Jun '08

to avoid this: cpu.c:47:1: warning: "CPU_TYPE_ENTRY" redefined In file included from cpu.c:33: /home/kim/git/u-boot/include/asm/processor.h:982:1: warning: this is the location of the previous definition Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- cpu/mpc83xx/cpu.c | 1 - include/asm-ppc/processor.h | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 36de78d..cc03f8a 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -44,7 +44,6 @@ int checkcpu(void) char buf[32]; int i; -#define CPU_TYPE_ENTRY(x) {#x, SPR_##x} const struct cpu_type { char name[15]; u32 partid; diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 4bfd9f9..cf44f4f 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -979,8 +979,15 @@ struct cpu_type { struct cpu_type *identify_cpu(uint ver); +#if defined(CONFIG_MPC85xx) #define CPU_TYPE_ENTRY(n, v) \ { .name = #n, .soc_ver = SVR_##v, } +#else +#if defined(CONFIG_MPC83XX) +#define CPU_TYPE_ENTRY(x) {#x, SPR_##x} +#endif +#endif + #ifndef CONFIG_MACH_SPECIFIC extern int _machine; -- 1.5.6.rc2.26.g8c37

1 0

[U-Boot-Users] u-boot and CONFIG_MTD_NAND_ECC_SMC patch
by mark roths 17 Jun '08

17 Jun '08

Sorry if this has been covered already, the problem exists in all the u-boot versions I have up to 1.2.0. When linux has CONFIG_MTD_NAND_ECC_SMC configured, NAND flash sectors written under linux appear to have ECC errors when read by u-boot. The help for CONFIG_MTD_NAND_ECC_SMC: Software ECC according to the Smart Media Specification. The original Linux implementation had byte 0 and 1 swapped. u-boot appears to conform to the 'original' linux implementation. The following patch fixes this. *** ../u-boot-1.1.5/drivers/nand/nand_ecc.c 2006-10-20 08:54:33.000000000 -0700 --- drivers/nand/nand_ecc.c 2008-06-10 12:59:21.000000000 -0700 *************** *** 118,123 **** --- 118,124 ---- { u_char idx, reg1, reg2, reg3; int j; + u_char tmp0, tmp1; /* Initialize variables */ reg1 = reg2 = reg3 = 0; *************** *** 140,148 **** --- 141,157 ---- /* Create non-inverted ECC code from line parity */ nand_trans_result(reg2, reg3, ecc_code); + #define CONFIG_MTD_NAND_ECC_SMC /* Calculate final ECC code */ + #ifdef CONFIG_MTD_NAND_ECC_SMC + tmp0 = ~ecc_code[0]; + tmp1 = ~ecc_code[1]; + ecc_code[0] = tmp1; + ecc_code[1] = tmp0; + #else ecc_code[0] = ~ecc_code[0]; ecc_code[1] = ~ecc_code[1]; + #endif ecc_code[2] = ((~reg1) << 2) | 0x03; return 0; } Mark Roths Softair Microsystems

2 1

[U-Boot-Users] Coldfire 5272C3 Ethernet Support?
by abeard＠Wabtec.com 17 Jun '08

17 Jun '08

Is ethernet support currently working for the Coldfire 5272C3 eval board off the git repository? Whenever I'm trying to transmit (ping, etc) I'm getting a "TX timeout" and no packets are making it to the wire. From what I can tell my receives aren't going much better. Going back through the archives I found a post from March that seemed to bring up the same issue but with no visible resolution. If the tip is broken does anyone know what the last version that was functional on the 5272C3 was? Thanks, Andrew Beard This email and any attachments are only for use by the intended recipient(s) and may contain legally privileged, confidential, proprietary or otherwise private information. Any unauthorized use, reproduction, dissemination, distribution or other disclosure of the contents of this e-mail or its attachments is strictly prohibited. If you have received this email in error, please notify the sender immediately and delete the original.

2 1

[U-Boot-Users] Coldfire 547x, Linux and big memory.
by Luigi 'Comio' Mantellini 17 Jun '08

17 Jun '08

Hi List, Hi Tsi-Ching Liew, I'm using u-boot 1.3.2 (trunk) on my application in order to boot the freescale linux kernel for mcf547x cpus. My application has a lot of memory (256MB) and this causes difficulties to start the linux kernel. The Head.S code of the mcf547x Linux Kernel allows a one-to-one TLB map for the first 16MB of memory (mcf547x can use up to 1M for page). From this observation it is mandatory that U-BOOT should call the kernel allowing all structures (board descr., intrd, env and command line) onto the first 16M of physical RAM. The solutions can be: - to use the env variables bootm_low = 0 and bootm_size = 0x1000000 (16M) - modify the code of do_bootm function in order to limitate mem_size to 16M - Pray the Freescale to modify the kernel code in order to use a better and more flexible initialization code. I'm studying for smart modifications for Kernel and U-Boot (that hasn't guilt). Best regards, luigi -- ______ Luigi Mantellini .'______'. R&D - Software (.' '.) Industrie Dial Face S.p.A. ( :=----=: ) Via Canzo, 4 ('.______.') 20068 Peschiera Borromeo (MI), Italy '.______.' Tel.: +39 02 5167 2813 Fax: +39 02 5167 2459 Ind. Dial Face Email: luigi.mantellini(a)idf-hit.com www.idf-hit.com GPG fingerprint: 3DD1 7B71 FBDF 6376 1B4A B003 175F E979 907E 1650

2 1

Re: [U-Boot-Users] [PATCH 1/1] FAT Bare Partition Support
by Michal Simek 17 Jun '08

17 Jun '08

If you can't find who is it - because I think there is no any special custodian for disks, Wolfgang Denk is that person. And please send your emails about U-BOOT directly to mailing list not personally to me. If you want use to me for a support, we can sign a contract. Michal > Sorry Michael but I'm pretty new... how can I know who is it? > I looked into MAINTAINERS and CREDITS but no disk/ directory found. > > Regards, > Antonio > > 2008/6/16 Michal Simek <monstr(a)seznam.cz <mailto:monstr@seznam.cz>>: > > > > > 2008/6/16 Michal Simek <monstr(a)seznam.cz <mailto:monstr@seznam.cz> > <mailto:monstr@seznam.cz <mailto:monstr@seznam.cz>>>: > > > > Hi Antonio > > > > I am not responsible for this part of U-BOOT but your patch > contain > > coding style > > violation. > > > > Regards, > > Michal Simek > > > > > Logic unit: > > > Purpose: Add support for bare partitions (no partition table) > > > Author: Antnoio R. Costa <antonio.costa <at> atmel.com > <http://atmel.com> > > <http://atmel.com>> > > > Date : 11 Jun 2008 > > > > > > Status: > > > ~~~~~~ > > > Some SD cards are not formatted with a partition table but with > > > just a bare partition at the beginnig of the memory. > > > > > > I modified get_partition_info_extended to call test_block_type > > > as done by print_partition_extended. In this way bare FAT > partitions > > > are recognised. Now we need a test for Ext2. > > > > > > Signed-off-by: Antonio R. Costa <antonio.costa(a)atmel.com > <mailto:antonio.costa@atmel.com> > > <mailto:antonio.costa@atmel.com <mailto:antonio.costa@atmel.com>>> > > > > > > diff --git a/disk/part_dos.c b/disk/part_dos.c > > > index 4d778ec..e5cc8aa 100644 > > > --- a/disk/part_dos.c > > > +++ b/disk/part_dos.c > > > @@ -1,4 +1,7 @@ > > > /* > > > + * (C) Copyright 2008 Atmel Corp. > > > + * Antonio R. Costa <antonio.costa <at> atmel.com > <http://atmel.com> <http://atmel.com>> > > > + * <costa.antonior <at> gmail.com > <http://gmail.com> > > <http://gmail.com>> > > > > choose only one email > > > > > > Ok > > > > > > > > > > > * (C) Copyright 2001 > > > * Raymond Lo, lo(a)routefree.com <mailto:lo@routefree.com> > <mailto:lo@routefree.com <mailto:lo@routefree.com>> > > > * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de > <mailto:wd@denx.de> > > <mailto:wd@denx.de <mailto:wd@denx.de>>. > > > @@ -53,6 +56,11 @@ static inline int le32_to_int(unsigned > char *le32) > > > ); > > > } > > > > > > +static inline int le16_to_int(unsigned char *le16) > > > +{ > > > + return ((le16[1] << 8) + le16[0]); > > > +} > > > + > > > > this should be in header file > > > > > > why? le32_to_int is defined in this file just above my function ??? > > > OK, keep it. > > > > > > static inline int is_extended(int part_type) > > > { > > > return (part_type == 0x5 || > > > @@ -166,12 +174,20 @@ static int get_partition_info_extended > > (block_dev_desc_t *dev_desc, int ext_part > > > unsigned char buffer[DEFAULT_SECTOR_SIZE]; > > > dos_partition_t *pt; > > > int i; > > > - > > > + > > > > Coding style issue. > > > > What is this ? Some kind of white spaces instead tabs or what? > > In our initial patch, you had on this line tab - look at it. > > And send this patch with cc to person who is responsible for this > part of u-boot. > > Michal > > > > if (dev_desc->block_read (dev_desc->dev, > ext_part_sector, 1, > > (ulong *) buffer) != 1) { > > > printf ("** Can't read partition table on > %d:%d **\n", > > > dev_desc->dev, ext_part_sector); > > > return -1; > > > } > > > + > > > +/* > > > + * ARC: This check is bad: > > > + * unfortunately both MBR and FAT bootsector > > > + * have a sign 0x55aa @ 0x1FF > > > + * I replaced it by test_block_type as in > > > + * print_partition_extended > > > + > > > if (buffer[DOS_PART_MAGIC_OFFSET] != 0x55 || > > > buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) { > > > printf ("bad MBR sector signature 0x%02x%02x\n", > > > @@ -179,7 +195,19 @@ static int get_partition_info_extended > > (block_dev_desc_t *dev_desc, int ext_part > > > buffer[DOS_PART_MAGIC_OFFSET + 1]); > > > return -1; > > > } > > > - > > > +*/ > > > + i=test_block_type(buffer); > > > + > > > + if(i==-1) { > > > + printf ("bad MBR sector signature 0x%02x%02x\n", > > > + buffer[DOS_PART_MAGIC_OFFSET], > > > + buffer[DOS_PART_MAGIC_OFFSET + 1]); > > > + return -1; > > > + } > > > + > > > + if(i==DOS_PBR) > > > + return -1; > > > + > > > /* Print all primary/logical partitions */ > > > pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET); > > > for (i = 0; i < 4; i++, pt++) { > > > @@ -193,6 +221,7 @@ static int get_partition_info_extended > > (block_dev_desc_t *dev_desc, int ext_part > > > info->blksz = 512; > > > info->start = ext_part_sector + > le32_to_int > > (pt->start4); > > > info->size = le32_to_int (pt->size4); > > > + > > > switch(dev_desc->if_type) { > > > case IF_TYPE_IDE: > > > case IF_TYPE_SATA: > > > @@ -208,6 +237,13 @@ static int get_partition_info_extended > > (block_dev_desc_t *dev_desc, int ext_part > > > case IF_TYPE_DOC: > > > sprintf ((char > *)info->name, > > "docd%c%d\n", 'a' + dev_desc->dev, part_num); > > > break; > > > + case IF_TYPE_MMC: > > > + sprintf ((char > *)info->name, > > "mmc%c%d\n", 'a' + dev_desc->dev, part_num); > > > + break; > > > + case IF_TYPE_SD: > > > + case IF_TYPE_SDHC: > > > + sprintf ((char > *)info->name, > > "sd%c%d\n", 'a' + dev_desc->dev, part_num); > > > + break; > > > default: > > > sprintf ((char > *)info->name, > > "xx%c%d\n", 'a' + dev_desc->dev, part_num); > > > break; > > > > > > > > > > Regards, > > Michal Simek > > > > ------------------------------------------------------------------------ > > > No virus found in this incoming message. > Checked by AVG. > Version: 8.0.100 / Virus Database: 270.3.0/1504 - Release Date: 15.6.2008 05:52

1 0

[U-Boot-Users] [PATCH 9/9] sh: Update Renesas R2DPlus board
by Nobuhiro Iwamatsu 17 Jun '08

17 Jun '08

New NOR Flash board support and remove old type flash board config. And Remove network setting from config file. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> --- include/configs/r2dplus.h | 42 +++++++++--------------------------------- 1 files changed, 9 insertions(+), 33 deletions(-) diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index c20baca..e269336 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -35,12 +35,6 @@ #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_ENV_OVERWRITE 1 -/* Network setting */ -#define CONFIG_NETMASK 255.0.0.0 -#define CONFIG_IPADDR 10.0.192.51 -#define CONFIG_SERVERIP 10.0.0.1 -#define CONFIG_GATEWAYIP 10.0.0.1 - /* SDRAM */ #define CFG_SDRAM_BASE (0x8C000000) #define CFG_SDRAM_SIZE (0x04000000) @@ -60,45 +54,27 @@ #define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 32 * 1024 * 1024) /* Address of u-boot image in Flash */ #define CFG_MONITOR_BASE (CFG_FLASH_BASE) -#define CFG_MONITOR_LEN (128 * 1024) +#define CFG_MONITOR_LEN (256 * 1024) /* Size of DRAM reserved for malloc() use */ -#define CFG_MALLOC_LEN (256 * 1024) +#define CFG_MALLOC_LEN (1024 * 1024) /* size in bytes reserved for initial data */ #define CFG_GBL_DATA_SIZE (256) #define CFG_BOOTMAPSZ (8 * 1024 * 1024) /* - * NOR Flash + * NOR Flash ( Spantion S29GL256P ) */ #define CFG_FLASH_CFI #define CFG_FLASH_CFI_DRIVER - -#if defined(CONFIG_R2DPLUS_OLD) -#define CFG_FLASH_BASE (0xA0000000) -#define CFG_MAX_FLASH_BANKS (1) /* Max number of - * Flash memory banks - */ -#define CFG_MAX_FLASH_SECT 142 -#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } - -#else /* CONFIG_R2DPLUS_OLD */ - #define CFG_FLASH_BASE (0xA0000000) -#define CFG_FLASH_CFI_WIDTH 0x04 /* 32bit */ -#define CFG_MAX_FLASH_BANKS (2) -#define CFG_MAX_FLASH_SECT 270 -#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE,\ - CFG_FLASH_BASE + 0x100000,\ - CFG_FLASH_BASE + 0x400000,\ - CFG_FLASH_BASE + 0x700000, } -#endif /* CONFIG_R2DPLUS_OLD */ +#define CFG_MAX_FLASH_BANKS (1) +#define CFG_MAX_FLASH_SECT 256 +#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } #define CFG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE 0x20000 -#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#define CFG_FLASH_ERASE_TOUT 120000 -#define CFG_FLASH_WRITE_TOUT 500 +#define CFG_ENV_SECT_SIZE 0x40000 +#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) +#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) /* * SuperH Clock setting -- 1.5.5.1

1 0

[U-Boot-Users] [PATCH 8/9] sh: Update Renesas R7780MP board
by Nobuhiro Iwamatsu 17 Jun '08

17 Jun '08

New NOR Flash board support and remove network setting from config file. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> --- include/configs/r7780mp.h | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 4e89580..1668ba7 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -1,7 +1,7 @@ /* * Configuation settings for the Renesas R7780MP board * - * Copyright (C) 2007 Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> + * Copyright (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> * Copyright (C) 2008 Yusuke Goda <goda.yusuke(a)renesas.com> * * See file CREDITS for list of people who contributed to this @@ -31,7 +31,8 @@ #define CONFIG_SH4A 1 #define CONFIG_CPU_SH7780 1 #define CONFIG_R7780MP 1 -#define __LITTLE_ENDIAN 1 +#define CFG_R7780MP_OLD_FLASH 1 +#define __LITTLE_ENDIAN__ 1 /* * Command line configuration. @@ -59,12 +60,6 @@ /* check for keypress on bootdelay==0 */ /*#define CONFIG_ZERO_BOOTDELAY_CHECK*/ -/* Network setting */ -#define CONFIG_NETMASK 255.0.0.0 -#define CONFIG_IPADDR 10.0.192.82 -#define CONFIG_SERVERIP 10.0.0.1 -#define CONFIG_GATEWAYIP 10.0.0.1 - #define CFG_SDRAM_BASE (0x08000000) #define CFG_SDRAM_SIZE (128 * 1024 * 1024) @@ -80,22 +75,30 @@ #define CFG_MEMTEST_START (CFG_SDRAM_BASE) #define CFG_MEMTEST_END (TEXT_BASE - 0x100000) -/* NOR Flash (S29PL127J60TFI130) */ +/* Flash board support */ #define CFG_FLASH_BASE (0xA0000000) -#define CFG_FLASH_CFI_WIDTH FLASH_CFI_32BIT -#define CFG_MAX_FLASH_BANKS (2) -#define CFG_MAX_FLASH_SECT 270 -#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE,\ +#ifdef CFG_R7780MP_OLD_FLASH +/* NOR Flash (S29PL127J60TFI130) */ +# define CFG_FLASH_CFI_WIDTH FLASH_CFI_32BIT +# define CFG_MAX_FLASH_BANKS (2) +# define CFG_MAX_FLASH_SECT 270 +# define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE,\ CFG_FLASH_BASE + 0x100000,\ CFG_FLASH_BASE + 0x400000,\ CFG_FLASH_BASE + 0x700000, } +#else /* CFG_R7780MP_OLD_FLASH */ +/* NOR Flash (Spantion S29GL256P) */ +# define CFG_MAX_FLASH_BANKS (1) +# define CFG_MAX_FLASH_SECT 256 +# define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE } +#endif /* CFG_R7780MP_OLD_FLASH */ #define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 4 * 1024 * 1024) /* Address of u-boot image in Flash */ #define CFG_MONITOR_BASE (CFG_FLASH_BASE) -#define CFG_MONITOR_LEN (112 * 1024) +#define CFG_MONITOR_LEN (256 * 1024) /* Size of DRAM reserved for malloc() use */ -#define CFG_MALLOC_LEN (256 * 1024) +#define CFG_MALLOC_LEN (1204 * 1024) /* size in bytes reserved for initial data */ #define CFG_GBL_DATA_SIZE (256) @@ -110,7 +113,7 @@ #define CFG_FLASH_EMPTY_INFO #define CFG_ENV_IS_IN_FLASH -#define CFG_ENV_SECT_SIZE (16 * 1024) +#define CFG_ENV_SECT_SIZE (256 * 1024) #define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE) #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_FLASH_ERASE_TOUT 120000 @@ -141,8 +144,10 @@ #endif /* CONFIG_CMD_PCI */ #if defined(CONFIG_CMD_NET) -/* #define CONFIG_NET_MULTI - #define CONFIG_RTL8169 */ +/* +#define CONFIG_NET_MULTI +#define CONFIG_RTL8169 +*/ /* AX88696L Support(NE2000 base chip) */ #define CONFIG_DRIVER_NE2000 #define CONFIG_DRIVER_AX88796L -- 1.5.5.1

1 0