August 2011 - U-Boot

[U-Boot] [PATCH V2 8/9] ColdFire:Define the DM9000 byteswap for M5253 board.
by Jason Jin 25 Aug '11

25 Aug '11

The M5253DEMO board swapped the io pins which make the standard IO function did not work for dm9000. Define the byte swap to use raw io for dm9000. Signed-off-by: Jason Jin <Jason.jin(a)freescale.com> --- Changes for V2: rename the DM9000_BYTE_SWAPPED to CONFIG_DM9000_BYTE_SWAPPED include/configs/M5253DEMO.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index f2f3159..8120b68 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -95,6 +95,7 @@ # define DM9000_IO CONFIG_DM9000_BASE # define DM9000_DATA (CONFIG_DM9000_BASE + 4) # undef CONFIG_DM9000_DEBUG +# define CONFIG_DM9000_BYTE_SWAPPED # define CONFIG_OVERWRITE_ETHADDR_ONCE -- 1.6.4

1 0

[U-Boot] [PATCH] README: clean up and document the Freescale QE/FMAN firmware macros
by Timur Tabi 25 Aug '11

25 Aug '11

The Freescale QE and FMAN devices support uploading of firmware, and U-Boot can locate that firmware on different types of storage media. However, the current macros used for this code are inconsistent and poorly documented. Note that some of the code managed by these macros have not yet been posted externally. Such code will be posted, but properly documenting the macros is the first step. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- README | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/README b/README index 0886987..f47cea1 100644 --- a/README +++ b/README @@ -3124,6 +3124,44 @@ Low Level (hardware related) configuration options: be used if available. These functions may be faster under some conditions but may increase the binary size. +Freescale QE/FMAN Firmware Support: +----------------------------------- + +The Freescale QUICCEngine (QE) and Frame Manager (FMAN) both support the +loading of "firmware", which is encoded in the QE firmware binary format. +This firmware often needs to be loaded during U-Boot booting, so macros +are used to identify the storage device (NOR flash, SPI, etc) and the address +within that device. + +- CONFIG_SYS_FMAN_FW_ADDR + The address in the storage device where the firmware is located. The + meaning of this address depends on which CONFIG_SYS_QE_FW_IN_xxx macro + is also specified. + +- CONFIG_SYS_FMAN_FW_LENGTH + The maximum possible size of the firmware. The firmware binary format + has a field that specifies the actual size of the firmware, but it + might not be possible to read any part of the firmware unless some + local storage is allocated to hold the entire firmware first. + +- CONFIG_SYS_QE_FW_IN_NOR + Specifies that QE/FMAN firmware is located in NOR flash, mapped as + normal addressable memory via the LBC. CONFIG_SYS_FMAN_FW_ADDR is the + virtual address in NOR flash. + +- CONFIG_SYS_QE_FW_IN_NAND + Specifies that QE/FMAN firmware is located in NAND flash. + CONFIG_SYS_FMAN_FW_ADDR is the offset within NAND flash. + +- CONFIG_SYS_QE_FW_IN_MMC + Specifies that QE/FMAN firmware is located on the primary SD/MMC + device. CONFIG_SYS_FMAN_FW_ADDR is the byte offset on that device. + +- CONFIG_SYS_QE_FW_IN_SPIFLASH + Specifies that QE/FMAN firmware is located on the primary SPI + device. CONFIG_SYS_FMAN_FW_ADDR is the byte offset on that device. + + Building the Software: ====================== -- 1.7.3.4

3 4

[U-Boot] [PATCH] beagleboard: enable HUB power on all variants of the BeagleBoard
by Joel A Fernandes 25 Aug '11

25 Aug '11

From: Christian Spielberger <c.spielberger(a)bct-electronic.com> Signed-off-by: Joel A Fernandes <joelagnel(a)ti.com> Cc: "Eric Bénard" <eric(a)eukrea.com> Cc: "Christian Spielberger" <c.spielberger(a)bct-electronic.com> --- Pushing this patch myself as no one else did. Previous discussions: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/105663/ http://article.gmane.org/gmane.comp.boot-loaders.u-boot/101540/ board/ti/beagle/beagle.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 13fe39b..9d65e9e 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -332,7 +332,15 @@ int misc_init_r(void) setenv(expansion_config.env_var, expansion_config.env_setting); twl4030_power_init(); - twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); + switch (get_board_revision()) { + case REVISION_XM_C: + case REVISION_C4: + twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); + break; + default: + twl4030_led_init(TWL4030_LED_LEDEN_LEDBON); + break; + } /* Set GPIO states before they are made outputs */ writel(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1, -- 1.7.1

