July 2009 - U-Boot

[U-Boot] [PATCH] Update the mtd driver name in bootargs for at91-based boards
by Albin Tonnerre 18 Aug '09

18 Aug '09

The name of the atmel nand driver in the kernel changed from at91_nand to atmel_nand back in June 2008, but the at91-based boards config files still refer to at91_nand. This patch updates them with the new name Signed-off-by: Albin Tonnerre <albin.tonnerre(a)free-electrons.com> --- include/configs/at91cap9adk.h | 4 ++-- include/configs/at91sam9260ek.h | 6 +++--- include/configs/at91sam9261ek.h | 6 +++--- include/configs/at91sam9263ek.h | 4 ++-- include/configs/at91sam9m10g45ek.h | 4 ++-- include/configs/at91sam9rlek.h | 4 ++-- include/configs/pm9261.h | 4 ++-- include/configs/pm9263.h | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 0ef3554..cc194d8 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -172,7 +172,7 @@ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock1 " \ "mtdparts=physmap-flash.0:-(nor);" \ - "at91_nand:-(root) " \ + "atmel_nand:-(root) " \ "rw rootfstype=jffs2" #else @@ -188,7 +188,7 @@ "root=/dev/mtdblock4 " \ "mtdparts=physmap-flash.0:16k(bootstrap)ro,"\ "16k(env),224k(uboot)ro,-(linux);" \ - "at91_nand:-(root) " \ + "atmel_nand:-(root) " \ "rw rootfstype=jffs2" #endif diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 6cee593..3507de2 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -163,7 +163,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) " \ + "mtdparts=atmel_nand:-(root) " \ "rw rootfstype=jffs2" #elif CONFIG_SYS_USE_DATAFLASH_CS1 @@ -177,7 +177,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) " \ + "mtdparts=atmel_nand:-(root) " \ "rw rootfstype=jffs2" #else /* CONFIG_SYS_USE_NANDFLASH */ @@ -190,7 +190,7 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ - "mtdparts=at91_nand:128k(bootstrap)ro," \ + "mtdparts=atmel_nand:128k(bootstrap)ro," \ "256k(uboot)ro,128k(env1)ro," \ "128k(env2)ro,2M(linux),-(root) " \ "rw rootfstype=jffs2" diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 3d108ab..f86698f 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -181,7 +181,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) " \ + "mtdparts=atmel_nand:-(root) " \ "rw rootfstype=jffs2" #elif CONFIG_SYS_USE_DATAFLASH_CS3 @@ -195,7 +195,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) " \ + "mtdparts=atmel_nand:-(root) " \ "rw rootfstype=jffs2" #else /* CONFIG_SYS_USE_NANDFLASH */ @@ -208,7 +208,7 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ - "mtdparts=at91_nand:128k(bootstrap)ro," \ + "mtdparts=atmel_nand:128k(bootstrap)ro," \ "256k(uboot)ro,128k(env1)ro," \ "128k(env2)ro,2M(linux),-(root) " \ "rw rootfstype=jffs2" diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 32f3f62..a1582fc 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -304,7 +304,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) "\ + "mtdparts=atmel_nand:-(root) "\ "rw rootfstype=jffs2" #elif CONFIG_SYS_USE_NANDFLASH @@ -317,7 +317,7 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ - "mtdparts=at91_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ + "mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ "rw rootfstype=jffs2" #endif diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 4b46c31..b460188 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -179,7 +179,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) "\ + "mtdparts=atmel_nand:-(root) "\ "rw rootfstype=jffs2" #else /* CONFIG_SYS_USE_NANDFLASH */ @@ -192,7 +192,7 @@ #define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ - "mtdparts=at91_nand:128k(bootstrap)ro, \ + "mtdparts=atmel_nand:128k(bootstrap)ro, \ 256k(uboot)ro,128k(env1)ro,128k(env2)ro, \ 2M(linux),-(root) " \ "rw rootfstype=jffs2" diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 9167304..b83266d 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -142,7 +142,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) "\ + "mtdparts=atmel_nand:-(root) "\ "rw rootfstype=jffs2" #else /* CONFIG_SYS_USE_NANDFLASH */ @@ -155,7 +155,7 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ - "mtdparts=at91_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ + "mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ "rw rootfstype=jffs2" #endif diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 203a14c..9bf49ba 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -289,7 +289,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) " \ + "mtdparts=atmel_nand:-(root) " \ "rw rootfstype=jffs2" #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */ @@ -302,7 +302,7 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ - "mtdparts=at91_nand:128k(bootstrap)ro," \ + "mtdparts=atmel_nand:128k(bootstrap)ro," \ "256k(uboot)ro,128k(env1)ro," \ "128k(env2)ro,2M(linux),-(root) " \ "rw rootfstype=jffs2" diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index a6ff28c..6761c18 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -310,7 +310,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) "\ + "mtdparts=atmel_nand:-(root) "\ "rw rootfstype=jffs2" #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CFG_USE_NANDFLASH */ @@ -323,7 +323,7 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ - "mtdparts=at91_nand:" \ + "mtdparts=atmel_nand:" \ "128k(bootstrap)ro," \ "256k(uboot)ro," \ "128k(env1)ro," \ -- 1.6.0.4

