May 2007 - U-Boot

[U-Boot-Users] Support for MicroSD card?
by Gautam Borad 23 May '07

23 May '07

Hi all, I would like to know which version of u-boot supports the ST MicroSD card SMSxxxFF. We have an MPC8247 custom board and are planning to load the kernel directly from the MicroSD card. Will it be supported, if not which SD/MMC cards are supported. regards, Gautam.

1 0

[U-Boot-Users] Xloader
by harsh poshtiwala 23 May '07

23 May '07

Hi Friends, We are trying to bringup ARM926EJS core based board. We need to port uboot on it,I learned that before i port uboot we need to port XLOADER and some JTAG memory initialization file as well as some of the plain files on the board. We are using Platform toolset supplied by ST to flash uboot and all this files. We have a JTAG probe as well that we would like to connect to board once we get our xloader flased. So why do we need XLOADER and other files to port Uboot? Any document to answer this ? or any commets ? -- Thanks & Regards Harsh

2 1

[U-Boot-Users] Unable to boot llnux 2.4 on OMAP 730 based board
by Pharaoh . 22 May '07

22 May '07

Hi I am trying to get Linux 2.4 up om OMAP 730 based board. But it just hangs after uncompressing kernel OK done booting hangs here. I am attaching my .config alongwith in case it makes sense. Please enlighten.

2 1

[U-Boot-Users] [PATCH 1/1] Support for National DP83848 Ethernet Phy
by kim M 22 May '07

22 May '07

Hi all If anyone interested, this is a patch which adds support for the National DP83848 Ethernet Phy. It allows derivatives of the at91rm9200dk board to use this Phy. You will have to edit your at91rm9200.c to use this Phy instead of the default dm9161. I think it makes sense to include it in the main branch, since it is a free feature and it does not occupy space unless used. BR Kim

2 1

[U-Boot-Users] [PATCH: libfdt 1/3] Replace fdt_node_offset() with fdt_find_node_by_path().
by Jerry Van Baren 22 May '07

22 May '07

The new name matches more closely the kernel's name, which is also a much better description. Signed-off-by: Wolfgang Grandegger <wg(a)grandegger.com> Acked-by: Gerald Van Baren <vanbaren(a)cideas.com> --- Patch previously published by WolfgangG with a minor update to fix a merge conflict. board/mpc8360emds/mpc8360emds.c | 2 +- board/mpc8360emds/pci.c | 2 +- common/cmd_fdt.c | 2 +- common/fdt_support.c | 10 +++++----- cpu/mpc83xx/cpu.c | 2 +- include/libfdt.h | 2 +- libfdt/fdt_ro.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/board/mpc8360emds/mpc8360emds.c b/board/mpc8360emds/mpc8360emds.c index 562eb8b..3f87f09 100644 --- a/board/mpc8360emds/mpc8360emds.c +++ b/board/mpc8360emds/mpc8360emds.c @@ -681,7 +681,7 @@ ft_board_setup(void *blob, bd_t *bd) int nodeoffset; int tmp[2]; - nodeoffset = fdt_path_offset (fdt, "/memory"); + nodeoffset = fdt_find_node_by_path (fdt, "/memory"); if (nodeoffset >= 0) { tmp[0] = cpu_to_be32(bd->bi_memstart); tmp[1] = cpu_to_be32(bd->bi_memsize); diff --git a/board/mpc8360emds/pci.c b/board/mpc8360emds/pci.c index 158effe..4c7a82b 100644 --- a/board/mpc8360emds/pci.c +++ b/board/mpc8360emds/pci.c @@ -311,7 +311,7 @@ ft_pci_setup(void *blob, bd_t *bd) int err; int tmp[2]; - nodeoffset = fdt_path_offset (fdt, "/" OF_SOC "/pci@8500"); + nodeoffset = fdt_find_node_by_path (fdt, "/" OF_SOC "/pci@8500"); if (nodeoffset >= 0) { tmp[0] = cpu_to_be32(hose[0].first_busno); tmp[1] = cpu_to_be32(hose[0].last_busno); diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index bf0aef7..5a2c3fd 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -59,7 +59,7 @@ static int findnodeoffset(const char *pathp) if (strcmp(pathp, "/") == 0) { nodeoffset = 0; } else { - nodeoffset = fdt_path_offset (fdt, pathp); + nodeoffset = fdt_find_node_by_path (fdt, pathp); if (nodeoffset < 0) { /* * Not found or something else bad happened. diff --git a/common/fdt_support.c b/common/fdt_support.c index 15f133c..efa63f0 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -97,7 +97,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) /* * Find the "chosen" node. */ - nodeoffset = fdt_path_offset (fdt, "/chosen"); + nodeoffset = fdt_find_node_by_path (fdt, "/chosen"); /* * If we have a "chosen" node already the "force the writing" @@ -145,7 +145,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) printf("WARNING fdt_chosen: could not set \"linux,stdout-path\" (libfdt error %s).\n", fdt_strerror(err)); #endif - nodeoffset = fdt_path_offset (fdt, "/cpus"); + nodeoffset = fdt_find_node_by_path (fdt, "/cpus"); if (nodeoffset >= 0) { clock = cpu_to_be32(bd->bi_intfreq); err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4); @@ -153,7 +153,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) printf("WARNING fdt_chosen: could not set \"clock-frequency\" (libfdt error %s).\n", fdt_strerror(err)); } #ifdef OF_TBCLK - nodeoffset = fdt_path_offset (fdt, "/cpus/" OF_CPU "/timebase-frequency"); + nodeoffset = fdt_find_node_by_path (fdt, "/cpus/" OF_CPU "/timebase-frequency"); if (nodeoffset >= 0) { clock = cpu_to_be32(OF_TBCLK); err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4); @@ -190,7 +190,7 @@ int fdt_env(void *fdt) * See if we already have a "u-boot-env" node, delete it if so. * Then create a new empty node. */ - nodeoffset = fdt_path_offset (fdt, "/u-boot-env"); + nodeoffset = fdt_find_node_by_path (fdt, "/u-boot-env"); if (nodeoffset >= 0) { err = fdt_del_node(fdt, nodeoffset); if (err < 0) { @@ -310,7 +310,7 @@ int fdt_bd_t(void *fdt) * See if we already have a "bd_t" node, delete it if so. * Then create a new empty node. */ - nodeoffset = fdt_path_offset (fdt, "/bd_t"); + nodeoffset = fdt_find_node_by_path (fdt, "/bd_t"); if (nodeoffset >= 0) { err = fdt_del_node(fdt, nodeoffset); if (err < 0) { diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index d2b8de0..01d4dd6 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -487,7 +487,7 @@ ft_cpu_setup(void *blob, bd_t *bd) int j; for (j = 0; j < (sizeof(fixup_props) / sizeof(fixup_props[0])); j++) { - nodeoffset = fdt_path_offset(fdt, fixup_props[j].node); + nodeoffset = fdt_find_node_by_path(fdt, fixup_props[j].node); if (nodeoffset >= 0) { err = fixup_props[j].set_fn(blob, nodeoffset, fixup_props[j].prop, bd); if (err < 0) diff --git a/include/libfdt.h b/include/libfdt.h index f8bac73..e080028 100644 --- a/include/libfdt.h +++ b/include/libfdt.h @@ -77,7 +77,7 @@ int fdt_subnode_offset_namelen(const void *fdt, int parentoffset, const char *name, int namelen); int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name); -int fdt_path_offset(const void *fdt, const char *path); +int fdt_find_node_by_path(const void *fdt, const char *path); struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset, const char *name, int *lenp); diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index defe59c..1a03109 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -132,7 +132,7 @@ int fdt_subnode_offset(const void *fdt, int parentoffset, * Searches for the node corresponding to the given path and returns the * offset of that node. */ -int fdt_path_offset(const void *fdt, const char *path) +int fdt_find_node_by_path(const void *fdt, const char *path) { const char *end = path + strlen(path); const char *p = path; -- 1.4.4.4

1 1

[U-Boot-Users] [PATCH: u-boot-fdt 3/3] For fdt_find_node_by_path(), handle the root path properly.
by Jerry Van Baren 22 May '07

22 May '07

Also removes the special case root path detection in cmd_fdt.c since it is no longer necessary. Signed-off-by: Gerald Van Baren <vanbaren(a)cideas.com> --- common/cmd_fdt.c | 35 ++++++++++++----------------------- libfdt/fdt_ro.c | 4 ++++ 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index 5a2c3fd..aa65297 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -52,25 +52,6 @@ static int fdt_parse_prop(char *pathp, char *prop, char *newval, char *data, int *len); static int fdt_print(char *pathp, char *prop, int depth); -static int findnodeoffset(const char *pathp) -{ - int nodeoffset; - - if (strcmp(pathp, "/") == 0) { - nodeoffset = 0; - } else { - nodeoffset = fdt_find_node_by_path (fdt, pathp); - if (nodeoffset < 0) { - /* - * Not found or something else bad happened. - */ - printf ("findnodeoffset() libfdt: %s\n", - fdt_strerror(nodeoffset)); - } - } - return nodeoffset; -} - /* * Flattened Device Tree command, see the help for parameter definitions. */ @@ -187,11 +168,13 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) pathp = argv[2]; nodep = argv[3]; - nodeoffset = findnodeoffset(pathp); + nodeoffset = fdt_find_node_by_path (fdt, pathp); if (nodeoffset < 0) { /* * Not found or something else bad happened. */ + printf ("libfdt fdt_find_node_by_path() returned %s\n", + fdt_strerror(nodeoffset)); return 1; } err = fdt_add_subnode(fdt, nodeoffset, nodep); @@ -225,11 +208,13 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) prop = argv[3]; newval = argv[4]; - nodeoffset = findnodeoffset(pathp); + nodeoffset = fdt_find_node_by_path (fdt, pathp); if (nodeoffset < 0) { /* * Not found or something else bad happened. */ + printf ("libfdt fdt_find_node_by_path() returned %s\n", + fdt_strerror(nodeoffset)); return 1; } ret = fdt_parse_prop(pathp, prop, newval, data, &len); @@ -283,11 +268,13 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) * Get the path. The root node is an oddball, the offset * is zero and has no name. */ - nodeoffset = findnodeoffset(argv[2]); + nodeoffset = fdt_find_node_by_path (fdt, argv[2]); if (nodeoffset < 0) { /* * Not found or something else bad happened. */ + printf ("libfdt fdt_find_node_by_path() returned %s\n", + fdt_strerror(nodeoffset)); return 1; } /* @@ -584,11 +571,13 @@ static int fdt_print(char *pathp, char *prop, int depth) int len; /* length of the property */ int level = 0; /* keep track of nesting level */ - nodeoffset = findnodeoffset(pathp); + nodeoffset = fdt_find_node_by_path (fdt, pathp); if (nodeoffset < 0) { /* * Not found or something else bad happened. */ + printf ("libfdt fdt_find_node_by_path() returned %s\n", + fdt_strerror(nodeoffset)); return 1; } /* diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index 923c389..ffd9209 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -283,6 +283,10 @@ int fdt_find_node_by_path(const void *fdt, const char *path) if (*path != '/') return -FDT_ERR_BADPATH; + /* Handle the root path: root offset is 0 */ + if (strcmp(path, "/") == 0) + return 0; + while (*p) { const char *q; -- 1.4.4.4

1 0

[U-Boot-Users] [PATCH: u-boot-fdt 2/3] Add fdt_find_node_by_type() and fdt_find_compatible_node() to LIBFDT
by Jerry Van Baren 22 May '07

22 May '07

Signed-off-by: Wolfgang Grandegger <wg(a)grandegger.com> Acked-by: Gerald Van Baren <vanbaren(a)cideas.com> --- Previously published by WolfgangG, added my ack. include/libfdt.h | 6 ++ libfdt/fdt_ro.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 149 insertions(+), 18 deletions(-) diff --git a/include/libfdt.h b/include/libfdt.h index e080028..340e89d 100644 --- a/include/libfdt.h +++ b/include/libfdt.h @@ -78,6 +78,12 @@ int fdt_subnode_offset_namelen(const void *fdt, int parentoffset, int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name); int fdt_find_node_by_path(const void *fdt, const char *path); +int fdt_find_node_by_type(const void *fdt, int nodeoffset, const char *type); + +int fdt_node_is_compatible(const void *fdt, int nodeoffset, + const char *compat); +int fdt_find_compatible_node(const void *fdt, int nodeoffset, + const char *type, const char *compat); struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset, const char *name, int *lenp); diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index 1a03109..923c389 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -51,6 +51,33 @@ static int offset_streq(const void *fdt, int offset, } /* + * Checks if the property name matches. + */ +static int prop_name_eq(const void *fdt, int offset, const char *name, + struct fdt_property **prop, int *lenp) +{ + int namestroff, len; + + *prop = fdt_offset_ptr_typed(fdt, offset, *prop); + if (! *prop) + return -FDT_ERR_BADSTRUCTURE; + + namestroff = fdt32_to_cpu((*prop)->nameoff); + if (streq(fdt_string(fdt, namestroff), name)) { + len = fdt32_to_cpu((*prop)->len); + *prop = fdt_offset_ptr(fdt, offset, + sizeof(**prop) + len); + if (*prop) { + if (lenp) + *lenp = len; + return 1; + } else + return -FDT_ERR_BADSTRUCTURE; + } + return 0; +} + +/* * Return a pointer to the string at the given string offset. */ char *fdt_string(const void *fdt, int stroffset) @@ -59,6 +86,118 @@ char *fdt_string(const void *fdt, int stroffset) } /* + * Check if the specified node is compatible by comparing the tokens + * in its "compatible" property with the specified string: + * + * nodeoffset - starting place of the node + * compat - the string to match to one of the tokens in the + * "compatible" list. + */ +int fdt_node_is_compatible(const void *fdt, int nodeoffset, + const char *compat) +{ + const char* cp; + int cplen, len; + + cp = fdt_getprop(fdt, nodeoffset, "compatible", &cplen); + if (cp == NULL) + return 0; + while (cplen > 0) { + if (strncmp(cp, compat, strlen(compat)) == 0) + return 1; + len = strlen(cp) + 1; + cp += len; + cplen -= len; + } + + return 0; +} + +/* + * Find a node by its device type property. On success, the offset of that + * node is returned or an error code otherwise: + * + * nodeoffset - the node to start searching from or 0, the node you pass + * will not be searched, only the next one will; typically, + * you pass 0 to start the search and then what the previous + * call returned. + * type - the device type string to match against. + */ +int fdt_find_node_by_type(const void *fdt, int nodeoffset, const char *type) +{ + int offset, nextoffset; + struct fdt_property *prop; + uint32_t tag; + int len, ret; + + CHECK_HEADER(fdt); + + tag = fdt_next_tag(fdt, nodeoffset, &nextoffset, NULL); + if (tag != FDT_BEGIN_NODE) + return -FDT_ERR_BADOFFSET; + if (nodeoffset) + nodeoffset = 0; /* start searching with next node */ + + while (1) { + offset = nextoffset; + tag = fdt_next_tag(fdt, offset, &nextoffset, NULL); + + switch (tag) { + case FDT_BEGIN_NODE: + nodeoffset = offset; + break; + + case FDT_PROP: + if (nodeoffset == 0) + break; + ret = prop_name_eq(fdt, offset, "device_type", + &prop, &len); + if (ret < 0) + return ret; + else if (ret > 0 && + strncmp(prop->data, type, len - 1) == 0) + return nodeoffset; + break; + + case FDT_END_NODE: + case FDT_NOP: + break; + + case FDT_END: + return -FDT_ERR_NOTFOUND; + + default: + return -FDT_ERR_BADSTRUCTURE; + } + } +} + +/* + * Find a node based on its device type and one of the tokens in its its + * "compatible" property. On success, the offset of that node is returned + * or an error code otherwise: + * + * nodeoffset - the node to start searching from or 0, the node you pass + * will not be searched, only the next one will; typically, + * you pass 0 to start the search and then what the previous + * call returned. + * type - the device type string to match against. + * compat - the string to match to one of the tokens in the + * "compatible" list. + */ +int fdt_find_compatible_node(const void *fdt, int nodeoffset, + const char *type, const char *compat) +{ + int offset; + + offset = fdt_find_node_by_type(fdt, nodeoffset, type); + if (offset < 0 || fdt_node_is_compatible(fdt, offset, compat)) + return offset; + + return -FDT_ERR_NOTFOUND; +} + +/* * Return the node offset of the node specified by: * parentoffset - starting place (0 to start at the root) * name - name being searched for @@ -187,7 +326,6 @@ struct fdt_property *fdt_get_property(const void *fdt, int level = 0; uint32_t tag; struct fdt_property *prop; - int namestroff; int offset, nextoffset; int err; @@ -227,24 +365,11 @@ struct fdt_property *fdt_get_property(const void *fdt, if (level != 0) continue; - err = -FDT_ERR_BADSTRUCTURE; - prop = fdt_offset_ptr_typed(fdt, offset, prop); - if (! prop) - goto fail; - namestroff = fdt32_to_cpu(prop->nameoff); - if (streq(fdt_string(fdt, namestroff), name)) { - /* Found it! */ - int len = fdt32_to_cpu(prop->len); - prop = fdt_offset_ptr(fdt, offset, - sizeof(*prop)+len); - if (! prop) - goto fail; - - if (lenp) - *lenp = len; - + err = prop_name_eq(fdt, offset, name, &prop, lenp); + if (err > 0) return prop; - } + else if (err < 0) + goto fail; break; case FDT_NOP: -- 1.4.4.4

1 0

[U-Boot-Users] Ideas on U-Boot configuration with FDT
by Wolfgang Grandegger 21 May '07

21 May '07

Hello, here are my ideas on what is basically necessary to use FDT for U-Boot configuration. I tried to keep it simple: - If CFG_FDT_ADDR is defined in the boards configuration file, the global variable "fdt", already used by the FDT command, will be set at compile time to that address: #ifdef CFG_FDT_ADDR struct fdt_header *fdt = CFG_FDT_ADDR; else struct fdt_header *fdt = NULL; #endif - In the early boot phase, before relocation, the FDT is checked and an error message printed in case it's not found or invalid: CPU: MPC5200 v1.0, Core v1.1 at 396 MHz Bus 132 MHz, IPB 66 MHz, PCI 33 MHz FDT: FDT_ERR_BADMAGIC (or OK, or version number?) At this level also the compatibility of the FDT tree could be checked using fdt_boardcheck(). - After relocation, the blob is copied into memory via fdt_open_into() to a defined place and "fdt" is updated accordingly. Not sure, what location in RAM to use, but it should fit into the existing scheme. Any recommendations? - When U-Boot is up, "fdt" points to a valid FDT, e.g. "fdt addr" is not necessary. - I think the basic mechanism should also work _without_ FDT commands (cmd_fdt.c, getting ride of quit some code). - bootm should then automatically use the address of "fdt" to boot the kernel. Some more comments. I realized rather heavy consistency checks on almost any public FDT function via fdt_check_header. I actually would prefer to have one extended check function at the beginning, which also ensures the compatibility with the board and reduce the other checks to just verify the magic number. Other related issues? Do we also need to maintain a checksum of the blob? At least it's on Jerry's to-do list. What do you think? I'm going to show a first patch soon. Wolfgang.

6 31

[U-Boot-Users] bug in cpu/ppc4xx/start.S
by Bruce Adler 21 May '07

21 May '07

hi, what's the preferred method for reporting u-boot bugs? enter them into the bug database on sourceforge.net, or post them to the mailing list, or email the designated custodian? the reason I ask is that I just discovered a bug in the OCM initialization code for the PPC405EZ at line 786, the mtdcr instruction specifies the wrong register, it should say "r4" not "r3" this: addis r3,0,0x0800 /* OCM Data Parity Disable - 1 Wait State */ mtdcr ocmdsisdpc,r4 should be changed to this: addis r3,0,0x0800 /* OCM Data Parity Disable - 1 Wait State */ mtdcr ocmdsisdpc,r3 bruce

3 2

[U-Boot-Users] PXA27x usbtty start up sequence
by Rodolfo Giometti 21 May '07

21 May '07

Hello, I'm still playing with the PXA27x USB device support... Using serial console with a bootdelay of only 1 second is ok, but using usbtty is not. In fact is not possible to stop boot sequence anymore unless bootdelay is increased at least 10-15 seconds needed to run the terminal on the new ttyUSB0 device and to enter the password. Is someone using usbtty during the boot sequence? Also I notice that when usbtty is selected as the default console the system doesn't start up until I connect the kermit/minicom to the new ttyUSB0 device. Is someone getting the same behaviour? Thanks, Rodolfo -- GNU/Linux Solutions e-mail: giometti(a)enneenne.com Linux Device Driver giometti(a)gnudd.com Embedded Systems giometti(a)linux.it UNIX programming phone: +39 349 2432127

2 9

[U-Boot-Users] Yoon Kah Leow is out of the office.
by Yoon Kah Leow 20 May '07

20 May '07

I will be out of the office starting 05/21/2007 and will not return until 05/25/2007. I will respond to your message when I return.

1 0

[U-Boot-Users] firebrand toughen
by align 19 May '07

19 May '07

1 0

[U-Boot-Users] multicast tftp: RFC2090
by David Updegraff 19 May '07

19 May '07

Hi. looking for interest to support mutlicast tftp in u-boot. I have a version working according to RFC2090 working with 'atftp' with only a dozen or so lines patch in net/tftp.c and a few in net/net.c. But the messy part is that the ethernet driver needs to have hooks to set up mcast ether-addrs... Has there already been a discussion about this that I missed that someone could refer me to? thnx. -dbu.

5 10

[U-Boot-Users] [GIT PULL] Please pull from git://www.denx.de/git/u-boot-arm.git
by Peter Pearse 18 May '07

18 May '07

Wolfgang The following changes since commit 70124c2602ae2d4c5d3dba05b482d91548242de8: Stefano Babic (1): Fix compile problem cause my Microblaze merge are found in the git repository at: git://www.denx.de/git/u-boot-arm.git Gary Jennejohn (1): Add support for the Siemens SMN42 board. Peter Pearse (10): Makefile permissions New board SMN42 branch Remove the deleted files for the SMN42 patch Add the files for the SMN42 board Add the board directory for SMN42 Makefile permissions Merge with git://www.denx.de/git/u-boot.git Makefile permissions Merge with git://www.denx.de/git/u-boot.git Reduce line lengths to 80 characters max. MAKEALL | 2 +- Makefile | 5 +- board/lpc2292sodimm/Makefile | 35 +- board/lpc2292sodimm/flash.c | 240 +---------- board/siemens/SMN42/Makefile | 51 +++ board/siemens/SMN42/config.mk | 30 ++ board/siemens/SMN42/flash.c | 476 ++++++++++++++++++++ board/siemens/SMN42/lowlevel_init.S | 123 +++++ board/siemens/SMN42/smn42.c | 62 +++ board/siemens/SMN42/u-boot.lds | 55 +++ common/soft_i2c.c | 3 + cpu/arm720t/lpc2292/Makefile | 50 ++ cpu/arm720t/lpc2292/flash.c | 249 ++++++++++ .../arm720t/lpc2292}/iap_entry.S | 0 {board/lpc2292sodimm => cpu/arm720t/lpc2292}/mmc.c | 7 +- .../lpc2292sodimm => cpu/arm720t/lpc2292}/mmc_hw.c | 2 +- .../lpc2292sodimm => cpu/arm720t/lpc2292}/mmc_hw.h | 0 {board/lpc2292sodimm => cpu/arm720t/lpc2292}/spi.c | 2 +- disk/part.c | 7 +- drivers/Makefile | 2 +- board/lpc2292sodimm/eth.c => drivers/enc28j60.c | 236 +++++++--- fs/fat/fat.c | 13 +- include/asm-arm/arch-arm720t/hardware.h | 2 - .../mmc.h => arch-lpc2292/hardware.h} | 21 +- .../lpc2292_registers.h | 0 .../asm-arm/{arch-arm720t => arch-lpc2292}/mmc.h | 0 .../asm-arm/arch-lpc2292}/spi.h | 0 include/configs/SMN42.h | 199 ++++++++ include/configs/lpc2292sodimm.h | 18 +- 29 files changed, 1539 insertions(+), 351 deletions(-) create mode 100644 board/siemens/SMN42/Makefile create mode 100644 board/siemens/SMN42/config.mk create mode 100755 board/siemens/SMN42/flash.c create mode 100644 board/siemens/SMN42/lowlevel_init.S create mode 100644 board/siemens/SMN42/smn42.c create mode 100644 board/siemens/SMN42/u-boot.lds create mode 100644 cpu/arm720t/lpc2292/Makefile create mode 100644 cpu/arm720t/lpc2292/flash.c rename {board/lpc2292sodimm => cpu/arm720t/lpc2292}/iap_entry.S (100%) rename {board/lpc2292sodimm => cpu/arm720t/lpc2292}/mmc.c (97%) rename {board/lpc2292sodimm => cpu/arm720t/lpc2292}/mmc_hw.c (100%) rename {board/lpc2292sodimm => cpu/arm720t/lpc2292}/mmc_hw.h (100%) rename {board/lpc2292sodimm => cpu/arm720t/lpc2292}/spi.c (98%) mode change 100644 => 100755 disk/part.c rename board/lpc2292sodimm/eth.c => drivers/enc28j60.c (81%) mode change 100644 => 100755 mode change 100644 => 100755 fs/fat/fat.c copy include/asm-arm/{arch-arm720t/mmc.h => arch-lpc2292/hardware.h} (64%) rename include/asm-arm/{arch-arm720t => arch-lpc2292}/lpc2292_registers.h (100%) rename include/asm-arm/{arch-arm720t => arch-lpc2292}/mmc.h (100%) rename {board/lpc2292sodimm => include/asm-arm/arch-lpc2292}/spi.h (100%) create mode 100755 include/configs/SMN42.h mode change 100644 => 100755 include/configs/lpc2292sodimm.h --- Regards Peter