3 3

[U-Boot] [RFC] New init sequence processing without init_sequence array
by Graeme Russ 25 Aug '11

25 Aug '11

I have been thinking about the problem of the pesky init_sequence arrays and the inevitable #ifdefs and empty stub functions that result so I thought I'de have a crack at a more dynamic implementation. And like all good programmers, I stole the solution ;). This implementation is based on Linux's __initcall(fn) et. al. macros If this works cross-platform, we can finally move board_init_* into /lib/ - Wouldn't that be nice Thoughts? Regards, Graeme P.S Compile tested on x86 gcc 4.5.2 only - haven't fired it up yet --- arch/x86/cpu/sc520/sc520.c | 1 + arch/x86/cpu/sc520/sc520_sdram.c | 1 + arch/x86/cpu/u-boot.lds | 5 +++++ arch/x86/lib/board.c | 36 +++++++++++++++--------------------- board/eNET/eNET.c | 1 + common/console.c | 1 + common/env_flash.c | 2 ++ common/serial.c | 1 + include/common.h | 8 ++++++++ 9 files changed, 35 insertions(+), 21 deletions(-) diff --git a/arch/x86/cpu/sc520/sc520.c b/arch/x86/cpu/sc520/sc520.c index e37c403..fc2996a 100644 --- a/arch/x86/cpu/sc520/sc520.c +++ b/arch/x86/cpu/sc520/sc520.c @@ -53,6 +53,7 @@ int cpu_init_f(void) return x86_cpu_init_f(); } +INIT_FUNC(f, 010, cpu_init_f); int cpu_init_r(void) { diff --git a/arch/x86/cpu/sc520/sc520_sdram.c b/arch/x86/cpu/sc520/sc520_sdram.c index f3623f5..08674eb 100644 --- a/arch/x86/cpu/sc520/sc520_sdram.c +++ b/arch/x86/cpu/sc520/sc520_sdram.c @@ -57,6 +57,7 @@ int dram_init_f(void) return 0; } +INIT_FUNC(f, 070, dram_init_f); static inline void sc520_dummy_write(void) { diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index fe28030..48b5b99 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -57,6 +57,11 @@ SECTIONS __data_end = .; . = ALIGN(4); + __initfuncs_f_start = .; + .initfuncs_f : { KEEP(*(SORT_BY_NAME(.initfuncs_f*))) } + __initfuncs_f_end = .; + + . = ALIGN(4); __bss_start = ABSOLUTE(.); .bss (NOLOAD) : { *(.bss) } . = ALIGN(4); diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index b1b8680..de06800 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -64,6 +64,8 @@ extern ulong __rel_dyn_start; extern ulong __rel_dyn_end; extern ulong __bss_start; extern ulong __bss_end; +extern ulong __initfuncs_f_start; +extern ulong __initfuncs_f_end; /************************************************************************ * Init Utilities * @@ -83,6 +85,7 @@ static int init_baudrate (void) return (0); } +INIT_FUNC(f, 040, init_baudrate); static int display_banner (void) { @@ -152,22 +155,6 @@ static int copy_uboot_to_ram(void); static int clear_bss(void); static int do_elf_reloc_fixups(void); -init_fnc_t *init_sequence_f[] = { - cpu_init_f, - board_early_init_f, - env_init, - init_baudrate, - serial_init, - console_init_f, - dram_init_f, - calculate_relocation_address, - copy_uboot_to_ram, - clear_bss, - do_elf_reloc_fixups, - - NULL, -}; - init_fnc_t *init_sequence_r[] = { cpu_init_r, /* basic cpu dependent setup */ board_early_init_r, /* basic board dependent setup */ @@ -201,6 +188,7 @@ static int calculate_relocation_address(void) return 0; } +INIT_FUNC(f, 080, calculate_relocation_address); static int copy_uboot_to_ram(void) { @@ -213,6 +201,7 @@ static int copy_uboot_to_ram(void) return 0; } +INIT_FUNC(f, 090, copy_uboot_to_ram); static int clear_bss(void) { @@ -227,6 +216,7 @@ static int clear_bss(void) return 0; } +INIT_FUNC(f, 100, clear_bss); static int do_elf_reloc_fixups(void) { @@ -241,18 +231,22 @@ static int do_elf_reloc_fixups(void) return 0; } +INIT_FUNC(f, 110, do_elf_reloc_fixups); /* Load U-Boot into RAM, initialize BSS, perform relocation adjustments */ void board_init_f(ulong boot_flags) { - init_fnc_t **init_fnc_ptr; - gd->flags = boot_flags; - for (init_fnc_ptr = init_sequence_f; *init_fnc_ptr; ++init_fnc_ptr) { - if ((*init_fnc_ptr)() != 0) + init_fnc_t *init_fnc_ptr = (init_fnc_t *)(&__initfuncs_f_start); + init_fnc_t *init_func_end = (init_fnc_t *)(&__initfuncs_f_end); + + do { + if ((init_fnc_ptr)() != 0) hang(); - } + + } while (init_fnc_ptr++ < init_func_end); + gd->flags |= GD_FLG_RELOC; diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c index 2a5636c..2167df9 100644 --- a/board/eNET/eNET.c +++ b/board/eNET/eNET.c @@ -106,6 +106,7 @@ int board_early_init_f(void) return 0; } +INIT_FUNC(f, 020, board_early_init_f); static void enet_setup_pars(void) { diff --git a/common/console.c b/common/console.c index 8c650e0..559c799 100644 --- a/common/console.c +++ b/common/console.c @@ -531,6 +531,7 @@ int console_init_f(void) return 0; } +INIT_FUNC(f, 060, console_init_f); void stdio_print_current_devices(void) { diff --git a/common/env_flash.c b/common/env_flash.c index 50ca4ffa..a63c108 100644 --- a/common/env_flash.c +++ b/common/env_flash.c @@ -126,6 +126,7 @@ int env_init(void) return 0; } +INIT_FUNC(f, 030, env_init); #ifdef CMD_SAVEENV int saveenv(void) @@ -252,6 +253,7 @@ int env_init(void) gd->env_valid = 0; return 0; } +INIT_FUNC(f, 030, env_init); #ifdef CMD_SAVEENV diff --git a/common/serial.c b/common/serial.c index 995d268..5d097d8 100644 --- a/common/serial.c +++ b/common/serial.c @@ -168,6 +168,7 @@ int serial_init (void) return serial_current->init (); } +INIT_FUNC(f, 050, serial_init); void serial_setbrg (void) { diff --git a/include/common.h b/include/common.h index 12a1074..61126f1 100644 --- a/include/common.h +++ b/include/common.h @@ -39,8 +39,16 @@ typedef volatile unsigned char vu_char; #include <linux/bitops.h> #include <linux/types.h> #include <linux/string.h> +#include <linux/compiler.h> #include <asm/ptrace.h> #include <stdarg.h> + +typedef int (*initfunc_t)(void); + +#define INIT_FUNC(stage,step,fn) \ + static initfunc_t __initfunc_ ## fn ## stage __used \ + __attribute__((__section__(".initfuncs_" #stage "." #step))) = fn + #if defined(CONFIG_PCI) && (defined(CONFIG_4xx) && !defined(CONFIG_AP1000)) #include <pci.h> #endif -- 1.7.5.2.317.g391b14

