April 2004 - U-Boot

[U-Boot-Users] [patch #4/6] Hush parser update.
by Pantelis Antoniou 22 Apr '04

22 Apr '04

Wolfgang hi. This is a resend of my previous patch with the parantheses conditionalized on CONFIG_HUSH_OLD_PARSER_COMPATIBLE. Regards Pantelis diff -ruNb u-boot-original/README u-boot-work/README --- u-boot-original/README 2004-04-16 02:14:49.000000000 +0300 +++ u-boot-work/README 2004-04-16 19:28:29.278549688 +0300 @@ -1317,6 +1317,14 @@ of the backslashes before semicolons and special symbols. + Note 2: + CONFIG_HUSH_OLD_PARSER_COMPATIBLE + + Define this in order to allow compatibility between the + original parser; allows to enclose variables with '(' + and ')'. + Example $ipaddr = ${ipaddr} = $(ipaddr). + - Default Environment: CONFIG_EXTRA_ENV_SETTINGS diff -ruNb u-boot-original/common/command.c u-boot-work/common/command.c --- u-boot-original/common/command.c 2004-04-15 21:22:42.000000000 +0300 +++ u-boot-work/common/command.c 2004-04-16 18:38:02.507688800 +0300 @@ -74,6 +74,159 @@ " - echo args to console; \\c suppresses newline\n" ); +#ifdef CFG_HUSH_PARSER + +int +do_test (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + char **ap; + int left, adv, expr, last_expr, neg, last_cmp; + + /* args? */ + if (argc < 3) + return 1; + +#if 0 + { + printf("test:"); + left = 1; + while (argv[left]) + printf(" %s", argv[left++]); + } +#endif + + last_expr = 0; + left = argc - 1; ap = argv + 1; + if (left > 0 && strcmp(ap[0], "!") == 0) { + neg = 1; + ap++; + left--; + } else + neg = 0; + + expr = -1; + last_cmp = -1; + last_expr = -1; + while (left > 0) { + + if (strcmp(ap[0], "-o") == 0 || strcmp(ap[0], "-a") == 0) + adv = 1; + else if (strcmp(ap[0], "-z") == 0 || strcmp(ap[0], "-n") == 0) + adv = 2; + else + adv = 3; + + if (left < adv) { + expr = 1; + break; + } + + if (adv == 1) { + if (strcmp(ap[0], "-o") == 0) { + last_expr = expr; + last_cmp = 0; + } else if (strcmp(ap[0], "-a") == 0) { + last_expr = expr; + last_cmp = 1; + } else { + expr = 1; + break; + } + } + + if (adv == 2) { + if (strcmp(ap[0], "-z") == 0) + expr = strlen(ap[1]) == 0 ? 0 : 1; + else if (strcmp(ap[0], "-n") == 0) + expr = strlen(ap[1]) == 0 ? 1 : 0; + else { + expr = 1; + break; + } + + if (last_cmp == 0) + expr = last_expr || expr; + else if (last_cmp == 1) + expr = last_expr && expr; + last_cmp = -1; + } + + if (adv == 3) { + if (strcmp(ap[1], "=") == 0) + expr = strcmp(ap[0], ap[2]) == 0; + else if (strcmp(ap[1], "!=") == 0) + expr = strcmp(ap[0], ap[2]) != 0; + else if (strcmp(ap[1], ">") == 0) + expr = strcmp(ap[0], ap[2]) > 0; + else if (strcmp(ap[1], "<") == 0) + expr = strcmp(ap[0], ap[2]) < 0; + else if (strcmp(ap[1], "-eq") == 0) + expr = simple_strtol(ap[0], NULL, 10) == simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-ne") == 0) + expr = simple_strtol(ap[0], NULL, 10) != simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-lt") == 0) + expr = simple_strtol(ap[0], NULL, 10) < simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-le") == 0) + expr = simple_strtol(ap[0], NULL, 10) <= simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-gt") == 0) + expr = simple_strtol(ap[0], NULL, 10) > simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-ge") == 0) + expr = simple_strtol(ap[0], NULL, 10) >= simple_strtol(ap[2], NULL, 10); + else { + expr = 1; + break; + } + + if (last_cmp == 0) + expr = last_expr || expr; + else if (last_cmp == 1) + expr = last_expr && expr; + last_cmp = -1; + } + + ap += adv; left -= adv; + } + + if (neg) + expr = !expr; + + expr = !expr; + +#if 0 + printf(": returns %d\n", expr); +#endif + + return expr; +} + +U_BOOT_CMD( + test, CFG_MAXARGS, 1, do_test, + "test - minimal test like /bin/sh\n", + "[args..]\n" + " - test functionality\n" +); + +int +do_exit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + int r; + + r = 0; + if (argc > 1) + r = simple_strtoul(argv[1], NULL, 10); + + return -r - 2; +} + +U_BOOT_CMD( + exit, 2, 1, do_exit, + "exit - exit script\n", + " - exit functionality\n" +); + + +#endif + /* * Use puts() instead of printf() to avoid printf buffer overflow * for long help messages diff -ruNb u-boot-original/common/hush.c u-boot-work/common/hush.c --- u-boot-original/common/hush.c 2004-04-12 17:31:44.000000000 +0300 +++ u-boot-work/common/hush.c 2004-04-16 19:02:10.753521968 +0300 @@ -290,6 +290,7 @@ unsigned int global_argc; #endif unsigned int last_return_code; +int nesting_level; #ifndef __U_BOOT__ extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */ #endif @@ -416,7 +417,9 @@ static int b_addchr(o_string *o, int ch); static void b_reset(o_string *o); static int b_addqchr(o_string *o, int ch, int quote); +#ifndef __U_BOOT__ static int b_adduint(o_string *o, unsigned int i); +#endif /* in_str manipulations: */ static int static_get(struct in_str *i); static int static_peek(struct in_str *i); @@ -936,6 +939,7 @@ return p + 1; } +#ifndef __U_BOOT__ static int b_adduint(o_string *o, unsigned int i) { int r; @@ -944,6 +948,7 @@ do r=b_addchr(o, *p++); while (r==0 && *p); return r; } +#endif static int static_get(struct in_str *i) { @@ -1921,6 +1926,10 @@ } last_return_code=rcode; #else + if (rcode < -1) { + last_return_code = -rcode - 2; + return -2; /* exit */ + } last_return_code=(rcode == 0) ? 0 : 1; #endif #ifndef __U_BOOT__ @@ -2145,6 +2154,10 @@ } #endif +#ifdef __U_BOOT__ +static char *get_dollar_var(char ch); +#endif + /* This is used to get/check local shell variables */ static char *get_local_var(const char *s) { @@ -2152,6 +2165,12 @@ if (!s) return NULL; + +#ifdef __U_BOOT__ + if (*s == '$') + return get_dollar_var(s[1]); +#endif + for (cur = top_vars; cur; cur=cur->next) if(strcmp(cur->name, s)==0) return cur->value; @@ -2168,12 +2187,19 @@ int result=0; struct variables *cur; +#ifdef __U_BOOT__ + /* might be possible! */ + if (!isalpha(*s)) + return -1; +#endif + name=strdup(s); #ifdef __U_BOOT__ if (getenv(name) != NULL) { printf ("ERROR: " "There is a global environment variable with the same name.\n"); + free(name); return -1; } #endif @@ -2278,7 +2304,10 @@ static int is_assignment(const char *s) { - if (s==NULL || !isalpha(*s)) return 0; + if (s == NULL) + return 0; + + if (!isalpha(*s)) return 0; ++s; while(isalnum(*s) || *s=='_') ++s; return *s=='='; @@ -2749,15 +2778,35 @@ * see the bash man page under "Parameter Expansion" */ static char *lookup_param(char *src) { - char *p=NULL; - if (src) { + char *p; + + if (!src) + return NULL; + p = getenv(src); if (!p) p = get_local_var(src); - } + return p; } +#ifdef __U_BOOT__ +static char *get_dollar_var(char ch) +{ + static char buf[40]; + + buf[0] = '\0'; + switch (ch) { + case '?': + sprintf(buf, "%u", (unsigned int)last_return_code); + break; + default: + return NULL; + } + return buf; +} +#endif + /* return code: 0 for OK, 1 for syntax error */ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *input) { @@ -2769,6 +2818,7 @@ #ifndef __U_BOOT__ char sep[]=" "; #endif + char match; int ch = input->peek(input); /* first character after the $ */ debug_printf("handle_dollar: ch=%c\n",ch); if (isalpha(ch)) { @@ -2799,7 +2849,15 @@ break; #endif case '?': +#ifndef __U_BOOT__ b_adduint(dest,last_return_code); +#else + ctx->child->sp++; + b_addchr(dest, SPECIAL_VAR_SYMBOL); + b_addchr(dest, '$'); + b_addchr(dest, '?'); + b_addchr(dest, SPECIAL_VAR_SYMBOL); +#endif advance = 1; break; #ifndef __U_BOOT__ @@ -2809,14 +2867,18 @@ break; #endif case '{': +#if defined(__U_BOOT__) && defined(CONFIG_HUSH_OLD_PARSER_COMPATIBLE) + case '(': +#endif + match = ch == '{' ? '}' : ')'; b_addchr(dest, SPECIAL_VAR_SYMBOL); ctx->child->sp++; b_getch(input); /* XXX maybe someone will try to escape the '}' */ - while(ch=b_getch(input),ch!=EOF && ch!='}') { + while(ch=b_getch(input),ch!=EOF && ch!=match) { b_addchr(dest,ch); } - if (ch != '}') { + if (ch != match) { syntax(); return 1; } @@ -2885,8 +2947,10 @@ if (input->__promptme == 0) return 1; #endif next = (ch == '\n') ? 0 : b_peek(input); - debug_printf("parse_stream: ch=%c (%d) m=%d quote=%d\n", - ch,ch,m,dest->quote); + + debug_printf("parse_stream: ch=%c (%d) m=%d quote=%d - %c\n", + ch >= ' ' ? ch : '.',ch,m,dest->quote,ctx->stack == NULL ? '*' : '.'); + if (m==0 || ((m==1 || m==2) && dest->quote)) { b_addqchr(dest, ch, dest->quote); } else { @@ -3107,7 +3171,18 @@ #ifndef __U_BOOT__ run_list(ctx.list_head); #else - if (((code = run_list(ctx.list_head)) == -1)) + code = run_list(ctx.list_head); + if (code == -2) { /* exit */ + b_free(&temp); + code = 0; + /* XXX hackish way to not allow exit from main loop */ + if (inp->peek == file_peek) { + printf("exit not allowed from main input shell.\n"); + continue; + } + break; + } + if (code == -1) flag_repeat = 0; #endif } else { README | 8 ++ common/command.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/hush.c | 93 ++++++++++++++++++++++++++++++--- 3 files changed, 245 insertions(+), 9 deletions(-)

2 3