3 9

[U-Boot] [PATCH] Fix Freescale link scripts for newer GCCs
by Matthew L. Creech 17 Aug '09

17 Aug '09

This addresses the problem described here: http://lists.denx.de/pipermail/u-boot/2008-December/045029.html This changes the link scripts of several of the mpcXXX CPUs to include everything from '.rodata'. Without this, using a recent powerpc-linux-gnu toolchain (e.g. from CodeSourcery) to build U-Boot fails, often producing a multi-GB binary file. Signed-off-by: Matthew Creech <mlcreech(a)gmail.com> --- mpc5xx/u-boot.lds | 4 +--- mpc5xxx/u-boot-customlayout.lds | 4 +--- mpc5xxx/u-boot.lds | 4 +--- mpc8220/u-boot.lds | 4 +--- mpc824x/u-boot.lds | 4 +--- mpc8260/u-boot.lds | 4 +--- mpc83xx/u-boot.lds | 4 +--- 7 files changed, 7 insertions(+), 21 deletions(-) diff -purN orig/cpu/mpc5xx/u-boot.lds u-boot/cpu/mpc5xx/u-boot.lds --- orig/cpu/mpc5xx/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc5xx/u-boot.lds 2009-01-07 17:59:25.000000000 -0500 @@ -65,9 +65,7 @@ SECTIONS PROVIDE (etext = .); .rodata : { - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc5xxx/u-boot-customlayout.lds u-boot/cpu/mpc5xxx/u-boot-customlayout.lds --- orig/cpu/mpc5xxx/u-boot-customlayout.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc5xxx/u-boot-customlayout.lds 2009-01-07 18:00:33.000000000 -0500 @@ -68,9 +68,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc5xxx/u-boot.lds u-boot/cpu/mpc5xxx/u-boot.lds --- orig/cpu/mpc5xxx/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc5xxx/u-boot.lds 2009-01-07 17:59:01.000000000 -0500 @@ -57,9 +57,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc8220/u-boot.lds u-boot/cpu/mpc8220/u-boot.lds --- orig/cpu/mpc8220/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc8220/u-boot.lds 2009-01-07 17:59:41.000000000 -0500 @@ -57,9 +57,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc824x/u-boot.lds u-boot/cpu/mpc824x/u-boot.lds --- orig/cpu/mpc824x/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc824x/u-boot.lds 2009-01-07 17:58:45.000000000 -0500 @@ -57,9 +57,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc8260/u-boot.lds u-boot/cpu/mpc8260/u-boot.lds --- orig/cpu/mpc8260/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc8260/u-boot.lds 2009-01-07 17:58:27.000000000 -0500 @@ -57,9 +57,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 diff -purN orig/cpu/mpc83xx/u-boot.lds u-boot/cpu/mpc83xx/u-boot.lds --- orig/cpu/mpc83xx/u-boot.lds 2009-01-07 17:57:22.000000000 -0500 +++ u-boot/cpu/mpc83xx/u-boot.lds 2009-01-07 17:58:11.000000000 -0500 @@ -55,9 +55,7 @@ SECTIONS *(.fixup) *(.got1) . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) + *(.rodata*) *(.eh_frame) } .fini : { *(.fini) } =0 -- Matthew L. Creech