5 20

[U-Boot] From Ms.Rose Juan.
by Rose Juan 25 Aug '11

25 Aug '11

>From Ms.Rose Juan, Permit me to inform you of my desire of going into business relationship with you, My Name is Rose Juan, the only daughter and the only child of late Mr. Adams Juan, I am 20 years old girl ,My father was the Director of Gold and Cotton products exportation in Burkina Faso. Before the death of my father on 18th Febuary 2007 my father told me that he deposited sum of (USD $950,000.00 Nine hundred and fifty Thousand U.S Dollars ) in a bank here in Burkina Faso, He also made me to understand that it was because of his position that he was poisoned by Government associates while on a business trip to France with them and he instructed me to look for a foreign partner not from this country who will help me and transfer this money out of here and invest it for me, my purpose of contacting you is for you to help me and transfer the money into your account, I hope you will not betray the trust I have on you because this money is my only hope in life and you will also help me to relocate over to your country to continue my education while you will invest my own share of the money for me viably, I will compensate you with 35% of this money for your kind assistance My problem is not the money but is who will take care of me and my school, I can assure you there is No Risk involve, the money is an inheritance from my late father I also secured the deposit documents of the fund with me. I am waiting to hear from you. Yours Sincarelly Ms. Rose Juan.

1 0

[U-Boot] hi dear,
by davina camara 25 Aug '11