[U-Boot-Users] [patch #2/6] CRC32 verify support
by Pantelis Antoniou 22 Apr '04

22 Apr '04

Wolfgang hi. The following patch adds verify support to the crc32 command. It is conditionalized on the CONFIG_CRC32_VERIFY as requested. Regards Pantelis diff -ruNb u-boot-original/common/cmd_mem.c u-boot-work/common/cmd_mem.c --- u-boot-original/common/cmd_mem.c 2004-03-24 00:14:12.000000000 +0200 +++ u-boot-work/common/cmd_mem.c 2004-04-16 18:54:11.054447312 +0300 @@ -963,6 +963,8 @@ return 0; } +#ifndef CONFIG_CRC32_VERIFY + int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { ulong addr, length; @@ -992,6 +994,62 @@ return 0; } +#else + +int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + ulong addr, length; + ulong crc; + ulong *ptr; + ulong vcrc; + int verify; + int ac; + char **av; + + if (argc < 3) { + usage: + printf ("Usage:\n%s\n", cmdtp->usage); + return 1; + } + + av = argv + 1; + ac = argc - 1; + if (strcmp(*av, "-v") == 0) { + verify = 1; + av++; + ac--; + if (ac < 3) + goto usage; + } else + verify = 0; + + addr = simple_strtoul(*av++, NULL, 16); + addr += base_address; + length = simple_strtoul(*av++, NULL, 16); + + crc = crc32(0, (const uchar *) addr, length); + + if (!verify) { + printf ("CRC32 for %08lx ... %08lx ==> %08lx\n", + addr, addr + length - 1, crc); + if (ac > 2) { + ptr = (ulong *) simple_strtoul (*av++, NULL, 16); + *ptr = crc; + } + } else { + vcrc = simple_strtoul(*av++, NULL, 16); + if (vcrc != crc) { + printf ("CRC32 for %08lx ... %08lx ==> %08lx != %08lx ** ERROR **\n", + addr, addr + length - 1, crc, vcrc); + return 1; + } + } + + return 0; + +} +#endif + /**************************************************/ #if (CONFIG_COMMANDS & CFG_CMD_MEMORY) U_BOOT_CMD( @@ -1032,12 +1090,25 @@ "[.b, .w, .l] addr1 addr2 count\n - compare memory\n" ); +#ifndef CONFIG_CRC32_VERIFY + U_BOOT_CMD( crc32, 4, 1, do_mem_crc, "crc32 - checksum calculation\n", "address count [addr]\n - compute CRC32 checksum [save at addr]\n" ); +#else + +U_BOOT_CMD( + crc32, 5, 1, do_mem_crc, + "crc32 - checksum calculation\n", + "address count [addr]\n - compute CRC32 checksum [save at addr]\n" + "-v address count crc\n - verify crc of memory area\n" +); + +#endif + U_BOOT_CMD( base, 2, 1, do_mem_base, "base - print or set address offset\n", cmd_mem.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+)

2 3

[U-Boot-Users] CRC problem on at91rm9200
by Jean-Philippe Francois 22 Apr '04

22 Apr '04

Hi, I am trying to boot linux with a board based on an atmel at91rm9200. U-boot is running but the crc show a strange behaviour : when used on a small amount of memory, like 0x2000 or 0x1000, evrything seems fine. However, with bigger amount, the cpu seems to hang. With a 0x20000 size, it always fails. With 0x10000 it sometimes works. Any hint would be greatly appreciated. JP Francois

2 1

[U-Boot-Users] RC32438
by Shlomo_Kut＠mksinst.com 22 Apr '04

22 Apr '04

Hi, Has anybody ported u-boot to the IDT RC32438 MIPS processor or anything similar? regards Shlomo Kut Software Engineer MKS Instruments Tenta Products Tel: 972-8-9181015 Fax: 972-8-9181020 www.mksinst.com This e-mail is intended solely for the person or entity to which it is addressed and may contain confidential information. Any review, dissemination, copying, printing or other use of this e-mail by persons or entities other than the addressee is prohibited. If you have received this e-mail in error, please contact the sender immediately and delete the material from any computer.

1 0

[U-Boot-Users] printf question - board at91rm9200
by CG 21 Apr '04

21 Apr '04

Hello, I think that's not really important for you, but I really don't know where printf() function is declared in u-boot 1.0.0? I see everywhere that printf is called in many and many functions, but I really don't know how the string is sent through the debug serial port? Anybody can tell how does it work? The same question for input function like getc... Regards

2 1

[U-Boot-Users] U-boot & smsc91c111
by Earle Clubb 21 Apr '04

21 Apr '04

I'm using U-boot on a Coldfire 5407 with the 91c111 attached on a 32-bit data bus. I can write to the bank select register and read from all the other MAC registers via BDM. However, when I run U-boot the 91c111 driver doesn't seem to be able to read from any of the internal PHY registers. I have debugging in the driver enabled at level 4, and it shows that I get all zeros on the MDI line when reading any PHY register. The external PHY bit in the config register is off. Does anyone have an idea why the driver can't read from the internal PHY regs? Thanks. Earle Clubb Software Engineer Valcom, Inc. E-mail: eclubb(a)valcom.com Voice: (540) 563-2000 x253 Fax: (540) 362-9800

1 0

[U-Boot-Users] u-boot compiler
by CG 21 Apr '04

21 Apr '04

Hello, I just started with u-boot and I have to compile U-boot for my board (at91rm9200dk) So, to compile u-boot, I read the README file. make at91rm9200dk_config and I got this error : : unrecognized option when it executes ./mkconfig Any idea about this error? Regards

2 2

RE: [U-Boot-Users] error starting linux ...
by Alan J. Luse 21 Apr '04

21 Apr '04

Wolfgang K- You need to enable bzip2 compression in the U-Boot build. It is not enabled by default in most configurations. Define CONFIG_BZIP2 in your configuration header. As noted in the U-Boot README you will need lots of RAM to perform the decompression. Alan Luse -----Original Message----- From: u-boot-users-admin(a)lists.sourceforge.net [mailto:u-boot-users-admin@lists.sourceforge.net] On Behalf Of Wolfgang Kanovsky Sent: Wednesday, 21 April 2004 7:05 AM To: U-Boot-Users Subject: [U-Boot-Users] error starting linux ... Importance: High Hi all, hi wolfgang denk, Anyone here how knows this error ? means it bzip2 is not implemented in Uboot ? --but its an valid opt. in mkimage ? U-Boot 1.0.2 (Apr 21 2004 - 14:08:02) U-Boot code: 08FC0000 -> 08FDB0A9 data: 00400000 -> 00400BD3 BSS: 00400BD4 -> 0040B05F stack: 0040B060 -> 0041305F DRAM Configuration: Bank #0: 00000000 64 MB Bank #0: Micron / Intel 28F640J3A Flash: 16 MB FLASH: 16 MB set_irq(): map INTA to IRQ9 00 11 8086 1209 0200 09 In: serial Out: serial Err: serial Net: i82559#0 ***SC520 BOARD last stage init done*** boot => boot => boot => bootm 8000000 U-Boot Command_code_tabelle: 08FD3EEA -> 08FD4324 U-Boot Cmd_table_start_search: 08FD3EEC ## Booting image at 08000000 ... Image Name: Hopf Embedded Linux Kernel Image Type: Intel x86 Linux Kernel Image (bzip2 compressed) Data Size: 839181 Bytes = 819.5 kB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK Unimplemented compression type 2 boot => boot => boot => Thanks Wolfgang k. ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ U-Boot-Users mailing list U-Boot-Users(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users

1 0

[U-Boot-Users] error starting linux ...
by Wolfgang Kanovsky 21 Apr '04

21 Apr '04

Hi all, hi wolfgang denk, Anyone here how knows this error ? means it bzip2 is not implemented in Uboot ? --but its an valid opt. in mkimage ? U-Boot 1.0.2 (Apr 21 2004 - 14:08:02) U-Boot code: 08FC0000 -> 08FDB0A9 data: 00400000 -> 00400BD3 BSS: 00400BD4 -> 0040B05F stack: 0040B060 -> 0041305F DRAM Configuration: Bank #0: 00000000 64 MB Bank #0: Micron / Intel 28F640J3A Flash: 16 MB FLASH: 16 MB set_irq(): map INTA to IRQ9 00 11 8086 1209 0200 09 In: serial Out: serial Err: serial Net: i82559#0 ***SC520 BOARD last stage init done*** boot => boot => boot => bootm 8000000 U-Boot Command_code_tabelle: 08FD3EEA -> 08FD4324 U-Boot Cmd_table_start_search: 08FD3EEC ## Booting image at 08000000 ... Image Name: Hopf Embedded Linux Kernel Image Type: Intel x86 Linux Kernel Image (bzip2 compressed) Data Size: 839181 Bytes = 819.5 kB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK Unimplemented compression type 2 boot => boot => boot => Thanks Wolfgang k.

1 0

RE: [U-Boot-Users] v1.1.0, omap boards and udelay()
by Kamat, Nishant 20 Apr '04

20 Apr '04

Dave, In versions prior 1.1.0, there was a small bug in the omap1610 port, in that the timer was not enabled. Obviously the udelay wouldn't function normally and so there was this busy loop to make for it. In 1.1.0 this is fixed by enabling the MPU timers, and there is no need for the loop. See board/omap1610inn/platform.S where MPU Timer 1 is now enabled. You might be missing similar code in the 730's port. That said, the same bug in 1510 is not yet fixed, and it still uses the busy loop (in cpu/arm925t/interrupts.c). I'll send a little patch to fix that soon. Regards, Nishant -----Original Message----- From: u-boot-users-admin(a)lists.sourceforge.net [mailto:u-boot-users-admin@lists.sourceforge.net] On Behalf Of Dave Peverley Sent: Monday, April 19, 2004 7:00 AM To: u-boot-users(a)lists.sourceforge.net Subject: [U-Boot-Users] v1.1.0, omap boards and udelay() Hi all, I'm just merging my omap730p2 port into the 1.1.0 codebase, and have hit a snag that I would have thought would affect the omap1510 and 1610 code as well ; can anyone confirm this? The problem is as follows : in boards/omapXXXX/omapXXXX.c, the function ether__init() uses the udelay() call. Prior to version 1.1.0, this was implemented using : #if defined(CONFIG_INNOVATOROMAP1610) || defined(CONFIG_P2OMAP730) #define LOOPS_PER_MSEC 100 /* tuned on omap1610 */ volatile int i, time_remaining = LOOPS_PER_MSEC * usec; for (i = time_remaining; i > 0; i--) { } #else so that the omap's wouldn't use the MPU timer, as this does not work (at least at that point in the startup) This means that u-boot hangs on my board during ether__init() now as the timer never gets incremented. Can anyone tell me why this code was removed? Looking at it, I can't see a reason why it shouldn't break the 1510/1610 omap support as well. I've tested moving the code back as it was (using the 1.1.0 CONFIG_OMAP instead) and this fixes the problem once more. Best Wishes, Dave Peverley ------------------------------------------------------------------------ --- Dave Peverley, Software Engineer, MPC Data Limited. Phone : [+44] (0) 1225 868 228 Web : http://www.mpc-data.co.uk

1 0

[U-Boot-Users] U-Boot for Motorola's DragonBall MX1/MXL ???
by Steven Scholz 20 Apr '04

20 Apr '04

Hi there, have there been any attempts to port U-Boot onto Motorola's MC9328MXL processors (aka. DragonBall MX1/MXL)? They're based on ARM9(TDMI). Thanks. -- Steven Scholz imc Measurement & Control imc Meßsysteme GmbH Voltastr. 5 Voltastr. 5 13355 Berlin 13355 Berlin Germany Deutschland

1 0

[U-Boot-Users] SDRAM autodetection patch for Debris board update
by Sangmoon Kim 20 Apr '04

20 Apr '04

Hi, This patch do the same as the last patch for Debris board, and changes the value of CFG_MAX_RAM_SIZE from 0x10000000 (256M) to 0x20000000 (512M). Regards, Sangmoon Kim

2 2

RE: [U-Boot-Users] Re: Latest changes to cmd_nand.c
by Dave Ellis 19 Apr '04

19 Apr '04