7 19

[U-Boot] [PATCH 0/8]: Fixes for ubifs build on ARM
by Simon Kagstrom 17 Aug '09

17 Aug '09

Hello! This series of patches corrects some of the issues I've had with building and using the ubifs support on ARM (and some general things). In summary: - move __set_bit and __clear_bit to bitops.h (was defined in ubifs.h) - define fls for all architectures (and ffs where it was missing) - unaligned.h was missing for ARM, add it - use do_div from div64.h for vsprintf (avoid __udivdi3) - use lldiv in ubifs (again to avoid __udivdi3 references) - handle VID header offset in the ubi part command - proper argument checking in ubifsmount I've built and tested it on ARM (OpenRD base), but some of the patches also affect other architectures, so please look this through! // Simon

5 29

[U-Boot] [PATCH 0/3]: arm: Kirkwood: Various egiga send fixes
by Simon Kagstrom 17 Aug '09

17 Aug '09

Hi! These three patches fix a few issues I've had with sending data on the network interface on the OpenRD base board. In summary, they do: - Fix compiler optimization bug in kwgbe_send - Check the error summary bit during send - Allow sending data which is not 8-byte aligned // Simon

3 11

[U-Boot] USB EHCI driver
by FrancescoVT 16 Aug '09

16 Aug '09

Hi, I'm developing an USB EHCI driver for ADS5121e. Now , I completed initialization sequence for my SOC EHCI Controller. My scope is to use with mass storage, but I think that ehci core layer don't work correctly. Do somebody use EHCI CORE layer for Mass storage and it was ok? Thank you. -- View this message in context: http://www.nabble.com/USB-EHCI-driver-tp22598488p22598488.html Sent from the Uboot - Users mailing list archive at Nabble.com.

8 18

[U-Boot] Add md5sum and sha1 commands...
by Robin Getz 13 Aug '09

13 Aug '09