25 Aug '11

hi dear, My name is Miss Nina,I am very interested to know you well,I was searching for a good relationship today and became so much excited in you,Please my dear if you really need my friendship i will like you to contact me directly because i don´t have full access to log in this site.i am very good person loyal honest lovely kindness.if you are also good person you can reply me with full love and trust i will send you my picture. i hate person that say lie contact me through my email

1 0

[U-Boot] [PATCH] tsec: Configure the buffer descriptor bases to always include all of the descriptors
by Joe Hershberger 25 Aug '11

25 Aug '11

Previously only the last N were included based on the current one in use. Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Joe Hershberger <joe.hershberger(a)gmail.com> Cc: Mingkai Hu <Mingkai.hu(a)freescale.com> Cc: Andy Fleming <afleming(a)freescale.com> Cc: Kumar Gala <galak(a)kernel.crashing.org> Cc: Detlev Zundel <dzu(a)denx.de> --- drivers/net/tsec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 78ffc95..1805ca0 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -250,8 +250,8 @@ static void startup_tsec(struct eth_device *dev) txIdx = 0; /* Point to the buffer descriptors */ - out_be32(&regs->tbase, (unsigned int)(&rtx.txbd[txIdx])); - out_be32(&regs->rbase, (unsigned int)(&rtx.rxbd[rxIdx])); + out_be32(&regs->tbase, (unsigned int)(&rtx.txbd[0])); + out_be32(&regs->rbase, (unsigned int)(&rtx.rxbd[0])); /* Initialize the Rx Buffer descriptors */ for (i = 0; i < PKTBUFSRX; i++) { -- 1.6.0.2

6 11

[U-Boot] [PATCH] AT91: Defer Dataflash access to env_relocate_spec
by Hong Xu 24 Aug '11

24 Aug '11

When env_init is called, the SPI is not actually initialized in U-Boot. So that we can not read Dataflash for its content. We simply mark it OK for now, and defer the real work to `env_relocate_spec'. (Idealy from env_nand.c) Signed-off-by: Hong Xu <hong.xu(a)atmel.com> --- common/env_dataflash.c | 83 ++++++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 38 deletions(-) diff --git a/common/env_dataflash.c b/common/env_dataflash.c index 1d57079..55534a5 100644 --- a/common/env_dataflash.c +++ b/common/env_dataflash.c @@ -21,6 +21,7 @@ #include <command.h> #include <environment.h> #include <linux/stddef.h> +#include <malloc.h> #include <dataflash.h> #include <search.h> #include <errno.h> @@ -50,11 +51,46 @@ uchar env_get_char_spec(int index) void env_relocate_spec(void) { - char buf[CONFIG_ENV_SIZE]; + ulong old_crc, new_crc = 0; + char *buf; - read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, buf); + gd->env_valid = 0; - env_import(buf, 1); + buf = (char *)malloc(CONFIG_ENV_SIZE); + if (buf == NULL) { + error("Can not allocate memory for env.\n"); + goto err_mem; + } + + AT91F_DataflashInit(); + + if (read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc), + sizeof(ulong), (char *)&old_crc) != DATAFLASH_OK) { + error("Dataflash: Failed to read original 4-bytes CRC\n"); + goto err; + } + + if (read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, data), + ENV_SIZE, buf) != DATAFLASH_OK) { + error("Dataflash: Failed to read env string.\n"); + goto err; + } + + new_crc = crc32(new_crc, (uchar *)buf, ENV_SIZE); + + if (old_crc == new_crc) { + gd->env_addr = offsetof(env_t, data); + gd->env_valid = 1; + env_import(buf, 0); + goto out; + } + +err: + set_default_env("!bad CRC"); +out: + free(buf); +err_mem: + return; } #ifdef CONFIG_ENV_OFFSET_REDUND @@ -83,44 +119,15 @@ int saveenv(void) /* * Initialize environment use * - * We are still running from ROM, so data use is limited. - * Use a (moderately small) buffer on the stack + * When env_init is called, the SPI is not actually initialized in U-Boot. + * So that we can not read Dataflash for its content. + * We simply mark it OK for now, and defer the real work to + * `env_relocate_spec'. (Idealy from env_nand.c) */ int env_init(void) { - ulong crc, len, new; - unsigned off; - uchar buf[64]; - - if (gd->env_valid) - return 0; - - AT91F_DataflashInit(); /* prepare for DATAFLASH read/write */ - - /* read old CRC */ - read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc), - sizeof(ulong), (char *)&crc); - - new = 0; - len = ENV_SIZE; - off = offsetof(env_t,data); - while (len > 0) { - int n = (len > sizeof(buf)) ? sizeof(buf) : len; - - read_dataflash(CONFIG_ENV_ADDR + off, n, (char *)buf); - - new = crc32 (new, buf, n); - len -= n; - off += n; - } - - if (crc == new) { - gd->env_addr = offsetof(env_t,data); - gd->env_valid = 1; - } else { - gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = 0; - } + gd->env_addr = (ulong)&default_environment[0]; + gd->env_valid = 1; return 0; } -- 1.7.3.3

4 4

[U-Boot] [PATCH] post: fix up I/O helper usage
by Mike Frysinger 24 Aug '11

24 Aug '11

The I/O API from Linux defaults to little endian accesses. In order to do big endian accesses, there are a "be" variants. The "le32" variants are arch-specific and not terribly common, so change it to the normal Linux API funcs. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- include/post.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/post.h b/include/post.h index 519cef1..c9ec2f4 100644 --- a/include/post.h +++ b/include/post.h @@ -78,12 +78,12 @@ static inline ulong post_word_load (void) { - return in_le32((volatile void *)(_POST_WORD_ADDR)); + return inl((volatile void *)(_POST_WORD_ADDR)); } static inline void post_word_store (ulong value) { - out_le32((volatile void *)(_POST_WORD_ADDR), value); + outl(value, (volatile void *)(_POST_WORD_ADDR)); } #endif /* defined (CONFIG_POST) || defined(CONFIG_LOGBUFFER) */ #endif /* __ASSEMBLY__ */ -- 1.7.5.rc3

2 6

[U-Boot] Expanding checkpatch for non-linux (specifically U-Boot) use
by Graeme Russ 24 Aug '11

24 Aug '11

Hi all, There has been a bit of discussion lately on the U-Boot mailing list regarding the use of checkpatch for U-Boot patches (see http://lists.denx.de/pipermail/u-boot/2011-April/090954.html) U-Boot uses the Linux coding style and checkpatch is therefore a very good tool for us to use to check style compliance. However, checkpatch has a few Linux specific checks which throw up false warnings for U-Boot patches like: WARNING: consider using kstrto* in preference to simple_strto* WARNING: Use #include <linux/$file> instead of <asm/$file> Also, checkpatch seems to be checking not only patched lines, but context lines as well. There is a policy for U-Boot patches to not intermix whitespace / code cleanup changes and functional changes in in the same patch. So to achieve zero warnings and errors, the submitter is forced to create an additional code-cleanup patch in addition to the functionality patch. The code cleanup can end up being significantly larger than the functionality change which discourages casual submitters. So I have a pretty simple question to ask of LKML - Will checkpatch patches to create a 'U-Boot' command-line option to explicitly filter out Linux specific warnings and errors ever be accepted into checkpatch, or will we be required to create and maintain a U-Boot specific version? P.S. If you could please keep the U-Boot mailing list Cc'd, that would be appreciated Regards, Graeme

4 10