Wolfgank Denk wrote: > To: "David Müller (ELSOFT AG)" > In message <407FCCDA.6040508(a)elsoft.ch> you wrote: > > > > What was the reason to make a new command "nand read.jffs2s" to handle > > bad block skipping in the read case. > > > > Why not just integrate the bad block skipping into the standard > > "read.jffs2" command. > > Good questions. > > > IMHO the "original functionality" is broken. The "nand write" command > > skips over bad blocks by default, while "nand read" and (even worse) > > "nandboot" don't. > > I agree. Can you please submit a patch? I implemented the current nand read.jffs2 bad block handling so that both the amount of the nand read and memory written would always be the amount requested. If I ask for 2 MiB and there are bad blocks, there would be some unknown amount of memory at the end with random data and I didn't see a good way to tell the jffs2 code to ignore it. Initializing all the memory to 0xff to account for that would have slowed my boot process too much. The read.jffs2 command could skip bad blocks and pad the data with 0xff at the end instead so that the total bytes read is still always what was requested. This change to the "original functionality" wouldn't break any code (like mine :-) ) that depends on all of the destination memory being defined. I should have done it that way originally, but I didn't think of it. It seems to me that the current functionality is fine for jffs2 and the jffs2s version is needed when you are not actually using jffs2. I think we should reserve read.jffs2 for jffs2 use. Then it can be optimized to read only the data really needed for jffs2. If it is used for other purposes these optimizations would break the other uses. If what is really needed (and it isn't for jffs2) is what nandboot should (but doesn't) do, which is read enough blocks to get a certain amount of _good_ data, there should be a new command, something like "nand read.good". This would need a new option flag for nanda_rw(). Dave Ellis

1 0

[U-Boot-Users] v1.1.0, omap boards and udelay()
by Dave Peverley 19 Apr '04

19 Apr '04

Hi all, I'm just merging my omap730p2 port into the 1.1.0 codebase, and have hit a snag that I would have thought would affect the omap1510 and 1610 code as well ; can anyone confirm this? The problem is as follows : in boards/omapXXXX/omapXXXX.c, the function ether__init() uses the udelay() call. Prior to version 1.1.0, this was implemented using : #if defined(CONFIG_INNOVATOROMAP1610) || defined(CONFIG_P2OMAP730) #define LOOPS_PER_MSEC 100 /* tuned on omap1610 */ volatile int i, time_remaining = LOOPS_PER_MSEC * usec; for (i = time_remaining; i > 0; i--) { } #else so that the omap's wouldn't use the MPU timer, as this does not work (at least at that point in the startup) This means that u-boot hangs on my board during ether__init() now as the timer never gets incremented. Can anyone tell me why this code was removed? Looking at it, I can't see a reason why it shouldn't break the 1510/1610 omap support as well. I've tested moving the code back as it was (using the 1.1.0 CONFIG_OMAP instead) and this fixes the problem once more. Best Wishes, Dave Peverley --------------------------------------------------------------------------- Dave Peverley, Software Engineer, MPC Data Limited. Phone : [+44] (0) 1225 868 228 Web : http://www.mpc-data.co.uk

1 0

[U-Boot-Users] NetSilicon NS9750 DevBoard not listed in Makefile
by Wolfgang Denk 19 Apr '04

19 Apr '04

Dear markus, it seems some parts of your patch to add the NetSilicon NS9750 DevBoard board were missing - there is no entry for this board in the toplevel Makefile. Please check and send a patch. Best regards, Wolfgang Denk -- Software Engineering: Embedded and Realtime Systems, Embedded Linux Phone: (+49)-8142-4596-87 Fax: (+49)-8142-4596-88 Email: wd(a)denx.de "The fundamental principle of science, the definition almost, is this: the sole test of the validity of any idea is experiment." - Richard P. Feynman

2 3

Re: [U-Boot-Users] Need help booting linux on 8265 eval board
by 19 Apr '04

19 Apr '04