From: Robin Getz <rgetz(a)blackfin.uclinux.org> Now that we have sha1 and md5 in lib_generic, allow people to use them on the command line, for checking downloaded files Signed-off-by: Robin Getz <rgetz(a)analog.com> README | 4 ++ common/cmd_mem.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) --- diff --git a/README b/README index 9071472..cf3867d 100644 --- a/README +++ b/README @@ -629,6 +629,8 @@ The following options need to be configured: CONFIG_CMD_KGDB * kgdb CONFIG_CMD_LOADB loadb CONFIG_CMD_LOADS loads + CONFIG_CMD_MD5SUM print md5 message digest + (requires CONFIG_CMD_MEMORY and CONFIG_MD5) CONFIG_CMD_MEMORY md, mm, nm, mw, cp, cmp, crc, base, loop, loopw, mtest CONFIG_CMD_MISC Misc functions like sleep etc @@ -652,6 +654,8 @@ The following options need to be configured: (requires CONFIG_CMD_I2C) CONFIG_CMD_SETGETDCR Support for DCR Register access (4xx only) + CONFIG_CMD_SHA1 print sha1 memory digest + (requires CONFIG_CMD_MEMORY) CONFIG_CMD_SOURCE "source" command Support CONFIG_CMD_SPI * SPI serial bus support CONFIG_CMD_USB * USB support diff --git a/common/cmd_mem.c b/common/cmd_mem.c index cdf8c79..ac2492c 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -34,6 +34,14 @@ #endif #include <watchdog.h> +#ifdef CONFIG_CMD_MD5SUM +#include <u-boot/md5.h> +#endif + +#ifdef CONFIG_CMD_SHA1 +#include <sha1.h> +#endif + #ifdef CMD_MEM_DEBUG #define PRINTF(fmt,args...) printf (fmt ,##args) #else @@ -1141,6 +1149,55 @@ int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } #endif /* CONFIG_CRC32_VERIFY */ +#ifdef CONFIG_CMD_MD5SUM +int do_md5sum(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + unsigned long addr, len; + unsigned int i; + u8 output[16]; + + if (argc < 3) { + cmd_usage(cmdtp); + return 1; + } + + addr = simple_strtoul(argv[1], NULL, 16); + len = simple_strtoul(argv[2], NULL, 16); + + md5((unsigned char *) addr, len, output); + printf("md5 for %08lx ... %08lx ==> ", addr, addr + len - 1); + for (i = 0; i < 16 ; i++) + printf("%02x", output[i]); + printf("\n"); + + return 0; +} +#endif + +#ifdef CONFIG_CMD_SHA1 +int do_sha1(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + unsigned long addr, len; + unsigned int i; + u8 output[20]; + + if (argc < 3) { + cmd_usage(cmdtp); + return 1; + } + + addr = simple_strtoul(argv[1], NULL, 16); + len = simple_strtoul(argv[2], NULL, 16); + + sha1_csum((unsigned char *) addr, len, output); + printf("SHA1 for %08lx ... %08lx ==> ", addr, addr + len - 1); + for (i = 0; i < 20 ; i++) + printf("%02x", output[i]); + printf("\n"); + + return 0; +} +#endif #ifdef CONFIG_CMD_UNZIP int gunzip (void *, int, unsigned char *, unsigned long *); @@ -1267,6 +1324,22 @@ U_BOOT_CMD( ); #endif /* CONFIG_MX_CYCLIC */ +#ifdef CONFIG_CMD_MD5SUM +U_BOOT_CMD( + md5sum, 3, 1, do_md5sum, + "compute MD5 message digest", + "address count" +); +#endif + +#ifdef CONFIG_CMD_SHA1 +U_BOOT_CMD( + sha1, 3, 1, do_sha1, + "compute SHA1 message digest", + "address count" +); +#endif /* CONFIG_CMD_SHA1 */ + #ifdef CONFIG_CMD_UNZIP U_BOOT_CMD( unzip, 4, 1, do_unzip,

3 10

[U-Boot] Environment structure.
by Tuma 13 Aug '09

13 Aug '09

Hello All! I develop some "upgrade" tool based on the U-Boot booted from SD card. I want to boot from SD card, and execute some simple script which is stored in bootcmd environment variable: "echo Hello! ; mmcinit ; sleep 10 ; reset; " etc... So I need to generate some environment file. I find source from tools/env very useful (I try to get variables from correct file I already have), but I can't find any description of environment file (or flash partition) at all (which I need to write tool for generating environment file). Can someone explain me the structure of the file, please. Something like: 0-4 - CRC 5-... - (Environment)\0(Environment)\0... ... Environment End Mark... and so on. Or tell me in what file should I see from U-Boot source. And is there any difference between content of OneNAND flash environment-partition and file on SD card? Thank you. -- Software Developer General Satellite Corp.

3 7

[U-Boot] [PATCH] Fix enetaddr initialization with CONFIG_NET_MULTI
by Albin Tonnerre 13 Aug '09

13 Aug '09