1 0

[U-Boot-Users] idea: fdt_checkboard
by Timur Tabi 18 May '07

18 May '07

Jerry, What do you think about implementing a board-specific function called "fdt_checkboard()"? On platforms that have this function, it would be called by fdt_open_into(). fdt_checkboard() would scan the device tree and make sure that it's the right tree for this board (e.g. by checking the 'model' or 'compatible' fields), and return an error if it's not. This would be helpful in eliminating the possibility of accidentally using the wrong device tree. It could happen, for instance, if there are multiple device trees for a given board. -- Timur Tabi Linux Kernel Developer @ Freescale

3 3

Re: [U-Boot-Users] RO jffs2 implementation for bootloader
by Matthieu CASTET 18 May '07

18 May '07

Hi Stefan, Stefan Roese a écrit : > Hi Matthieu, > > On Friday 04 May 2007 11:55, Matthieu CASTET wrote: >>> On Thu, 2007-05-03 at 08:40 +0000, Matthieu CASTET wrote: >>>> I need to mount a jffs2 partition in a bootloader. I tried u-boot that >>>> support jffs2, but it is very slow (2 minutes for mounting a 64MB >>>> partition). Do you know if there are other (fast) implemenation of jffs2 >>>> suitable for a bootloader ? >>> Not sure about any existing "fast" implementation, but mounting a JFFS2 >>> partition is about scanning whole partition. You may optimize some >>> thing, but you have to scan anyway. >> Well u-boot implementation is very slow. For 64MB partition : 2 minutes >> for u-boot > > This really is slow. 64MB isn't that big and shouldn't take that long to > mount. > >> and 11 s for linux (3s with summary). > > So it can be done better. > > Did you think about improving the performance in U-Boot? If so, please let's > move this discussion to the u-boot-users mailing list. Somebody already try something for u-boot jffs2 [1], but is doesn't seem to work (don't compile). He didn't receive any report, so u-boot jffs2 code seems unmaintained. > > Thanks. > > BTW: What cpu at what speed are you using? an arm9 @240 Mhz. Matthieu [1] http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/25780/focus=25808 -- Matthieu Castet Ingénieur Développement Logiciel Parrot SA 174 Quai de Jemmapes 75010 Paris, France Tél: +33 (0) 1 48 03 74 78 Fax: +33 (0) 1 48 03 06 66 Email: matthieu.castet(a)parrot.fr http://www.parrot.biz

4 9

[U-Boot-Users] [RFC] Remove some redundant fdt code from do_bootm_linux
by Andy Fleming 18 May '07

18 May '07

There were a number of places where libfdt and the old ft code were doing essentially the same thing. By adding some stubs for some of the libfdt convenience functions, we can eliminate some of these redundancies. This patch has some overlap with a patch Jerry already submitted, so I'm not expecting this to apply. I'm just interested in opinions as to whether this is a good approach. In the process: * Eliminated a bug in the libfdt error handling for uImages where a correct header would trigger an error * Moved the debug message about transferring control to Linux next to the first potential invocation of Linux * Did a few minor formatting tweaks to improve readability * Removed what appeared to be redundant calls to fdt_chosen, fdt_env, and fdt_bd_t * Eliminated the #ifdef protecting the if statement which checked if we had an of_flat_tree. If CONFIG_OF_FLAT_TREE or CONFIG_OF_LIBFDT aren't defined, then of_flat_tree will be NULL (and any compiler will eliminate the check in that case) * Made clear in a few places that LIBFDT and OF_FLAT_TREE are mutually exclusive * Added definition for fdt_check_header (evaluates to 0 if the header is of type OF_DT_HEADER * Added definition for fdt_totalsize() (evaluates to the value of totalsize) * Added a stub for fdt_open_into() which just does the memmove and returns 0 Signed-off-by: Andy Fleming <afleming(a)freescale.com> --- common/cmd_bootm.c | 102 +++++++++++++--------------------------------------- include/ft_build.h | 11 ++++++ 2 files changed, 36 insertions(+), 77 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index d12ef76..b995b34 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -534,10 +534,8 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, bd_t *kbd; void (*kernel)(bd_t *, ulong, ulong, ulong, ulong); image_header_t *hdr = &header; -#if defined(CONFIG_OF_FLAT_TREE) || defined(CONFIG_OF_LIBFDT) char *of_flat_tree = NULL; ulong of_data = 0; -#endif if ((s = getenv ("initrd_high")) != NULL) { /* a value of "no" or a similar string will act like 0, @@ -748,13 +746,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, if(argc > 3) { of_flat_tree = (char *) simple_strtoul(argv[3], NULL, 16); hdr = (image_header_t *)of_flat_tree; -#if defined(CONFIG_OF_LIBFDT) - if (fdt_check_header(of_flat_tree) == 0) { -#else - if (*(ulong *)of_flat_tree == OF_DT_HEADER) { -#endif + if (fdt_check_header(of_flat_tree) == 0) of_data = (ulong)of_flat_tree; - } else if (ntohl(hdr->ih_magic) == IH_MAGIC) { + else if (ntohl(hdr->ih_magic) == IH_MAGIC) { printf("## Flat Device Tree Image at %08lX\n", hdr); print_image_hdr(hdr); @@ -791,11 +785,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, printf("ERROR: uImage is not uncompressed\n"); return; } -#if defined(CONFIG_OF_LIBFDT) - if (fdt_check_header(of_flat_tree + sizeof(image_header_t)) == 0) { -#else - if (*((ulong *)(of_flat_tree + sizeof(image_header_t))) != OF_DT_HEADER) { -#endif + if (fdt_check_header(of_flat_tree + sizeof(image_header_t)) != 0) { printf ("ERROR: uImage data is not a flat device tree\n"); return; } @@ -832,20 +822,12 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, of_data += 4 - tail; } -#if defined(CONFIG_OF_LIBFDT) if (fdt_check_header((void *)of_data) != 0) { -#else - if (((struct boot_param_header *)of_data)->magic != OF_DT_HEADER) { -#endif printf ("ERROR: image is not a flat device tree\n"); return; } -#if defined(CONFIG_OF_LIBFDT) if (be32_to_cpu(fdt_totalsize(of_data)) != ntohl(len_ptr[2])) { -#else - if (((struct boot_param_header *)of_data)->totalsize != ntohl(len_ptr[2])) { -#endif printf ("ERROR: flat device tree size does not agree with image\n"); return; } @@ -920,16 +902,10 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, initrd_end = 0; } - debug ("## Transferring control to Linux (at address %08lx) ...\n", - (ulong)kernel); - - SHOW_BOOT_PROGRESS (15); - #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500) unlock_ram_in_cache(); #endif -#if defined(CONFIG_OF_LIBFDT) /* move of_flat_tree if needed */ if (of_data) { int err; @@ -937,62 +913,35 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, of_len = be32_to_cpu(fdt_totalsize(of_data)); - /* position on a 4K boundary before the initrd/kbd */ - of_start = (ulong)kbd - of_len; + /* + * Position on a 4K boundary before the initrd/kbd, + * and give it a little extra room + */ + of_start = (ulong)kbd - of_len - 8192; of_start &= ~(4096 - 1); /* align on page */ - debug ("## device tree at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n", + + debug("## Device Tree at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n", of_data, of_data + of_len - 1, of_len, of_len); of_flat_tree = (char *)of_start; + printf (" Loading Device Tree to %08lx, end %08lx ... ", of_start, of_start + of_len - 1); + err = fdt_open_into((void *)of_start, (void *)of_data, of_len); if (err != 0) { - printf ("libfdt: %s " __FILE__ " %d\n", fdt_strerror(err), __LINE__); - } - printf("OK\n"); - - /* - * Add the chosen node if it doesn't exist, add the env and bd_t - * if the user wants it (the logic is in the subroutines). - */ - if (fdt_chosen(of_flat_tree, initrd_start, initrd_end, 0) < 0) { - printf("Failed creating the /chosen node (0x%08X), aborting.\n", of_flat_tree); - return; - } -#ifdef CONFIG_OF_HAS_UBOOT_ENV - if (fdt_env(of_flat_tree) < 0) { - printf("Failed creating the /u-boot-env node, aborting.\n"); - return; - } -#endif -#ifdef CONFIG_OF_HAS_BD_T - if (fdt_bd_t(of_flat_tree) < 0) { - printf("Failed creating the /bd_t node, aborting.\n"); - return; - } +#ifdef CONFIG_OF_LIBFDT + printf ("libfdt: %s " __FILE__ " %d\n", + fdt_strerror(err), __LINE__); #endif + } else + printf("OK\n"); } -#endif -#if defined(CONFIG_OF_FLAT_TREE) - /* move of_flat_tree if needed */ - if (of_data) { - ulong of_start, of_len; - of_len = ((struct boot_param_header *)of_data)->totalsize; - /* provide extra 8k pad */ - of_start = (ulong)kbd - of_len - 8192; - of_start &= ~(4096 - 1); /* align on page */ - debug ("## device tree at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n", - of_data, of_data + of_len - 1, of_len, of_len); + debug ("## Transferring control to Linux (at address %08lx) ...\n", + (ulong)kernel); - of_flat_tree = (char *)of_start; - printf (" Loading Device Tree to %08lx, end %08lx ... ", - of_start, of_start + of_len - 1); - memmove ((void *)of_start, (void *)of_data, of_len); - printf ("OK\n"); - } -#endif + SHOW_BOOT_PROGRESS (15); /* * Linux Kernel Parameters (passing board info data): @@ -1002,9 +951,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, * r6: Start of command line string * r7: End of command line string */ -#if defined(CONFIG_OF_FLAT_TREE) || defined(CONFIG_OF_LIBFDT) if (!of_flat_tree) /* no device tree; boot old style */ -#endif (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end); /* does not return */ @@ -1020,10 +967,11 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, #if defined(CONFIG_OF_FLAT_TREE) ft_setup(of_flat_tree, kbd, initrd_start, initrd_end); /* ft_dump_blob(of_flat_tree); */ -#endif -#if defined(CONFIG_OF_LIBFDT) + +#else /* defined(CONFIG_OF_LIBFDT) */ if (fdt_chosen(of_flat_tree, initrd_start, initrd_end, 0) < 0) { - printf("Failed creating the /chosen node (0x%08X), aborting.\n", of_flat_tree); + printf("Failed creating the /chosen node (0x%08X), aborting.\n", + of_flat_tree); return; } #ifdef CONFIG_OF_HAS_UBOOT_ENV @@ -1041,7 +989,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, #endif /* if defined(CONFIG_OF_LIBFDT) */ (*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0); -#endif +#endif /* CONFIG_OF_FLAT_TREE || CONFIG_OF_LIBFDT */ } #endif /* CONFIG_PPC */ diff --git a/include/ft_build.h b/include/ft_build.h index 89c689c..c2222f7 100644 --- a/include/ft_build.h +++ b/include/ft_build.h @@ -20,6 +20,17 @@ #define OF_DT_VERSION 0x10 +/* Mimic some libfdt functions to reduce redundancy */ +#define fdt_check_header(fdt) (*(ulong *)fdt != OF_DT_HEADER) +#define fdt_totalsize(fdt) (((struct boot_param_header *)of_data)->totalsize) + +static inline int fdt_open_into(void *dest, void *src, int len) +{ + memmove(dest, src, len); + + return 0; +} + struct boot_param_header { u32 magic; /* magic word OF_DT_HEADER */ u32 totalsize; /* total size of DT block */ -- 1.5.0.2.230.gfbe3d-dirty

2 1

[U-Boot-Users] [PATCH] Polished the 85xx ADS config files
by Andy Fleming 18 May '07

18 May '07

Made the boot commands use device trees by default. Also moved the ramdisk to 1000000 (I think the previous address was getting overridden during boot). Signed-off-by: Andy Fleming <afleming(a)freescale.com> --- include/configs/MPC8540ADS.h | 4 ++-- include/configs/MPC8560ADS.h | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 5aeea58..3d5588a 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -520,7 +520,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ - "ramdiskaddr=600000\0" \ + "ramdiskaddr=1000000\0" \ "ramdiskfile=your.ramdisk.u-boot\0" \ "fdtaddr=400000\0" \ "fdtfile=your.fdt.dtb\0" @@ -540,7 +540,7 @@ "tftp $ramdiskaddr $ramdiskfile;" \ "tftp $loadaddr $bootfile;" \ "tftp $fdtaddr $fdtfile;" \ - "bootm $loadaddr $ramdiskaddr" + "bootm $loadaddr $ramdiskaddr $fdtaddr" #define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index f16e39d..010736f 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -560,8 +560,8 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ - "consoledev=ttyS0\0" \ - "ramdiskaddr=600000\0" \ + "consoledev=ttyCPM\0" \ + "ramdiskaddr=1000000\0" \ "ramdiskfile=your.ramdisk.u-boot\0" \ "fdtaddr=400000\0" \ "fdtfile=mpc8560ads.dtb\0" @@ -580,7 +580,8 @@ "console=$consoledev,$baudrate $othbootargs;" \ "tftp $ramdiskaddr $ramdiskfile;" \ "tftp $loadaddr $bootfile;" \ - "bootm $loadaddr $ramdiskaddr" + "tftp $fdtaddr $fdtfile;" \ + "bootm $loadaddr $ramdiskaddr $fdtaddr" #define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND -- 1.5.0.2.230.gfbe3d-dirty

1 0

[U-Boot-Users] fdt_find_compatible_node() and friends
by Wolfgang Grandegger 17 May '07

17 May '07

Hi Jerry, before re-coding fdt_find_compatible_node(), some more comments. After browsing more carefully the FDT related code of "arch/powerpc" I think we also need, apart from fdt_find_compatible_node() and fdt_path_offset(), fdt_find_node_by_type() and maybe fdt_find_node_by_name(). These functions do a sequential scan of all devices starting at the beginning or after a specified node. They actually ignore the hierarchy. Do you agree? BTW: any reason why not using the more compatible name fdt_find_node_by_path() for fdt_path_offset()? Wolfgang.

3 8

[U-Boot-Users] about "env_init"
by 孙彬 17 May '07

17 May '07

hello,all In the file Env_flash.c ,there is a function as #ifdef CFG_ENV_ADDR_REDUND int env_init(void) { DECLARE_GLOBAL_DATA_PTR; ... } What's CFG_ENV_ADDR_REDUND mean?on which condition the function env_init(void) works. and I want to know when env store in flash,where to store,and how to store the env and how can i get it from flash thanks a lots --------------------------------- 抢注雅虎免费邮箱3.5G容量，20M附件！

2 1

[U-Boot-Users] Crash after saveenv; reset commands
by wenqing Gao 17 May '07

17 May '07

hi all : I 've got a yaffs patch which is not based on "#define CFG_NAND_LEGACY " . So I should write my own board_init function.To solve this problem , I used a nand boot patch provided by openmoko ,an open source cell phone project.Finally u-boot-1.2.0 works. But after I use saveenv command ,then reset,Problem occurred My board doesn't work , no serial feedback any more on minicom.Have you ever meet this problem? Can you give me any advice? best regards Gao Wenqing tiplinky2002(a)yahoo.com.cn Wuhan University of Technology Hubei,China ___________________________________________________________ Mp3疯狂搜-新歌热歌高速下 http://music.yahoo.com.cn/?source=mail_mailbox_footer

1 0

[U-Boot-Users] [PATCH] cmd_mfsl: Don't include asm/asm.h on other architectures.
by Scott Wood 17 May '07

17 May '07

This file currently breaks the build for any architecture other than microblaze due to the absence of asm/asm.h. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- common/cmd_mfsl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c index 26786aa..ab74dba 100644 --- a/common/cmd_mfsl.c +++ b/common/cmd_mfsl.c @@ -26,13 +26,13 @@ * Microblaze FSL support */ +#if (CONFIG_COMMANDS & CFG_CMD_MFSL) + #include <common.h> #include <config.h> #include <command.h> #include <asm/asm.h> -#if (CONFIG_COMMANDS & CFG_CMD_MFSL) - int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { unsigned int fslnum; -- 1.5.0.3

3 2

[U-Boot-Users] [PATCH u-boot-fdt] Fix cmd_fdt line lengths, refactor code.
by Jerry Van Baren 17 May '07

17 May '07

Break lines that were greater than 80 characters in length. Move the fdt print and property parsing code to separate static functions to reduce coding clutter in the fdt_cmd handling body. Signed-off-by: Gerald Van Baren <vanbaren(a)cideas.com> --- common/cmd_fdt.c | 426 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 239 insertions(+), 187 deletions(-) diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index 8402ca7..bf0aef7 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -45,16 +45,12 @@ DECLARE_GLOBAL_DATA_PTR; /* - * Scratchpad memory. - */ -static char data[SCRATCHPAD]; - - -/* * Function prototypes/declarations. */ static int fdt_valid(void); -static void print_data(const void *data, int len); +static int fdt_parse_prop(char *pathp, char *prop, char *newval, + char *data, int *len); +static int fdt_print(char *pathp, char *prop, int depth); static int findnodeoffset(const char *pathp) { @@ -68,7 +64,8 @@ static int findnodeoffset(const char *pathp) /* * Not found or something else bad happened. */ - printf ("findnodeoffset() libfdt: %s\n", fdt_strerror(nodeoffset)); + printf ("findnodeoffset() libfdt: %s\n", + fdt_strerror(nodeoffset)); } } return nodeoffset; @@ -105,7 +102,8 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) */ len = simple_strtoul(argv[3], NULL, 16); if (len < fdt_totalsize(fdt)) { - printf ("New length %d < existing length %d, ignoring.\n", + printf ("New length %d < existing length %d, " + "ignoring.\n", len, fdt_totalsize(fdt)); } else { /* @@ -113,7 +111,8 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) */ err = fdt_open_into(fdt, fdt, len); if (err != 0) { - printf ("libfdt fdt_open_into(): %s\n", fdt_strerror(err)); + printf ("libfdt fdt_open_into(): %s\n", + fdt_strerror(err)); } } } @@ -139,7 +138,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 1; } - newaddr = (struct fdt_header *)simple_strtoul(argv[3], NULL, 16); + newaddr = (struct fdt_header *)simple_strtoul(argv[3],NULL,16); /* * If the user specifies a length, use that. Otherwise use the @@ -150,7 +149,8 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } else { len = simple_strtoul(argv[4], NULL, 16); if (len < fdt_totalsize(fdt)) { - printf ("New length 0x%X < existing length 0x%X, aborting.\n", + printf ("New length 0x%X < existing length " + "0x%X, aborting.\n", len, fdt_totalsize(fdt)); return 1; } @@ -161,7 +161,8 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) */ err = fdt_open_into(fdt, newaddr, len); if (err != 0) { - printf ("libfdt fdt_open_into(): %s\n", fdt_strerror(err)); + printf ("libfdt fdt_open_into(): %s\n", + fdt_strerror(err)); return 1; } fdt = newaddr; @@ -195,7 +196,8 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } err = fdt_add_subnode(fdt, nodeoffset, nodep); if (err < 0) { - printf ("libfdt fdt_add_subnode(): %s\n", fdt_strerror(err)); + printf ("libfdt fdt_add_subnode(): %s\n", + fdt_strerror(err)); return 1; } @@ -204,16 +206,12 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) ********************************************************************/ } else if (argv[1][0] == 's') { char *pathp; /* path */ - char *prop; /* property */ - struct fdt_property *nodep; /* node struct pointer */ + char *prop; /* property */ char *newval; /* value from the user (as a string) */ - char *vp; /* temporary value pointer */ - char *cp; /* temporary char pointer */ int nodeoffset; /* node offset from libfdt */ - int len; /* new length of the property */ - int oldlen; /* original length of the property */ - unsigned long tmp; /* holds converted values */ - int ret; /* return value */ + static char data[SCRATCHPAD]; /* storage for the property */ + int len; /* new length of the property */ + int ret; /* return value */ /* * Parameters: Node path, property, value. @@ -234,67 +232,9 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) */ return 1; } - /* - * Convert the new property - */ - vp = data; - if (*newval == '<') { - /* - * Bigger values than bytes. - */ - len = 0; - newval++; - while ((*newval != '>') && (*newval != '\0')) { - cp = newval; - tmp = simple_strtoul(cp, &newval, 16); - if ((newval - cp) <= 2) { - *vp = tmp & 0xFF; - vp += 1; - len += 1; - } else if ((newval - cp) <= 4) { - *(uint16_t *)vp = __cpu_to_be16(tmp); - vp += 2; - len += 2; - } else if ((newval - cp) <= 8) { - *(uint32_t *)vp = __cpu_to_be32(tmp); - vp += 4; - len += 4; - } else { - printf("Sorry, I could not convert \"%s\"\n", cp); - return 1; - } - while (*newval == ' ') - newval++; - } - if (*newval != '>') { - printf("Unexpected character '%c'\n", *newval); - return 1; - } - } else if (*newval == '[') { - /* - * Byte stream. Convert the values. - */ - len = 0; - newval++; - while ((*newval != ']') && (*newval != '\0')) { - tmp = simple_strtoul(newval, &newval, 16); - *vp++ = tmp & 0xFF; - len++; - while (*newval == ' ') - newval++; - } - if (*newval != ']') { - printf("Unexpected character '%c'\n", *newval); - return 1; - } - } else { - /* - * Assume it is a string. Copy it into our data area for - * convenience (including the terminating '\0'). - */ - len = strlen(newval) + 1; - strcpy(data, newval); - } + ret = fdt_parse_prop(pathp, prop, newval, data, &len); + if (ret != 0) + return ret; ret = fdt_setprop(fdt, nodeoffset, prop, data, len); if (ret < 0) { @@ -306,20 +246,10 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) * Print (recursive) / List (single level) ********************************************************************/ } else if ((argv[1][0] == 'p') || (argv[1][0] == 'l')) { - /* - * Recursively print (a portion of) the fdt. - */ - static int offstack[MAX_LEVEL]; - static char tabs[MAX_LEVEL+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; int depth = MAX_LEVEL; /* how deep to print */ char *pathp; /* path */ - char *prop; /* property */ - void *nodep; /* property node pointer */ - int nodeoffset; /* node offset from libfdt */ - int nextoffset; /* next node offset from libfdt */ - uint32_t tag; /* tag */ - int len; /* length of the property */ - int level = 0; /* keep track of nesting level */ + char *prop; /* property */ + int ret; /* return value */ /* * list is an alias for print, but limited to 1 level @@ -338,88 +268,9 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) else prop = NULL; - nodeoffset = findnodeoffset(pathp); - if (nodeoffset < 0) { - /* - * Not found or something else bad happened. - */ - return 1; - } - /* - * The user passed in a property as well as node path. Print only - * the given property and then return. - */ - if (prop) { - nodep = fdt_getprop (fdt, nodeoffset, prop, &len); - if (len == 0) { - printf("%s %s\n", pathp, prop); /* no property value */ - return 0; - } else if (len > 0) { - printf("%s=", prop); - print_data (nodep, len); - printf("\n"); - return 0; - } else { - printf ("libfdt fdt_getprop(): %s\n", fdt_strerror(len)); - return 1; - } - } - - /* - * The user passed in a node path and no property, print the node - * and all subnodes. - */ - offstack[0] = nodeoffset; - - while(level >= 0) { - tag = fdt_next_tag(fdt, nodeoffset, &nextoffset, &pathp); - switch(tag) { - case FDT_BEGIN_NODE: - if(level <= depth) - printf("%s%s {\n", &tabs[MAX_LEVEL - level], pathp); - level++; - offstack[level] = nodeoffset; - if (level >= MAX_LEVEL) { - printf("Aaaiii <splat> nested too deep. Aborting.\n"); - return 1; - } - break; - case FDT_END_NODE: - level--; - if(level <= depth) - printf("%s};\n", &tabs[MAX_LEVEL - level]); - if (level == 0) { - level = -1; /* exit the loop */ - } - break; - case FDT_PROP: - nodep = fdt_getprop (fdt, offstack[level], pathp, &len); - if (len < 0) { - printf ("libfdt fdt_getprop(): %s\n", fdt_strerror(len)); - return 1; - } else if (len == 0) { - /* the property has no value */ - if(level <= depth) - printf("%s%s;\n", &tabs[MAX_LEVEL - level], pathp); - } else { - if(level <= depth) { - printf("%s%s=", &tabs[MAX_LEVEL - level], pathp); - print_data (nodep, len); - printf(";\n"); - } - } - break; - case FDT_NOP: - break; - case FDT_END: - return 1; - default: - if(level <= depth) - printf("Unknown tag 0x%08X\n", tag); - return 1; - } - nodeoffset = nextoffset; - } + ret = fdt_print(pathp, prop, depth); + if (ret != 0) + return ret; /******************************************************************** * Remove a property/node @@ -446,13 +297,15 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) if (argc > 3) { err = fdt_delprop(fdt, nodeoffset, argv[3]); if (err < 0) { - printf("libfdt fdt_delprop(): %s\n", fdt_strerror(err)); + printf("libfdt fdt_delprop(): %s\n", + fdt_strerror(err)); return err; } } else { err = fdt_del_node(fdt, nodeoffset); if (err < 0) { - printf("libfdt fdt_del_node(): %s\n", fdt_strerror(err)); + printf("libfdt fdt_del_node(): %s\n", + fdt_strerror(err)); return err; } } @@ -486,7 +339,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 0; } -/********************************************************************/ +/****************************************************************************/ static int fdt_valid(void) { @@ -509,12 +362,14 @@ static int fdt_valid(void) if (err == -FDT_ERR_BADVERSION) { if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION) { printf (" - too old, fdt $d < %d", - fdt_version(fdt), FDT_FIRST_SUPPORTED_VERSION); + fdt_version(fdt), + FDT_FIRST_SUPPORTED_VERSION); fdt = NULL; } if (fdt_last_comp_version(fdt) > FDT_LAST_SUPPORTED_VERSION) { printf (" - too new, fdt $d > %d", - fdt_version(fdt), FDT_LAST_SUPPORTED_VERSION); + fdt_version(fdt), + FDT_LAST_SUPPORTED_VERSION); fdt = NULL; } return 0; @@ -525,13 +380,91 @@ static int fdt_valid(void) return 1; } -/********************************************************************/ +/****************************************************************************/ /* - * OF flat tree handling - * Written by: Pantelis Antoniou <pantelis.antoniou(a)gmail.com> - * Updated by: Matthew McClintock <msm(a)freescale.com> - * Converted to libfdt by: Gerald Van Baren <vanbaren(a)cideas.com> + * Parse the user's input, partially heuristic. Valid formats: + * <00> - hex byte + * <0011> - hex half word (16 bits) + * <00112233> - hex word (32 bits) + * - hex double words (64 bits) are not supported, must use + * a byte stream instead. + * [00 11 22 .. nn] - byte stream + * "string" - If the the value doesn't start with "<" or "[", it is + * treated as a string. Note that the quotes are + * stripped by the parser before we get the string. + */ +static int fdt_parse_prop(char *pathp, char *prop, char *newval, + char *data, int *len) +{ + char *cp; /* temporary char pointer */ + unsigned long tmp; /* holds converted values */ + + if (*newval == '<') { + /* + * Bigger values than bytes. + */ + *len = 0; + newval++; + while ((*newval != '>') && (*newval != '\0')) { + cp = newval; + tmp = simple_strtoul(cp, &newval, 16); + if ((newval - cp) <= 2) { + *data = tmp & 0xFF; + data += 1; + *len += 1; + } else if ((newval - cp) <= 4) { + *(uint16_t *)data = __cpu_to_be16(tmp); + data += 2; + *len += 2; + } else if ((newval - cp) <= 8) { + *(uint32_t *)data = __cpu_to_be32(tmp); + data += 4; + *len += 4; + } else { + printf("Sorry, I could not convert \"%s\"\n", + cp); + return 1; + } + while (*newval == ' ') + newval++; + } + if (*newval != '>') { + printf("Unexpected character '%c'\n", *newval); + return 1; + } + } else if (*newval == '[') { + /* + * Byte stream. Convert the values. + */ + *len = 0; + newval++; + while ((*newval != ']') && (*newval != '\0')) { + tmp = simple_strtoul(newval, &newval, 16); + *data++ = tmp & 0xFF; + *len++; + while (*newval == ' ') + newval++; + } + if (*newval != ']') { + printf("Unexpected character '%c'\n", *newval); + return 1; + } + } else { + /* + * Assume it is a string. Copy it into our data area for + * convenience (including the terminating '\0'). + */ + *len = strlen(newval) + 1; + strcpy(data, newval); + } + return 0; +} + +/****************************************************************************/ + +/* + * Heuristic to guess if this is a string or concatenated strings. */ static int is_printable_string(const void *data, int len) @@ -571,6 +504,12 @@ static int is_printable_string(const void *data, int len) return 1; } + +/* + * Print the property in the best format, a heuristic guess. Print as + * a string, concatenated strings, a byte, word, double word, or (if all + * else fails) it is printed as a stream of bytes. + */ static void print_data(const void *data, int len) { int j; @@ -626,6 +565,119 @@ static void print_data(const void *data, int len) } } +/****************************************************************************/ + +/* + * Recursively print (a portion of) the fdt. The depth parameter + * determines how deeply nested the fdt is printed. + */ +static int fdt_print(char *pathp, char *prop, int depth) +{ + static int offstack[MAX_LEVEL]; + static char tabs[MAX_LEVEL+1] = + "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" + "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; + void *nodep; /* property node pointer */ + int nodeoffset; /* node offset from libfdt */ + int nextoffset; /* next node offset from libfdt */ + uint32_t tag; /* tag */ + int len; /* length of the property */ + int level = 0; /* keep track of nesting level */ + + nodeoffset = findnodeoffset(pathp); + if (nodeoffset < 0) { + /* + * Not found or something else bad happened. + */ + return 1; + } + /* + * The user passed in a property as well as node path. + * Print only the given property and then return. + */ + if (prop) { + nodep = fdt_getprop (fdt, nodeoffset, prop, &len); + if (len == 0) { + /* no property value */ + printf("%s %s\n", pathp, prop); + return 0; + } else if (len > 0) { + printf("%s=", prop); + print_data (nodep, len); + printf("\n"); + return 0; + } else { + printf ("libfdt fdt_getprop(): %s\n", + fdt_strerror(len)); + return 1; + } + } + + /* + * The user passed in a node path and no property, + * print the node and all subnodes. + */ + offstack[0] = nodeoffset; + + while(level >= 0) { + tag = fdt_next_tag(fdt, nodeoffset, &nextoffset, &pathp); + switch(tag) { + case FDT_BEGIN_NODE: + if(level <= depth) + printf("%s%s {\n", + &tabs[MAX_LEVEL - level], pathp); + level++; + offstack[level] = nodeoffset; + if (level >= MAX_LEVEL) { + printf("Aaaiii <splat> nested too deep. " + "Aborting.\n"); + return 1; + } + break; + case FDT_END_NODE: + level--; + if(level <= depth) + printf("%s};\n", &tabs[MAX_LEVEL - level]); + if (level == 0) { + level = -1; /* exit the loop */ + } + break; + case FDT_PROP: + nodep = fdt_getprop (fdt, offstack[level], pathp, &len); + if (len < 0) { + printf ("libfdt fdt_getprop(): %s\n", + fdt_strerror(len)); + return 1; + } else if (len == 0) { + /* the property has no value */ + if(level <= depth) + printf("%s%s;\n", + &tabs[MAX_LEVEL - level], + pathp); + } else { + if(level <= depth) { + printf("%s%s=", + &tabs[MAX_LEVEL - level], + pathp); + print_data (nodep, len); + printf(";\n"); + } + } + break; + case FDT_NOP: + break; + case FDT_END: + return 1; + default: + if(level <= depth) + printf("Unknown tag 0x%08X\n", tag); + return 1; + } + nodeoffset = nextoffset; + } + return 0; +} + /********************************************************************/ U_BOOT_CMD( -- 1.4.4.4

1 0

[U-Boot-Users] How to add a driver
by Alex Parkinson 17 May '07

17 May '07

Hey everyone, I've written a very simple driver for an HD44780-compatible LCD which I'd like to include into U-Boot to print a welcome screen while Linux is booting on my AT91SAM9260EK board. I've managed to get the driver working, but only if I put all of my code into board/at91sam9260ek/at91sam9260ek.c. Obviously, this is terrible form, and I'd like to have my code in separate files, hd44780.c and hd44780.h, but I haven't been able to get U-Boot to compile when I do this. I #include <hd44780.h> into at91sam9260ek.c, where I'm calling the hd44780_init() function, and I also added hd44780.o to COBJS in board/at91sam9260ek/Makefile. However, when I compile, I get an error stating that there is an undefined reference to hd44780_init() in board_late_init() of at91sam9260ek.c. So my question is, what's the proper way to add a driver to U-Boot, and where is the best place to initialize that driver. I've been searching the web for some information on the subject, but have so far been able to find any. Cheers, Alex

1 1

[U-Boot-Users] [PATCH] Reduce CONFIG_MPC8YXX_TSECx to CONFIG_TSECx
by Kim Phillips 17 May '07

17 May '07

For all practical u-boot purposes, TSECs don't differ throughout the mpc8[356]xx families; reduce CONFIG_MPC8YXX_TSECx to CONFIG_TSECx. Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- board/cds/mpc8548cds/mpc8548cds.c | 10 ++++---- cpu/mpc83xx/cpu.c | 8 +++--- cpu/mpc85xx/cpu.c | 2 +- cpu/mpc86xx/cpu.c | 8 +++--- drivers/tsec.c | 18 +++++++--------- include/configs/MPC8313ERDB.h | 8 +++--- include/configs/MPC8349EMDS.h | 8 +++--- include/configs/MPC8349ITX.h | 14 ++++++------ include/configs/MPC8540ADS.h | 8 +++--- include/configs/MPC8540EVAL.h | 8 +++--- include/configs/MPC8541CDS.h | 8 +++--- include/configs/MPC8544DS.h | 8 +++--- include/configs/MPC8548CDS.h | 16 +++++++------- include/configs/MPC8555CDS.h | 8 +++--- include/configs/MPC8560ADS.h | 8 +++--- include/configs/MPC8568MDS.h | 12 +++++----- include/configs/MPC8641HPCN.h | 16 +++++++------- include/configs/PM854.h | 8 +++--- include/configs/PM856.h | 8 +++--- include/configs/TQM834x.h | 8 +++--- include/configs/TQM85xx.h | 8 +++--- include/configs/sbc8349.h | 8 +++--- include/configs/stxgp3.h | 8 +++--- include/configs/stxssa.h | 8 +++--- net/eth.c | 39 +++++++----------------------------- 25 files changed, 119 insertions(+), 144 deletions(-) diff --git a/board/cds/mpc8548cds/mpc8548cds.c b/board/cds/mpc8548cds/mpc8548cds.c index 929ff2e..b723641 100644 --- a/board/cds/mpc8548cds/mpc8548cds.c +++ b/board/cds/mpc8548cds/mpc8548cds.c @@ -345,23 +345,23 @@ int last_stage_init(void) /* This is needed to get the RGMII working for the 1.3+ * CDS cards */ if (get_board_version() == 0x13) { - miiphy_write(CONFIG_MPC85XX_TSEC1_NAME, + miiphy_write(CONFIG_TSEC1_NAME, TSEC1_PHY_ADDR, 29, 18); - miiphy_read(CONFIG_MPC85XX_TSEC1_NAME, + miiphy_read(CONFIG_TSEC1_NAME, TSEC1_PHY_ADDR, 30, &temp); temp = (temp & 0xf03f); temp |= 2 << 9; /* 36 ohm */ temp |= 2 << 6; /* 39 ohm */ - miiphy_write(CONFIG_MPC85XX_TSEC1_NAME, + miiphy_write(CONFIG_TSEC1_NAME, TSEC1_PHY_ADDR, 30, temp); - miiphy_write(CONFIG_MPC85XX_TSEC1_NAME, + miiphy_write(CONFIG_TSEC1_NAME, TSEC1_PHY_ADDR, 29, 3); - miiphy_write(CONFIG_MPC85XX_TSEC1_NAME, + miiphy_write(CONFIG_TSEC1_NAME, TSEC1_PHY_ADDR, 30, 0x8000); } diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index e078f27..841fe82 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -415,7 +415,7 @@ static const struct { "clock-frequency", fdt_set_busfreq }, -#ifdef CONFIG_MPC83XX_TSEC1 +#ifdef CONFIG_TSEC1 { "/" OF_SOC "/ethernet@24000, "mac-address", fdt_set_eth0 @@ -425,7 +425,7 @@ static const struct { fdt_set_eth0 }, #endif -#ifdef CONFIG_MPC83XX_TSEC2 +#ifdef CONFIG_TSEC2 { "/" OF_SOC "/ethernet@25000, "mac-address", fdt_set_eth1 @@ -525,7 +525,7 @@ ft_cpu_setup(void *blob, bd_t *bd) if (p != NULL) *p = cpu_to_be32(clock); -#ifdef CONFIG_MPC83XX_TSEC1 +#ifdef CONFIG_TSEC1 p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enetaddr, 6); @@ -535,7 +535,7 @@ ft_cpu_setup(void *blob, bd_t *bd) memcpy(p, bd->bi_enetaddr, 6); #endif -#ifdef CONFIG_MPC83XX_TSEC2 +#ifdef CONFIG_TSEC2 p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enet1addr, 6); diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c index 7735a52..1d791c9 100644 --- a/cpu/mpc85xx/cpu.c +++ b/cpu/mpc85xx/cpu.c @@ -280,7 +280,7 @@ ft_cpu_setup(void *blob, bd_t *bd) if (p != NULL) *p = cpu_to_be32(clock); -#if defined(CONFIG_MPC85XX_TSEC1) +#if defined(CONFIG_TSEC1) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/mac-address", &len); if (p) memcpy(p, bd->bi_enetaddr, 6); diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index a33acfe..9456471 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -278,7 +278,7 @@ ft_cpu_setup(void *blob, bd_t *bd) if (p != NULL) *p = cpu_to_be32(clock); -#if defined(CONFIG_MPC86XX_TSEC1) +#if defined(CONFIG_TSEC1) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enetaddr, 6); @@ -287,7 +287,7 @@ ft_cpu_setup(void *blob, bd_t *bd) memcpy(p, bd->bi_enetaddr, 6); #endif -#if defined(CONFIG_MPC86XX_TSEC2) +#if defined(CONFIG_TSEC2) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enet1addr, 6); @@ -296,7 +296,7 @@ ft_cpu_setup(void *blob, bd_t *bd) memcpy(p, bd->bi_enet1addr, 6); #endif -#if defined(CONFIG_MPC86XX_TSEC3) +#if defined(CONFIG_TSEC3) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@26000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enet2addr, 6); @@ -305,7 +305,7 @@ ft_cpu_setup(void *blob, bd_t *bd) memcpy(p, bd->bi_enet2addr, 6); #endif -#if defined(CONFIG_MPC86XX_TSEC4) +#if defined(CONFIG_TSEC4) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@27000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enet3addr, 6); diff --git a/drivers/tsec.c b/drivers/tsec.c index b418773..2a81aea 100644 --- a/drivers/tsec.c +++ b/drivers/tsec.c @@ -65,33 +65,31 @@ struct tsec_info_struct { * FEC_PHYIDX */ static struct tsec_info_struct tsec_info[] = { -#if defined(CONFIG_MPC85XX_TSEC1) || defined(CONFIG_MPC83XX_TSEC1) -#if defined(CONFIG_MPC8544DS) +#if defined(CONFIG_TSEC1) +#if defined(CONFIG_MPC8544DS) || defined(CONFIG_MPC8641HPCN) {TSEC1_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC1_PHYIDX}, #else {TSEC1_PHY_ADDR, TSEC_GIGABIT, TSEC1_PHYIDX}, #endif -#elif defined(CONFIG_MPC86XX_TSEC1) - {TSEC1_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC1_PHYIDX}, -#else {0, 0, 0}, #endif -#if defined(CONFIG_MPC85XX_TSEC2) || defined(CONFIG_MPC83XX_TSEC2) - {TSEC2_PHY_ADDR, TSEC_GIGABIT, TSEC2_PHYIDX}, -#elif defined(CONFIG_MPC86XX_TSEC2) +#if defined(CONFIG_TSEC2) +#if defined(CONFIG_MPC8641HPCN) {TSEC2_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC2_PHYIDX}, #else + {TSEC2_PHY_ADDR, TSEC_GIGABIT, TSEC2_PHYIDX}, +#endif {0, 0, 0}, #endif #ifdef CONFIG_MPC85XX_FEC {FEC_PHY_ADDR, 0, FEC_PHYIDX}, #else -#if defined(CONFIG_MPC85XX_TSEC3) || defined(CONFIG_MPC83XX_TSEC3) || defined(CONFIG_MPC86XX_TSEC3) +#if defined(CONFIG_TSEC3) {TSEC3_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC3_PHYIDX}, #else {0, 0, 0}, #endif -#if defined(CONFIG_MPC85XX_TSEC4) || defined(CONFIG_MPC83XX_TSEC4) || defined(CONFIG_MPC86XX_TSEC4) +#if defined(CONFIG_TSEC4) {TSEC4_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC4_PHYIDX}, #else {0, 0, 0}, diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 6976313..7e1005c 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -303,11 +303,11 @@ #endif #define CONFIG_GMII 1 /* MII PHY management */ -#define CONFIG_MPC83XX_TSEC1 1 +#define CONFIG_TSEC1 1 -#define CONFIG_MPC83XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC83XX_TSEC2 1 -#define CONFIG_MPC83XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #define TSEC1_PHY_ADDR 0x1c #define TSEC2_PHY_ADDR 4 #define TSEC1_PHYIDX 0 diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 0460be9..20c6d5a 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -432,10 +432,10 @@ #endif #define CONFIG_GMII 1 /* MII PHY management */ -#define CONFIG_MPC83XX_TSEC1 1 -#define CONFIG_MPC83XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC83XX_TSEC2 1 -#define CONFIG_MPC83XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #define TSEC1_PHY_ADDR 0 #define TSEC2_PHY_ADDR 1 #define TSEC1_PHYIDX 0 diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 906339e..834934d 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -374,18 +374,18 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_MII #define CONFIG_PHY_GIGE /* In case CFG_CMD_MII is specified */ -#define CONFIG_MPC83XX_TSEC1 +#define CONFIG_TSEC1 -#ifdef CONFIG_MPC83XX_TSEC1 -#define CONFIG_MPC83XX_TSEC1_NAME "TSEC0" +#ifdef CONFIG_TSEC1 +#define CONFIG_TSEC1_NAME "TSEC0" #define CFG_TSEC1_OFFSET 0x24000 #define TSEC1_PHY_ADDR 0x1c /* VSC8201 uses address 0x1c */ #define TSEC1_PHYIDX 0 #endif -#ifdef CONFIG_MPC83XX_TSEC2 +#ifdef CONFIG_TSEC2 #define CONFIG_HAS_ETH1 -#define CONFIG_MPC83XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC2_NAME "TSEC1" #define CFG_TSEC2_OFFSET 0x25000 #define CONFIG_UNKNOWN_TSEC /* TSEC2 is proprietary */ #define TSEC2_PHY_ADDR 4 @@ -628,11 +628,11 @@ boards, we say we have two, but don't display a message if we find only one. */ */ #define CONFIG_ENV_OVERWRITE -#ifdef CONFIG_MPC83XX_TSEC1 +#ifdef CONFIG_TSEC1 #define CONFIG_ETHADDR 00:E0:0C:00:8C:01 #endif -#ifdef CONFIG_MPC83XX_TSEC2 +#ifdef CONFIG_TSEC2 #define CONFIG_ETH1ADDR 00:E0:0C:00:8C:02 #endif diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 5aeea58..9176be3 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -366,10 +366,10 @@ #endif #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #define TSEC1_PHY_ADDR 0 #define TSEC2_PHY_ADDR 1 #define TSEC1_PHYIDX 0 diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h index 418a3a3..b568cb4 100644 --- a/include/configs/MPC8540EVAL.h +++ b/include/configs/MPC8540EVAL.h @@ -212,10 +212,10 @@ #elif defined(CONFIG_TSEC_ENET) #define CONFIG_NET_MULTI 1 #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #define CONFIG_MPC85XX_FEC 1 #define CONFIG_MPC85XX_FEC_NAME "FEC" #define TSEC1_PHY_ADDR 7 diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index fb360d2..e047e25 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -373,10 +373,10 @@ extern unsigned long get_clock_freq(void); #endif #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #undef CONFIG_MPC85XX_FEC #define TSEC1_PHY_ADDR 0 #define TSEC2_PHY_ADDR 1 diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 4c34308..7cd62e9 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -359,10 +359,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "eTSEC1" -#define CONFIG_MPC85XX_TSEC3 1 -#define CONFIG_MPC85XX_TSEC3_NAME "eTSEC3" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "eTSEC1" +#define CONFIG_TSEC3 1 +#define CONFIG_TSEC3_NAME "eTSEC3" #undef CONFIG_MPC85XX_FEC #define TSEC1_PHY_ADDR 0 diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 680009d..a0d291e 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -391,14 +391,14 @@ extern unsigned long get_clock_freq(void); #endif #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "eTSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "eTSEC1" -#define CONFIG_MPC85XX_TSEC3 1 -#define CONFIG_MPC85XX_TSEC3_NAME "eTSEC2" -#undef CONFIG_MPC85XX_TSEC4 -#define CONFIG_MPC85XX_TSEC4_NAME "eTSEC3" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "eTSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "eTSEC1" +#define CONFIG_TSEC3 1 +#define CONFIG_TSEC3_NAME "eTSEC2" +#undef CONFIG_TSEC4 +#define CONFIG_TSEC4_NAME "eTSEC3" #undef CONFIG_MPC85XX_FEC #define TSEC1_PHY_ADDR 0 diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 4c8b4e7..b7e703c 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -373,10 +373,10 @@ extern unsigned long get_clock_freq(void); #endif #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #undef CONFIG_MPC85XX_FEC #define TSEC1_PHY_ADDR 0 #define TSEC2_PHY_ADDR 1 diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 21e6637..043397f 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -356,10 +356,10 @@ #endif #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #undef CONFIG_MPC85XX_FEC #define TSEC1_PHY_ADDR 0 #define TSEC2_PHY_ADDR 1 diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 3f65644..0ff0416 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -353,12 +353,12 @@ extern unsigned long get_clock_freq(void); #endif #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "eTSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "eTSEC1" -#undef CONFIG_MPC85XX_TSEC3 -#undef CONFIG_MPC85XX_TSEC4 +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "eTSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "eTSEC1" +#undef CONFIG_TSEC3 +#undef CONFIG_TSEC4 #undef CONFIG_MPC85XX_FEC #define TSEC1_PHY_ADDR 2 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index bbe3505..43a9d6f 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -359,14 +359,14 @@ #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC86XX_TSEC1 1 -#define CONFIG_MPC86XX_TSEC1_NAME "eTSEC1" -#define CONFIG_MPC86XX_TSEC2 1 -#define CONFIG_MPC86XX_TSEC2_NAME "eTSEC2" -#define CONFIG_MPC86XX_TSEC3 1 -#define CONFIG_MPC86XX_TSEC3_NAME "eTSEC3" -#define CONFIG_MPC86XX_TSEC4 1 -#define CONFIG_MPC86XX_TSEC4_NAME "eTSEC4" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "eTSEC1" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "eTSEC2" +#define CONFIG_TSEC3 1 +#define CONFIG_TSEC3_NAME "eTSEC3" +#define CONFIG_TSEC4 1 +#define CONFIG_TSEC4_NAME "eTSEC4" #define TSEC1_PHY_ADDR 0 #define TSEC2_PHY_ADDR 1 diff --git a/include/configs/PM854.h b/include/configs/PM854.h index 4fb5440..8f130f5 100644 --- a/include/configs/PM854.h +++ b/include/configs/PM854.h @@ -262,10 +262,10 @@ #endif #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #define TSEC1_PHY_ADDR 0 #define TSEC2_PHY_ADDR 1 #define TSEC1_PHYIDX 0 diff --git a/include/configs/PM856.h b/include/configs/PM856.h index 87ab934..0286b53 100644 --- a/include/configs/PM856.h +++ b/include/configs/PM856.h @@ -258,10 +258,10 @@ #endif #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #undef CONFIG_MPC85XX_FEC #define TSEC1_PHY_ADDR 0 #define TSEC2_PHY_ADDR 1 diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index ed03577..4a5f8b6 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -248,10 +248,10 @@ extern int tqm834x_num_flash_banks; #define CONFIG_NET_MULTI #endif -#define CONFIG_MPC83XX_TSEC1 1 -#define CONFIG_MPC83XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC83XX_TSEC2 1 -#define CONFIG_MPC83XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #define TSEC1_PHY_ADDR 2 #define TSEC2_PHY_ADDR 1 #define TSEC1_PHYIDX 0 diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index f45f3a2..b0b9dd3 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -258,10 +258,10 @@ #define CONFIG_NET_MULTI 1 #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #define TSEC1_PHY_ADDR 2 #define TSEC2_PHY_ADDR 1 #define TSEC1_PHYIDX 0 diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 65aac5c..e6e3866 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -401,10 +401,10 @@ #define CONFIG_NET_MULTI 1 #endif -#define CONFIG_MPC83XX_TSEC1 1 -#define CONFIG_MPC83XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC83XX_TSEC2 1 -#define CONFIG_MPC83XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #define CONFIG_PHY_BCM5421S 1 #define TSEC1_PHY_ADDR 0x19 #define TSEC2_PHY_ADDR 0x1a diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index 625cf20..21065b9 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -230,10 +230,10 @@ #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #undef CONFIG_MPS85XX_FEC #define TSEC1_PHY_ADDR 2 diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index 8624f4b..2a34185 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -252,10 +252,10 @@ #define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_MPC85XX_TSEC1 1 -#define CONFIG_MPC85XX_TSEC1_NAME "TSEC0" -#define CONFIG_MPC85XX_TSEC2 1 -#define CONFIG_MPC85XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "TSEC0" +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "TSEC1" #undef CONFIG_MPS85XX_FEC #define TSEC1_PHY_ADDR 2 diff --git a/net/eth.c b/net/eth.c index 0fc2211..ab56dcf 100644 --- a/net/eth.c +++ b/net/eth.c @@ -173,28 +173,20 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_SK98) skge_initialize(bis); #endif -#if defined(CONFIG_MPC85XX_TSEC1) - tsec_initialize(bis, 0, CONFIG_MPC85XX_TSEC1_NAME); -#elif defined(CONFIG_MPC83XX_TSEC1) - tsec_initialize(bis, 0, CONFIG_MPC83XX_TSEC1_NAME); +#if defined(CONFIG_TSEC1) + tsec_initialize(bis, 0, CONFIG_TSEC1_NAME); #endif -#if defined(CONFIG_MPC85XX_TSEC2) - tsec_initialize(bis, 1, CONFIG_MPC85XX_TSEC2_NAME); -#elif defined(CONFIG_MPC83XX_TSEC2) - tsec_initialize(bis, 1, CONFIG_MPC83XX_TSEC2_NAME); +#if defined(CONFIG_TSEC2) + tsec_initialize(bis, 1, CONFIG_TSEC2_NAME); #endif #if defined(CONFIG_MPC85XX_FEC) tsec_initialize(bis, 2, CONFIG_MPC85XX_FEC_NAME); #else -# if defined(CONFIG_MPC85XX_TSEC3) - tsec_initialize(bis, 2, CONFIG_MPC85XX_TSEC3_NAME); -# elif defined(CONFIG_MPC83XX_TSEC3) - tsec_initialize(bis, 2, CONFIG_MPC83XX_TSEC3_NAME); +# if defined(CONFIG_TSEC3) + tsec_initialize(bis, 2, CONFIG_TSEC3_NAME); # endif -# if defined(CONFIG_MPC85XX_TSEC4) - tsec_initialize(bis, 3, CONFIG_MPC85XX_TSEC4_NAME); -# elif defined(CONFIG_MPC83XX_TSEC4) - tsec_initialize(bis, 3, CONFIG_MPC83XX_TSEC4_NAME); +# if defined(CONFIG_TSEC4) + tsec_initialize(bis, 3, CONFIG_TSEC4_NAME); # endif #endif #if defined(CONFIG_UEC_ETH1) @@ -203,21 +195,6 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_UEC_ETH2) uec_initialize(1); #endif -#if defined(CONFIG_MPC86XX_TSEC1) - tsec_initialize(bis, 0, CONFIG_MPC86XX_TSEC1_NAME); -#endif - -#if defined(CONFIG_MPC86XX_TSEC2) - tsec_initialize(bis, 1, CONFIG_MPC86XX_TSEC2_NAME); -#endif - -#if defined(CONFIG_MPC86XX_TSEC3) - tsec_initialize(bis, 2, CONFIG_MPC86XX_TSEC3_NAME); -#endif - -#if defined(CONFIG_MPC86XX_TSEC4) - tsec_initialize(bis, 3, CONFIG_MPC86XX_TSEC4_NAME); -#endif #if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC) fec_initialize(bis); -- 1.5.0.3

2 1

[U-Boot-Users] cache and buffer problems
by chark_uboot＠126.com 16 May '07

16 May '07

Hi, I got a problem about cache and write buffer after I download the u-boot.bin to my board (s3c4510),I found that I can't erase the Flash (at49bv1614) any more ,so the u-boot is still running on my board I can't erase it . First I think it is caused by the Flash sector locked , but I check the status by software , it shows that it isn't be locked . So I think about write buffer and cache ,maybe my erase command cannot arrive flash,but in write buffer. from the datasheet ,it seems that s3c4510 can't close the cache while it is working untill system reset and clear the cache enable bit in SYSCFG register . but after reset ,u-boot enable cache again . plz tell me how to erase the flash or disable the cache. thx!

5 7

[U-Boot-Users] FLASH: flash_init function returns size correctly ?
by Lucas Cyrulski 16 May '07

16 May '07

Hi, I'm still working to get ATMEL flash working with u-boot, my target board is at91rm9200ek. My u-boot source code version is 1.1.6. There is a function in flash.c file in u-boot/board/atmel/at91rm9200ek: ulong flash_init( void) it calculates flash size and stores it in flash_info.size field and then returns this value. But it is not a physical size of flash ( 2Mbits x 16bits organisation = 32Mbits), only a size that this flash takes in address memory space which is 2Mbits. Is this correct ?? I'm concerned about that because when I worked with this source code, I encountered many errors. It seemed like a person who wrote it did not even try to check if it works on hardware. I'm wondering if it is another mistake or it is how u-boot gets info about flash size on board. Thanks for any replies and regards Lucas

1 0

[U-Boot-Users] [PATCH 2/2] NAND: Add mpc831x support.
by Scott Wood 16 May '07

16 May '07

Signed-off-by: Nick Spence <nick.spence(a)freescale.com> Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- cpu/mpc83xx/Makefile | 2 +- cpu/mpc83xx/nand-831x.c | 764 +++++++++++++++++++++++++++++++++++++++++ include/configs/MPC8313ERDB.h | 4 +- 3 files changed, 768 insertions(+), 2 deletions(-) create mode 100644 cpu/mpc83xx/nand-831x.c diff --git a/cpu/mpc83xx/Makefile b/cpu/mpc83xx/Makefile index bb96f77..e698a02 100644 --- a/cpu/mpc83xx/Makefile +++ b/cpu/mpc83xx/Makefile @@ -29,7 +29,7 @@ LIB = $(obj)lib$(CPU).a START = start.o COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o \ - spd_sdram.o qe_io.o pci.o + spd_sdram.o qe_io.o pci.o nand-831x.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/cpu/mpc83xx/nand-831x.c b/cpu/mpc83xx/nand-831x.c new file mode 100644 index 0000000..4319128 --- /dev/null +++ b/cpu/mpc83xx/nand-831x.c @@ -0,0 +1,764 @@ +/* + * Copyright (C) Freescale Semiconductor, Inc. 2006. + * + * Authors: Nick.Spence(a)freescale.com + * Wilson.Lo(a)freescale.com + * scottwood(a)freescale.com + * + * 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 + */ + +#include <common.h> + +#ifdef CFG_NAND_MPC831X +#if defined(CFG_NAND_LEGACY) +#error "U-Boot legacy NAND commands not supported." +#endif + +#include <malloc.h> +#include <asm/errno.h> +#include <nand.h> + +#undef CFG_FCM_DEBUG +#define CFG_FCM_DEBUG_LVL 5 +#ifdef CFG_FCM_DEBUG +#define FCM_DEBUG(n, args...) \ + do { \ + if (n <= CFG_FCM_DEBUG_LVL) \ + printf(args); \ + } while (0) +#else /* CONFIG_FCM_DEBUG */ +#define FCM_DEBUG(n, args...) do { } while (0) +#endif + +#define ERR_BYTE 0xFF /* Value returned for read bytes when read failed */ +#define FCM_TIMEOUT_USECS 100000 /* Maximum number of uSecs to wait for FCM */ + +/* Private structure holding NAND Flash device specific information */ +struct fcm_nand { + int bank; /* Chip select bank number */ + uint base; /* Chip select base address */ + int pgs; /* NAND page size */ + uint page; /* Last page written to / read from */ + uint fmr; /* FCM Flash Mode Register value */ + uint mdr; /* UPM/FCM Data Register value */ + uint use_mdr; /* Non zero if the MDR is to be set */ + u8 *addr; /* Address of assigned FCM buffer */ + uint read_bytes; /* Number of bytes read during command */ + uint index; /* Pointer to next byte to 'read' */ + uint req_bytes; /* Number of bytes read if command ok */ + uint req_index; /* New read index if command ok */ + uint status; /* status read from LTESR after last op*/ + int use_ecc; /* If non-zero, use ECC on next xfer */ +}; + + +/* These map to the positions used by the FCM hardware ECC generator */ + +/* Small Page FLASH with FMR[ECCM] = 0 */ +static struct nand_oobinfo fcm_oob_sp_eccm0 = { + .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */ + .eccbytes = 3, + .eccpos = {6, 7, 8}, + .oobfree = { {0, 5}, {9, 7} } +}; + +/* Small Page FLASH with FMR[ECCM] = 1 */ +static struct nand_oobinfo fcm_oob_sp_eccm1 = { + .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */ + .eccbytes = 3, + .eccpos = {8, 9, 10}, + .oobfree = { {0, 5}, {6, 2}, {11, 5} } +}; + +/* Large Page FLASH with FMR[ECCM] = 0 */ +static struct nand_oobinfo fcm_oob_lp_eccm0 = { + .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */ + .eccbytes = 12, + .eccpos = {6, 7, 8, 22, 23, 24, 38, 39, 40, 54, 55, 56}, + .oobfree = { {1, 5}, {9, 13}, {25, 13}, {41, 13}, {57, 7} } +}; + +/* Large Page FLASH with FMR[ECCM] = 1 */ +static struct nand_oobinfo fcm_oob_lp_eccm1 = { + .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */ + .eccbytes = 12, + .eccpos = {8, 9, 10, 24, 25, 26, 40, 41, 42, 56, 57, 58}, + .oobfree = { {1, 7}, {11, 13}, {27, 13}, {43, 13}, {59, 5} } +}; + +/* + * execute FCM command and wait for it to complete + */ +static int fcm_run_command(struct mtd_info *mtd) +{ + volatile immap_t *im = (immap_t *)CFG_IMMR; + volatile lbus83xx_t *lbc = &im->lbus; + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + long long end_tick; + + /* Setup the FMR[OP] to execute without write protection */ + lbc->fmr = fcm->fmr | 3; + if (fcm->use_mdr) + lbc->mdr = fcm->mdr; + + FCM_DEBUG(5, "fcm_run_command: fmr= %08X fir= %08X fcr= %08X\n", + lbc->fmr, lbc->fir, lbc->fcr); + FCM_DEBUG(5, "fcm_run_command: fbar=%08X fpar=%08X fbcr=%08X bank=%d\n", + lbc->fbar, lbc->fpar, lbc->fbcr, fcm->bank); + + /* clear event registers */ + lbc->lteatr = 0; + lbc->ltesr |= LTESR_FCT | LTESR_PAR | LTESR_CC; + + /* execute special operation */ + lbc->lsor = fcm->bank; + + /* wait for FCM complete flag or timeout */ + fcm->status = 0; + end_tick = usec2ticks(FCM_TIMEOUT_USECS) + get_ticks(); + + while (end_tick > get_ticks()) { + if (lbc->ltesr & LTESR_CC) { + fcm->status = lbc->ltesr & + (LTESR_FCT | LTESR_PAR | LTESR_CC); + break; + } + } + + /* store mdr value in case it was needed */ + if (fcm->use_mdr) + fcm->mdr = lbc->mdr; + + fcm->use_mdr = 0; + + FCM_DEBUG(5, "fcm_run_command: stat=%08X mdr= %08X fmr= %08X\n", + fcm->status, fcm->mdr, lbc->fmr); + + /* if the operation completed ok then set the read buffer pointers */ + if (fcm->status == LTESR_CC) { + fcm->read_bytes = fcm->req_bytes; + fcm->index = fcm->req_index; + return 0; + } + + printf("831x NAND flash: "); + + if (fcm->status & LTESR_FCT) { + printf("Timeout"); + + if (fcm->status & LTESR_PAR) + printf(", "); + } + + if (fcm->status & LTESR_PAR) + printf("ECC error"); + + printf("\n"); + return -1; +} + +/* + * Set up the FCM hardware block and page address fields, and the fcm + * structure addr field to point to the correct FCM buffer in memory + */ +static void set_addr(struct mtd_info *mtd, int column, int page_addr, int oob) +{ + volatile immap_t *im = (immap_t *)CFG_IMMR; + volatile lbus83xx_t *lbc = &im->lbus; + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + int buf_num; + + fcm->page = page_addr; + + lbc->fbar = page_addr >> (this->phys_erase_shift - this->page_shift); + if (fcm->pgs) { + lbc->fpar = ((page_addr << FPAR_LP_PI_SHIFT) & FPAR_LP_PI) | + (oob ? FPAR_LP_MS : 0) | column; + buf_num = (page_addr & 1) << 2; + } else { + lbc->fpar = ((page_addr << FPAR_SP_PI_SHIFT) & FPAR_SP_PI) | + (oob ? FPAR_SP_MS : 0) | column; + buf_num = page_addr & 7; + } + + fcm->addr = (u8 *)(fcm->base + buf_num * 1024); + + /* for OOB data point to the second half of the buffer */ + if (oob) + fcm->addr += fcm->pgs ? 2048 : 512; +} + +/* not required for FCM */ +static void fcm_hwcontrol(struct mtd_info *mtdinfo, int cmd) +{ +} + +/* + * FCM does not support 16 bit data busses + */ +static u16 fcm_read_word(struct mtd_info *mtd) +{ + printf("fcm_read_word: UNIMPLEMENTED.\n"); + return 0; +} + +static void fcm_write_word(struct mtd_info *mtd, u16 word) +{ + printf("fcm_write_word: UNIMPLEMENTED.\n"); +} + +/* + * Write buf to the FCM Controller Data Buffer + */ +static void fcm_write_buf(struct mtd_info *mtd, const u8 *buf, int len) +{ + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + + FCM_DEBUG(3, "fcm_write_buf: writing %d bytes starting with 0x%x" + " at %d.\n", len, *((u32 *)buf), fcm->index); + + /* copy the data into the FCM hardware buffer and update the index */ + memcpy(&fcm->addr[fcm->index], buf, len); + fcm->index += len; +} + + +/* + * FCM does not support individual writes. Instead these are either commands + * or data being written, both of which are handled through the cmdfunc + * handler. + */ +static void fcm_write_byte(struct mtd_info *mtd, u8 byte) +{ + printf("fcm_write_byte: UNIMPLEMENTED.\n"); +} + +/* + * read a byte from either the FCM hardware buffer if it has any data left + * otherwise issue a command to read a single byte. + */ +static u8 fcm_read_byte(struct mtd_info *mtd) +{ + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + u8 byte; + + /* If there are still bytes in the FCM then use the next byte */ + if (fcm->index < fcm->read_bytes) { + byte = fcm->addr[fcm->index++]; + FCM_DEBUG(4, "fcm_read_byte: byte %u (%02X): %d of %d.\n", + byte, byte, fcm->index - 1, fcm->read_bytes); + return byte; + } + + return ERR_BYTE; +} + +/* + * Read from the FCM Controller Data Buffer + */ +static void fcm_read_buf(struct mtd_info *mtd, u8 *buf, int len) +{ + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + + FCM_DEBUG(3, "fcm_read_buf: reading %d bytes.\n", len); + + /* If last read failed then return error bytes */ + if (fcm->status != LTESR_CC) { + /* just keep copying bytes so that the oob works */ + memcpy(buf, &fcm->addr[fcm->index], len); + fcm->index += len; + return; + } + + len = min(len, fcm->read_bytes - fcm->index); + + memcpy(buf, &fcm->addr[fcm->index], len); + fcm->index += len; +} + +/* + * Verify buffer against the FCM Controller Data Buffer + */ +static int fcm_verify_buf(struct mtd_info *mtd, const u8 *buf, int len) +{ + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + + FCM_DEBUG(3, "fcm_verify_buf: checking %d bytes starting with 0x%02x.\n", + len, *((u32 *)buf)); + + /* If last read failed then return error bytes */ + if (fcm->status != LTESR_CC) + return -EFAULT; + + /* see how much is still in the FCM buffer */ + if ((uint)len > fcm->read_bytes - fcm->index) + return -EFAULT; + + if (memcmp(buf, &fcm->addr[fcm->index], len)) { + fcm->index += len; + return -EFAULT; + } + + fcm->index += len; + return 0; +} + +/* This function is called after Program and Erase Operations to + * check for success or failure + */ +static int fcm_wait(struct mtd_info *mtd, struct nand_chip *this, int state) +{ + volatile immap_t *im = (immap_t *)CFG_IMMR; + volatile lbus83xx_t *lbc = &im->lbus; + struct fcm_nand *fcm = this->priv; + + if (fcm->status != LTESR_CC) + return 1; /* Status Read error */ + + /* Use READ_STATUS command, but wait for the device to be ready */ + fcm->use_mdr = 0; + fcm->req_index = 0; + fcm->read_bytes = 0; + fcm->index = 0; + lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_RBW << FIR_OP1_SHIFT); + lbc->fcr = NAND_CMD_STATUS << FCR_CMD0_SHIFT; + set_addr(mtd, 0, 0, 0); + lbc->fbcr = 1; + fcm->req_bytes = 1; + fcm_run_command(mtd); + + if (fcm->status != LTESR_CC) + return 1; /* Status Read error */ + + return fcm_read_byte(mtd); +} + +/* cmdfunc send commands to the FCM */ +static void fcm_cmdfunc(struct mtd_info *mtd, unsigned command, + int column, int page_addr) +{ + volatile immap_t *im = (immap_t *)CFG_IMMR; + volatile lbus83xx_t *lbc = &im->lbus; + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + + fcm->use_mdr = 0; + fcm->req_index = 0; + + /* clear the read buffer */ + fcm->read_bytes = 0; + if (command != NAND_CMD_PAGEPROG) + fcm->index = 0; + + switch (command) { + /* READ0 reads the entire buffer to use hardware ECC. */ + case NAND_CMD_READ0: + FCM_DEBUG(2, "fcm_cmdfunc: NAND_CMD_READ0, page_addr:" + " 0x%x, column: 0x%x.\n", page_addr, column); + fcm->req_index = column; + + if (fcm->pgs) { + lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_CA << FIR_OP1_SHIFT) | + (FIR_OP_PA << FIR_OP2_SHIFT) | + (FIR_OP_CW1 << FIR_OP3_SHIFT) | + (FIR_OP_RBW << FIR_OP4_SHIFT); + } else { + lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_CA << FIR_OP1_SHIFT) | + (FIR_OP_PA << FIR_OP2_SHIFT) | + (FIR_OP_RBW << FIR_OP3_SHIFT); + } + lbc->fcr = (NAND_CMD_READ0 << FCR_CMD0_SHIFT) | + (NAND_CMD_READSTART << FCR_CMD1_SHIFT); + + fcm->req_bytes = mtd->oobblock + mtd->oobsize; + + if (fcm->use_ecc) + lbc->fbcr = 0; /* read entire page to enable ECC */ + else + lbc->fbcr = fcm->req_bytes; + + set_addr(mtd, 0, page_addr, 0); + goto write_cmd2; + + /* READOOB read only the OOB becasue no ECC is performed */ + case NAND_CMD_READOOB: + FCM_DEBUG(2, "fcm_cmdfunc: NAND_CMD_READOOB, page_addr:" + " 0x%x, column: 0x%x.\n", page_addr, column); + if (fcm->pgs) { + lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_CA << FIR_OP1_SHIFT) | + (FIR_OP_PA << FIR_OP2_SHIFT) | + (FIR_OP_CW1 << FIR_OP3_SHIFT) | + (FIR_OP_RBW << FIR_OP4_SHIFT); + lbc->fcr = (NAND_CMD_READ0 << FCR_CMD0_SHIFT) | + (NAND_CMD_READSTART << FCR_CMD1_SHIFT); + } else { + lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_CA << FIR_OP1_SHIFT) | + (FIR_OP_PA << FIR_OP2_SHIFT) | + (FIR_OP_RBW << FIR_OP3_SHIFT); + lbc->fcr = NAND_CMD_READOOB << FCR_CMD0_SHIFT; + } + lbc->fbcr = mtd->oobsize - column; + set_addr(mtd, column, page_addr, 1); + goto write_cmd1; + + /* READID must read all 5 possible bytes while CEB is active */ + case NAND_CMD_READID: + FCM_DEBUG(2, "fcm_cmdfunc: NAND_CMD_READID.\n"); + lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_UA << FIR_OP1_SHIFT) | + (FIR_OP_RBW << FIR_OP2_SHIFT); + lbc->fcr = NAND_CMD_READID << FCR_CMD0_SHIFT; + lbc->fbcr = 5; /* 5 bytes for manuf, device and exts */ + fcm->use_mdr = 1; + fcm->mdr = 0; + goto write_cmd0; + + /* ERASE1 stores the block and page address */ + case NAND_CMD_ERASE1: + FCM_DEBUG(2, "fcm_cmdfunc: NAND_CMD_ERASE1, page_addr:" + " 0x%x.\n", page_addr); + set_addr(mtd, 0, page_addr, 0); + return; + + /* ERASE2 uses the block and page address from ERASE1 */ + case NAND_CMD_ERASE2: + FCM_DEBUG(2, "fcm_cmdfunc: NAND_CMD_ERASE2.\n"); + lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_PA << FIR_OP1_SHIFT) | + (FIR_OP_CM1 << FIR_OP2_SHIFT); + lbc->fcr = (NAND_CMD_ERASE1 << FCR_CMD0_SHIFT) | + (NAND_CMD_ERASE2 << FCR_CMD1_SHIFT); + lbc->fbcr = 0; + goto write_cmd1; + + /* SEQIN sets up the addr buffer and all registers except the length */ + case NAND_CMD_SEQIN: + FCM_DEBUG(2, "fcm_cmdfunc: NAND_CMD_SEQIN/PAGE_PROG, page_addr:" + " 0x%x, column: 0x%x.\n", page_addr, column); + if (column == 0) { + lbc->fbcr = 0; /* write entire page to enable ECC */ + } else { + lbc->fbcr = 1; /* mark as partial page so no HW ECC */ + } + if (fcm->pgs) { + /* always use READ0 for large page devices */ + lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_CA << FIR_OP1_SHIFT) | + (FIR_OP_PA << FIR_OP2_SHIFT) | + (FIR_OP_WB << FIR_OP3_SHIFT) | + (FIR_OP_CW1 << FIR_OP4_SHIFT); + lbc->fcr = (NAND_CMD_SEQIN << FCR_CMD0_SHIFT) | + (NAND_CMD_PAGEPROG << FCR_CMD1_SHIFT); + set_addr(mtd, column, page_addr, 0); + } else { + lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_CM2 << FIR_OP1_SHIFT) | + (FIR_OP_CA << FIR_OP2_SHIFT) | + (FIR_OP_PA << FIR_OP3_SHIFT) | + (FIR_OP_WB << FIR_OP4_SHIFT) | + (FIR_OP_CW1 << FIR_OP5_SHIFT); + if (column >= mtd->oobblock) { + /* OOB area --> READOOB */ + column -= mtd->oobblock; + lbc->fcr = (NAND_CMD_READOOB << FCR_CMD0_SHIFT) + | (NAND_CMD_PAGEPROG << FCR_CMD1_SHIFT) + | (NAND_CMD_SEQIN << FCR_CMD2_SHIFT); + set_addr(mtd, column, page_addr, 1); + } else if (column < 256) { + /* First 256 bytes --> READ0 */ + lbc->fcr = (NAND_CMD_READ0 << FCR_CMD0_SHIFT) + | (NAND_CMD_PAGEPROG << FCR_CMD1_SHIFT) + | (NAND_CMD_SEQIN << FCR_CMD2_SHIFT); + set_addr(mtd, column, page_addr, 0); + } else { + /* Second 256 bytes --> READ1 */ + column -= 256; + lbc->fcr = (NAND_CMD_READ1 << FCR_CMD0_SHIFT) + | (NAND_CMD_PAGEPROG << FCR_CMD1_SHIFT) + | (NAND_CMD_SEQIN << FCR_CMD2_SHIFT); + set_addr(mtd, column, page_addr, 0); + } + } + return; + + /* PAGEPROG reuses all of the setup from SEQIN and adds the length */ + case NAND_CMD_PAGEPROG: + FCM_DEBUG(2, "fcm_cmdfunc: NAND_CMD_PAGEPROG" + " writing %d bytes.\n", fcm->index); + /* if the write did not start at 0 or is not a full page */ + /* then set the exact length, otherwise use a full page */ + /* write so the HW generates the ECC. */ + if (lbc->fbcr || fcm->index != mtd->oobblock + mtd->oobsize || + !fcm->use_ecc) + lbc->fbcr = fcm->index; + fcm->req_bytes = 0; + goto write_cmd2; + + /* CMD_STATUS must read the status byte while CEB is active */ + /* Note - it does not wait for the ready line */ + case NAND_CMD_STATUS: + FCM_DEBUG(2, "fcm_cmdfunc: NAND_CMD_STATUS.\n"); + lbc->fir = (FIR_OP_CM0 << FIR_OP0_SHIFT) | + (FIR_OP_RBW << FIR_OP1_SHIFT); + lbc->fcr = NAND_CMD_STATUS << FCR_CMD0_SHIFT; + lbc->fbcr = 1; + goto write_cmd0; + + /* RESET without waiting for the ready line */ + case NAND_CMD_RESET: + FCM_DEBUG(2, "fcm_cmdfunc: NAND_CMD_RESET.\n"); + lbc->fir = FIR_OP_CM0 << FIR_OP0_SHIFT; + lbc->fcr = NAND_CMD_RESET << FCR_CMD0_SHIFT; + lbc->fbcr = 0; + goto write_cmd0; + + default: + printk("fcm_cmdfunc: error, unsupported command.\n"); + return; + } + + /* Short cuts fall through to save code */ + write_cmd0: + set_addr(mtd, 0, 0, 0); + write_cmd1: + fcm->req_bytes = lbc->fbcr; + write_cmd2: + fcm_run_command(mtd); +} + +static void fcm_enable_hwecc(struct mtd_info *mtd, int mode) +{ + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + + fcm->use_ecc = 1; +} + +/* + * fcm_correct_data - Detect and correct bit error(s) + * The detection and correction is done automatically by the hardware, + * if the complete page was read. If the status code is okay then there + * was no error, otherwise we return an error code indicating an uncorrectable + * error. + */ +static int fcm_correct_data(struct mtd_info *mtd, u8 *dat, u8 *read_ecc, u8 *calc_ecc) +{ + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + + /* No errors */ + if (fcm->status == LTESR_CC) + return 0; + + return -1; /* uncorrectable error */ +} + +/* + * Dummy scan_bbt to complete setup of the FMR based on NAND size + */ +static int fcm_scan_bbt (struct mtd_info *mtd) +{ + volatile immap_t *im = (immap_t *)CFG_IMMR; + volatile lbus83xx_t *lbc = &im->lbus; + struct nand_chip *this = mtd->priv; + struct fcm_nand *fcm = this->priv; + uint al; + + if (!fcm) { + printk (KERN_ERR "fcm_scan_bbt():" \ + " Failed to allocate chip specific data structure\n"); + return -1; + } + + /* calculate FMR Address Length field */ + al = 0; + if (this->pagemask & 0xffff0000) + al++; + if (this->pagemask & 0xff000000) + al++; + + /* add to ECCM mode set in fcm_init */ + fcm->fmr |= 12 << FMR_CWTO_SHIFT | /* Timeout > 12 mSecs */ + al << FMR_AL_SHIFT; + + FCM_DEBUG(1, "fcm_init: nand->options = %08X\n", this->options); + FCM_DEBUG(1, "fcm_init: nand->numchips = %10d\n", this->numchips); + FCM_DEBUG(1, "fcm_init: nand->chipsize = %10d\n", this->chipsize); + FCM_DEBUG(1, "fcm_init: nand->pagemask = %10X\n", this->pagemask); + FCM_DEBUG(1, "fcm_init: nand->eccmode = %10d\n", this->eccmode); + FCM_DEBUG(1, "fcm_init: nand->eccsize = %10d\n", this->eccsize); + FCM_DEBUG(1, "fcm_init: nand->eccbytes = %10d\n", this->eccbytes); + FCM_DEBUG(1, "fcm_init: nand->eccsteps = %10d\n", this->eccsteps); + FCM_DEBUG(1, "fcm_init: nand->chip_delay = %8d\n", this->chip_delay); + FCM_DEBUG(1, "fcm_init: nand->badblockpos = %7d\n", this->badblockpos); + FCM_DEBUG(1, "fcm_init: nand->chip_shift = %8d\n", this->chip_shift); + FCM_DEBUG(1, "fcm_init: nand->page_shift = %8d\n", this->page_shift); + FCM_DEBUG(1, "fcm_init: nand->phys_erase_shift = %2d\n", + this->phys_erase_shift); + FCM_DEBUG(1, "fcm_init: mtd->flags = %08X\n", mtd->flags); + FCM_DEBUG(1, "fcm_init: mtd->size = %10d\n", mtd->size); + FCM_DEBUG(1, "fcm_init: mtd->erasesize = %10d\n", mtd->erasesize); + FCM_DEBUG(1, "fcm_init: mtd->oobblock = %10d\n", mtd->oobblock); + FCM_DEBUG(1, "fcm_init: mtd->oobsize = %10d\n", mtd->oobsize); + FCM_DEBUG(1, "fcm_init: mtd->oobavail = %10d\n", mtd->oobavail); + FCM_DEBUG(1, "fcm_init: mtd->ecctype = %10d\n", mtd->ecctype); + FCM_DEBUG(1, "fcm_init: mtd->eccsize = %10d\n", mtd->eccsize); + + /* adjust Option Register and ECC to match Flash page size */ + if (mtd->oobblock == 512) + lbc->bank[fcm->bank].or &= ~(OR_FCM_PGS); + else if (mtd->oobblock == 2048) { + lbc->bank[fcm->bank].or |= OR_FCM_PGS; + /* adjust ecc setup if needed */ + if ((lbc->bank[fcm->bank].br & BR_DECC) == BR_DECC_CHK_GEN) { + mtd->eccsize = 2048; + mtd->oobavail -= 9; + this->eccsize = 2048; + this->eccbytes += 9; + this->eccsteps = 1; + this->autooob = (fcm->fmr & FMR_ECCM) ? + &fcm_oob_lp_eccm1 : &fcm_oob_lp_eccm0; + memcpy(&mtd->oobinfo, this->autooob, + sizeof(mtd->oobinfo)); + } + } else { + printf("fcm_init: page size %d is not supported\n", + mtd->oobblock); + return -1; + } + + fcm->pgs = (lbc->bank[fcm->bank].or >> OR_FCM_PGS_SHIFT) & 1; + + /* restore default scan_bbt function and call it */ + this->scan_bbt = nand_default_bbt; + return nand_default_bbt(mtd); +} + +/* + * Board-specific NAND initialization. The following members of the + * argument are board-specific (per include/linux/mtd/nand_new.h): + * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device + * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device + * - hwcontrol: hardwarespecific function for accesing control-lines + * - dev_ready: hardwarespecific function for accesing device ready/busy line + * - enable_hwecc: function to enable (reset) hardware ecc generator. Must + * only be provided if a hardware ECC is available + * - eccmode: mode of ecc, see defines + * - chip_delay: chip dependent delay for transfering data from array to + * read regs (tR) + * - options: various chip options. They can partly be set to inform + * nand_scan about special functionality. See the defines for further + * explanation + * Members with a "?" were not set in the merged testing-NAND branch, + * so they are not set here either. + */ +int board_nand_init(struct nand_chip *nand) +{ + volatile immap_t *im = (immap_t *)CFG_IMMR; + volatile lbus83xx_t *lbc = &im->lbus; + struct fcm_nand *fcm; + uint bank; + + /* Enable FCM detection of timeouts, ECC errors and completion */ + lbc->ltedr &= ~(LTESR_FCT | LTESR_PAR | LTESR_CC); + + fcm = kmalloc (sizeof(struct fcm_nand), GFP_KERNEL); + if (!fcm) { + printk (KERN_ERR "board_nand_init():" \ + " Cannot allocate read buffer data structure\n"); + return -1; + } + + /* Find which chip select bank is being used for this device */ + for (bank = 0; bank < 8; bank++) { + /* Not valid */ + if (!(lbc->bank[bank].br & BR_V)) + continue; + + /* Not NAND */ + if ((lbc->bank[bank].br & BR_MSEL) != BR_MS_FCM) + continue; + + /* Wrong address */ + if ((lbc->bank[bank].br & BR_BA) != + ((u32)(nand->IO_ADDR_R) & lbc->bank[bank].or & OR_FCM_AM)) + continue; + + fcm->bank = bank; + fcm->fmr = FMR_ECCM; /* rest filled in later */ + fcm->fmr = 0; /* rest filled in later */ + fcm->read_bytes = 0; + fcm->index = 0; + fcm->pgs = (lbc->bank[bank].or >> OR_FCM_PGS_SHIFT) & 1; + fcm->base = lbc->bank[bank].br & BR_BA; + fcm->addr = (u8 *)fcm->base; + nand->priv = fcm; + break; + } + + if (!nand->priv) { + printk (KERN_ERR "board_nand_init():" \ + " Could not find matching Chip Select\n"); + return -1; + } + + /* set up nand options */ + nand->options = NAND_NO_AUTOINCR; + /* set up function call table */ + nand->hwcontrol = fcm_hwcontrol; + nand->waitfunc = fcm_wait; + nand->read_byte = fcm_read_byte; + nand->write_byte = fcm_write_byte; + nand->read_word = fcm_read_word; + nand->write_word = fcm_write_word; + nand->read_buf = fcm_read_buf; + nand->verify_buf = fcm_verify_buf; + nand->write_buf = fcm_write_buf; + nand->cmdfunc = fcm_cmdfunc; + nand->scan_bbt = fcm_scan_bbt; + + /* If CS Base Register selects full hardware ECC then use it */ + if (((lbc->bank[bank].br & BR_DECC) >> BR_DECC_SHIFT) == 2) { + /* put in small page settings and adjust later if needed */ + nand->eccmode = NAND_ECC_TRANSPARENT; + nand->autooob = (fcm->fmr & FMR_ECCM) ? + &fcm_oob_sp_eccm1 : &fcm_oob_sp_eccm0; + nand->enable_hwecc = fcm_enable_hwecc; + nand->correct_data = fcm_correct_data; + } else { + /* otherwise fall back to default software ECC */ + nand->eccmode = NAND_ECC_SOFT; + } + + return 0; +} + +#endif diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 2519c6b..536f9ce 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -200,6 +200,7 @@ #define CFG_LBC_MRTPR 0x20000000 /*TODO */ /* LB refresh timer prescal, 266MHz/32 */ /* drivers/nand/nand.c */ +#define CFG_NAND_MPC831X #define CFG_NAND_BASE 0xE2800000 /* 0xF0000000 */ #define CFG_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS 1 @@ -355,7 +356,8 @@ | CFG_CMD_I2C \ | CFG_CMD_MII \ | CFG_CMD_DATE \ - | CFG_CMD_PCI) + | CFG_CMD_PCI \ + | CFG_CMD_NAND) #define CONFIG_CMDLINE_EDITING 1 -- 1.5.0.3

1 0

[U-Boot-Users] u-boot for PXA270
by 白栋贤 16 May '07

16 May '07

Dear all, I am John , and I met a problem about uboot migrate for PXA270. My modification as following: 1 add my board johnPxa in Makefile johnPxa_config : unconfig @$(MKCONFIG) $(@:_config=) arm pxa270 johnPxa 2 add my board directory under board/ with board/lubbock cp -a lubbock johnPxa 3 add johnPxa.h under include/configs/ with lubbock.h cp lubbock.h johnPxa.h and modified it as my board's configuration. 4 add pxa270 directory under cpu/ with cpu/pxa cp -a pxa pxa270 5 modified config.mk under cpu/pxa270/ PLATFORM_CPPFLAGS += -mapcs-32 -march=armv5 -mtune=xscale 6 add my board information into mach-types.h 7 modified start.S(cpu/pxa270) with blob's start.S and xlli_LowLev_Init.s ps: this blob could run on my board. and I compiled with arm-linux-gcc 3.4.1 At last the u-boot.bin couldn't run on my board. Could you give me some help, thank you very much. Best regards John _________________________________________________________________ 免费下载 MSN Explorer: http://explorer.msn.com/lccn

4 3

[U-Boot-Users] [PATCH] cfi_flash.c: use addr2info
by Ladislav Michl 16 May '07

16 May '07

Hi, cfi_flash.c is providing functionality already present elsewhere as addr2info (in common/flash.c). Lets sava few bytes by using it. Btw, I'm considering name flash_get_info a bit more descriptive than addr2info... I'll eventually send renaming patch on top of this one. Signed-off-by: Ladislav Michl <ladis(a)linux-mips.org> Use addr2info instead of private flash_get_info. diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c index 5579a1e..0536e20 100644 --- a/drivers/cfi_flash.c +++ b/drivers/cfi_flash.c @@ -196,9 +196,6 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest, cfiword_t cword static int flash_full_status_check (flash_info_t * info, flash_sect_t sector, ulong tout, char *prompt); ulong flash_get_size (ulong base, int banknum); -#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE) -static flash_info_t *flash_get_info(ulong base); -#endif #ifdef CFG_FLASH_USE_BUFFER_WRITE static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp, int len); #endif @@ -401,7 +398,7 @@ unsigned long flash_init (void) flash_protect (FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + monitor_flash_len - 1, - flash_get_info(CFG_MONITOR_BASE)); + addr2info(CFG_MONITOR_BASE)); #endif /* Environment protection ON by default */ @@ -409,7 +406,7 @@ unsigned long flash_init (void) flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, - flash_get_info(CFG_ENV_ADDR)); + addr2info(CFG_ENV_ADDR)); #endif /* Redundant environment protection ON by default */ @@ -417,32 +414,13 @@ unsigned long flash_init (void) flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, - flash_get_info(CFG_ENV_ADDR_REDUND)); + addr2info(CFG_ENV_ADDR_REDUND)); #endif return (size); } /*----------------------------------------------------------------------- */ -#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE) -static flash_info_t *flash_get_info(ulong base) -{ - int i; - flash_info_t * info = 0; - - for (i = 0; i < CFG_MAX_FLASH_BANKS; i ++) { - info = & flash_info[i]; - if (info->size && info->start[0] <= base && - base <= info->start[0] + info->size - 1) - break; - } - - return i == CFG_MAX_FLASH_BANKS ? 0 : info; -} -#endif - -/*----------------------------------------------------------------------- - */ int flash_erase (flash_info_t * info, int s_first, int s_last) { int rcode = 0;

5 8

[U-Boot-Users] FW: WG: No ethernet functionality.
by u-boot＠olivernetzt.de 16 May '07

16 May '07

Dear all, I'm pretty frustrated and discouraged because my ethernet doesn't work. I have an at91sam9260ek based board (we tried to copy layout 'n stuff) and after a week trying to get the ethernet connection working I'd like to give up. :-/ I am here now, i.e. the u-boot hangs here after entering a ping command to reach a host within the same network (ethaddr, ipaddr is set properly; link status is ok; link speed is detected; phy is initialized): -> ether.c: eth_send: entering while ... [my output] In file ether.c in function eth_send there is that while-loop where the AT91C_EMAC_COMP bit is tested in register EMAC_TSR (transm. status register). This bit is never set, that's why the while-loop loops eternaly. The simple question is: Why? Any hints that might lead to the answer? Oliver.

1 0

[U-Boot-Users] Patch: Add USB OHCI support for MPC8220 - part 1
by TsiChung Liew 16 May '07

16 May '07

- USB Ohci support Regards, TsiChung Liew Signed-off by: TsiChung Liew<Tsi-Chung.Liew(a)freescale.com> diff -rupN u-boot-all.git/cpu/mpc8220/usb_ohci.c u-boot-all-8220- usbh/cpu/mpc8220/usb_ohci.c --- u-boot-all.git/cpu/mpc8220/usb_ohci.c 1969-12-31 18:00:00.000000000 -0600 +++ u-boot-all-8220-usbh/cpu/mpc8220/usb_ohci.c 2007-05-10 17:27:57.000000000 -0500 @@ -0,0 +1,1658 @@ +/* + * URB OHCI HCD (Host Controller Driver) for USB on the MPC8220. + * + * (C) Copyright 2003-2004 + * Gary Jennejohn, DENX Software Engineering <gj(a)denx.de> + * + * (C) Copyright 2004 + * Pierre Aubert, Staubli Faverges <p.aubert(a)staubli.com> + * + * 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 + * + * Note: Part of this code has been derived from linux + * + */ +/* + * IMPORTANT NOTES + * 1 - this driver is intended for use with USB Mass Storage Devices + * (BBB) ONLY. There is NO support for Interrupt or Isochronous pipes! + */ + +#include <common.h> + +#ifdef CONFIG_USB_OHCI + +#include <malloc.h> +#include <usb.h> +#include "usb_ohci.h" + +#include <mpc8220.h> + +#define OHCI_USE_NPS /* force NoPowerSwitching mode */ +#undef OHCI_VERBOSE_DEBUG /* not always helpful */ +#undef DEBUG +#undef SHOW_INFO +#undef OHCI_FILL_TRACE + +/* For initializing controller (mask in an HCFS mode too) */ +#define OHCI_CONTROL_INIT \ + (OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE + +#define readl(a) (*((vu_long *)(a))) +#define writel(a, b) (*((vu_long *)(b)) = ((vu_long)a)) + +#define min_t(type,x,y) ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) + +#ifdef DEBUG +#define dbg(format, arg...) printf("DEBUG: " format "\n", ## arg) +#else +#define dbg(format, arg...) do {} while(0) +#endif /* DEBUG */ +#define err(format, arg...) printf("ERROR: " format "\n", ## arg) +#ifdef SHOW_INFO +#define info(format, arg...) printf("INFO: " format "\n", ## arg) +#else +#define info(format, arg...) do {} while(0) +#endif + +#define m16_swap(x) swap_16(x) +#define m32_swap(x) swap_32(x) + +#define ohci_cpu_to_le16(x) (x) +#define ohci_cpu_to_le32(x) (x) + +/* global ohci_t */ +static ohci_t gohci; +/* this must be aligned to a 256 byte boundary */ +struct ohci_hcca ghcca[1]; +/* a pointer to the aligned storage */ +struct ohci_hcca *phcca; +/* this allocates EDs for all possible endpoints */ +struct ohci_device ohci_dev; +/* urb_priv */ +urb_priv_t urb_priv; +/* RHSC flag */ +int got_rhsc; +/* device which was disconnected */ +struct usb_device *devgone; + +/*-------------------------------------------------------------------------*/ + +/* AMD-756 (D2 rev) reports corrupt register contents in some cases. + * The erratum (#4) description is incorrect. AMD's workaround waits + * till some bits (mostly reserved) are clear; ok for all revs. + */ +#define OHCI_QUIRK_AMD756 0xabcd +#define read_roothub(hc, register, mask) ({ \ + u32 temp = readl (&hc->regs->roothub.register); \ + if (hc->flags & OHCI_QUIRK_AMD756) \ + while (temp & mask) \ + temp = readl (&hc->regs->roothub.register); \ + temp; }) + +static u32 roothub_a(struct ohci *hc) +{ + return read_roothub(hc, a, 0xfc0fe000); +} +static inline u32 roothub_b(struct ohci *hc) +{ + return readl(&hc->regs->roothub.b); +} +static inline u32 roothub_status(struct ohci *hc) +{ + return readl(&hc->regs->roothub.status); +} +static u32 roothub_portstatus(struct ohci *hc, int i) +{ + return read_roothub(hc, portstatus[i], 0xffe0fce0); +} + +/* forward declaration */ +static int hc_interrupt(void); +static void +td_submit_job(struct usb_device *dev, unsigned long pipe, void *buffer, + int transfer_len, struct devrequest *setup, urb_priv_t * urb, + int interval); + +/*-------------------------------------------------------------------------* + * URB support functions + *-------------------------------------------------------------------------*/ + +/* free HCD-private data associated with this URB */ + +static void urb_free_priv(urb_priv_t * urb) +{ + int i; + int last; + struct td *td; + + last = urb->length - 1; + if (last >= 0) { + for (i = 0; i <= last; i++) { + td = urb->td[i]; + if (td) { + td->usb_dev = NULL; + urb->td[i] = NULL; + } + } + } +} + +/*-------------------------------------------------------------------------*/ + +#ifdef DEBUG +static int sohci_get_current_frame_number(struct usb_device *dev); + +/* debug| print the main components of an URB + * small: 0) header + data packets 1) just header */ + +static void pkt_print(struct usb_device *dev, unsigned long pipe, void *buffer, + int transfer_len, struct devrequest *setup, char *str, + int small) +{ + urb_priv_t *purb = &urb_priv; + + dbg("%s URB:[%4x] dev:%2d,ep:%2d-%c,type:%s,len:%d/%d stat:%#lx", + str, + sohci_get_current_frame_number(dev), + usb_pipedevice(pipe), + usb_pipeendpoint(pipe), + usb_pipeout(pipe) ? 'O' : 'I', + usb_pipetype(pipe) < 2 ? (usb_pipeint(pipe) ? "INTR" : "ISOC") : + (usb_pipecontrol(pipe) ? "CTRL" : "BULK"), + purb->actual_length, + transfer_len, + dev->status); +#ifdef OHCI_VERBOSE_DEBUG + if (!small) { + int i, len; + + if (usb_pipecontrol(pipe)) { + printf(__FILE__ ": cmd(8):"); + for (i = 0; i < 8; i++) + printf(" %02x", ((__u8 *) setup)[i]); + printf("\n"); + } + if (transfer_len > 0 && buffer) { + printf(__FILE__ ": data(%d/%d):", + purb->actual_length, transfer_len); + len = usb_pipeout(pipe) ? + transfer_len : purb->actual_length; + for (i = 0; i < 16 && i < len; i++) + printf(" %02x", ((__u8 *) buffer)[i]); + printf("%s\n", i < len ? "..." : ""); + } + } +#endif +} + +/* just for debugging; prints non-empty branches of the int ed tree inclusive iso eds*/ +void ep_print_int_eds(ohci_t * ohci, char *str) +{ + int i, j; + __u32 *ed_p; + for (i = 0; i < 32; i++) { + j = 5; + ed_p = &(ohci->hcca->int_table[i]); + if (*ed_p == 0) + continue; + printf(__FILE__ ": %s branch int %2d(%2x):", str, i, i); + while (*ed_p != 0 && j--) { + ed_t *ed = (ed_t *) ohci_cpu_to_le32(ed_p); + printf(" ed: %4x;", ed->hwINFO); + ed_p = &ed->hwNextED; + } + printf("\n"); + } +} + +static void ohci_dump_intr_mask(char *label, __u32 mask) +{ + dbg("%s: 0x%08x%s%s%s%s%s%s%s%s%s", + label, + mask, + (mask & OHCI_INTR_MIE) ? " MIE" : "", + (mask & OHCI_INTR_OC) ? " OC" : "", + (mask & OHCI_INTR_RHSC) ? " RHSC" : "", + (mask & OHCI_INTR_FNO) ? " FNO" : "", + (mask & OHCI_INTR_UE) ? " UE" : "", + (mask & OHCI_INTR_RD) ? " RD" : "", + (mask & OHCI_INTR_SF) ? " SF" : "", + (mask & OHCI_INTR_WDH) ? " WDH" : "", + (mask & OHCI_INTR_SO) ? " SO" : ""); +} + +static void maybe_print_eds(char *label, __u32 value) +{ + ed_t *edp = (ed_t *) value; + + if (value) { + dbg("%s %08x", label, value); + dbg("%08x", edp->hwINFO); + dbg("%08x", edp->hwTailP); + dbg("%08x", edp->hwHeadP); + dbg("%08x", edp->hwNextED); + } +} + +static char *hcfs2string(int state) +{ + switch (state) { + case OHCI_USB_RESET: + return "reset"; + case OHCI_USB_RESUME: + return "resume"; + case OHCI_USB_OPER: + return "operational"; + case OHCI_USB_SUSPEND: + return "suspend"; + } + return "?"; +} + +/* dump control and status registers */ +static void ohci_dump_status(ohci_t * controller) +{ + struct ohci_regs *regs = controller->regs; + __u32 temp; + + temp = readl(&regs->revision) & 0xff; + if (temp != 0x10) + dbg("spec %d.%d", (temp >> 4), (temp & 0x0f)); + + temp = readl(&regs->control); + dbg("control: 0x%08x%s%s%s HCFS=%s%s%s%s%s CBSR=%d", temp, + (temp & OHCI_CTRL_RWE) ? " RWE" : "", + (temp & OHCI_CTRL_RWC) ? " RWC" : "", + (temp & OHCI_CTRL_IR) ? " IR" : "", + hcfs2string(temp & OHCI_CTRL_HCFS), + (temp & OHCI_CTRL_BLE) ? " BLE" : "", + (temp & OHCI_CTRL_CLE) ? " CLE" : "", + (temp & OHCI_CTRL_IE) ? " IE" : "", + (temp & OHCI_CTRL_PLE) ? " PLE" : "", + temp & OHCI_CTRL_CBSR); + + temp = readl(&regs->cmdstatus); + dbg("cmdstatus: 0x%08x SOC=%d%s%s%s%s", temp, + (temp & OHCI_SOC) >> 16, + (temp & OHCI_OCR) ? " OCR" : "", + (temp & OHCI_BLF) ? " BLF" : "", + (temp & OHCI_CLF) ? " CLF" : "", + (temp & OHCI_HCR) ? " HCR" : ""); + + ohci_dump_intr_mask("intrstatus", readl(&regs->intrstatus)); + ohci_dump_intr_mask("intrenable", readl(&regs->intrenable)); + + maybe_print_eds("ed_periodcurrent", readl(&regs->ed_periodcurrent)); + + maybe_print_eds("ed_controlhead", readl(&regs->ed_controlhead)); + maybe_print_eds("ed_controlcurrent", readl(&regs->ed_controlcurrent)); + + maybe_print_eds("ed_bulkhead", readl(&regs->ed_bulkhead)); + maybe_print_eds("ed_bulkcurrent", readl(&regs->ed_bulkcurrent)); + + maybe_print_eds("donehead", readl(&regs->donehead)); +} + +static void ohci_dump_roothub(ohci_t * controller, int verbose) +{ + __u32 temp, ndp, i; + + temp = roothub_a(controller); + ndp = (temp & RH_A_NDP); + + if (verbose) { + dbg("roothub.a: %08x POTPGT=%d%s%s%s%s%s NDP=%d", temp, + ((temp & RH_A_POTPGT) >> 24) & 0xff, + (temp & RH_A_NOCP) ? " NOCP" : "", + (temp & RH_A_OCPM) ? " OCPM" : "", + (temp & RH_A_DT) ? " DT" : "", + (temp & RH_A_NPS) ? " NPS" : "", + (temp & RH_A_PSM) ? " PSM" : "", + ndp); + temp = roothub_b(controller); + dbg("roothub.b: %08x PPCM=%04x DR=%04x", + temp, (temp & RH_B_PPCM) >> 16, (temp & RH_B_DR) + ); + temp = roothub_status(controller); + dbg("roothub.status: %08x%s%s%s%s%s%s", + temp, + (temp & RH_HS_CRWE) ? " CRWE" : "", + (temp & RH_HS_OCIC) ? " OCIC" : "", + (temp & RH_HS_LPSC) ? " LPSC" : "", + (temp & RH_HS_DRWE) ? " DRWE" : "", + (temp & RH_HS_OCI) ? " OCI" : "", + (temp & RH_HS_LPS) ? " LPS" : ""); + } + + for (i = 0; i < ndp; i++) { + temp = roothub_portstatus(controller, i); + dbg("roothub.portstatus [%d] = 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s", + i, + temp, + (temp & RH_PS_PRSC) ? " PRSC" : "", + (temp & RH_PS_OCIC) ? " OCIC" : "", + (temp & RH_PS_PSSC) ? " PSSC" : "", + (temp & RH_PS_PESC) ? " PESC" : "", + (temp & RH_PS_CSC) ? " CSC" : "", + (temp & RH_PS_LSDA) ? " LSDA" : "", + (temp & RH_PS_PPS) ? " PPS" : "", + (temp & RH_PS_PRS) ? " PRS" : "", + (temp & RH_PS_POCI) ? " POCI" : "", + (temp & RH_PS_PSS) ? " PSS" : "", + (temp & RH_PS_PES) ? " PES" : "", + (temp & RH_PS_CCS) ? " CCS" : ""); + } +} + +static void ohci_dump(ohci_t * controller, int verbose) +{ + dbg("OHCI controller usb-%s state", controller->slot_name); + + /* dumps some of the state we know about */ + ohci_dump_status(controller); + if (verbose) + ep_print_int_eds(controller, "hcca"); + dbg("hcca frame #%04x", controller->hcca->frame_no); + ohci_dump_roothub(controller, 1); +} + +#endif /* DEBUG */ + +/*-------------------------------------------------------------------------* + * Interface functions (URB) + *-------------------------------------------------------------------------*/ + +/* get a transfer request */ + +int sohci_submit_job(struct usb_device *dev, unsigned long pipe, void *buffer, + int transfer_len, struct devrequest *setup, int interval) +{ + ohci_t *ohci; + ed_t *ed; + urb_priv_t *purb_priv; + int i, size = 0; + + ohci = &gohci; + + /* when controller's hung, permit only roothub cleanup attempts + * such as powering down ports */ + if (ohci->disabled) { + err("sohci_submit_job: EPIPE"); + return -1; + } + + /* every endpoint has a ed, locate and fill it */ + if (!(ed = ep_add_ed(dev, pipe))) { + err("sohci_submit_job: ENOMEM"); + return -1; + } + + /* for the private part of the URB we need the number of TDs (size) */ + switch (usb_pipetype(pipe)) { + case PIPE_BULK: /* one TD for every 4096 Byte */ + size = (transfer_len - 1) / 4096 + 1; + break; + case PIPE_CONTROL: /* 1 TD for setup, 1 for ACK and 1 for every 4096 B */ + size = (transfer_len == 0) ? 2 : (transfer_len - 1) / 4096 + 3; + break; + } + + if (size >= (N_URB_TD - 1)) { + err("need %d TDs, only have %d", size, N_URB_TD); + return -1; + } + purb_priv = &urb_priv; + purb_priv->pipe = pipe; + + /* fill the private part of the URB */ + purb_priv->length = size; + purb_priv->ed = ed; + purb_priv->actual_length = 0; + + /* allocate the TDs */ + /* note that td[0] was allocated in ep_add_ed */ + for (i = 0; i < size; i++) { + purb_priv->td[i] = td_alloc(dev); + if (!purb_priv->td[i]) { + purb_priv->length = i; + urb_free_priv(purb_priv); + err("sohci_submit_job: ENOMEM"); + return -1; + } + } + + if (ed->state == ED_NEW || (ed->state & ED_DEL)) { + urb_free_priv(purb_priv); + err("sohci_submit_job: EINVAL"); + return -1; + } + + /* link the ed into a chain if is not already */ + if (ed->state != ED_OPER) + ep_link(ohci, ed); + + /* fill the TDs and link it to the ed */ + td_submit_job(dev, pipe, buffer, transfer_len, setup, purb_priv, + interval); + + return 0; +} + +/*-------------------------------------------------------------------------*/ + +#ifdef DEBUG +/* tell us the current USB frame number */ + +static int sohci_get_current_frame_number(struct usb_device *usb_dev) +{ + ohci_t *ohci = &gohci; + + return ohci_cpu_to_le16(ohci->hcca->frame_no); +} +#endif + +/*-------------------------------------------------------------------------* + * ED handling functions + *-------------------------------------------------------------------------*/ + +/* link an ed into one of the HC chains */ + +static int ep_link(ohci_t * ohci, ed_t * edi) +{ + volatile ed_t *ed = edi; + + ed->state = ED_OPER; + + switch (ed->type) { + case PIPE_CONTROL: + ed->hwNextED = 0; + if (ohci->ed_controltail == NULL) { + writel(ed, &ohci->regs->ed_controlhead); + } else { + ohci->ed_controltail->hwNextED = + ohci_cpu_to_le32((unsigned long)ed); + } + ed->ed_prev = ohci->ed_controltail; + if (!ohci->ed_controltail && !ohci->ed_rm_list[0] && + !ohci->ed_rm_list[1] && !ohci->sleeping) { + ohci->hc_control |= OHCI_CTRL_CLE; + writel(ohci->hc_control, &ohci->regs->control); + } + ohci->ed_controltail = edi; + break; + + case PIPE_BULK: + ed->hwNextED = 0; + if (ohci->ed_bulktail == NULL) { + writel(ed, &ohci->regs->ed_bulkhead); + } else { + ohci->ed_bulktail->hwNextED = + ohci_cpu_to_le32((unsigned long)ed); + } + ed->ed_prev = ohci->ed_bulktail; + if (!ohci->ed_bulktail && !ohci->ed_rm_list[0] && + !ohci->ed_rm_list[1] && !ohci->sleeping) { + ohci->hc_control |= OHCI_CTRL_BLE; + writel(ohci->hc_control, &ohci->regs->control); + } + ohci->ed_bulktail = edi; + break; + } + return 0; +} + +/*-------------------------------------------------------------------------*/ + +/* unlink an ed from one of the HC chains. + * just the link to the ed is unlinked. + * the link from the ed still points to another operational ed or 0 + * so the HC can eventually finish the processing of the unlinked ed */ + +static int ep_unlink(ohci_t * ohci, ed_t * edi) +{ + volatile ed_t *ed = edi; + + ed->hwINFO |= ohci_cpu_to_le32(OHCI_ED_SKIP); + + switch (ed->type) { + case PIPE_CONTROL: + if (ed->ed_prev == NULL) { + if (!ed->hwNextED) { + ohci->hc_control &= ~OHCI_CTRL_CLE; + writel(ohci->hc_control, &ohci->regs->control); + } + writel(ohci_cpu_to_le32(*((__u32 *) & ed->hwNextED)), + &ohci->regs->ed_controlhead); + } else { + ed->ed_prev->hwNextED = ed->hwNextED; + } + if (ohci->ed_controltail == ed) { + ohci->ed_controltail = ed->ed_prev; + } else { + ((ed_t *) + ohci_cpu_to_le32(*((__u32 *) & ed->hwNextED)))-> + ed_prev = ed->ed_prev; + } + break; + + case PIPE_BULK: + if (ed->ed_prev == NULL) { + if (!ed->hwNextED) { + ohci->hc_control &= ~OHCI_CTRL_BLE; + writel(ohci->hc_control, &ohci->regs->control); + } + writel(ohci_cpu_to_le32(*((__u32 *) & ed->hwNextED)), + &ohci->regs->ed_bulkhead); + } else { + ed->ed_prev->hwNextED = ed->hwNextED; + } + if (ohci->ed_bulktail == ed) { + ohci->ed_bulktail = ed->ed_prev; + } else { + ((ed_t *) + ohci_cpu_to_le32(*((__u32 *) & ed->hwNextED)))-> + ed_prev = ed->ed_prev; + } + break; + } + ed->state = ED_UNLINK; + return 0; +} + +/*-------------------------------------------------------------------------*/ + +/* add/reinit an endpoint; this should be done once at the usb_set_configuration command, + * but the USB stack is a little bit stateless so we do it at every transaction + * if the state of the ed is ED_NEW then a dummy td is added and the state is changed to ED_UNLINK + * in all other cases the state is left unchanged + * the ed info fields are setted anyway even though most of them should not change */ + +static ed_t *ep_add_ed(struct usb_device *usb_dev, unsigned long pipe) +{ + td_t *td; + ed_t *ed_ret; + volatile ed_t *ed; + + ed = ed_ret = &ohci_dev.ed[(usb_pipeendpoint(pipe) << 1) | + (usb_pipecontrol(pipe) ? 0 : + usb_pipeout(pipe))]; + + if ((ed->state & ED_DEL) || (ed->state & ED_URB_DEL)) { + err("ep_add_ed: pending delete"); + /* pending delete request */ + return NULL; + } + + if (ed->state == ED_NEW) { + ed->hwINFO = ohci_cpu_to_le32(OHCI_ED_SKIP); /* skip ed */ + /* dummy td; end of td list for ed */ + td = td_alloc(usb_dev); + ed->hwTailP = ohci_cpu_to_le32((unsigned long)td); + ed->hwHeadP = ed->hwTailP; + ed->state = ED_UNLINK; + ed->type = usb_pipetype(pipe); + ohci_dev.ed_cnt++; + } + + ed->hwINFO = ohci_cpu_to_le32(usb_pipedevice(pipe) + | usb_pipeendpoint(pipe) << 7 + | (usb_pipeisoc(pipe) ? 0x8000 : 0) + | (usb_pipecontrol(pipe) ? 0 + : (usb_pipeout(pipe) ? 0x800 : 0x1000)) + | usb_pipeslow(pipe) << 13 | + usb_maxpacket(usb_dev, pipe) << 16); + + return ed_ret; +} + +/*-------------------------------------------------------------------------* + * TD handling functions + *-------------------------------------------------------------------------*/ + +/* enqueue next TD for this URB (OHCI spec 5.2.8.2) */ + +static void td_fill(ohci_t * ohci, unsigned int info, + void *data, int len, + struct usb_device *dev, int index, urb_priv_t * urb_priv) +{ + volatile td_t *td, *td_pt; +#ifdef OHCI_FILL_TRACE + int i; +#endif + + if (index > urb_priv->length) { + err("index > length"); + return; + } + /* use this td as the next dummy */ + td_pt = urb_priv->td[index]; + td_pt->hwNextTD = 0; + + /* fill the old dummy TD */ + td = urb_priv->td[index] = + (td_t *) (ohci_cpu_to_le32(urb_priv->ed->hwTailP) & ~0xf); + + td->ed = urb_priv->ed; + td->next_dl_td = NULL; + td->index = index; + td->data = (__u32) data; +#ifdef OHCI_FILL_TRACE + if ((usb_pipetype(urb_priv->pipe) == PIPE_BULK) + && usb_pipeout(urb_priv->pipe)) { + for (i = 0; i < len; i++) + printf("td->data[%d] %#2x ", i, + ((unsigned char *)td->data)[i]); + printf("\n"); + } +#endif + if (!len) + data = 0; + + td->hwINFO = ohci_cpu_to_le32(info); + td->hwCBP = ohci_cpu_to_le32((unsigned long)data); + if (data) + td->hwBE = ohci_cpu_to_le32((unsigned long)(data + len - 1)); + else + td->hwBE = 0; + td->hwNextTD = ohci_cpu_to_le32((unsigned long)td_pt); + td->hwPSW[0] = ohci_cpu_to_le16(((__u32) data & 0x0FFF) | 0xE000); + + /* append to queue */ + td->ed->hwTailP = td->hwNextTD; +} + +/*-------------------------------------------------------------------------*/ + +/* prepare all TDs of a transfer */ + +static void td_submit_job(struct usb_device *dev, unsigned long pipe, + void *buffer, int transfer_len, + struct devrequest *setup, urb_priv_t * urb, + int interval) +{ + ohci_t *ohci = &gohci; + int data_len = transfer_len; + void *data; + int cnt = 0; + __u32 info = 0; + unsigned int toggle = 0; + + /* OHCI handles the DATA-toggles itself, we just use the USB-toggle bits for reseting */ + if (usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) { + toggle = TD_T_TOGGLE; + } else { + toggle = TD_T_DATA0; + usb_settoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe), + 1); + } + urb->td_cnt = 0; + if (data_len) + data = buffer; + else + data = 0; + + switch (usb_pipetype(pipe)) { + case PIPE_BULK: + info = usb_pipeout(pipe) ? TD_CC | TD_DP_OUT : TD_CC | TD_DP_IN; + while (data_len > 4096) { + td_fill(ohci, info | (cnt ? TD_T_TOGGLE : toggle), data, + 4096, dev, cnt, urb); + data += 4096; + data_len -= 4096; + cnt++; + } + info = usb_pipeout(pipe) ? + TD_CC | TD_DP_OUT : TD_CC | TD_R | TD_DP_IN; + td_fill(ohci, info | (cnt ? TD_T_TOGGLE : toggle), data, + data_len, dev, cnt, urb); + cnt++; + + if (!ohci->sleeping) + writel(OHCI_BLF, &ohci->regs->cmdstatus); /* start bulk list */ + break; + + case PIPE_CONTROL: + info = TD_CC | TD_DP_SETUP | TD_T_DATA0; + td_fill(ohci, info, setup, 8, dev, cnt++, urb); + if (data_len > 0) { + info = usb_pipeout(pipe) ? + TD_CC | TD_R | TD_DP_OUT | TD_T_DATA1 : TD_CC | TD_R + | TD_DP_IN | TD_T_DATA1; + /* NOTE: mishandles transfers >8K, some >4K */ + td_fill(ohci, info, data, data_len, dev, cnt++, urb); + } + info = usb_pipeout(pipe) ? + TD_CC | TD_DP_IN | TD_T_DATA1 : TD_CC | TD_DP_OUT | + TD_T_DATA1; + td_fill(ohci, info, data, 0, dev, cnt++, urb); + if (!ohci->sleeping) + writel(OHCI_CLF, &ohci->regs->cmdstatus); /* start Control list */ + break; + } + if (urb->length != cnt) + dbg("TD LENGTH %d != CNT %d", urb->length, cnt); +} + +/*-------------------------------------------------------------------------* + * Done List handling functions + *-------------------------------------------------------------------------*/ + +/* calculate the transfer length and update the urb */ + +static void dl_transfer_length(td_t * td) +{ + __u32 tdINFO, tdBE, tdCBP; + urb_priv_t *lurb_priv = &urb_priv; + + tdINFO = ohci_cpu_to_le32(td->hwINFO); + tdBE = ohci_cpu_to_le32(td->hwBE); + tdCBP = ohci_cpu_to_le32(td->hwCBP); + + if (!(usb_pipetype(lurb_priv->pipe) == PIPE_CONTROL && + ((td->index == 0) || (td->index == lurb_priv->length - 1)))) { + if (tdBE != 0) { + if (td->hwCBP == 0) + lurb_priv->actual_length += tdBE - td->data + 1; + else + lurb_priv->actual_length += tdCBP - td->data; + } + } +} + +/*-------------------------------------------------------------------------*/ + +/* replies to the request have to be on a FIFO basis so + * we reverse the reversed done-list */ + +static td_t *dl_reverse_done_list(ohci_t * ohci) +{ + __u32 td_list_hc; + td_t *td_rev = NULL; + td_t *td_list = NULL; + urb_priv_t *lurb_priv = NULL; + + td_list_hc = ohci_cpu_to_le32(ohci->hcca->done_head) & 0xfffffff0; + ohci->hcca->done_head = 0; + + while (td_list_hc) { + td_list = (td_t *) td_list_hc; + + if (TD_CC_GET(ohci_cpu_to_le32(td_list->hwINFO))) { + lurb_priv = &urb_priv; + dbg(" USB-error/status: %x : %p", + TD_CC_GET(ohci_cpu_to_le32(td_list->hwINFO)), + td_list); + if (td_list->ed->hwHeadP & ohci_cpu_to_le32(0x1)) { + if (lurb_priv + && ((td_list->index + 1) < + lurb_priv->length)) { + td_list->ed->hwHeadP = + (lurb_priv-> + td[lurb_priv->length - + 1]-> + hwNextTD & + ohci_cpu_to_le32(0xfffffff0)) | + (td_list->ed-> + hwHeadP & ohci_cpu_to_le32(0x2)); + lurb_priv->td_cnt += + lurb_priv->length - td_list->index - + 1; + } else + td_list->ed->hwHeadP &= + ohci_cpu_to_le32(0xfffffff2); + } +#ifdef CONFIG_MPC8220 + td_list->hwNextTD = 0; +#endif + } + + td_list->next_dl_td = td_rev; + td_rev = td_list; + td_list_hc = ohci_cpu_to_le32(td_list->hwNextTD) & 0xfffffff0; + } + return td_list; +} +

3 5

[U-Boot-Users] [GIT PULL] mpc83xx: MPC8313ERDB support, memory init fixes
by Kim Phillips 16 May '07

16 May '07

Wolfgang, please pull: git://www.denx.de/git/u-boot-mpc83xx.git to add support for the MPC8313ERDB, plus a couple of memory initialization fixes: Kim Phillips (3): mpc83xx: minor fixups for 8313rdb introduction mpc83xx: replace elaborate boottime verbosity with 'clocks' command mpc83xx: fix trivial error in MAKEALL Scott Wood (7): mpc83xx: Add register definitions for MPC831x. mpc83xx: Recognize SPR values for MPC8311 and MPC8313. mpc83xx: Change PVR_83xx to PVR_E300C1-3, and update checkcpu(). mpc83xx: Add 831x support to global_data.h mpc83xx: Add 831x support to speed.c. mpc83xx: Add generic PCI setup code. mpc83xx: Add MPC8313ERDB support. Timur Tabi (1): Fix memory initialization on MPC8349E-mITX Xie Xiaobo (1): Fix two bugs for MPC83xx DDR2 controller SPD Init MAKEALL | 4 +- Makefile | 13 + board/mpc8313erdb/Makefile | 50 ++++ board/mpc8313erdb/config.mk | 1 + board/mpc8313erdb/mpc8313erdb.c | 116 ++++++++ board/mpc8313erdb/sdram.c | 133 +++++++++ board/mpc8313erdb/u-boot.lds | 123 +++++++++ board/mpc8349itx/mpc8349itx.c | 3 +- cpu/mpc83xx/Makefile | 2 +- cpu/mpc83xx/cpu.c | 39 +++- cpu/mpc83xx/pci.c | 192 +++++++++++++ cpu/mpc83xx/spd_sdram.c | 11 +- cpu/mpc83xx/speed.c | 78 ++++-- doc/README.mpc8313erdb | 83 ++++++ include/asm-ppc/e300.h | 16 +- include/asm-ppc/global_data.h | 6 +- include/asm-ppc/immap_83xx.h | 56 ++++- include/common.h | 2 - include/configs/MPC8313ERDB.h | 569 +++++++++++++++++++++++++++++++++++++++ include/configs/MPC8349ITX.h | 3 + include/mpc83xx.h | 257 ++++++++++++++++++- lib_ppc/board.c | 4 - 22 files changed, 1686 insertions(+), 75 deletions(-) create mode 100644 board/mpc8313erdb/Makefile create mode 100644 board/mpc8313erdb/config.mk create mode 100644 board/mpc8313erdb/mpc8313erdb.c create mode 100644 board/mpc8313erdb/sdram.c create mode 100644 board/mpc8313erdb/u-boot.lds create mode 100644 cpu/mpc83xx/pci.c create mode 100644 doc/README.mpc8313erdb create mode 100644 include/configs/MPC8313ERDB.h

2 1

[U-Boot-Users] Please pull u-boot-microblaze.git
by Michal Simek 16 May '07

16 May '07

Hi Wolfgang, Please pull u-boot-microblaze.git to mainline. Changes: Support USE_MSR_INTR, FSL links. New FSL commands. Read and Write to SPR register. Clean ASM code. Exception handling for Microblaze v5 FIX bug in interrupt handler Best regards, Michal Simek

2 1

[U-Boot-Users] undefined instruction during bootp
by Junior 15 May '07

15 May '07

Hi all, I'm getting an undefined instruction error at the end of the bootp command: Filename 'kernel_img'. Load address: 0xc0f00000 Loading: ################################################################# ############undefined instruction pc : [<75b1ac08>] lr : [<c1fc139c>] sp : c1f5fb00 ip : ffffffff fp : c1f5fded r10: 8388956c r9 : 328b03e0 r8 : c1f5ffdc r7 : 6bfbb68d r6 : 8ecfd531 r5 : 5faa503d r4 : e926e94c r3 : 70000048 r2 : 6137fe02 r1 : 0000002e r0 : f53c4775 Flags: Nzcv IRQs off FIQs off Mode SVC_32 Resetting CPU ... This seem to happen durint the NetSendUDPPacket functions: c1fc1384: ebffff66 bl c1fc1124 <NetSetIP> c1fc1388: e5970000 ldr r0, [r7] c1fc138c: e0601004 rsb r1, r0, r4 c1fc1390: e0811009 add r1, r1, r9 c1fc1394: e281101c add r1, r1, #28 ; 0x1c c1fc1398: eb000d27 bl c1fc483c <eth_send> c1fc139c: e3a00000 mov r0, #0 ; 0x0 c1fc13a0: e28dd00c add sp, sp, #12 ; 0xc c1fc13a4: e8bd8ef0 ldmia sp!, {r4, r5, r6, r7, r9, sl, fp, pc} c1fc13a8: c1fd60d0 ldrgtsb r6, [sp]! c1fc13ac: c1fd6dd4 ldrgtsb r6, [sp, #212]! c1fc13b0: c1fd8d54 mvngts r8, r4, asr sp c1fc13b4: c1fd6dd0 ldrgtsb r6, [sp, #208]! c1fc13b8: c1fd8d48 mvngts r8, r8, asr #26 c1fc13bc: c1fd8d50 mvngts r8, r0, asr sp c1fc13c0: c1fd8d58 mvngts r8, r8, asr sp c1fc13c4: c1fd9380 mvngts r9, r0, lsl #7 c1fc13c8: c1fd937c mvngts r9, ip, ror r3 Does anyone know how to solve this problem? Thanks, --Jr.

2 4

[U-Boot-Users] [DNX#2007051542000041] [PATCH] Add support for BCM5464 Quad Phy
by U-Boot patch tracking system 15 May '07

15 May '07

Dear Mr. U. Boot, thank you for your contribution to the U-Boot project. Your e-mail was registered at our system under the ticket number [DNX#2007051542000041]. Please keep this ticket ID string in the subject line of any e-mail replies!!! Your U-Boot support team Powered by OTRS (http://otrs.org/)

1 0

[U-Boot-Users] [DNX#2007051542000041] [PATCH] Add support for BCM5464 Quad Phy
by DENX Support System 15 May '07

15 May '07

Hello list, inside the automatic U-Boot patch tracking system a new ticket [DNX#2007051542000041] was created: <snip> > In message <051f01c78b71$261b5800$6900a8c0@ESIDT> you wrote: > > > > Added support for Broadcom's BCM5464 Quad Phy > > > > Signed-off-by: Joe Hamman <joe.hamman(a)embeddedspecialties.com> > > Applied to u-boot-testing. > > Thanks. > > > > diff --git a/drivers/tsec.c b/drivers/tsec.c > > index 3f11eb0..5c4219d 100644 > ------------------------^^^^^^^^ > > But please keep your file modes under control!!!! > > Best regards, > > Wolfgang Denk > > -- > DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de > "Spock, did you see the looks on their faces?" > "Yes, Captain, a sort of vacant contentment." </snip> Your U-Boot support team

1 0

[U-Boot-Users] [PATCH re-send] MACOSX support
by Aubrey.Li 15 May '07

15 May '07

The following patch fixes compilation issue on macosx >From 8291cf1d7cf4544312ffd819a401c7de68b7a6bc Mon Sep 17 00:00:00 2001 From: Aubrey Li <aubrey.adi(a)gmail.com> Date: Mon, 14 May 2007 11:17:26 +0800 Subject: [PATCH] MACOSX support Singed-off-by: Marc Hoffman <Marc.Hoffman(a)analog.com> Signed-off-by: Aubrey Li <aubrey.adi(a)gmail.com> --- tools/Makefile | 2 +- tools/mkimage.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 6177f90..5e26bd7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -74,7 +74,7 @@ TOOLSUBDIRS = ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc) HOST_CFLAGS = -traditional-cpp -Wall HOST_LDFLAGS =-multiply_defined suppress -HOST_ENVIRO_CFLAGS = -traditional-cpp +HOST_ENVIRO_CFLAGS = else ifeq ($(HOSTOS)-$(HOSTARCH),netbsd-ppc) diff --git a/tools/mkimage.c b/tools/mkimage.c index 416e658..2125130 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -446,7 +446,7 @@ NXTARG: ; } /* We're a bit of paranoid */ -#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__) +#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__) && !defined(__APPLE__) (void) fdatasync (ifd); #else (void) fsync (ifd); @@ -496,7 +496,7 @@ NXTARG: ; (void) munmap((void *)ptr, sbuf.st_size); /* We're a bit of paranoid */ -#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__) +#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__) && !defined(__APPLE__) (void) fdatasync (ifd); #else (void) fsync (ifd); -- 1.5.1.2

2 1

[U-Boot-Users] [patch] Search the exception table with linear algorithm
by Zang Roy-r61911 15 May '07

15 May '07

Search the exception table with linear algorithm instead of bisecting algorithm. Because the exception table might be unsorted. Signed-off-by: Roy Zang <tie-fei.zang(a)freescale.com> --- lib_ppc/extable.c | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/lib_ppc/extable.c b/lib_ppc/extable.c index b14d661..8354411 100644 --- a/lib_ppc/extable.c +++ b/lib_ppc/extable.c @@ -52,30 +52,27 @@ search_one_table(const struct exception_table_entry *first, const struct exception_table_entry *last, unsigned long value) { - while (first <= last) { - const struct exception_table_entry *mid; - long diff; - - mid = (last - first) / 2 + first; - if ((ulong) mid > CFG_MONITOR_BASE) { - /* exception occurs in FLASH, before u-boot relocation. - * No relocation offset is needed. - */ - diff = mid->insn - value; + long diff; + if ((ulong) first > CFG_MONITOR_BASE) { + /* exception occurs in FLASH, before u-boot relocation. + * No relocation offset is needed. + */ + while (first <= last) { + diff = first->insn - value; if (diff == 0) - return mid->fixup; - } else { - /* exception occurs in RAM, after u-boot relocation. - * A relocation offset should be added. - */ - diff = (mid->insn + gd->reloc_off) - value; + return first->fixup; + first++; + } + } else { + /* exception occurs in RAM, after u-boot relocation. + * A relocation offset should be added. + */ + while (first <= last) { + diff = (first->insn + gd->reloc_off) - value; if (diff == 0) - return (mid->fixup + gd->reloc_off); + return (first->fixup + gd->reloc_off); + first++; } - if (diff < 0) - first = mid + 1; - else - last = mid - 1; } return 0; } -- 1.5.1

2 1

Re: [U-Boot-Users] [PATCH] Add support for BCM5464 Quad Phy
by Wolfgang Denk 15 May '07

15 May '07

In message <051f01c78b71$261b5800$6900a8c0@ESIDT> you wrote: > > Added support for Broadcom's BCM5464 Quad Phy > > Signed-off-by: Joe Hamman <joe.hamman(a)embeddedspecialties.com> Applied to u-boot-testing. Thanks. > diff --git a/drivers/tsec.c b/drivers/tsec.c > index 3f11eb0..5c4219d 100644 ------------------------^^^^^^^^ But please keep your file modes under control!!!! Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "Spock, did you see the looks on their faces?" "Yes, Captain, a sort of vacant contentment."

1 0

Re: [U-Boot-Users] [Fwd: Regarding the Sata patch]
by Wolfgang Denk 15 May '07

15 May '07

In message <46231445.2060109(a)procsys.com> you wrote: > > I had submitted the SATA patch on 26th of march, please let me know the > status and feed-back. This will help me to submit other patchs. > I had added Hynix NAND Flash support for u-boot-1.1.3, i am trying to > bring these changes to current version of u-boot. Your patch did not include a Sigend-off-by: line. Can you please just send this in addition, and I will take care of it ASAP. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk Office: Kirchenstr. 5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Another megabytes the dust.

2 2

[U-Boot-Users] No ethernet functionality.
by Bühn, Oliver 15 May '07

15 May '07

Dear all, I'm pretty frustrated and discouraged because my ethernet doesn't work. I have an at91sam9260ek based board (we tried to copy layout 'n stuff) and after a week trying to get the ethernet connection working I'd like to give up. :-/ I am here now, i.e. the u-boot hangs here after entering a ping command to reach a host within the same network (ethaddr, ipaddr is set properly; link status is ok; link speed is detected; phy is initialized): -> ether.c: eth_send: entering while ... [my output] In file ether.c in function eth_send there is that while-loop where the AT91C_EMAC_COMP bit is tested in register EMAC_TSR (transm. status register). This bit is never set, that's why the while-loop loops eternaly. The simple question is: Why? Any hints that might lead to the answer? Oliver. P.S.: Please excuse any attached disclaimer or note after this. It get's attached out of my control. --- This message (including any attachments) contains confidential and/or proprietary information intended only for the addressee. Any unauthorized disclosure, copying, distribution or reliance on the contents of this information is strictly prohibited and may constitute a violation of law. If you are not the intended recipient, please notify the sender immediately by responding to this e-mail, and delete the message from your system. If you have any questions about this e-mail please notify the sender immediately.

3 5

[U-Boot-Users] Patch: USB Host update for MPC8220
by TsiChung Liew 15 May '07

15 May '07

USB Host update for MPC8220 using generic USB OHCI driver Regards, TsiChung Signed-off by TsiChung Liew<Tsi-Chung.Liew(a)freescale.com> diff -rupN usborg/drivers/usb_ohci.c usbnew/drivers/usb_ohci.c --- usborg/drivers/usb_ohci.c 2007-05-15 14:25:02.000000000 -0500 +++ usbnew/drivers/usb_ohci.c 2007-05-15 15:29:27.466913928 -0500 @@ -66,7 +66,8 @@ defined(CONFIG_S3C2400) || \ defined(CONFIG_S3C2410) || \ defined(CONFIG_440EP) || \ - defined(CONFIG_MPC5200) + defined(CONFIG_MPC5200) || \ + defined(CONFIG_MPC8220) # define OHCI_USE_NPS /* force NoPowerSwitching mode */ #endif @@ -98,7 +99,7 @@ #define info(format, arg...) do {} while(0) #endif -#if defined(CONFIG_440EP) || defined(CONFIG_MPC5200) +#if defined(CONFIG_440EP) || defined(CONFIG_MPC5200) || defined (CONFIG_MPC8220) # define m16_swap(x) (x) # define m32_swap(x) (x) #else @@ -832,7 +833,7 @@ static td_t * dl_reverse_done_list (ohci } else td_list->ed->hwHeadP &= m32_swap (0xfffffff2); } -#ifdef CONFIG_MPC5200 +#if defined(CONFIG_MPC5200) || defined(CONFIG_MPC8220) td_list->hwNextTD = 0; #endif } @@ -882,13 +883,14 @@ static int dl_done_list (ohci_t *ohci, t (lurb_priv->state != URB_DEL)) #else if ((ed->state & (ED_OPER | ED_UNLINK))) +#endif urb_finished = 1; else dbg("dl_done_list: strange.., ED state %x, ed->state\n"); } else dbg("dl_done_list: processing TD %x, len %x\n", lurb_priv->td_cnt, lurb_priv->length); -#endif + if (ed->state != ED_NEW) { edHeadP = m32_swap (ed->hwHeadP) & 0xfffffff0; edTailP = m32_swap (ed->hwTailP); @@ -1074,7 +1076,7 @@ pkt_print(dev, pipe, buffer, transfer_le } bmRType_bReq = cmd->requesttype | (cmd->request << 8); -#if defined(CONFIG_440EP) || defined(CONFIG_MPC5200) +#if defined(CONFIG_440EP) || defined(CONFIG_MPC5200) || defined (CONFIG_MPC8220) wValue = __swap_16(cmd->value); wIndex = __swap_16(cmd->index); wLength = __swap_16(cmd->length); @@ -1082,7 +1084,7 @@ pkt_print(dev, pipe, buffer, transfer_le wValue = m16_swap (cmd->value); wIndex = m16_swap (cmd->index); wLength = m16_swap (cmd->length); -#endif /* CONFIG_440EP || CONFIG_MPC5200 */ +#endif /* CONFIG_440EP || CONFIG_MPC5200 || CONFIG_MPC8220 */ info("Root-Hub: adr: %2x cmd(%1x): %08x %04x %04x %04x", dev->devnum, 8, bmRType_bReq, wValue, wIndex, wLength); @@ -1096,7 +1098,7 @@ pkt_print(dev, pipe, buffer, transfer_le RH_OTHER | RH_CLASS almost ever means HUB_PORT here */ -#if defined(CONFIG_440EP) || defined(CONFIG_MPC5200) +#if defined(CONFIG_440EP) || defined(CONFIG_MPC5200) || defined (CONFIG_MPC8220) case RH_GET_STATUS: *(__u16 *) data_buf = __swap_16(1); OK (2); case RH_GET_STATUS | RH_INTERFACE: @@ -1122,7 +1124,7 @@ pkt_print(dev, pipe, buffer, transfer_le OK (4); case RH_GET_STATUS | RH_OTHER | RH_CLASS: *(__u32 *) data_buf = m32_swap (RD_RH_PORTSTAT); OK (4); -#endif /* CONFIG_440EP || CONFIG_MPC5200 */ +#endif /* CONFIG_440EP || CONFIG_MPC5200 || CONFIG_MPC8220 */ case RH_CLEAR_FEATURE | RH_ENDPOINT: switch (wValue) { diff -rupN usborg/drivers/usb_ohci.h usbnew/drivers/usb_ohci.h --- usborg/drivers/usb_ohci.h 2007-05-15 14:25:20.000000000 -0500 +++ usbnew/drivers/usb_ohci.h 2007-05-15 13:46:30.412968000 -0500 @@ -10,7 +10,7 @@ /* functions for doing board or CPU specific setup/cleanup */ extern int usb_board_init(void); extern int usb_board_stop(void); -extern int usb_cpu_init_fail(void); +extern int usb_board_init_fail(void); extern int usb_cpu_init(void); extern int usb_cpu_stop(void);

1 0

[U-Boot-Users] [PATCH] Support for QNAP TurboStation TS-101/TS-201
by Øyvind Repvik 15 May '07

15 May '07

Hi, This patch adds support for the QNAP Turbostation TS-101 and TS-201 devices (http://www.qnap.com.tw/pro_storage.asp). Applies to git tree. Regards, Øyvind Repvik Signed-off-by: Øyvind Repvik <nail(a)nslu2-linux.org> Signed-off-by: Alessandro Zummo <a.zummo(a)towertech.it> Signed-off-by: Andrew Luyten <u-boot(a)luyten.org.uk> --- u-boot-1.2.0.vanilla/board/qnap/config.mk 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-1.2.0/board/qnap/config.mk 2007-02-26 01:55:37.000000000 +0100 @@ -0,0 +1,35 @@ +# +# (C) Copyright 2000, 2001 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +# Valid values for TEXT_BASE are: +# +# Standard configuration +# 0xFFF00000 boot from flash +# +# Standard configuration +# 0xFFE60000 chain boot from flash +# + + +TEXT_BASE = 0xFFE60000 + +PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) --- u-boot-1.2.0.vanilla/board/qnap/ide.c 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-1.2.0/board/qnap/ide.c 2007-02-26 01:55:37.000000000 +0100 @@ -0,0 +1,67 @@ +/* + * (C) Copyright 2000 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + + #include <common.h> + +#ifdef CFG_CMD_IDE +#include <ata.h> +#include <ide.h> +#include <pci.h> + +extern ulong ide_bus_offset[CFG_IDE_MAXBUS]; +extern struct pci_controller hose; + +int ide_preinit (void) +{ + int status; + pci_dev_t devbusfn; + int l; + + status = 1; + for (l = 0; l < CFG_IDE_MAXBUS; l++) { + ide_bus_offset[l] = -ATA_STATUS; + } + devbusfn = pci_find_device (0x1095, 0x3512, 0); + + if (devbusfn != -1) { + + status = 0; + + pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, + (u32 *) &ide_bus_offset[0]); + ide_bus_offset[0] &= 0xfffffffe; + ide_bus_offset[0] = pci_hose_bus_to_phys(&hose, + ide_bus_offset[0] & 0xfffffffe, + PCI_REGION_IO); + + pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_2, + (u32 *) &ide_bus_offset[1]); + ide_bus_offset[1] &= 0xfffffffe; + ide_bus_offset[1] = pci_hose_bus_to_phys(&hose, + ide_bus_offset[1] & 0xfffffffe, + PCI_REGION_IO); + } + return (status); +} + +#endif /* of CONFIG_CMDS_IDE */ --- u-boot-1.2.0.vanilla/board/qnap/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-1.2.0/board/qnap/Makefile 2007-02-26 01:55:37.000000000 +0100 @@ -0,0 +1,40 @@ +# +# (C) Copyright 2000 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = lib$(BOARD).a + +OBJS = $(BOARD).o ide.o + +$(LIB): .depend $(OBJS) + $(AR) crv $@ $(OBJS) + +######################################################################### + +.depend: Makefile $(OBJS:.o=.c) + $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@ + +sinclude .depend + +######################################################################### --- u-boot-1.2.0.vanilla/board/qnap/qnap.c 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-1.2.0/board/qnap/qnap.c 2007-02-26 01:55:37.000000000 +0100 @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2006 Andrew Luyten <u-boot(a)luyten.org.uk> + * + * Copyright (C) 2000 + * Rob Taylor, Flying Pig Systems. robt(a)flyingpig.com. + * + * 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 + * + */ + +#include <common.h> +#include <mpc824x.h> +#include <pci.h> + +int checkboard (void) +{ + ulong busfreq = get_bus_freq(0); + char buf[32]; + + printf("Board: QNAP TS-101/TS-201 local bus at %s MHz\n", strmhz(buf, busfreq)); + return 0; +} + + +long int initdram (int board_type) +{ + long size; + long new_bank0_end; + long mear1; + long emear1; + + size = get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE); + + new_bank0_end = size - 1; + mear1 = mpc824x_mpc107_getreg(MEAR1); + emear1 = mpc824x_mpc107_getreg(EMEAR1); + mear1 = (mear1 & 0xFFFFFF00) | + ((new_bank0_end & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT); + emear1 = (emear1 & 0xFFFFFF00) | + ((new_bank0_end & MICR_ADDR_MASK) >> MICR_EADDR_SHIFT); + mpc824x_mpc107_setreg(MEAR1, mear1); + mpc824x_mpc107_setreg(EMEAR1, emear1); + + return (size); +} + +/* + * Initialize PCI Devices, report devices found. + */ +#ifndef CONFIG_PCI_PNP + +static struct pci_config_table pci_qnap_config_table[] = { + /* vendor, device, class */ + /* bus, dev, func */ + + { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, + PCI_ANY_ID, 0x0f, 0, /* RTL8110SC or Intel 82540EM */ + /* Gigabit ethernet controller */ + pci_cfgfunc_config_device, { PCI_ETH_IOADDR, + PCI_ETH_MEMADDR, + PCI_COMMAND_IO | + PCI_COMMAND_MEMORY | + PCI_COMMAND_MASTER }}, + + { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, + PCI_ANY_ID, 0x0d, 0, /* SII3512 */ + /* SATA controller */ + pci_cfgfunc_config_device, { PCI_IDE_IOADDR, + PCI_IDE_MEMADDR, + PCI_COMMAND_IO | + PCI_COMMAND_MEMORY | + PCI_COMMAND_MASTER }}, + + { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, + PCI_ANY_ID, 0x0e, 0, /* D720101 USB controller, 1st USB 1.1 */ + pci_cfgfunc_config_device, { PCI_USB0_IOADDR, + PCI_USB0_MEMADDR, + PCI_COMMAND_MEMORY | + PCI_COMMAND_MASTER }}, + { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, + PCI_ANY_ID, 0x0e, 1, /* D720101 USB controller, 2nd USB 1.1 */ + pci_cfgfunc_config_device, { PCI_USB1_IOADDR, + PCI_USB1_MEMADDR, + PCI_COMMAND_MEMORY | + PCI_COMMAND_MASTER }}, + { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, + PCI_ANY_ID, 0x0e, 2, /* D720101 USB controller, USB 2.0 */ + pci_cfgfunc_config_device, { PCI_USB2_IOADDR, + PCI_USB2_MEMADDR, + PCI_COMMAND_MEMORY | + PCI_COMMAND_MASTER }}, + { } +}; +#endif + +struct pci_controller hose = { +#ifndef CONFIG_PCI_PNP + config_table: pci_qnap_config_table, +#endif +}; + +void pci_init_board(void) +{ + pci_mpc824x_init(&hose); + + /* Reset USB 1.1 !/ + out_le32(PCI_USB0_MEMADDR+8, 1); + out_le32(PCI_USB1_MEMADDR+8, 1); + */ +} --- u-boot-1.2.0.vanilla/board/qnap/README 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-1.2.0/board/qnap/README 2007-02-26 01:55:37.000000000 +0100 @@ -0,0 +1,10 @@ +*This port of U-Boot will run on a QNAP TS-101/TS-201 NAS* +Andrew Luyten (u-boot(a)luyten.org.uk) + +Adapted from a Linkstation port by Mihai Georgian +http://http://www.linuxnotincluded.org.uk/ + +Adapted from Motorola Sandpoint 3 development system equipped with +a Unity X4 PPMC card (MPC8240 CPU) only. It is a snapshot of work +in progress and far from being completed. +Thomas Koeller --- u-boot-1.2.0.vanilla/board/qnap/u-boot.lds 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-1.2.0/board/qnap/u-boot.lds 2007-02-26 01:55:37.000000000 +0100 @@ -0,0 +1,136 @@ +/* + * (C) Copyright 2001 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_ARCH(powerpc) +SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib); +/* Do we need any of these for elf? + __DYNAMIC = 0; */ +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = + SIZEOF_HEADERS; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .rel.text : { *(.rel.text) } + .rela.text : { *(.rela.text) } + .rel.data : { *(.rel.data) } + .rela.data : { *(.rela.data) } + .rel.rodata : { *(.rel.rodata) } + .rela.rodata : { *(.rela.rodata) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.bss : { *(.rel.bss) } + .rela.bss : { *(.rela.bss) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + .init : { *(.init) } + .plt : { *(.plt) } + .text : + { + cpu/mpc824x/start.o (.text) + lib_ppc/board.o (.text) + lib_ppc/ppcstring.o (.text) + lib_generic/vsprintf.o (.text) + lib_generic/crc32.o (.text) + lib_generic/zlib.o (.text) + + . = DEFINED(env_offset) ? env_offset : .; + common/environment.o (.text) + + *(.text) + + *(.fixup) + *(.got1) + . = ALIGN(16); + *(.rodata) + *(.rodata1) + *(.rodata.str1.4) + *(.eh_frame) + } + .fini : { *(.fini) } =0 + .ctors : { *(.ctors) } + .dtors : { *(.dtors) } + + /* Read-write section, merged into data segment: */ + . = (. + 0x0FFF) & 0xFFFFF000; + _erotext = .; + PROVIDE (erotext = .); + .reloc : + { + *(.got) + _GOT2_TABLE_ = .; + *(.got2) + _FIXUP_TABLE_ = .; + *(.fixup) + } + __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __fixup_entries = (. - _FIXUP_TABLE_) >> 2; + + .data : + { + *(.data) + *(.data1) + *(.sdata) + *(.sdata2) + *(.dynamic) + CONSTRUCTORS + } + _edata = .; + PROVIDE (edata = .); + + . = .; + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + + . = .; + __start___ex_table = .; + __ex_table : { *(__ex_table) } + __stop___ex_table = .; + + . = ALIGN(4096); + __init_begin = .; + .text.init : { *(.text.init) } + .data.init : { *(.data.init) } + . = ALIGN(4096); + __init_end = .; + + __bss_start = .; + .bss : + { + *(.sbss) *(.scommon) + *(.dynbss) + *(.bss) + *(COMMON) + } + + _end = . ; + PROVIDE (end = .); +} --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-1.2.0/include/configs/qnap.h 2007-04-07 21:56:55.376393000 +0200 @@ -0,0 +1,363 @@ +/* + * Copyright (C) 2006 Andrew Luyten <u-boot(a)luyten.org.uk> + * + * 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 + */ + +/* ------------------------------------------------------------------------- */ + +/* + * board/config.h - configuration options, board specific + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* + * High Level Configuration Options + * (easy to change) + */ + +#define CONFIG_MPC824X 1 +#define CONFIG_MPC8245 1 +#define CONFIG_MPC8241 1 + +#define CONFIG_IDENT_STRING " OpenTS(c)" +#define CONFIG_TIMESTAMP +#define CFG_HUSH_PARSER 1 +#define CFG_PROMPT_HUSH_PS2 "turbostation> " +#define CONFIG_BOOTDELAY 3 + + +/*---------------------------------------------------------------------- + * Define supported commands + */ + +#define CONFIG_COMMANDS ( \ + CONFIG_CMD_DFL | \ + CFG_CMD_ELF | \ + CFG_CMD_I2C | \ + CFG_CMD_PING | \ + CFG_CMD_DHCP | \ + CFG_CMD_IDE | \ + CFG_CMD_EXT2 | \ + CFG_CMD_DATE | \ + CFG_CMD_PCI ) + +/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ +#include <cmd_confdefs.h> + + +/*----------------------------------------------------------------------- + * Miscellaneous configurable options + */ + +#define CFG_LONGHELP 1 /* undef to save memory */ +#define CFG_PROMPT "=> " /* Monitor Command Prompt*/ +#define CFG_CBSIZE 256 /* Console I/O Buffer Size*/ +#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size*/ +#define CFG_MAXARGS 16 /* max number of command args*/ +#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size*/ +#define CFG_LOAD_ADDR 0x00100000 /* default load address */ +#define CFG_HZ 1000 /* decrementer freq:1 ms ticks*/ + + +/*----------------------------------------------------------------------- + * PCI + * + */ + +#define CONFIG_PCI +#undef CONFIG_PCI_PNP + +#define PCI_ETH_IOADDR 0xbffe00 +#define PCI_ETH_MEMADDR 0xbfffce00 + +#define PCI_IDE_IOADDR 0xbfffd0 +#define PCI_IDE_MEMADDR 0xbffffe00 + +#define PCI_USB0_IOADDR 0 +#define PCI_USB0_MEMADDR 0xbfffe000 +#define PCI_USB1_IOADDR 0 +#define PCI_USB1_MEMADDR 0xbfffd000 +#define PCI_USB2_IOADDR 0 +#define PCI_USB2_MEMADDR 0xbfffcf00 + + +/*----------------------------------------------------------------------- + * Start addresses for the final memory configuration + * (Set up by the startup code) + */ + +#define CFG_SDRAM_BASE 0x00000000 +#define CFG_MONITOR_BASE TEXT_BASE +#undef CFG_RAMBOOT + +#define CFG_PCI_MEM_ADDR 0xB0000000 +#define CFG_EUMB_ADDR 0xFC000000 +#define CFG_FLASH_BASE 0xFF000000 + +#define CFG_RESET_ADDRESS 0xFFF00100 + +#define CFG_MONITOR_LEN (256 << 10) +#define CFG_MALLOC_LEN (512 << 10) + +#define CFG_MEMTEST_START 0x00000000 /* memtest works on */ +#define CFG_MEMTEST_END 0x04000000 /* 0 ... 32 MB in DRAM */ +#define CFG_MAX_RAM_SIZE 0x10000000 /* up to 256M of SDRAM */ + + +/*----------------------------------------------------------------------- + * Definitions for initial stack pointer and data area + */ + +#define CFG_INIT_RAM_ADDR 0x40000000 +#define CFG_INIT_RAM_END 0x1000 +#define CFG_GBL_DATA_SIZE 128 +#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) + + +/*----------------------------------------------------------------------- + * FLASH organization + */ + +#define CFG_FLASH_CFI 1 +#define CFG_FLASH_CFI_DRIVER 1 /* Use the common driver */ +#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ +#define CFG_MAX_FLASH_SECT 128 /* max number of sectors on one chip*/ +#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ +#define CFG_FLASH_USE_BUFFER_WRITE /* faster writes */ + +#define CFG_ENV_IS_IN_FLASH 1 +#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00EA0000) +#define CFG_ENV_SECT_SIZE 0x00020000 /* Total Size of Environment Sector*/ + + +/*----------------------------------------------------------------------- + * Gigabit Ethernet + */ + +#define CONFIG_NET_MULTI +#define CONFIG_RTL8169 + + +/*----------------------------------------------------------------------- + * Filesystems + */ + +#define CONFIG_MAC_PARTITION +#define CONFIG_DOS_PARTITION +//#define CONFIG_ISO_PARTITION + + +/*----------------------------------------------------------------------- + * IDE/ATA + */ + +#undef CONFIG_IDE_8xx_DIRECT /* no pcmcia interface required */ +#undef CONFIG_IDE_LED /* no led for ide supported */ +#undef CONFIG_IDE_RESET /* no reset for ide supported */ +#undef CONFIG_ATAPI /* no ATAPI support */ + +#define CONFIG_IDE_PREINIT /* To set up MMIO adresses */ +#define CONFIG_LBA48 /* Large disk support */ + +#define CFG_IDE_MAXBUS 2 /* Two channels x 1 device each */ +#define CFG_IDE_MAXDEVICE (CFG_IDE_MAXBUS*1) + +#define CFG_ATA_BASE_ADDR 0x0000 /* Set up in board specific code */ +#define CFG_ATA_DATA_OFFSET 0x0000 /* Offset for data I/O */ +#define CFG_ATA_REG_OFFSET 0x0000 /* Offset for normal register accesses */ +#define CFG_ATA_ALT_OFFSET 0x0000 /* Offset for alternate registers */ + + +/*---------------------------------------------------------------------- + * On Chip Serial configuration + */ + +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200 +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +#define CFG_NS16550 +#define CFG_NS16550_SERIAL + +#define CFG_NS16550_REG_SIZE 1 +#define CFG_NS16550_CLK get_bus_freq(0) + +#define CFG_NS16550_COM1 (CFG_EUMB_ADDR + 0x4500) /* Console port */ +#define CFG_NS16550_COM2 (CFG_EUMB_ADDR + 0x4600) /* PIC ? */ + + +/*---------------------------------------------------------------------- + * i2c support configuration + */ + +#define CONFIG_HARD_I2C 1 /* To enable I2C support */ +#undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CFG_I2C_SPEED 400000 /* I2C speed and slave address */ +#define CFG_I2C_SLAVE 0x7F + +#define CONFIG_RTC_RS5C372A /* Real-time clock chip */ + + +/*---------------------------------------------------------------------- + * Low Level Configuration Settings + * (address mappings, register initial values, etc.) + * You should know what you are doing if you make changes here. + */ + +#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */ + +#define CFG_ROMNAL 7 /*rom/flash next access time */ +#define CFG_ROMFAL 11 /*rom/flash access time */ + +#define CFG_REFINT 430 /* no of clock cycles between CBR refresh cycles */ + +/* the following are for SDRAM only*/ +#define CFG_BSTOPRE 121 /* Burst To Precharge, sets open page interval */ +#define CFG_REFREC 8 /* Refresh to activate interval */ +#define CFG_RDLAT 4 /* data latency from read command */ +#define CFG_PRETOACT 3 /* Precharge to activate interval */ +#define CFG_ACTTOPRE 5 /* Activate to Precharge interval */ +#define CFG_ACTORW 3 /* Activate to R/W */ +#define CFG_SDMODE_CAS_LAT 3 /* SDMODE CAS latency */ +#define CFG_SDMODE_WRAP 0 /* SDMODE wrap type */ + +#define CFG_REGISTERD_TYPE_BUFFER 1 +#define CFG_EXTROM 1 +#define CFG_REGDIMM 0 + + +/*---------------------------------------------------------------------- + * memory bank settings + * + * only bits 20-29 are actually used from these vales to set the + * start/end address the upper two bits will be 0, and the lower 20 + * bits will be set to 0x00000 for a start address, or 0xfffff for an + * end address + */ + +#define CFG_BANK0_START 0x00000000 +#define CFG_BANK0_END (CFG_MAX_RAM_SIZE - 1) +#define CFG_BANK0_ENABLE 1 +#define CFG_BANK1_START 0x3ff00000 +#define CFG_BANK1_END 0x3fffffff +#define CFG_BANK1_ENABLE 0 +#define CFG_BANK2_START 0x3ff00000 +#define CFG_BANK2_END 0x3fffffff +#define CFG_BANK2_ENABLE 0 +#define CFG_BANK3_START 0x3ff00000 +#define CFG_BANK3_END 0x3fffffff +#define CFG_BANK3_ENABLE 0 +#define CFG_BANK4_START 0x00000000 +#define CFG_BANK4_END 0x00000000 +#define CFG_BANK4_ENABLE 0 +#define CFG_BANK5_START 0x00000000 +#define CFG_BANK5_END 0x00000000 +#define CFG_BANK5_ENABLE 0 +#define CFG_BANK6_START 0x00000000 +#define CFG_BANK6_END 0x00000000 +#define CFG_BANK6_ENABLE 0 +#define CFG_BANK7_START 0x00000000 +#define CFG_BANK7_END 0x00000000 +#define CFG_BANK7_ENABLE 0 + + +/* + * Memory bank enable bitmask, specifying which of the banks defined above + are actually present. MSB is for bank #7, LSB is for bank #0. + */ +#define CFG_BANK_ENABLE 0x01 + +#define CFG_ODCR 0xff /* configures line driver impedances, */ + /* see 8240 book for bit definitions */ +#define CFG_PGMAX 0x32 /* how long the 8240 retains the */ + /* currently accessed page in memory */ + /* see 8240 book for details */ +#define CFG_DBUS_SIZE2 1 +#define CFG_BANK0_ROW 2 + + +/*---------------------------------------------------------------------- + * Initial BAT mappings + */ + +/* SDRAM 0 - 256MB */ +#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) +#define CFG_IBAT0U (CFG_SDRAM_BASE | BATU_BL_256M | BATU_VS | BATU_VP) + +/* stack in DCACHE @ 1GB (no backing mem) */ +#define CFG_IBAT1L (CFG_INIT_RAM_ADDR | BATL_PP_10 | BATL_MEMCOHERENCE) +#define CFG_IBAT1U (CFG_INIT_RAM_ADDR | BATU_BL_128K | BATU_VS | BATU_VP) + +/* PCI memory */ +#define CFG_IBAT2L (CFG_PCI_MEM_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT2U (CFG_PCI_MEM_ADDR | BATU_BL_256M | BATU_VS | BATU_VP) + +/* Flash, config addrs, etc */ +#define CFG_IBAT3L (0xF0000000 | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT3U (0xF0000000 | BATU_BL_256M | BATU_VS | BATU_VP) + +#define CFG_DBAT0L CFG_IBAT0L +#define CFG_DBAT0U CFG_IBAT0U +#define CFG_DBAT1L CFG_IBAT1L +#define CFG_DBAT1U CFG_IBAT1U +#define CFG_DBAT2L CFG_IBAT2L +#define CFG_DBAT2U CFG_IBAT2U +#define CFG_DBAT3L CFG_IBAT3L +#define CFG_DBAT3U CFG_IBAT3U + +/* + * For booting Linux, the board info and command line data + * have to be in the first 8 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ + + +/*----------------------------------------------------------------------- + * Cache Configuration + */ + +#define CFG_CACHELINE_SIZE 32 /* For MPC8240 CPU */ +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ +#endif + + +/*----------------------------------------------------------------------- + * Internal Definitions + * + * Boot Flags + */ +#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ +#define BOOTFLAG_WARM 0x02 /* Software reboot */ + +/* pass open firmware flat tree */ +#define CONFIG_OF_FLAT_TREE 1 + +/* maximum size of the flat tree (8K) */ +#define OF_FLAT_TREE_MAX_SIZE 8192 + +#define OF_CPU "PowerPC,603e" +#define OF_STDOUT_PATH "/soc10x/serial@fc004500" + +#endif /* __CONFIG_H */ + Index: u-boot.git/Makefile =================================================================== --- u-boot.git.orig/Makefile 2007-05-05 20:10:25.000000000 +0200 +++ u-boot.git/Makefile 2007-05-07 12:44:07.000000000 +0200 @@ -1328,6 +1328,9 @@ PN62_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc824x pn62 +qnap_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc824x qnap + Sandpoint8240_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc824x sandpoint

3 2

Re: [U-Boot-Users] u-boot HUSH scripting using local variables.
by Wolfgang Denk 15 May '07

15 May '07

I wrote: > > > " In the current implementation, the local variables space and global > > environment variables space are separated. Local variables are those you > > define by simply typing like name=value. To access a local variable > > later on, you have to write '$name' or '${name}'; to execute the > > contents of a variable directly you can type '$name' at the command > > prompt." > > > > ...which implies that local variables can be used to save commands and > > execute them later. It doesn't contradict with the statement in previous > > bullet that > > I don't see how you derive that. The text above does not mention > commands or execution. Delete that part, please. I was reding a different part of the message then. Sorry. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "He only drinks when he gets depressed." "Why does he get depressed?" "Sometimes it's because he hasn't had a drink." - Terry Pratchett, _Men at Arms_

2 1

[U-Boot-Users] Uboot Memory access violation
by Shiju 15 May '07

15 May '07

Hello, We have a new board based on imx31. I am trying to bring up uboot on the board.I upload uboot through jtag using RVI debugger and run from RAM. But uboot hangs after printing a few greeting messages.Sometimes it could come till the uboot prompt. When I debug it on RVI, the error message it gives is memory access vioaltion. I don't have a source level degugging available right now. So I compare the disassembly from RVI to the u-boot.map file. WHat I could find is that it fails while printing to console(vsprintf.o).I could not exacly map to the correct line of code. The uboot hangs when trying to branch to a location which is not defined (BLNE 0x89533926). On my board the memory is mapped from 0x80000000 - 87FFFFFF. The uboot is based on the imx31 litekit patch that was posted and it was working well on a imx31 freescale ADS.THe memory map for our custom board is same as that of imx freescale ADS board. But I am not sure why it branches to some undefined location. Any help is appreciated. THanks, Shiju

2 1

[U-Boot-Users] [PATCH] Fix for compile of JSE target
by Stephen Williams 15 May '07

15 May '07

The attached patch fixes the compile of the JSE board in the denx git as of 14 may 2007. It is an extremely simple patch, it just adds the missing define of CFG_SYSTEMACE_WIDTH. Fix to compile JSE against 20070514 git of u-boot --- commit bfedb7c81957634eb13d3dc078b1b57a006c0084 tree 6fe80c95ff42066b76e0fc77b18a87db5fdecea5 parent dea6b2fa2f9175fe6f73ac0bfff78eac2a76caca author Stephen Williams <steve(a)wing.icarus.com> Mon, 14 May 2007 19:18:19 -0700 committer Stephen Williams <steve(a)wing.icarus.com> Mon, 14 May 2007 19:18:19 -0700 include/configs/JSE.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- Steve Williams "The woods are lovely, dark and deep. steve at icarus.com But I have promises to keep, http://www.icarus.com and lines to code before I sleep, http://www.picturel.com And lines to code before I sleep."

1 0

[U-Boot-Users] about "flash extend data"
by 孙彬 15 May '07

15 May '07

/******************************************************************************* * flashDataExt - Extend Data. * DESCRIPTION: * Should be used only for FLASH CFI command sequence. * * Prepare the Data according to the Flash Width and Bus Width. * If flash width = 2 and bus width = 1 data = 0x55 -> data = 0x55 * If flash width = 2 and bus width = 4 data = 0x55 -> data = 0x550055 * If flash width = 1 and bus width = 4 data = 0x55 -> data = 0x55555555 * * INPUT: * data - Data to be expended. * pFlash - flash information. * * OUTPUT: * None * * RETURN: * MV_U32 - Data after extension. * OxFFFFFFFF if pFlash is Null * *******************************************************************************/ MV_U32 flashDataExt( MV_FLASH_INFO *pFlash, MV_U32 data) { MV_U32 i; if(NULL == pFlash) return 0xFFFFFFFF; for(i = 0; i < pFlash->busWidth ; i+= pFlash->devWidth) { data |= data << 8*i; } return data; } This is the code of flash initialization in u-boot,i am not sure what's use of the extend data. regards sun --------------------------------- 抢注雅虎免费邮箱3.5G容量，20M附件！

2 1

[U-Boot-Users] why "go 0x0" and "go 0x0c000000" could start u-boot?
by HoHo_Zhao 15 May '07

15 May '07

hello, everyone: (Will somebody write to me to tell me how i can see your replies?) when reset cpu or power up, u-boot starts, press any key to stop it automaticly boot the kernel, i test "go 0x0" and "go 0x0c000000", but two of them could go to restart u-boot! I am sure u-boot was flashed in 0x0c000000, but why "go 0x0" has the same effect?! With my mxlads board, I know another truth, when power up, cpu exec the first cmd in 0x0c000000. (this could be set by switches) Somebody know why? HoHo_Zhao

2 1

[U-Boot-Users] Patch: MPC8220 FEC and DMA update - part 6
by TsiChung Liew 15 May '07

15 May '07

- Better handling in ethernet MII, applied new DMA functions Regards, TsiChung Liew Signed-off by: TsiChung Liew Tsi-Chung.Liew(a)freescale.com diff -rupN u-boot-all.git/cpu/mpc8220/MCD_tasksInit.c u-boot-all-8220- fec/cpu/mpc8220/MCD_tasksInit.c --- u-boot-all.git/cpu/mpc8220/MCD_tasksInit.c 1969-12-31 18:00:00.000000000 -0600 +++ u-boot-all-8220-fec/cpu/mpc8220/MCD_tasksInit.c 2007-05-10 17:53:38.000000000 -0500 @@ -0,0 +1,253 @@ +/* + * (C) Copyright 2004 + * Freescale Semiconductor + * + * 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 + */ + +/* + * File: MCD_tasksInit.c + * Purpose: Functions for initializing variable tables of different + * types of tasks. + * + * Notes: + */ + +/* + * Do not edit! + */ + +#include "MCD_dma.h" + +extern dmaRegs *MCD_dmaBar; + +/* + * Task 0 + */ + +void MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr, + int xferSize, short xferSizeIncr, int *cSave, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 2, (u32) currBD); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr)); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) (0xe000 << 16) | (0xffff & destIncr)); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) xferSize); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr)); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 0, (u32) cSave); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) 0x00000000); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) 0x00000000); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000000); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x00000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) 0x00000000); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 13, (u32) 0x80000000); /* var[13] */ + MCD_SET_VAR(taskTable + channel, 14, (u32) 0x00000010); /* var[14] */ + MCD_SET_VAR(taskTable + channel, 15, (u32) 0x00000004); /* var[15] */ + MCD_SET_VAR(taskTable + channel, 16, (u32) 0x08000000); /* var[16] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x00000000); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0x80000000); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0x80000001); /* inc[5] */ + MCD_SET_VAR(taskTable + channel, 30, (u32) 0x40000000); /* inc[6] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 1 + */ + +void MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, + short destIncr, int dmaSize, short xferSizeIncr, + int flags, int *currBD, int *cSave, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 7, (u32) srcAddr); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr)); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) destAddr); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) (0xe000 << 16) | (0xffff & destIncr)); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) dmaSize); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr)); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) flags); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) currBD); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 0, (u32) cSave); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) 0x00000000); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000004); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x08000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x00000000); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0x80000001); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0x40000000); /* inc[5] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 2 + */ + +void MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr, + int xferSize, short xferSizeIncr, int *cSave, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 3, (u32) currBD); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr)); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) (0xe000 << 16) | (0xffff & destIncr)); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) xferSize); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr)); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 0, (u32) cSave); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) 0x00000000); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) 0x00000000); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000000); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x00000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) 0x00000000); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 13, (u32) 0x00000000); /* var[13] */ + MCD_SET_VAR(taskTable + channel, 14, (u32) 0x80000000); /* var[14] */ + MCD_SET_VAR(taskTable + channel, 15, (u32) 0x00000010); /* var[15] */ + MCD_SET_VAR(taskTable + channel, 16, (u32) 0x00000001); /* var[16] */ + MCD_SET_VAR(taskTable + channel, 17, (u32) 0x00000004); /* var[17] */ + MCD_SET_VAR(taskTable + channel, 18, (u32) 0x08000000); /* var[18] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x00000000); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0x80000000); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0xc0000000); /* inc[5] */ + MCD_SET_VAR(taskTable + channel, 30, (u32) 0x80000001); /* inc[6] */ + MCD_SET_VAR(taskTable + channel, 31, (u32) 0x40000000); /* inc[7] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 3 + */ + +void MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, + short destIncr, int dmaSize, short xferSizeIncr, + int flags, int *currBD, int *cSave, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 8, (u32) srcAddr); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr)); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) destAddr); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) (0xe000 << 16) | (0xffff & destIncr)); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) dmaSize); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr)); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) flags); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) currBD); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 0, (u32) cSave); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000000); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x00000001); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) 0x00000004); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) 0x08000000); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x00000000); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0xc0000000); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0x80000000); /* inc[5] */ + MCD_SET_VAR(taskTable + channel, 30, (u32) 0x80000001); /* inc[6] */ + MCD_SET_VAR(taskTable + channel, 31, (u32) 0x40000000); /* inc[7] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 4 + */ + +void MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 0, (u32) bDBase); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) currBD); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) rcvFifoPtr); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) 0x00000000); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x0000ffff); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x30000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) 0x0fffffff); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) 0x00000008); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) 0x00000000); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) 0x60000000); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) 0x20000004); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x40000000); /* inc[3] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 5 + */ + +void MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 0, (u32) bDBase); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) currBD); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) xmitFifoPtr); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) 0x00000000); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) 0x00000000); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000000); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x00000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) 0x00000000); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 13, (u32) 0x0000ffff); /* var[13] */ + MCD_SET_VAR(taskTable + channel, 14, (u32) 0xffffffff); /* var[14] */ + MCD_SET_VAR(taskTable + channel, 15, (u32) 0x00000004); /* var[15] */ + MCD_SET_VAR(taskTable + channel, 16, (u32) 0x00000008); /* var[16] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) 0x00000000); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) 0x60000000); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) 0x40000000); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0xc000fffc); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0xe0000004); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0x80000000); /* inc[5] */ + MCD_SET_VAR(taskTable + channel, 30, (u32) 0x4000ffff); /* inc[6] */ + MCD_SET_VAR(taskTable + channel, 31, (u32) 0xe0000001); /* inc[7] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} diff -rupN u-boot-all.git/cpu/mpc8220/MCD_tasksInit.h u-boot-all-8220- fec/cpu/mpc8220/MCD_tasksInit.h --- u-boot-all.git/cpu/mpc8220/MCD_tasksInit.h 1969-12-31 18:00:00.000000000 -0600 +++ u-boot-all-8220-fec/cpu/mpc8220/MCD_tasksInit.h 2007-05-10 17:53:38.000000000 -0500 @@ -0,0 +1,73 @@ +/* + * (C) Copyright 2004 + * Freescale Semiconductor + * + * 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 + */ + +#ifndef MCD_TSK_INIT_H +#define MCD_TSK_INIT_H 1 + +/* + * Do not edit! + */ + +/* + * Task 0 + */ +void MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr, + int xferSize, short xferSizeIncr, int *cSave, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 1 + */ +void MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, + short destIncr, int dmaSize, short xferSizeIncr, + int flags, int *currBD, int *cSave, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 2 + */ +void MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr, + int xferSize, short xferSizeIncr, int *cSave, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 3 + */ +void MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, + short destIncr, int dmaSize, short xferSizeIncr, + int flags, int *currBD, int *cSave, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 4 + */ +void MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 5 + */ +void MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr, + volatile TaskTableEntry * taskTable, int channel); + +#endif /* MCD_TSK_INIT_H */ diff -rupN u-boot-all.git/include/configs/Alaska8220.h u-boot-all-8220- fec/include/configs/Alaska8220.h --- u-boot-all.git/include/configs/Alaska8220.h 2007-04-03 19:18:56.000000000 -0500 +++ u-boot-all-8220-fec/include/configs/Alaska8220.h 2007-05-10 19:47:01.438535584 -0500 @@ -274,8 +274,8 @@ */ #define CONFIG_MPC8220_FEC 1 #define CONFIG_FEC_10MBIT 1 /* Workaround for FEC 100Mbit problem */ -#define CONFIG_PHY_ADDR 0x18 - +#define CONFIG_PHY_ADDR 0x00 +#define CONFIG_PHY1_ADDR 0x18 /* * Miscellaneous configurable options

1 0