hello,Mr Wolfgang thanks for your reply. I think i should describe the problem clearly. First i explain why i modified the uboot/linux default values. I'm a graduate student. the board is designed by my schoolfellow(the board use 8265,but it is very like the board MPC8266ADS-PCI-AI), but this board is not supported by uboot, I must modify the configuration of sdram,IMMR and some other registers(from motorola datasheet). now the uboot looks running well(it can read/write flash/sdram, scc and fcc is also working), but when i boot the linux kernel, i meet the problem. i think i must let imap_addr(linux kernel)=IMMR(uboot), so I modify some default values. Now I want to know why linux mapped at 0xC0000000 , the uboot say "## Transferring control to Linux (at address 00000000) ...", so KERNELLOAD should be 0xc0000000 or 0x00000000? and if I use linux kernel 2.4.20, CONFIG_CLOCKS_IN_MHZ should be 0 or 1? Best regards, liu ming liutomorrow(a)hotmail.com >From: Wolfgang Denk <wd(a)denx.de> >To: <liutomorrow(a)hotmail.com> >CC: u-boot-users(a)lists.sourceforge.net >Subject: Re: [U-Boot-Users] Need help booting linux on 8265 eval board >Date: Sun, 18 Apr 2004 17:10:53 +0200 > >In message <BAY2-F91LEdyt3cew8k000156e5(a)hotmail.com> you wrote: > > > > I have problem booting linux on 8265 eval board. when I boot the linux > > kernel, the board be dead. the registers look like > > to be some default values(use powertap pro). I try u-boot1.1, ppcboot1.1.5; > >Be careful. User the default values as defined in U-Boot and Linux, >and DON'T change these unless you know EXACTLY what you are doing. > > > vim Makefile, arch=ppc CROSS_COMPILE=ppc_82xx > > vim arch/ppc/platforms/ads826x.h, IMAP_ADDR=0x04700000 BCSR=0x04500000 > >This cannot work. Please leave the mapping as defined by U-Boot and Linux. > > > > then the board is dead and the LED(FCC link) coruscate . > > (I have modified clock calculations for this board. it's the reason?) > > any ideas? thanks a lot! > >You seem to modify a lot of stuff without konwing exactly why - don;t >do this. The default values are there for a reason - they are known >to work. > >Best regards, > >Wolfgang Denk > >-- >Software Engineering: Embedded and Realtime Systems, Embedded Linux >Phone: (+49)-8142-4596-87 Fax: (+49)-8142-4596-88 Email: wd(a)denx.de >"There are three principal ways to lose money: wine, women, and engi- >neers. While the first two are more pleasant, the third is by far the >more certain." - Baron Rothschild, ca. 1800 >>Hi, I have problem booting linux on 8265 eval board. when I boot the linux kernel, the board be dead. the registers look like to be some default values(use powertap pro). I try u-boot1.1, ppcboot1.1.5; linux kernel 2.4.4 2.4.18 2.4.20. (1)about kernel vim Makefile, arch=ppc CROSS_COMPILE=ppc_82xx vim arch/ppc/platforms/ads826x.h, IMAP_ADDR=0x04700000 BCSR=0x04500000 then make mrproper/make ads826x_config/make oldconfig/make dep/make pImage (bd info struct is quite same between uboot and linux) Is there anything I had ignored? (2)let's see!(I add some "printf" to display values, "console=ttyS0,9600" is added) => bootm ffa00000 ffc00000 ## Booting image at ffa00000 ... Image Name: Linux-2.4.20-pre7ncsd1 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 634729 Bytes = 619 kB = 0 MB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK Uncompressing Kernel Image ... OK ## Current stack ends at 0x03F7FC48 => set upper limit to 0x00800000 ## cmdline at 0x007FFF00 ... 0x007FFF23 memstart = 0x00000000 memsize = 0x04000000 flashstart = 0xFF800000 flashsize = 0x00800000 flashoffset = 0x00000000 sramstart = 0x00000000 sramsize = 0x00000000 immr_base = 0x04700000 bootflags = 0x00000001 vco = 266.666 MHz sccfreq = 66.666 MHz brgfreq = 16.666 MHz intfreq = 166.666 MHz cpmfreq = 133.333 MHz busfreq = 33.333 MHz ethaddr = 00:10:EC:00:30:8C IP addr = 8.6.0.1 baudrate = 9600 bps ## Loading RAMDisk Image at ffc00000 ... Image Name: Simple Ramdisk-Image Image Type: PowerPC Linux RAMDisk Image (gzip compressed) Data Size: 567988 Bytes = 554 kB = 0 MB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## initrd at 0xFFC00040 ... 0xFFC8AAF3 (len=567988=0x8AAB4) Loading Ramdisk to 03ef4000, end 03f7eab4 ... OK ## Transferring control to Linux (at address 00000000) ... then the board is dead and the LED(FCC link) coruscate . (I have modified clock calculations for this board. it's the reason?) any ideas? thanks a lot! -- liu >>liutomorrow(a)hotmail.com _________________________________________________________________ 免费下载 MSN Explorer: http://explorer.msn.com/lccn/

2 1

[U-Boot-Users] IceCube target names to be unified?
by Jonas Mark-r50740 19 Apr '04

19 Apr '04

Dear IceCube users, looking at the U-Boot Makefile one can see that there are lot of redundant targets for the Lite5200 / IceCube boards. Is there some reason for this legacy or would cleaning it up help? I propose the following targets: - icecube_5100_config (MPC5100 boards with 8 MB Flash, official name is Lite5100) - icecube_5100_lowboot_config (Lite5100, lowboot position) - icecube_5200_config (MPC5200 boards with 16 MB Flash, official name is Lite5200) - icecube_5200_lowboot_config (Lite5200 with U-Boot at lowboot position) - icecube_5200_08_config (Lite5200 with only 8 MB Flash) - icecube_5200_08_lowboot_config (Lite5200 with only 8 MB Flash, lowboot position) - icecube_5200_ddr_config (Lite5200 with DDR instead of SDR memory) - icecube_5200_ddr_lowboot_config (Lite5200 with DDR, lowboot position) These targets cover the same cases like the existing ones but ignore 2 redundant cases (MPC5200LITE_config, IceCube_5200_config, icecube_5200_config), remove a non-existing target (icecube_5200_DDR_LOWBOOT08_config), add an existing but not mentioned case (Lite5100 lowboot) and present a unified naming convention. I advocate using the project name IceCube instead of the product name Lite5x00 because the source files and dirctories are already named such. Hopefully our marketing people are not reading this mailing list. For doing the work I would volunteer but I guess it would be less work for Wolfgang to do it himself than applying my patch. Wolfgang, what would you prefer? Regards Mark Jonas

3 2

[U-Boot-Users] [PATCH] IceCube fixed and cleaned up SDRAM init
by Mark Jonas 19 Apr '04

19 Apr '04

Hello, the attached patch fixes a problem with the SDRAM init code for IceCube (Lite5xxx) I experienced when using LOWBOOT images. In my case U-Boot would always die when doing the first access to SDRAM after initialization which is usually done when trying to find out how big the SDRAM is. I found that no sync instructions where used the synchronize the program flow during SDRAM initialization. This is fixed now. Additionally, I cleaned up the code and moved all the SDRAM chip specific constants into separate include files. The SDRAM initilization itself should be better readable now, too, by merging the DDR / SDR and the MGT5100 / MPC5200 code as cleanly as possible. The code was tested on a Lite5200 (16 MB Flash, LOWBOOT), a Lite5200DDR (16 MB Flash, LOWBOOT) and a Lite5100 (8MB Flash). Regards Mark Jonas * Patch by Mark Jonas, 13 Apr 2004: - Add sync instructions to IceCube SDRAM init code - Move SDRAM chip constants into seperate include files - Unify DDR and SDR initialization code icecube.c | 226 ++++++++++++++++++++++++++++++++++------------------- mt46v16m16-75.h | 37 ++++++++ mt48lc16m16a2-75.h | 43 ++++++++++ 3 files changed, 228 insertions(+), 78 deletions(-)

3 3

[U-Boot-Users] Patch for mii read range and mii dump
by Kerl, John 19 Apr '04

19 Apr '04

Hello, Please find included a minor enhancement to the mii command. This is my first u-boot patch submission so it is almost certain that I've screwed something up. Please forgive! * Patch by John Kerl, 16 Apr 2004: Enable ranges in mii command, e.g. mii read 0-1f 0 or mii read 4-7 18-1a. Also add mii dump subcommand for pretty-printing standard regs 0-5.

2 2

[U-Boot-Users] [PATCH] MPC5200: Remove CSBOOT / CS0 configuration from start.S
by Mark Jonas 19 Apr '04

19 Apr '04

Hello, the attached patch fixes the problem that the current start.S for MPC5200 contains code to initialize CSBOOT / CS0 timing, bus width and other configuration. lis r3, 0x00047800@h ori r3, r3, 0x00047800@l stw r3, 0x300(r4) /* set timing, CS0/boot conf reg */ Right now that only works because all U-Boot supported MPC5200 boards are very Lite5200 (aka IceCube 5200) like. Once there is a board which's Flash is is connected in 24 bits address, 8 bits data, non-multiplexed mode this will break. Additionally, the patch removes enabling of the IPBI wait states. This is not needed because IP bus is not configured to run with > 66 MHz in U-Boot and if needed this should be done always and not only when performing a low boot. Interesting enough U-Boot already has a solution for setting tuned CS0 timings. This is done using the CFG_BOOTCS_CFG define which is applied in cpu/mpc5xxx/cpu_init.c. Regards Mark Jonas * Patch by Mark Jonas, 13 Apr 2004: - Remove CS0 chip select timing setting from cpu/mpc5xxx/start.S start.S | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-)

2 1

[U-Boot-Users] [patch #9/11] VLAN/CDP networking support.
by Pantelis Antoniou 19 Apr '04

19 Apr '04

Hello The following patch adds networking support for VLANs (802.1q), and CDP (Cisco Discovery Protocol). You control the sending/receiving of VLAN tagged packets with the "vlan" environmental variable. When not present no tagging is performed. CDP is used mainly to discover your device VLAN(s) when connected to a Cisco switch. Note: In order to enable CDP support a small change is needed in the networking driver. You have to enable reception of the 01:00:0c:cc:cc:cc mac address which is a multicast address. Various defines control CDP; see the README section. Regards Pantelis README | 63 +++++ common/cmd_net.c | 55 ++++ include/cmd_confdefs.h | 4 include/net.h | 52 ++++ net/bootp.c | 6 net/eth.c | 50 ++++ net/net.c | 577 ++++++++++++++++++++++++++++++++++++++++++++++--- net/nfs.c | 2 net/rarp.c | 5 net/tftp.c | 2 10 files changed, 775 insertions(+), 41 deletions(-) diff -ruNb u-boot-original/README u-boot-net/README --- u-boot-original/README 2004-03-30 14:37:28.395972064 +0300 +++ u-boot-net/README 2004-03-30 16:48:11.265674640 +0300 @@ -581,6 +581,7 @@ CFG_CMD_USB * USB support CFG_CMD_VFD * VFD support (TRAB) CFG_CMD_BSP * Board SPecific functions + CFG_CMD_CDP * Cisco Discover Protocol support ----------------------------------------------- CFG_CMD_ALL all @@ -949,6 +950,48 @@ environment variable is passed as option 12 to the DHCP server. + - CDP Options: + CONFIG_CDP_DEVICE_ID + + The device id used in CDP trigger frames. + + CONFIG_CDP_DEVICE_ID_PREFIX + + A two character string which is prefixed to the MAC address + of the device. + + CONFIG_CDP_PORT_ID + + A printf format string which contains the ascii name of + the port. Normally is set to "eth%d" which sets + eth0 for the first ethernet, eth1 for the second etc. + + CONFIG_CDP_CAPABILITIES + + A 32bit integer which indicates the device capabilities; + 0x00000010 for a normal host which does not forwards. + + CONFIG_CDP_VERSION + + An ascii string containing the version of the software. + + CONFIG_CDP_PLATFORM + + An ascii string containing the name of the platform. + + CONFIG_CDP_TRIGGER + + A 32bit integer sent on the trigger. + + CONFIG_CDP_POWER_CONSUMPTION + + A 16bit integer containing the power consumption of the + device in .1 of milliwatts. + + CONFIG_CDP_APPLIANCE_VLAN_TYPE + + A byte containing the id of the VLAN. + - Status LED: CONFIG_STATUS_LED Several configurations allow to display the current @@ -2182,6 +2225,26 @@ bootstopkey - see CONFIG_AUTOBOOT_STOP_STR + ethprime - When CONFIG_NET_MULTI is enabled controls which + interface is used first. + + ethact - When CONFIG_NET_MULTI is enabled controls which + interface is currently active. For example you + can do the following + + => setenv ethact FEC ETHERNET + => ping 192.168.0.1 # traffic sent on FEC ETHERNET + => setenv ethact SCC ETHERNET + => ping 10.0.0.1 # traffic sent on SCC ETHERNET + + netretry - When set to "no" each network operation will + either succeed or fail without retrying. + Useful on scripts which control the retry operation + themselves. + + vlan - When set to a value < 4095 the traffic over + ethernet is encapsulated/received over 802.1q + VLAN tagged frames. The following environment variables may be used and automatically updated by the network boot commands ("bootp" and "rarpboot"), diff -ruNb u-boot-original/common/cmd_net.c u-boot-net/common/cmd_net.c --- u-boot-original/common/cmd_net.c 2004-03-30 14:37:28.664931176 +0300 +++ u-boot-net/common/cmd_net.c 2004-03-30 15:41:00.406458384 +0300 @@ -96,7 +96,7 @@ static void netboot_update_env(void) { - char tmp[16] ; + char tmp[22] ; if (NetOurGatewayIP) { ip_to_string (NetOurGatewayIP, tmp); @@ -139,6 +139,16 @@ if (NetOurNISDomain[0]) setenv("domain", NetOurNISDomain); + if (ntohs(NetOurVLAN) != (ushort)-1) { + VLAN_to_string(NetOurVLAN, tmp); + setenv("vlan", tmp); + } + + if (ntohs(NetOurNativeVLAN) != (ushort)-1) { + VLAN_to_string(NetOurNativeVLAN, tmp); + setenv("vlan", tmp); + } + } static int netboot_common (int proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) @@ -238,4 +248,47 @@ ); #endif /* CFG_CMD_PING */ +#if (CONFIG_COMMANDS & CFG_CMD_CDP) + +static void cdp_update_env(void) +{ + char tmp[16]; + + if (CDPApplianceVLAN != htons(-1)) { + printf("CDP offered appliance VLAN %d\n", ntohs(CDPApplianceVLAN)); + VLAN_to_string(CDPApplianceVLAN, tmp); + setenv("vlan", tmp); + NetOurVLAN = CDPApplianceVLAN; + } + + if (CDPNativeVLAN != htons(-1)) { + printf("CDP offered native VLAN %d\n", ntohs(CDPNativeVLAN)); + VLAN_to_string(CDPNativeVLAN, tmp); + setenv("nvlan", tmp); + NetOurNativeVLAN = CDPNativeVLAN; + } + +} + +int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + int r; + + r = NetLoop(CDP); + if (r < 0) { + printf("cdp failed; perhaps not a CISCO switch?\n"); + return 1; + } + + cdp_update_env(); + + return 0; +} + +U_BOOT_CMD( + cdp, 1, 1, do_cdp, + "cdp - Perform CDP network configuration\n", +); +#endif /* CFG_CMD_CDP */ + #endif /* CFG_CMD_NET */ diff -ruNb u-boot-original/include/cmd_confdefs.h u-boot-net/include/cmd_confdefs.h --- u-boot-original/include/cmd_confdefs.h 2004-03-30 14:37:28.749918256 +0300 +++ u-boot-net/include/cmd_confdefs.h 2004-03-30 15:41:00.407458232 +0300 @@ -88,6 +88,7 @@ #define CFG_CMD_ITEST 0x0040000000000000U /* Integer (and string) test */ #define CFG_CMD_NFS 0x0080000000000000U /* NFS support */ #define CFG_CMD_REISER 0x0100000000000000U /* Reiserfs support */ +#define CFG_CMD_CDP 0x0200000000000000U /* Cisco Discovery Protocol */ #define CFG_CMD_ALL 0xFFFFFFFFFFFFFFFFU /* ALL commands */ @@ -131,7 +132,8 @@ CFG_CMD_SDRAM | \ CFG_CMD_SPI | \ CFG_CMD_USB | \ - CFG_CMD_VFD ) + CFG_CMD_VFD | \ + CFG_CMD_CDP ) /* Default configuration */ diff -ruNb u-boot-original/include/net.h u-boot-net/include/net.h --- u-boot-original/include/net.h 2004-03-30 14:37:28.756917192 +0300 +++ u-boot-net/include/net.h 2004-03-30 15:41:00.408458080 +0300 @@ -110,7 +110,11 @@ extern int eth_initialize(bd_t *bis); /* Initialize network subsystem */ extern int eth_register(struct eth_device* dev);/* Register network device */ extern void eth_try_another(int first_restart); /* Change the device */ +#ifdef CONFIG_NET_MULTI +extern void eth_set_current(void); /* set nterface to ethcur var. */ +#endif extern struct eth_device *eth_get_dev(void); /* get the current device MAC */ +extern int eth_get_dev_index (void); /* get the device index */ extern void eth_set_enetaddr(int num, char* a); /* Set new MAC address */ extern int eth_init(bd_t *bis); /* Initialize the device */ @@ -143,9 +147,24 @@ #define ETHER_HDR_SIZE 14 /* Ethernet header size */ #define E802_HDR_SIZE 22 /* 802 ethernet header size */ + +/* + * Ethernet header + */ +typedef struct { + uchar vet_dest[6]; /* Destination node */ + uchar vet_src[6]; /* Source node */ + ushort vet_vlan_type; /* PROT_VLAN */ + ushort vet_tag; /* TAG of VLAN */ + ushort vet_type; /* protocol type */ +} VLAN_Ethernet_t; + +#define VLAN_ETHER_HDR_SIZE 18 /* VLAN Ethernet header size */ + #define PROT_IP 0x0800 /* IP protocol */ #define PROT_ARP 0x0806 /* IP ARP protocol */ #define PROT_RARP 0x8035 /* IP ARP protocol */ +#define PROT_VLAN 0x8100 /* IEEE 802.1q protocol */ #define IPPROTO_ICMP 1 /* Internet Control Message Protocol */ #define IPPROTO_UDP 17 /* User Datagram Protocol */ @@ -296,6 +315,15 @@ extern unsigned NetIPID; /* IP ID (counting) */ extern uchar NetBcastAddr[6]; /* Ethernet boardcast address */ +#define VLAN_NONE 4095 /* untagged */ +#define VLAN_IDMASK 0x0fff /* mask of valid vlan id */ +extern ushort NetOurVLAN; /* Our VLAN */ +extern ushort NetOurNativeVLAN; /* Our Native VLAN */ + +extern uchar NetCDPAddr[6]; /* Ethernet CDP address */ +extern ushort CDPNativeVLAN; /* CDP returned native VLAN */ +extern ushort CDPApplianceVLAN; /* CDP returned appliance VLAN */ + extern int NetState; /* Network loop state */ #define NETLOOP_CONTINUE 1 #define NETLOOP_RESTART 2 @@ -306,7 +334,7 @@ extern int NetRestartWrap; /* Tried all network devices */ #endif -typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS } proto_t; +typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP } proto_t; /* from net/net.c */ extern char BootFile[128]; /* Boot File name */ @@ -315,6 +343,12 @@ extern IPaddr_t NetPingIP; /* the ip address to ping */ #endif +#if (CONFIG_COMMANDS & CFG_CMD_CDP) +/* when CDP completes these hold the return values */ +extern ushort CDPNativeVLAN; +extern ushort CDPApplianceVLAN; +#endif + /* Initialize the network adapter */ extern int NetLoop(proto_t); @@ -324,8 +358,11 @@ /* Load failed. Start again. */ extern void NetStartAgain(void); -/* Set ethernet header */ -extern void NetSetEther(volatile uchar *, uchar *, uint); +/* Get size of the ethernet header when we send */ +extern int NetEthHdrSize(void); + +/* Set ethernet header; returns the size of the header */ +extern int NetSetEther(volatile uchar *, uchar *, uint); /* Set IP header */ extern void NetSetIP(volatile uchar *, IPaddr_t, int, int, int); @@ -397,9 +434,18 @@ /* Convert a string to ip address */ extern IPaddr_t string_to_ip(char *s); +/* Convert a VLAN id to a string */ +extern void VLAN_to_string (ushort x, char *s); + +/* Convert a string to a vlan id */ +extern ushort string_to_VLAN(char *s); + /* read an IP address from a environment variable */ extern IPaddr_t getenv_IPaddr (char *); +/* read a VLAN id from an environment variable */ +extern ushort getenv_VLAN(char *); + /* copy a filename (allow for "..." notation, limit length) */ extern void copy_filename (uchar *dst, uchar *src, int size); diff -ruNb u-boot-original/net/bootp.c u-boot-net/net/bootp.c --- u-boot-original/net/bootp.c 2004-03-30 14:37:28.828906248 +0300 +++ u-boot-net/net/bootp.c 2004-03-30 15:41:00.409457928 +0300 @@ -644,8 +644,7 @@ pkt = NetTxPacket; memset ((void*)pkt, 0, PKTSIZE); - NetSetEther(pkt, NetBcastAddr, PROT_IP); - pkt += ETHER_HDR_SIZE; + pkt += NetSetEther(pkt, NetBcastAddr, PROT_IP); /* * Next line results in incorrect packet size being transmitted, resulting @@ -791,8 +790,7 @@ pkt = NetTxPacket; memset ((void*)pkt, 0, PKTSIZE); - NetSetEther(pkt, NetBcastAddr, PROT_IP); - pkt += ETHER_HDR_SIZE; + pkt += NetSetEther(pkt, NetBcastAddr, PROT_IP); iphdr = pkt; /* We'll need this later to set proper pkt size */ pkt += IP_HDR_SIZE; diff -ruNb u-boot-original/net/eth.c u-boot-net/net/eth.c --- u-boot-original/net/eth.c 2004-03-30 14:37:28.828906248 +0300 +++ u-boot-net/net/eth.c 2004-03-30 15:41:00.410457776 +0300 @@ -87,6 +87,14 @@ if (!eth_devices) { eth_current = eth_devices = dev; +#ifdef CONFIG_NET_MULTI + /* update current ethernet name */ + { + char *act = getenv("ethact"); + if (act == NULL || strcmp(act, eth_current->name) != 0) + setenv("ethact", eth_current->name); + } +#endif } else { for (d=eth_devices; d->next!=eth_devices; d=d->next); d->next = dev; @@ -221,6 +229,16 @@ dev = dev->next; } while(dev != eth_devices); +#ifdef CONFIG_NET_MULTI + /* update current ethernet name */ + if (eth_current) { + char *act = getenv("ethact"); + if (act == NULL || strcmp(act, eth_current->name) != 0) + setenv("ethact", eth_current->name); + } else + setenv("ethact", NULL); +#endif + putc ('\n'); } @@ -326,12 +344,44 @@ eth_current = eth_current->next; +#ifdef CONFIG_NET_MULTI + /* update current ethernet name */ + { + char *act = getenv("ethact"); + if (act == NULL || strcmp(act, eth_current->name) != 0) + setenv("ethact", eth_current->name); + } +#endif + if (first_failed == eth_current) { NetRestartWrap = 1; } } +#ifdef CONFIG_NET_MULTI +void eth_set_current(void) +{ + char *act; + struct eth_device* old_current; + + if (!eth_current) /* XXX no current */ + return; + + act = getenv("ethact"); + if (act != NULL) { + old_current = eth_current; + do { + if (strcmp(eth_current->name, act) == 0) + return; + eth_current = eth_current->next; + } while (old_current != eth_current); + } + + setenv("ethact", eth_current->name); +} +#endif + char *eth_get_name (void) { return (eth_current ? eth_current->name : "unknown"); diff -ruNb u-boot-original/net/net.c u-boot-net/net/net.c --- u-boot-original/net/net.c 2004-03-30 14:37:28.829906096 +0300 +++ u-boot-net/net/net.c 2004-03-30 15:41:00.412457472 +0300 @@ -121,6 +121,10 @@ { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; uchar NetEtherNullAddr[6] = { 0, 0, 0, 0, 0, 0 }; +#if (CONFIG_COMMANDS & CFG_CMD_CDP) +uchar NetCDPAddr[6] = /* Ethernet bcast address */ + { 0x01, 0x00, 0x0c, 0xcc, 0xcc, 0xcc }; +#endif int NetState; /* Network loop state */ #ifdef CONFIG_NET_MULTI int NetRestartWrap = 0; /* Tried all network devices */ @@ -128,6 +132,9 @@ static int NetDevExists = 0; /* At least one device configured */ #endif +ushort NetOurVLAN = ntohs(-1); /* default is without VLAN */ +ushort NetOurNativeVLAN = htons(-1); /* dido */ + char BootFile[128]; /* Boot File name */ #if (CONFIG_COMMANDS & CFG_CMD_PING) @@ -136,6 +143,14 @@ static void PingStart(void); #endif +#if (CONFIG_COMMANDS & CFG_CMD_CDP) + +static void CDPStart(void); + + + +#endif + volatile uchar PktBuf[(PKTBUFSRX+1) * PKTSIZE_ALIGN + PKTALIGN]; volatile uchar *NetRxPackets[PKTBUFSRX]; /* Receive packets */ @@ -170,8 +185,7 @@ #endif pkt = NetTxPacket; - NetSetEther(pkt, NetBcastAddr, PROT_ARP); - pkt += ETHER_HDR_SIZE; + pkt += NetSetEther(pkt, NetBcastAddr, PROT_ARP); arp = (ARP_t *)pkt; @@ -196,7 +210,7 @@ NetArpWaitReplyIP = NetArpWaitPacketIP; NetWriteIP((uchar*)&arp->ar_data[16], NetArpWaitReplyIP); - (void) eth_send(NetTxPacket, ETHER_HDR_SIZE + ARP_HDR_SIZE); + (void) eth_send(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE); } void ArpTimeoutCheck(void) @@ -269,6 +283,7 @@ } eth_halt(); + eth_set_current(); if(eth_init(bd) < 0) return(-1); @@ -298,6 +313,8 @@ NetCopyIP(&NetOurIP, &bd->bi_ip_addr); NetOurGatewayIP = getenv_IPaddr ("gatewayip"); NetOurSubnetMask= getenv_IPaddr ("netmask"); + NetOurVLAN = getenv_VLAN("vlan"); + NetOurNativeVLAN = getenv_VLAN("nvlan"); switch (protocol) { #if (CONFIG_COMMANDS & CFG_CMD_NFS) @@ -324,6 +341,11 @@ */ NetOurIP = 0; NetServerIP = getenv_IPaddr ("serverip"); + NetOurVLAN = getenv_VLAN("vlan"); /* VLANs must be read */ + NetOurNativeVLAN = getenv_VLAN("nvlan"); + case CDP: + NetOurVLAN = getenv_VLAN("vlan"); /* VLANs must be read */ + NetOurNativeVLAN = getenv_VLAN("nvlan"); break; default: break; @@ -378,6 +400,11 @@ NfsStart(); break; #endif +#if (CONFIG_COMMANDS & CFG_CMD_CDP) + case CDP: + CDPStart(); + break; +#endif default: break; } @@ -469,6 +496,9 @@ NetBootFileXferSize); sprintf(buf, "%lx", NetBootFileXferSize); setenv("filesize", buf); + + sprintf(buf, "%lX", (unsigned long)load_addr); + setenv("fileaddr", buf); } eth_halt(); return NetBootFileXferSize; @@ -496,12 +526,19 @@ void NetStartAgain(void) { + DECLARE_GLOBAL_DATA_PTR; + char *s; + + if ((s = getenv("netretry")) != NULL && *s == 'n') { + eth_halt(); + NetState = NETLOOP_FAIL; + return; + } + #ifndef CONFIG_NET_MULTI NetSetTimeout(10 * CFG_HZ, startAgainTimeout); NetSetHandler(startAgainHandler); #else - DECLARE_GLOBAL_DATA_PTR; - eth_halt(); eth_try_another(!NetRestarted); eth_init(gd->bd); @@ -559,6 +596,8 @@ int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len) { + uchar *pkt; + /* convert to new style broadcast */ if (dest == 0) dest = 0xFFFFFFFF; @@ -573,16 +612,17 @@ #ifdef ET_DEBUG printf("sending ARP for %08lx\n", dest); #endif - NetArpWaitPacketIP = dest; NetArpWaitPacketMAC = ether; - NetSetEther (NetArpWaitTxPacket, NetArpWaitPacketMAC, PROT_IP); - NetSetIP (NetArpWaitTxPacket + ETHER_HDR_SIZE, dest, dport, sport, len); - memcpy(NetArpWaitTxPacket + ETHER_HDR_SIZE + IP_HDR_SIZE, - (uchar *)NetTxPacket + ETHER_HDR_SIZE + IP_HDR_SIZE, len); + + pkt = NetArpWaitTxPacket; + pkt += NetSetEther (pkt, NetArpWaitPacketMAC, PROT_IP); + + NetSetIP (pkt, dest, dport, sport, len); + memcpy(pkt + IP_HDR_SIZE, (uchar *)NetTxPacket + (pkt - (uchar *)NetArpWaitTxPacket) + IP_HDR_SIZE, len); /* size of the waiting packet */ - NetArpWaitTxPacketSize = ETHER_HDR_SIZE + IP_HDR_SIZE + len; + NetArpWaitTxPacketSize = (pkt - NetArpWaitTxPacket) + IP_HDR_SIZE + len; /* and do the ARP request */ NetArpWaitTry = 1; @@ -596,9 +636,10 @@ dest, ether[0], ether[1], ether[2], ether[3], ether[4], ether[5]); #endif - NetSetEther (NetTxPacket, ether, PROT_IP); - NetSetIP (NetTxPacket + ETHER_HDR_SIZE, dest, dport, sport, len); - (void) eth_send(NetTxPacket, ETHER_HDR_SIZE + IP_HDR_SIZE + len); + pkt = (uchar *)NetTxPacket; + pkt += NetSetEther (pkt, ether, PROT_IP); + NetSetIP (pkt, dest, dport, sport, len); + (void) eth_send(NetTxPacket, (pkt - NetTxPacket) + IP_HDR_SIZE + len); return 0; /* transmited */ } @@ -611,6 +652,7 @@ static uchar mac[6]; volatile IP_t *ip; volatile ushort *s; + uchar *pkt; /* XXX always send arp request */ @@ -623,9 +665,10 @@ NetArpWaitPacketIP = NetPingIP; NetArpWaitPacketMAC = mac; - NetSetEther(NetArpWaitTxPacket, mac, PROT_IP); + pkt = NetArpWaitTxPacket; + pkt += NetSetEther(pkt, mac, PROT_IP); - ip = (volatile IP_t *)(NetArpWaitTxPacket + ETHER_HDR_SIZE); + ip = (volatile IP_t *)pkt; /* * Construct an IP and ICMP header. (need to set no fragment bit - XXX) @@ -650,7 +693,7 @@ s[1] = ~NetCksum((uchar *)s, 8/2); /* size of the waiting packet */ - NetArpWaitTxPacketSize = ETHER_HDR_SIZE + IP_HDR_SIZE_NO_UDP + 8; + NetArpWaitTxPacketSize = (pkt - NetArpWaitTxPacket) + IP_HDR_SIZE_NO_UDP + 8; /* and do the ARP request */ NetArpWaitTry = 1; @@ -681,6 +724,9 @@ static void PingStart(void) { +#if defined(CONFIG_NET_MULTI) + printf ("Using %s device\n", eth_get_name()); +#endif NetSetTimeout (10 * CFG_HZ, PingTimeout); NetSetHandler (PingHandler); @@ -689,37 +735,454 @@ #endif +#if (CONFIG_COMMANDS & CFG_CMD_CDP) + +#define CDP_DEVICE_ID_TLV 0x0001 +#define CDP_ADDRESS_TLV 0x0002 +#define CDP_PORT_ID_TLV 0x0003 +#define CDP_CAPABILITIES_TLV 0x0004 +#define CDP_VERSION_TLV 0x0005 +#define CDP_PLATFORM_TLV 0x0006 +#define CDP_NATIVE_VLAN_TLV 0x000a +#define CDP_APPLIANCE_VLAN_TLV 0x000e +#define CDP_TRIGGER_TLV 0x000f +#define CDP_POWER_CONSUMPTION_TLV 0x0010 +#define CDP_SYSNAME_TLV 0x0014 +#define CDP_SYSOBJECT_TLV 0x0015 +#define CDP_MANAGEMENT_ADDRESS_TLV 0x0016 + +#define CDP_TIMEOUT (CFG_HZ/4) /* one packet every 250ms */ + +static int CDPSeq; +static int CDPOK; + +ushort CDPNativeVLAN; +ushort CDPApplianceVLAN; + +static const uchar CDP_SNAP_hdr[8] = { 0xAA, 0xAA, 0x03, 0x00, 0x00, 0x0C, 0x20, 0x00 }; + +static ushort CDP_compute_csum(const uchar *buff, ushort len) +{ + ushort csum; + int odd; + ulong result = 0; + ushort leftover; + + if (len > 0) { + odd = 1 & (ulong)buff; + if (odd) { + result = *buff << 8; + len--; + buff++; + } + while (len > 1) { + result += *((const ushort *)buff)++; + if (result & 0x80000000) + result = (result & 0xFFFF) + (result >> 16); + len -= 2; + } + if (len) { + leftover = (signed short)(*(const signed char *)buff); + /* * XXX CISCO SUCKS big time! (and blows too) */ + result = (result & 0xffff0000) | ((result + leftover) & 0x0000ffff); + } + while (result >> 16) + result = (result & 0xFFFF) + (result >> 16); + + if (odd) + result = ((result >> 8) & 0xff) | ((result & 0xff) << 8); + } + + /* add up 16-bit and 17-bit words for 17+c bits */ + result = (result & 0xffff) + (result >> 16); + /* add up 16-bit and 2-bit for 16+c bit */ + result = (result & 0xffff) + (result >> 16); + /* add up carry.. */ + result = (result & 0xffff) + (result >> 16); + + /* negate */ + csum = ~(ushort)result; + + /* run time endian detection */ + if (csum != htons(csum)) /* little endian */ + csum = htons(csum); + + return csum; +} + +int CDPSendTrigger(void) +{ + volatile uchar *pkt; + volatile ushort *s; + volatile ushort *cp; + Ethernet_t *et; + char buf[32]; + int len; + ushort chksum; + + pkt = NetTxPacket; + et = (Ethernet_t *)pkt; + + /* NOTE: trigger sent not on any VLAN */ + + /* form ethernet header */ + memcpy(et->et_dest, NetCDPAddr, 6); + memcpy(et->et_src, NetOurEther, 6); + + pkt += ETHER_HDR_SIZE; + + /* SNAP header */ + memcpy((uchar *)pkt, CDP_SNAP_hdr, sizeof(CDP_SNAP_hdr)); + pkt += sizeof(CDP_SNAP_hdr); + + /* CDP header */ + *pkt++ = 0x02; /* CDP version 2 */ + *pkt++ = 180; /* TTL */ + s = (volatile ushort *)pkt; + cp = s; + *s++ = htons(0); /* checksum (0 for later calculation) */ + + /* CDP fields */ +#ifdef CONFIG_CDP_DEVICE_ID + *s++ = htons(CDP_DEVICE_ID_TLV); + *s++ = htons(CONFIG_CDP_DEVICE_ID); + memset(buf, 0, sizeof(buf)); + sprintf(buf, CONFIG_CDP_DEVICE_ID_PREFIX "%02X%02X%02X%02X%02X%02X", + NetOurEther[0] & 0xff, NetOurEther[1] & 0xff, + NetOurEther[2] & 0xff, NetOurEther[3] & 0xff, + NetOurEther[4] & 0xff, NetOurEther[5] & 0xff); + memcpy((uchar *)s, buf, 16); + s += 16 / 2; +#endif + +#ifdef CONFIG_CDP_PORT_ID + *s++ = htons(CDP_PORT_ID_TLV); + memset(buf, 0, sizeof(buf)); + sprintf(buf, CONFIG_CDP_PORT_ID, eth_get_dev_index()); + len = strlen(buf); + if (len & 1) /* make it even */ + len++; + *s++ = htons(len + 4); + memcpy((uchar *)s, buf, len); + s += len / 2; +#endif + +#ifdef CONFIG_CDP_CAPABILITIES + *s++ = htons(CDP_CAPABILITIES_TLV); + *s++ = htons(8); + *(ulong *)s = htonl(CONFIG_CDP_CAPABILITIES); + s += 2; +#endif + +#ifdef CONFIG_CDP_VERSION + *s++ = htons(CDP_VERSION_TLV); + memset(buf, 0, sizeof(buf)); + strcpy(buf, CONFIG_CDP_VERSION); + len = strlen(buf); + if (len & 1) /* make it even */ + len++; + *s++ = htons(len + 4); + memcpy((uchar *)s, buf, len); + s += len / 2; +#endif + +#ifdef CONFIG_CDP_PLATFORM + *s++ = htons(CDP_PLATFORM_TLV); + memset(buf, 0, sizeof(buf)); + strcpy(buf, CONFIG_CDP_PLATFORM); + len = strlen(buf); + if (len & 1) /* make it even */ + len++; + *s++ = htons(len + 4); + memcpy((uchar *)s, buf, len); + s += len / 2; +#endif + +#ifdef CONFIG_CDP_TRIGGER + *s++ = htons(CDP_TRIGGER_TLV); + *s++ = htons(8); + *(ulong *)s = htonl(CONFIG_CDP_TRIGGER); + s += 2; +#endif + +#ifdef CONFIG_CDP_POWER_CONSUMPTION + *s++ = htons(CDP_POWER_CONSUMPTION_TLV); + *s++ = htons(6); + *s++ = htons(CONFIG_CDP_POWER_CONSUMPTION); +#endif + + /* length of ethernet packet */ + len = (uchar *)s - ((uchar *)NetTxPacket + ETHER_HDR_SIZE); + et->et_protlen = htons(len); + + len = ETHER_HDR_SIZE + sizeof(CDP_SNAP_hdr); + chksum = CDP_compute_csum((uchar *)NetTxPacket + len, (uchar *)s - (NetTxPacket + len)); + if (chksum == 0) + chksum = 0xFFFF; + *cp = htons(chksum); + + (void) eth_send(NetTxPacket, (uchar *)s - NetTxPacket); + return 0; +} + +static void +CDPTimeout (void) +{ + CDPSeq++; + + if (CDPSeq < 3) { + NetSetTimeout (CDP_TIMEOUT, CDPTimeout); + CDPSendTrigger(); + return; + } + + /* if not OK try again */ + if (!CDPOK) + NetStartAgain(); + else + NetState = NETLOOP_SUCCESS; +} + +static void +CDPDummyHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) +{ + /* nothing */ +} + +static void +CDPHandler(const uchar * pkt, unsigned len) +{ + const uchar *t; + const ushort *ss; + ushort type, tlen; + uchar applid; + ushort vlan, nvlan; + + /* minimum size? */ + if (len < sizeof(CDP_SNAP_hdr) + 4) + goto pkt_short; + + /* check for valid CDP SNAP header */ + if (memcmp(pkt, CDP_SNAP_hdr, sizeof(CDP_SNAP_hdr)) != 0) + return; + + pkt += sizeof(CDP_SNAP_hdr); + len -= sizeof(CDP_SNAP_hdr); + + /* Version of CDP protocol must be >= 2 and TTL != 0 */ + if (pkt[0] < 0x02 || pkt[1] == 0) + return; + + /* if version is greater than 0x02 maybe we'll have a problem; output a warning */ + if (pkt[0] != 0x02) + printf("** WARNING: CDP packet received with a protocol version %d > 2\n", + pkt[0] & 0xff); + + if (CDP_compute_csum(pkt, len) != 0) + return; + + pkt += 4; + len -= 4; + + vlan = htons(-1); + nvlan = htons(-1); + while (len > 0) { + if (len < 4) + goto pkt_short; + + ss = (const ushort *)pkt; + type = ntohs(ss[0]); + tlen = ntohs(ss[1]); + if (tlen > len) { + goto pkt_short; + } + + pkt += tlen; + len -= tlen; + + ss += 2; /* point ss to the data of the TLV */ + tlen -= 4; + + switch (type) { + case CDP_DEVICE_ID_TLV: + break; + case CDP_ADDRESS_TLV: + break; + case CDP_PORT_ID_TLV: + break; + case CDP_CAPABILITIES_TLV: + break; + case CDP_VERSION_TLV: + break; + case CDP_PLATFORM_TLV: + break; + case CDP_NATIVE_VLAN_TLV: + nvlan = *ss; + break; + case CDP_APPLIANCE_VLAN_TLV: + t = (const uchar *)ss; + while (tlen > 0) { + if (tlen < 3) + goto pkt_short; + + applid = t[0]; + ss = (const ushort *)(t + 1); + +#ifdef CONFIG_CDP_APPLIANCE_VLAN_TYPE + if (applid == CONFIG_CDP_APPLIANCE_VLAN_TYPE) + vlan = *ss; +#else + vlan = ntohs(*ss); /* XXX will this work; dunno */ +#endif + t += 3; tlen -= 3; + } + break; + case CDP_TRIGGER_TLV: + break; + case CDP_POWER_CONSUMPTION_TLV: + break; + case CDP_SYSNAME_TLV: + break; + case CDP_SYSOBJECT_TLV: + break; + case CDP_MANAGEMENT_ADDRESS_TLV: + break; + } + } + + CDPApplianceVLAN = vlan; + CDPNativeVLAN = nvlan; + + CDPOK = 1; + return; + + pkt_short: + printf("** CDP packet is too short\n"); + return; +} + +static void CDPStart(void) +{ +#if defined(CONFIG_NET_MULTI) + printf ("Using %s device\n", eth_get_name()); +#endif + CDPSeq = 0; + CDPOK = 0; + + CDPNativeVLAN = htons(-1); + CDPApplianceVLAN = htons(-1); + + NetSetTimeout (CDP_TIMEOUT, CDPTimeout); + NetSetHandler (CDPDummyHandler); + + CDPSendTrigger(); +} + +#endif + + void -NetReceive(volatile uchar * pkt, int len) +NetReceive(volatile uchar * inpkt, int len) { Ethernet_t *et; IP_t *ip; ARP_t *arp; IPaddr_t tmp; int x; + uchar *pkt; +#if (CONFIG_COMMANDS & CFG_CMD_CDP) + int iscdp; +#endif + ushort cti = 0, vlanid = VLAN_NONE, myvlanid, mynvlanid; - NetRxPkt = pkt; +#ifdef ET_DEBUG + printf("packet received\n"); +#endif + + NetRxPkt = inpkt; NetRxPktLen = len; - et = (Ethernet_t *)pkt; + et = (Ethernet_t *)inpkt; + + /* too small packet? */ + if (len < ETHER_HDR_SIZE) + return; + +#if (CONFIG_COMMANDS & CFG_CMD_CDP) + /* keep track if packet is CDP */ + iscdp = memcmp(et->et_dest, NetCDPAddr, 6) == 0; +#endif + + myvlanid = ntohs(NetOurVLAN); + if (myvlanid == (ushort)-1) + myvlanid = VLAN_NONE; + mynvlanid = ntohs(NetOurNativeVLAN); + if (mynvlanid == (ushort)-1) + mynvlanid = VLAN_NONE; x = ntohs(et->et_protlen); +#ifdef ET_DEBUG + printf("packet received\n"); +#endif + if (x < 1514) { /* * Got a 802 packet. Check the other protocol field. */ x = ntohs(et->et_prot); - ip = (IP_t *)(pkt + E802_HDR_SIZE); + + ip = (IP_t *)(inpkt + E802_HDR_SIZE); len -= E802_HDR_SIZE; - } else { - ip = (IP_t *)(pkt + ETHER_HDR_SIZE); + + } else if (x != PROT_VLAN) { /* normal packet */ + ip = (IP_t *)(inpkt + ETHER_HDR_SIZE); len -= ETHER_HDR_SIZE; + + } else { /* VLAN packet */ + VLAN_Ethernet_t *vet = (VLAN_Ethernet_t *)et; + +#ifdef ET_DEBUG + printf("VLAN packet received\n"); +#endif + /* too small packet? */ + if (len < VLAN_ETHER_HDR_SIZE) + return; + + /* if no VLAN active */ + if ((ntohs(NetOurVLAN) & VLAN_IDMASK) == VLAN_NONE +#if (CONFIG_COMMANDS & CFG_CMD_CDP) + && iscdp == 0 +#endif + ) + return; + + cti = ntohs(vet->vet_tag); + vlanid = cti & VLAN_IDMASK; + x = ntohs(vet->vet_type); + + ip = (IP_t *)(inpkt + VLAN_ETHER_HDR_SIZE); + len -= VLAN_ETHER_HDR_SIZE; } #ifdef ET_DEBUG printf("Receive from protocol 0x%x\n", x); #endif +#if (CONFIG_COMMANDS & CFG_CMD_CDP) + if (iscdp) { + CDPHandler((uchar *)ip, len); + return; + } +#endif + + if ((myvlanid & VLAN_IDMASK) != VLAN_NONE) { + if (vlanid == VLAN_NONE) + vlanid = (mynvlanid & VLAN_IDMASK); + /* not matched? */ + if (vlanid != (myvlanid & VLAN_IDMASK)) + return; + } + switch (x) { case PROT_ARP: @@ -766,13 +1229,14 @@ #ifdef ET_DEBUG puts ("Got ARP REQUEST, return our IP\n"); #endif - NetSetEther((uchar *)et, et->et_src, PROT_ARP); + pkt = (uchar *)et; + pkt += NetSetEther(pkt, et->et_src, PROT_ARP); arp->ar_op = htons(ARPOP_REPLY); memcpy (&arp->ar_data[10], &arp->ar_data[0], 6); NetCopyIP(&arp->ar_data[16], &arp->ar_data[6]); memcpy (&arp->ar_data[ 0], NetOurEther, 6); NetCopyIP(&arp->ar_data[ 6], &NetOurIP); - (void) eth_send((uchar *)et, ((uchar *)arp-pkt) + ARP_HDR_SIZE); + (void) eth_send((uchar *)et, (pkt - (uchar *)et) + ARP_HDR_SIZE); return; case ARPOP_REPLY: /* arp reply */ @@ -963,6 +1427,7 @@ case DHCP: case RARP: case BOOTP: + case CDP: if (memcmp(NetOurEther, "\0\0\0\0\0\0", 6) == 0) { #ifdef CONFIG_NET_MULTI extern int eth_get_dev_index (void); @@ -1016,17 +1481,42 @@ return (xsum & 0xffff); } +int +NetEthHdrSize(void) +{ + ushort myvlanid; -void + myvlanid = ntohs(NetOurVLAN); + if (myvlanid == (ushort)-1) + myvlanid = VLAN_NONE; + + return ((myvlanid & VLAN_IDMASK) == VLAN_NONE) ? ETHER_HDR_SIZE : VLAN_ETHER_HDR_SIZE; +} + +int NetSetEther(volatile uchar * xet, uchar * addr, uint prot) { Ethernet_t *et = (Ethernet_t *)xet; + ushort myvlanid; + + myvlanid = ntohs(NetOurVLAN); + if (myvlanid == (ushort)-1) + myvlanid = VLAN_NONE; memcpy (et->et_dest, addr, 6); memcpy (et->et_src, NetOurEther, 6); + if ((myvlanid & VLAN_IDMASK) == VLAN_NONE) { et->et_protlen = htons(prot); -} + return ETHER_HDR_SIZE; + } else { + VLAN_Ethernet_t *vet = (VLAN_Ethernet_t *)xet; + vet->vet_vlan_type = htons(PROT_VLAN); + vet->vet_tag = htons((0 << 5) | (myvlanid & VLAN_IDMASK)); + vet->vet_type = htons(prot); + return VLAN_ETHER_HDR_SIZE; + } +} void NetSetIP(volatile uchar * xip, IPaddr_t dest, int dport, int sport, int len) @@ -1109,6 +1599,34 @@ return (htonl(addr)); } +void VLAN_to_string(ushort x, char *s) +{ + x = ntohs(x); + + if (x == (ushort)-1) + x = VLAN_NONE; + + if (x == VLAN_NONE) + strcpy(s, "none"); + else + sprintf(s, "%d", x & VLAN_IDMASK); +} + +ushort string_to_VLAN(char *s) +{ + ushort id; + + if (s == NULL) + return VLAN_NONE; + + if (*s < '0' || *s > '9') + id = VLAN_NONE; + else + id = (ushort)simple_strtoul(s, NULL, 10); + + return id; +} + void print_IPaddr (IPaddr_t x) { char tmp[16]; @@ -1122,3 +1640,8 @@ { return (string_to_ip(getenv(var))); } + +ushort getenv_VLAN(char *var) +{ + return (string_to_VLAN(getenv(var))); +} diff -ruNb u-boot-original/net/nfs.c u-boot-net/net/nfs.c --- u-boot-original/net/nfs.c 2004-03-30 14:37:28.829906096 +0300 +++ u-boot-net/net/nfs.c 2004-03-30 15:41:00.413457320 +0300 @@ -192,7 +192,7 @@ pktlen = (char *)p + datalen*sizeof(uint32_t) - (char *)&pkt; - memcpy ((char *)NetTxPacket+ETHER_HDR_SIZE+IP_HDR_SIZE, (char *)&pkt, pktlen); + memcpy ((char *)NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE, (char *)&pkt, pktlen); if (rpc_prog == PROG_PORTMAP) sport = SUNRPC_PORT; diff -ruNb u-boot-original/net/rarp.c u-boot-net/net/rarp.c --- u-boot-original/net/rarp.c 2004-03-30 14:37:28.829906096 +0300 +++ u-boot-net/net/rarp.c 2004-03-30 15:41:00.414457168 +0300 @@ -96,8 +96,7 @@ printf("RARP broadcast %d\n", ++RarpTry); pkt = NetTxPacket; - NetSetEther(pkt, NetBcastAddr, PROT_RARP); - pkt += ETHER_HDR_SIZE; + pkt += NetSetEther(pkt, NetBcastAddr, PROT_RARP); rarp = (ARP_t *)pkt; @@ -114,7 +113,7 @@ rarp->ar_data[16 + i] = 0xff; } - NetSendPacket(NetTxPacket, ETHER_HDR_SIZE + ARP_HDR_SIZE); + NetSendPacket(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE); NetSetTimeout(TIMEOUT * CFG_HZ, RarpTimeout); NetSetHandler(RarpHandler); diff -ruNb u-boot-original/net/tftp.c u-boot-net/net/tftp.c --- u-boot-original/net/tftp.c 2004-03-30 14:37:28.829906096 +0300 +++ u-boot-net/net/tftp.c 2004-03-30 15:41:00.414457168 +0300 @@ -111,7 +111,7 @@ * We will always be sending some sort of packet, so * cobble together the packet headers now. */ - pkt = NetTxPacket + ETHER_HDR_SIZE + IP_HDR_SIZE; + pkt = NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE; switch (TftpState) {

4 7

[U-Boot-Users] Link problem when CONFIG_NET_MULTI not set
by Stephen Williams 19 Apr '04

19 Apr '04

The latest CVS doesn't link if CONFIG_NET_MULTI is *not* set. The problem is NetLoop calls eth_set_current() unconditionally, but the implementation of that function (in net/eth.c) is not included if CONFIG_NET_MULTI is undefined. The attached patch fixes NetLoop to not use eth_set_current if CONFIG_NET_MULTI is not included. I presume that the function is compiled to save space and is really not needed in this case. CHANGELOG ENTRY: * Patch by Stephen Williams, 16 April 2004: link of eth_set_current fails when CONFIG_NET_MULTI not used. -- Steve Williams "The woods are lovely, dark and deep. steve at XXXXXXXXXX But I have promises to keep, http://www.XXXXXXXXXX and lines to code before I sleep, http://www.picturel.com And lines to code before I sleep."

2 1

[U-Boot-Users] Patches to the JSE board patch.
by Stephen Williams 19 Apr '04

19 Apr '04

I see that you did add JSE to CVS. Thanks. I've attached two small patches that correct a trivial error in the JSE.h header file and add me as the maintainer for the JSE port. (That's my job, after all:-) I'm not sure if the latter update got left out because of policy, or by accident. CHANGELOG for the two patches together: * Patches by Stephen Williams, 16 April 2004: Fix misspelled undef in JSE.h Add Stephen Williams as maintainer for JSE port. -- Steve Williams "The woods are lovely, dark and deep. steve at XXXXXXXXXX But I have promises to keep, http://www.XXXXXXXXXX and lines to code before I sleep, http://www.picturel.com And lines to code before I sleep."

2 1

[U-Boot-Users] Re: Latest changes to cmd_nand.c
by Wolfgang Denk 19 Apr '04

19 Apr '04

In message <407FCCDA.6040508(a)elsoft.ch> you wrote: > > What was the reason to make a new command "nand read.jffs2s" to handle > bad block skipping in the read case. > > Why not just integrate the bad block skipping into the standard > "read.jffs2" command. Good questions. > IMHO the "original functionality" is broken. The "nand write" command > skips over bad blocks by default, while "nand read" and (even worse) > "nandboot" don't. I agree. Can you please submit a patch? Best regards, Wolfgang Denk -- Software Engineering: Embedded and Realtime Systems, Embedded Linux Phone: (+49)-8142-4596-87 Fax: (+49)-8142-4596-88 Email: wd(a)denx.de In an infinite universe all things are possible, including the possi- bility that the universe does not exist. - Terry Pratchett, _The Dark Side of the Sun_

1 0

[U-Boot-Users] [patch #10/11] HUSH parser fixes.
by Pantelis Antoniou 19 Apr '04

19 Apr '04

Hello The following patch fixes various shortcomings in the hush parser. 1. A new test command was added. This is a simplified version of the one in the sh shell. 2. A new exit command was added which terminates the current executing script. 3. Handing of $? (exit code of last executed command), was wrong. Instead of being evaluated in the proper place it was evaluated once at the start of the evaluation. For example the following script worked like this. test 1 -eq 2 # set $? to 1 echo $? # outputs 1 test 1 -eq 1 # set $? to 0 echo $? # still outputs 1 Now it is fixed. 4. The simplified parser uses '(' and ')' for enclosing variables. This caused problems when migrating to hush because hash uses '{' and '}'. Modified to accept parentheses too. Regards Pantelis README | 5 + common/command.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/hush.c | 93 ++++++++++++++++++++++++++++++--- 3 files changed, 242 insertions(+), 9 deletions(-) diff -ruNb u-boot-original/README u-boot-parser/README --- u-boot-original/README 2004-03-30 14:37:28.395972064 +0300 +++ u-boot-parser/README 2004-03-30 15:54:35.451552696 +0300 @@ -1270,6 +1270,11 @@ of the backslashes before semicolons and special symbols. + Note 2: + In order to allow compatibility between the original + parser we also allow to enclose variables with '(' + and ')'. Example $ipaddr = ${ipaddr} = $(ipaddr). + - Default Environment: CONFIG_EXTRA_ENV_SETTINGS diff -ruNb u-boot-original/common/command.c u-boot-parser/common/command.c --- u-boot-original/common/command.c 2004-03-30 14:37:28.665931024 +0300 +++ u-boot-parser/common/command.c 2004-03-30 15:37:59.834909432 +0300 @@ -74,6 +74,159 @@ " - echo args to console; \\c suppresses newline\n" ); +#ifdef CFG_HUSH_PARSER + +int +do_test (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + char **ap; + int left, adv, expr, last_expr, neg, last_cmp; + + /* args? */ + if (argc < 3) + return 1; + +#if 0 + { + printf("test:"); + left = 1; + while (argv[left]) + printf(" %s", argv[left++]); + } +#endif + + last_expr = 0; + left = argc - 1; ap = argv + 1; + if (left > 0 && strcmp(ap[0], "!") == 0) { + neg = 1; + ap++; + left--; + } else + neg = 0; + + expr = -1; + last_cmp = -1; + last_expr = -1; + while (left > 0) { + + if (strcmp(ap[0], "-o") == 0 || strcmp(ap[0], "-a") == 0) + adv = 1; + else if (strcmp(ap[0], "-z") == 0 || strcmp(ap[0], "-n") == 0) + adv = 2; + else + adv = 3; + + if (left < adv) { + expr = 1; + break; + } + + if (adv == 1) { + if (strcmp(ap[0], "-o") == 0) { + last_expr = expr; + last_cmp = 0; + } else if (strcmp(ap[0], "-a") == 0) { + last_expr = expr; + last_cmp = 1; + } else { + expr = 1; + break; + } + } + + if (adv == 2) { + if (strcmp(ap[0], "-z") == 0) + expr = strlen(ap[1]) == 0 ? 0 : 1; + else if (strcmp(ap[0], "-n") == 0) + expr = strlen(ap[1]) == 0 ? 1 : 0; + else { + expr = 1; + break; + } + + if (last_cmp == 0) + expr = last_expr || expr; + else if (last_cmp == 1) + expr = last_expr && expr; + last_cmp = -1; + } + + if (adv == 3) { + if (strcmp(ap[1], "=") == 0) + expr = strcmp(ap[0], ap[2]) == 0; + else if (strcmp(ap[1], "!=") == 0) + expr = strcmp(ap[0], ap[2]) != 0; + else if (strcmp(ap[1], ">") == 0) + expr = strcmp(ap[0], ap[2]) > 0; + else if (strcmp(ap[1], "<") == 0) + expr = strcmp(ap[0], ap[2]) < 0; + else if (strcmp(ap[1], "-eq") == 0) + expr = simple_strtol(ap[0], NULL, 10) == simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-ne") == 0) + expr = simple_strtol(ap[0], NULL, 10) != simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-lt") == 0) + expr = simple_strtol(ap[0], NULL, 10) < simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-le") == 0) + expr = simple_strtol(ap[0], NULL, 10) <= simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-gt") == 0) + expr = simple_strtol(ap[0], NULL, 10) > simple_strtol(ap[2], NULL, 10); + else if (strcmp(ap[1], "-ge") == 0) + expr = simple_strtol(ap[0], NULL, 10) >= simple_strtol(ap[2], NULL, 10); + else { + expr = 1; + break; + } + + if (last_cmp == 0) + expr = last_expr || expr; + else if (last_cmp == 1) + expr = last_expr && expr; + last_cmp = -1; + } + + ap += adv; left -= adv; + } + + if (neg) + expr = !expr; + + expr = !expr; + +#if 0 + printf(": returns %d\n", expr); +#endif + + return expr; +} + +U_BOOT_CMD( + test, CFG_MAXARGS, 1, do_test, + "test - minimal test like /bin/sh\n", + "[args..]\n" + " - test functionality\n" +); + +int +do_exit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + int r; + + r = 0; + if (argc > 1) + r = simple_strtoul(argv[1], NULL, 10); + + return -r - 2; +} + +U_BOOT_CMD( + exit, 2, 1, do_exit, + "exit - exit script\n", + " - exit functionality\n" +); + + +#endif + /* * Use puts() instead of printf() to avoid printf buffer overflow * for long help messages diff -ruNb u-boot-original/common/hush.c u-boot-parser/common/hush.c --- u-boot-original/common/hush.c 2004-03-30 14:37:28.669930416 +0300 +++ u-boot-parser/common/hush.c 2004-03-30 15:37:59.850907000 +0300 @@ -290,6 +290,7 @@ unsigned int global_argc; #endif unsigned int last_return_code; +int nesting_level; #ifndef __U_BOOT__ extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */ #endif @@ -416,7 +417,9 @@ static int b_addchr(o_string *o, int ch); static void b_reset(o_string *o); static int b_addqchr(o_string *o, int ch, int quote); +#ifndef __U_BOOT__ static int b_adduint(o_string *o, unsigned int i); +#endif /* in_str manipulations: */ static int static_get(struct in_str *i); static int static_peek(struct in_str *i); @@ -936,6 +939,7 @@ return p + 1; } +#ifndef __U_BOOT__ static int b_adduint(o_string *o, unsigned int i) { int r; @@ -944,6 +948,7 @@ do r=b_addchr(o, *p++); while (r==0 && *p); return r; } +#endif static int static_get(struct in_str *i) { @@ -1921,6 +1926,10 @@ } last_return_code=rcode; #else + if (rcode < -1) { + last_return_code = -rcode - 2; + return -2; /* exit */ + } last_return_code=(rcode == 0) ? 0 : 1; #endif #ifndef __U_BOOT__ @@ -2145,6 +2154,10 @@ } #endif +#ifdef __U_BOOT__ +static char *get_dollar_var(char ch); +#endif + /* This is used to get/check local shell variables */ static char *get_local_var(const char *s) { @@ -2152,6 +2165,12 @@ if (!s) return NULL; + +#ifdef __U_BOOT__ + if (*s == '$') + return get_dollar_var(s[1]); +#endif + for (cur = top_vars; cur; cur=cur->next) if(strcmp(cur->name, s)==0) return cur->value; @@ -2168,12 +2187,19 @@ int result=0; struct variables *cur; +#ifdef __U_BOOT__ + /* might be possible! */ + if (!isalpha(*s)) + return -1; +#endif + name=strdup(s); #ifdef __U_BOOT__ if (getenv(name) != NULL) { printf ("ERROR: " "There is a global environment variable with the same name.\n"); + free(name); return -1; } #endif @@ -2278,7 +2304,10 @@ static int is_assignment(const char *s) { - if (s==NULL || !isalpha(*s)) return 0; + if (s == NULL) + return 0; + + if (!isalpha(*s)) return 0; ++s; while(isalnum(*s) || *s=='_') ++s; return *s=='='; @@ -2749,15 +2778,35 @@ * see the bash man page under "Parameter Expansion" */ static char *lookup_param(char *src) { - char *p=NULL; - if (src) { + char *p; + + if (!src) + return NULL; + p = getenv(src); if (!p) p = get_local_var(src); - } + return p; } +#ifdef __U_BOOT__ +static char *get_dollar_var(char ch) +{ + static char buf[40]; + + buf[0] = '\0'; + switch (ch) { + case '?': + sprintf(buf, "%u", (unsigned int)last_return_code); + break; + default: + return NULL; + } + return buf; +} +#endif + /* return code: 0 for OK, 1 for syntax error */ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *input) { @@ -2769,6 +2818,7 @@ #ifndef __U_BOOT__ char sep[]=" "; #endif + char match; int ch = input->peek(input); /* first character after the $ */ debug_printf("handle_dollar: ch=%c\n",ch); if (isalpha(ch)) { @@ -2799,7 +2849,15 @@ break; #endif case '?': +#ifndef __U_BOOT__ b_adduint(dest,last_return_code); +#else + ctx->child->sp++; + b_addchr(dest, SPECIAL_VAR_SYMBOL); + b_addchr(dest, '$'); + b_addchr(dest, '?'); + b_addchr(dest, SPECIAL_VAR_SYMBOL); +#endif advance = 1; break; #ifndef __U_BOOT__ @@ -2809,14 +2867,18 @@ break; #endif case '{': +#ifdef __U_BOOT__ + case '(': +#endif + match = ch == '{' ? '}' : ')'; b_addchr(dest, SPECIAL_VAR_SYMBOL); ctx->child->sp++; b_getch(input); /* XXX maybe someone will try to escape the '}' */ - while(ch=b_getch(input),ch!=EOF && ch!='}') { + while(ch=b_getch(input),ch!=EOF && ch!=match) { b_addchr(dest,ch); } - if (ch != '}') { + if (ch != match) { syntax(); return 1; } @@ -2885,8 +2947,10 @@ if (input->__promptme == 0) return 1; #endif next = (ch == '\n') ? 0 : b_peek(input); - debug_printf("parse_stream: ch=%c (%d) m=%d quote=%d\n", - ch,ch,m,dest->quote); + + debug_printf("parse_stream: ch=%c (%d) m=%d quote=%d - %c\n", + ch >= ' ' ? ch : '.',ch,m,dest->quote,ctx->stack == NULL ? '*' : '.'); + if (m==0 || ((m==1 || m==2) && dest->quote)) { b_addqchr(dest, ch, dest->quote); } else { @@ -3107,7 +3171,18 @@ #ifndef __U_BOOT__ run_list(ctx.list_head); #else - if (((code = run_list(ctx.list_head)) == -1)) + code = run_list(ctx.list_head); + if (code == -2) { /* exit */ + b_free(&temp); + code = 0; + /* XXX hackish way to not allow exit from main loop */ + if (inp->peek == file_peek) { + printf("exit not allowed from main input shell.\n"); + continue; + } + break; + } + if (code == -1) flag_repeat = 0; #endif } else {

2 3