When CONFIG_NET_MULTI is defined, the NetLoop code looks in eth_get_device()->enetaddr for the MAC address. However, this value may not be set. In fact, it will not be if ethaddr was not present in the environment when uboot was started. Therefore, even with 'setenv ethaddr xx:xx:xx:xx:xx:xx', eg. tftp will error out because it doesn't find the MAC address. This patch tries to fix this by checking the ethaddr for the current ethernet device in the environment and setting the enetaddr field accordingly when NetLoop is called. As I don't have a good knowledge of how the whole net subsystem works in u-boot, I'm not sure this is the right way to do it, and would appreciate guidance on the matter. Signed-off-by: Albin Tonnerre <albin.tonnerre(a)free-electrons.com> --- net/net.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/net/net.c b/net/net.c index 5637cf5..99666e9 100644 --- a/net/net.c +++ b/net/net.c @@ -341,19 +341,30 @@ NetLoop(proto_t protocol) eth_halt(); #ifdef CONFIG_NET_MULTI eth_set_current(); + + if (memcmp (eth_get_dev()->enetaddr, "\0\0\0\0\0\0", 6) == 0) { + int eth_cur_index; + char eth_cur_name[8]; + + eth_cur_index = eth_get_dev_index(); + if (eth_cur_index) + sprintf(eth_cur_name, "eth%iaddr", eth_cur_index); + else + strcpy(eth_cur_name, "ethaddr"); + + eth_getenv_enetaddr(eth_cur_name, NetOurEther); + } +#else + eth_getenv_enetaddr("ethaddr", NetOurEther); #endif + memcpy(eth_get_dev()->enetaddr, NetOurEther, 6); + if (eth_init(bd) < 0) { eth_halt(); return(-1); } restart: -#ifdef CONFIG_NET_MULTI - memcpy (NetOurEther, eth_get_dev()->enetaddr, 6); -#else - eth_getenv_enetaddr("ethaddr", NetOurEther); -#endif - NetState = NETLOOP_CONTINUE; /* -- 1.6.0.4

2 2

[U-Boot] [RFC 0/3] uboot-doc User's Manual Generation Tool
by John Schmoller 13 Aug '09

13 Aug '09

Hello all, I've been working on writing a User's Manual generation tool, and before I get too far I'd like to see if this is something the U-Boot community would be interested in. The thought was that everyone needs to develop User's Manuals for their customers, and there's no reason for us all to reinvent the wheel for each product we create. I've written a Perl script, uboot-doc, which is very loosely based on the kernel-doc documentation creator in Linux. (Take it easy on my Perl, this is my first script.) The specific syntax is described in uboot-doc, but the parser takes formatted comments with @'s and converts the information into DocBook XML. The DocBook XML can be used to generate HTML, XHTML, PDFs, and text, and can be extended to change formatting and appearance. The static portions of the manual are taken from .tmpl files in the doc/manual/ directory, which have basic precompiler support (#ifdef, #else, #endif) and support for accessing system environment variables (${TOPDIR}, for example) and any value found in autoconf.mk, (@CONFIG_BAUDRATE, for example). All template files in doc/manual/ can be over-ridden by a board specific file in board/$BOARDDIR/manual. For example, doc/manual/manual.tmpl would be over-ridden by board/$BOARDDIR/manual/manual.tmpl. General Control Flow: C pre-processor -> doc_stream.pl : pre-processed code gets everything but comments with an @ stripped away doc_stream.pl -> autoconf_doc.txt : "interesting" comments get sent to this file autoconf_doc.txt -> uboot-doc : file is parsed and comments are turned to XML *.tmpl -> uboot-doc : template files are processed into XML *.xml -> xsltproc : XML is converted into desired output format *.fo -> fop : (PDFs only) fo files are translated to PDF Steps to compile your very own manual (using Ubuntu package names): 1) Install xsltproc. I'm using version 1.1.24-2ubuntu2. If you've got no desire to make text, html, xhtml, or pdf you don't need this tool. 2) Install docbook-xsl. I'm using version 1.73.2.dfsg.1-5. If you've got no desire to make text, html, xhtml, or pdf you don't need this tool. 3) FOP needs to be installed with hyphenation support, which is not available from Synaptic or apt-get. Use the instructions from http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html to install your version of FOP (yes, you do need OFFO and JAI). You will need to install ant if you don't already have it (1.7.1-0ubuntu2). If you've got no desire to make a PDF, you don't need this tool. 4) If you follow the steps above, the default values of DOCBOOK_XSL_DIR, XSLT_PROCESSOR, and FO_PROCESSOR should be correct. If you decided to try to go it your own, set them accordingly. DOCBOOK_XSL_DIR points to your Docbook stylesheet directory, XSLT_PROCESSOR points to the default program which compiles XML into it's various forms, and FO_PROCESSOR points the the default program for turning FO images into PDFs. 5) Once you have the tools installed, you should be able to compile a manual. This documentation feature was tested on the X-ES's XPedite5370. make XPEDITE5370_config make {xml/html/xhtml/pdf/text} Note: text doesn't work yet as I believe there is an issue with the docbook style sheets (or possibly how I'm using them). It's being looked into. Something about varlistentries not belonging in varlists? I dunno. The doc/manual directory also includes a PDF style sheet (uboot_manual.xsl). By creating your own book_info.tmpl, you can add a company logo and an address to the cover page. By default these two are left out. It is also possible to create a completely new style sheet to customize your manual look. Similarly, HTML output can be customized using CSS. The results of this output as well as the HTML output can be found on the X-ES website: www.xes-inc.com/sources/u-boot/index.html www.xes-inc.com/sources/u-boot/xpedite5370.pdf Note that I've defined a "mediaobject" and "address" in my custom board/xes/xpedite5370/book_info.tmpl to place the address and company logo on the cover page. I see several advantages to adopting this scheme. - Documentation should be easier to keep in sync with code - DocBook XML output can be used to generate webpages, PDFs, text, etc, which are all extensible - People don't have to reinvent the wheel when writing documentation - Source code ends up being thouroughly commented These patches are just meant to be an example of how in-code documentation could be used. You'll also notice there are many warnings regarding variables the manual is referencing which aren't defined yet. I wanted to get some feedback before diving in too far. What do others think? Is this worth pursuing? Thanks, John John Schmoller (3): uboot-doc: Initial support of user documentation generator uboot-doc: Add example support for uboot-doc xpedite5370: Add uboot-doc support Makefile | 2 + board/xes/xpedite5370/manual/book_info.tmpl | 52 ++ board/xes/xpedite5370/manual/booting_linux.tmpl | 179 ++++ board/xes/xpedite5370/manual/booting_vxworks.tmpl | 166 ++++ board/xes/xpedite5370/manual/manual.tmpl | 30 + board/xes/xpedite5370/manual/redundant_images.tmpl | 50 ++ board/xes/xpedite5370/manual/scripting.tmpl | 168 ++++ common/cmd_i2c.c | 71 ++- common/cmd_mem.c | 45 +- common/cmd_net.c | 30 +- common/env_common.c | 35 + config.mk | 1 + doc/manual/85xx_program_flow.tmpl | 74 ++ doc/manual/book_info.tmpl | 35 + doc/manual/booting_linux.tmpl | 249 ++++++ doc/manual/config.mk | 74 ++ doc/manual/doc-stream.pl | 34 + doc/manual/introduction.tmpl | 136 +++ doc/manual/manual.tmpl | 26 + doc/manual/scripting.tmpl | 154 ++++ doc/manual/setup.tmpl | 294 +++++++ doc/manual/uboot-doc | 866 ++++++++++++++++++++ doc/manual/uboot_manual.xsl | 286 +++++++ include/configs/XPEDITE5370.h | 47 ++ post/tests.c | 16 + rules.mk | 7 + 26 files changed, 3122 insertions(+), 5 deletions(-) create mode 100644 board/xes/xpedite5370/manual/book_info.tmpl create mode 100644 board/xes/xpedite5370/manual/booting_linux.tmpl create mode 100644 board/xes/xpedite5370/manual/booting_vxworks.tmpl create mode 100644 board/xes/xpedite5370/manual/manual.tmpl create mode 100644 board/xes/xpedite5370/manual/redundant_images.tmpl create mode 100644 board/xes/xpedite5370/manual/scripting.tmpl create mode 100644 doc/manual/85xx_program_flow.tmpl create mode 100644 doc/manual/book_info.tmpl create mode 100644 doc/manual/booting_linux.tmpl create mode 100644 doc/manual/config.mk create mode 100644 doc/manual/doc-stream.pl create mode 100644 doc/manual/introduction.tmpl create mode 100644 doc/manual/manual.tmpl create mode 100644 doc/manual/scripting.tmpl create mode 100644 doc/manual/setup.tmpl create mode 100644 doc/manual/uboot-doc create mode 100644 doc/manual/uboot_manual.xsl

6 11

[U-Boot] [PATCH v3] export SPI functions to standalone apps
by Mike Frysinger 13 Aug '09

13 Aug '09

While we're here, fix the broken #ifdef handling in _exports.h. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- v3 - tweak code style common/exports.c | 8 ++++++++ include/_exports.h | 14 ++++++++++---- include/exports.h | 3 ++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/common/exports.c b/common/exports.c index ec4656b..b3b6e1f 100644 --- a/common/exports.c +++ b/common/exports.c @@ -38,4 +38,12 @@ void jumptable_init (void) gd->jt[XF_i2c_write] = (void *) i2c_write; gd->jt[XF_i2c_read] = (void *) i2c_read; #endif +#ifdef CONFIG_CMD_SPI + gd->jt[XF_spi_init] = (void *) spi_init; + gd->jt[XF_spi_setup_slave] = (void *) spi_setup_slave; + gd->jt[XF_spi_free_slave] = (void *) spi_free_slave; + gd->jt[XF_spi_claim_bus] = (void *) spi_claim_bus; + gd->jt[XF_spi_release_bus] = (void *) spi_release_bus; + gd->jt[XF_spi_xfer] = (void *) spi_xfer; +#endif } diff --git a/include/_exports.h b/include/_exports.h index af43885..f3df568 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -1,3 +1,7 @@ +/* + * You do not need to use #ifdef around functions that may not exist + * in the final configuration (such as i2c). + */ EXPORT_FUNC(get_version) EXPORT_FUNC(getc) EXPORT_FUNC(tstc) @@ -14,13 +18,15 @@ EXPORT_FUNC(vprintf) EXPORT_FUNC(do_reset) EXPORT_FUNC(getenv) EXPORT_FUNC(setenv) -#ifdef CONFIG_HAS_UID EXPORT_FUNC(forceenv) -#endif EXPORT_FUNC(simple_strtoul) EXPORT_FUNC(simple_strtol) EXPORT_FUNC(strcmp) -#if defined(CONFIG_CMD_I2C) EXPORT_FUNC(i2c_write) EXPORT_FUNC(i2c_read) -#endif +EXPORT_FUNC(spi_init) +EXPORT_FUNC(spi_setup_slave) +EXPORT_FUNC(spi_free_slave) +EXPORT_FUNC(spi_claim_bus) +EXPORT_FUNC(spi_release_bus) +EXPORT_FUNC(spi_xfer) diff --git a/include/exports.h b/include/exports.h index 0620e9e..16ea03a 100644 --- a/include/exports.h +++ b/include/exports.h @@ -33,6 +33,7 @@ void forceenv (char *varname, char *varvalue); int i2c_write (uchar, uint, int , uchar* , int); int i2c_read (uchar, uint, int , uchar* , int); #endif +#include <spi.h> void app_startup(char **); @@ -46,7 +47,7 @@ enum { XF_MAX }; -#define XF_VERSION 4 +#define XF_VERSION 5 #if defined(CONFIG_I386) extern gd_t *global_data; -- 1.6.3.3

2 5