May 2009 - U-Boot

[U-Boot] [PATCH v2] ppc4xx: Add Sequoia RAM-booting target
by Stefan Roese 11 May '09

11 May '09

This patch adds another build target for the AMCC Sequoia PPC440EPx eval board. This RAM-booting version is targeted for boards without NOR FLASH (NAND booting) which need a possibility to initially program their NAND FLASH. Using a JTAG debugger (e.g. BDI2000/3000) configured to setup the SDRAM, this debugger can load this RAM- booting image to the target address in SDRAM (in this case 0x1000000) and start it there. Then U-Boot's standard NAND commands can be used to program the NAND FLASH (e.g. "nand write ..."). Here the commands to load and start this image from the BDI2000: 440EPX>load 0x1000000 /tftpboot/sequoia/u-boot.bin 440EPX>go 0x1000000 Please note that this image automatically scans for an already initialized SDRAM TLB (detected by EPN=0). This TLB will not be cleared. So your debugger should configure the SDRAM TLB correctly (as done in the standard Sequoia BDI init script). Signed-off-by: Stefan Roese <sr(a)denx.de> --- Changes in v2: - Using #ifdef's instead of __attribute__((unused)) for variable declatration. Makefile | 11 +++ board/amcc/sequoia/init.S | 7 ++ board/amcc/sequoia/sdram.c | 3 +- board/amcc/sequoia/sequoia.c | 10 +++- board/amcc/sequoia/u-boot-ram.lds | 126 +++++++++++++++++++++++++++++++++++++ cpu/ppc4xx/start.S | 33 ++++++++-- include/configs/amcc-common.h | 11 +++ include/configs/sequoia.h | 30 +++++++-- 8 files changed, 215 insertions(+), 16 deletions(-) create mode 100644 board/amcc/sequoia/u-boot-ram.lds diff --git a/Makefile b/Makefile index 137c88f..1ae93ab 100644 --- a/Makefile +++ b/Makefile @@ -1533,6 +1533,17 @@ rainier_nand_config: unconfig @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk +sequoia_ramboot_config \ +rainier_ramboot_config: unconfig + @mkdir -p $(obj)include $(obj)board/amcc/sequoia + @echo "#define CONFIG_SYS_RAMBOOT" > $(obj)include/config.h + @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \ + tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h + @$(MKCONFIG) -n $@ -a sequoia ppc ppc4xx sequoia amcc + @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp + @echo "LDSCRIPT = board/amcc/sequoia/u-boot-ram.lds" >> \ + $(obj)board/amcc/sequoia/config.tmp + taihu_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx taihu amcc diff --git a/board/amcc/sequoia/init.S b/board/amcc/sequoia/init.S index 4452d26..3c0e400 100644 --- a/board/amcc/sequoia/init.S +++ b/board/amcc/sequoia/init.S @@ -43,12 +43,19 @@ tlbtab: /* vxWorks needs this as first entry for the Machine Check interrupt */ tlbentry( 0x40000000, SZ_256M, 0, 0, AC_R|AC_W|AC_X|SA_G|SA_I ) + /* + * The RAM-boot version skips the SDRAM TLB (identified by EPN=0). This + * entry is already configured for SDRAM via the JTAG debugger and mustn't + * be re-initialized by this RAM-booting U-Boot version. + */ +#ifndef CONFIG_SYS_RAMBOOT /* TLB-entry for DDR SDRAM (Up to 2GB) */ #ifdef CONFIG_4xx_DCACHE tlbentry( CONFIG_SYS_SDRAM_BASE, SZ_256M, CONFIG_SYS_SDRAM_BASE, 0, AC_R|AC_W|AC_X|SA_G) #else tlbentry( CONFIG_SYS_SDRAM_BASE, SZ_256M, CONFIG_SYS_SDRAM_BASE, 0, AC_R|AC_W|AC_X|SA_G|SA_I ) #endif +#endif /* CONFIG_SYS_RAMBOOT */ /* TLB-entry for EBC */ tlbentry( CONFIG_SYS_BCSR_BASE, SZ_256M, CONFIG_SYS_BCSR_BASE, 1, AC_R|AC_W|AC_X|SA_G|SA_I ) diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c index 6df4c6d..bde471c 100644 --- a/board/amcc/sequoia/sdram.c +++ b/board/amcc/sequoia/sdram.c @@ -54,7 +54,8 @@ extern void denali_core_search_data_eye(void); ************************************************************************/ phys_size_t initdram (int board_type) { -#if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) +#if !(defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_SYS_RAMBOOT)) || \ + defined(CONFIG_NAND_SPL) ulong speed = get_bus_freq(0); mtsdram(DDR0_02, 0x00000000); diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index e824b8f..246ad94 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -33,7 +33,9 @@ DECLARE_GLOBAL_DATA_PTR; +#if !defined(CONFIG_SYS_NO_FLASH) extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ +#endif extern void __ft_board_setup(void *blob, bd_t *bd); ulong flash_get_size(ulong base, int banknum); @@ -122,16 +124,19 @@ int board_early_init_f(void) int misc_init_r(void) { +#if !defined(CONFIG_SYS_NO_FLASH) uint pbcr; int size_val = 0; - u32 reg; +#endif #ifdef CONFIG_440EPX unsigned long usb2d0cr = 0; unsigned long usb2phy0cr, usb2h0cr = 0; unsigned long sdr0_pfc1; char *act = getenv("usbact"); #endif + u32 reg; +#if !defined(CONFIG_SYS_NO_FLASH) /* Re-do flash sizing to get full correct info */ /* adjust flash start and offset */ @@ -171,6 +176,7 @@ int misc_init_r(void) CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif +#endif /* CONFIG_SYS_NO_FLASH */ /* * USB suff... @@ -515,7 +521,7 @@ int post_hotkeys_pressed(void) } #endif /* CONFIG_POST */ -#if defined(CONFIG_NAND_U_BOOT) +#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_SYS_RAMBOOT) /* * On NAND-booting sequoia, we need to patch the chips select numbers * in the dtb (CS0 - NAND, CS3 - NOR) diff --git a/board/amcc/sequoia/u-boot-ram.lds b/board/amcc/sequoia/u-boot-ram.lds new file mode 100644 index 0000000..9393b65 --- /dev/null +++ b/board/amcc/sequoia/u-boot-ram.lds @@ -0,0 +1,126 @@ +/* + * (C) Copyright 2009 + * Stefan Roese, DENX Software Engineering, sr(a)denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_ARCH(powerpc) +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = + SIZEOF_HEADERS; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .rel.text : { *(.rel.text) } + .rela.text : { *(.rela.text) } + .rel.data : { *(.rel.data) } + .rela.data : { *(.rela.data) } + .rel.rodata : { *(.rel.rodata) } + .rela.rodata : { *(.rela.rodata) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.bss : { *(.rel.bss) } + .rela.bss : { *(.rela.bss) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + .init : { *(.init) } + .plt : { *(.plt) } + .text : + { + cpu/ppc4xx/start.o (.text) + + *(.text) + *(.fixup) + *(.got1) + } + _etext = .; + PROVIDE (etext = .); + .rodata : + { + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } + .fini : { *(.fini) } =0 + .ctors : { *(.ctors) } + .dtors : { *(.dtors) } + + /* Read-write section, merged into data segment: */ + . = (. + 0x00FF) & 0xFFFFFF00; + _erotext = .; + PROVIDE (erotext = .); + .reloc : + { + *(.got) + _GOT2_TABLE_ = .; + *(.got2) + _FIXUP_TABLE_ = .; + *(.fixup) + } + __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2; + __fixup_entries = (. - _FIXUP_TABLE_)>>2; + + .data : + { + *(.data) + *(.data1) + *(.sdata) + *(.sdata2) + *(.dynamic) + CONSTRUCTORS + } + _edata = .; + PROVIDE (edata = .); + + . = .; + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + + . = .; + __start___ex_table = .; + __ex_table : { *(__ex_table) } + __stop___ex_table = .; + + . = ALIGN(256); + __init_begin = .; + .text.init : { *(.text.init) } + .data.init : { *(.data.init) } + . = ALIGN(256); + __init_end = .; + + __bss_start = .; + .bss (NOLOAD) : + { + *(.sbss) *(.scommon) + *(.dynbss) + *(.bss) + *(COMMON) + . = ALIGN(4); + } + + _end = . ; + PROVIDE (end = .); +} diff --git a/cpu/ppc4xx/start.S b/cpu/ppc4xx/start.S index f2b8908..ac96fc2 100644 --- a/cpu/ppc4xx/start.S +++ b/cpu/ppc4xx/start.S @@ -257,6 +257,14 @@ bl board_init_f #endif +#if defined(CONFIG_SYS_RAMBOOT) + /* + * 4xx RAM-booting U-Boot image is started from offset 0 + */ + .text + bl _start_440 +#endif + /* * 440 Startup -- on reset only the top 4k of the effective * address space is mapped in by an entry in the instruction @@ -444,10 +452,17 @@ skip_debug_init: addis r0,0,0x0000 li r1,0x003f /* 64 TLB entries */ mtctr r1 -rsttlb: tlbwe r0,r1,0x0000 /* Invalidate all entries (V=0)*/ - tlbwe r0,r1,0x0001 - tlbwe r0,r1,0x0002 - subi r1,r1,0x0001 + li r4,0 /* Start with TLB #0 */ +rsttlb: +#ifdef CONFIG_SYS_RAMBOOT + tlbre r3,r4,0 /* Read contents from TLB word #0 to get EPN */ + rlwinm. r3,r3,0,0xfffffc00 /* Mask EPN */ + beq tlbnxt /* Skip EPN=0 TLB, this is the SDRAM TLB */ +#endif + tlbwe r0,r4,0 /* Invalidate all entries (V=0)*/ + tlbwe r0,r4,1 + tlbwe r0,r4,2 +tlbnxt: addi r4,r4,1 /* Next TLB */ bdnz rsttlb /*----------------------------------------------------------------*/ @@ -476,7 +491,13 @@ rsttlb: tlbwe r0,r1,0x0000 /* Invalidate all entries (V=0)*/ li r4,0 /* TLB # */ addi r5,r5,-4 -1: lwzu r0,4(r5) +1: +#ifdef CONFIG_SYS_RAMBOOT + tlbre r3,r4,0 /* Read contents from TLB word #0 */ + rlwinm. r3,r3,0,0x00000200 /* Mask V (valid) bit */ + bne tlbnx2 /* Skip V=1 TLB, this is the SDRAM TLB */ +#endif + lwzu r0,4(r5) cmpwi r0,0 beq 2f /* 0 marks end */ lwzu r1,4(r5) @@ -484,7 +505,7 @@ rsttlb: tlbwe r0,r1,0x0000 /* Invalidate all entries (V=0)*/ tlbwe r0,r4,0 /* TLB Word 0 */ tlbwe r1,r4,1 /* TLB Word 1 */ tlbwe r2,r4,2 /* TLB Word 2 */ - addi r4,r4,1 /* Next TLB */ +tlbnx2: addi r4,r4,1 /* Next TLB */ bdnz 1b /*----------------------------------------------------------------*/ diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index d3dc3e5..3b733c0 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -76,6 +76,17 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO +#if defined(CONFIG_SYS_RAMBOOT) +/* + * Disable NOR FLASH commands on RAM-booting version. One main reason for this + * RAM-booting version is boards with NAND and without NOR. This image can + * be used for initial NAND programming. + */ +#define CONFIG_SYS_NO_FLASH +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_IMLS +#endif + /* * Miscellaneous configurable options */ diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index fa226b2..89acacc 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -112,13 +112,26 @@ /* * Environment */ -#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) -#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */ +#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) +#define CONFIG_ENV_IS_IN_NAND /* use NAND for environ vars */ +#define CONFIG_ENV_IS_EMBEDDED /* use embedded environment */ +#elif defined(CONFIG_SYS_RAMBOOT) +#define CONFIG_ENV_IS_NOWHERE /* Store env in memory only */ +#define CONFIG_ENV_SIZE (8 << 10) +/* + * In RAM-booting version, we have no environment storage. So we need to + * provide at least preliminary MAC addresses for the 4xx EMAC driver to + * register the interfaces. Those two addresses are generated via the + * tools/gen_eth_addr tool and should only be used in a closed laboratory + * environment. + */ +#define CONFIG_ETHADDR 4a:56:49:22:3e:43 +#define CONFIG_ETH1ADDR 02:93:53:d5:06:98 #else -#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environ vars */ -#define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ +#define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environ vars */ #endif +#if defined(CONFIG_CMD_FLASH) /* * FLASH related */ @@ -148,6 +161,7 @@ #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif +#endif /* CONFIG_CMD_FLASH */ /* * IPL (Initial Program Loader, integrated inside CPU) @@ -211,7 +225,8 @@ * DDR SDRAM */ #define CONFIG_SYS_MBYTES_SDRAM (256) /* 256MB */ -#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) +#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) && \ + !defined(CONFIG_SYS_RAMBOOT) #define CONFIG_DDR_DATA_EYE /* use DDR2 optimization */ #endif #define CONFIG_SYS_MEM_TOP_HIDE (4 << 10) /* don't use last 4kbytes */ @@ -306,7 +321,7 @@ * overwrite part of the U-Boot image which is already loaded from NAND * to SDRAM. */ -#if defined(CONFIG_NAND_U_BOOT) +#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_SYS_RAMBOOT) #define CONFIG_SYS_POST_MEMORY_ON 0 #else #define CONFIG_SYS_POST_MEMORY_ON CONFIG_SYS_POST_MEMORY @@ -354,7 +369,8 @@ /* * On Sequoia CS0 and CS3 are switched when configuring for NAND booting */ -#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) +#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) && \ + !defined(CONFIG_SYS_RAMBOOT) #define CONFIG_SYS_NAND_CS 3 /* NAND chip connected to CSx */ /* Memory Bank 0 (NOR-FLASH) initialization */ #define CONFIG_SYS_EBC_PB0AP 0x03017200 -- 1.6.2.5

2 6

[U-Boot] Booting uboot from Onenand
by Vivek DALAL 11 May '09

11 May '09

Hi I am porting uboot on Poseidon Board(OMAP 2430). I am able to download uboot on to RAM using Trace-32(Leuterbach) and get the prompt and after downloading uboot.bin to RAM, I executed onenand erase and write commands for downloading u-boot-onenand.bin on to OneNand chip which is mapped at 0x00000000. After reset, board should get booted up automatically. But its not happening. The problem is in X-Loader section of U-boot-onenand.bin, which should automatically loads itself in SRAM section of Onenand(1 KB) and then should copy bootloader onto RAM; from where it should execute and give me prompt. In Onenand IPL section(xloader), I am disabling Watchdog timers, using default clock settings, initializing SDRC and stack. I am not able to debug the issue because as far as I know Trace-32 doesn't support debugging OneNand. Please provide me alternative to debug the problem as I am unable to guess which part of xloader is failing. -- Cheers Vivek Dalal === He who angers you conquers you ===

1 0

[U-Boot] Data transfer through Ethernet in u-boot.
by prathika 11 May '09

11 May '09

Hi all, I am porting u-boot on PPC440 EP. I am porting a stand alone application on it. I have coded for testing the peripherals of PPC. I have no issues in executing this application. Similarly I want to test ethernet communication also. I would like to transmit a text file from my board to PC and vice-versa. Are there any example application for this in u-boot. Please help me in this regard. Thanks & Regards, Prathika R

2 1

[U-Boot] [PATCH 0/3] OMAP3: Minor code clean up, no functional change
by Dirk Behme 11 May '09

11 May '09

This patch series is an attempt (*) to help with [1] and the first part of [2]. It contains only minor code clean up, no functional changes. Complete patch series boot tested on OMAP3 BeagleBoard and compile tested with ./MAKEALL ARM_CORTEX_A8. I'm unsure about two topics: * The initial ideas and patches for these changes are all from Jean-Christophe (*). So I added Jean-Christophe's From: and Signed-off-by:. If this is wrong, please correct. * Patch 2/3 renames interrupts.c to timer.c. In git this can be done easier by just rename. But for testing and sending it as patch to be applied I had to do it this way. Maybe the rename could be done easier while applying the patch to git? Best regards Dirk (*) Jean-Christophe told me that he is busy, hopefully I can help a little with this. [1] http://lists.denx.de/pipermail/u-boot/2009-May/051948.html [2] http://lists.denx.de/pipermail/u-boot/2009-May/051949.html

4 12

Re: [U-Boot] [PATCH v5] ARM DaVinci Adding DM357 Support
by David Brownell 11 May '09

11 May '09

Minor nit: for consistency with "dvevm" and "dm355evm", I suggest removing the underscore from "dm357_evm" in the directory name. > --- /dev/null > +++ b/include/configs/davinci_dm357_evm.h > @@ -0,0 +1,155 @@ > +... > + > +#ifndef __CONFIG_H > +#define __CONFIG_H > +#include <asm/sizes.h> > +#include <asm/arch/hardware.h> Breaks builds, since <config.h> is included by ASM code and <asm/arch/hardware.h> includes C declarations (which are invalid ASM syntax). > +#define CONFIG_STACKSIZE 0x40000 > ... > +#define CONFIG_STACKSIZE /* Input clock */ Also breaks builds, for a different reason. The second one is clearly nonsense ... I'd also be interested to know if the appended patchlet, in conjunction with the NAND chipselect cleanup patch I posted, provides proper access to the second NAND chip. It should report a total of 2112 MBytes in the startup message, and "nand devices" should report two chips. Obviously I couldn't compile-test because of the above issues ... but it looks more or less right; it's just a copy of the dm355evm stuff that works, so the question is whether the driver is handling both nCEO and nCE2 chipselect flavors right. There are also a few things I'd change in the dm357 config heade: enabling the NAND-resident BBT (faster boot), with MTDPART and UBIFS. - Dave --- u-boot-arm.orig/board/davinci/dm357_evm/dm357_evm.c +++ u-boot-arm/board/davinci/dm357_evm/dm357_evm.c @@ -20,8 +20,10 @@ */ #include <common.h> +#include <nand.h> #include <i2c.h> #include <asm/arch/hardware.h> +#include <asm/arch/nand_defs.h> #include "../common/psc.h" #include "../common/misc.h" @@ -67,3 +69,30 @@ int misc_init_r(void) return 0; } +#define BIT(x) (1 << (x)) + +static void nand_dm357evm_select_chip2(struct mtd_info *mtd, int chip) +{ + struct nand_chip *this = mtd->priv; + u32 wbase = (u32) this->IO_ADDR_W; + u32 rbase = (u32) this->IO_ADDR_R; + + if (chip == 1) { + wbase |= BIT(3); + rbase |= BIT(3); + } else { + wbase &= ~BIT(3); + rbase &= ~BIT(3); + } + this->IO_ADDR_W = (void *)wbase; + this->IO_ADDR_R = (void *)rbase; +} + +int board_nand_init(struct nand_chip *nand) +{ + davinci_nand_init(nand); + if (0x06000000 == (u32) this->IO_ADDR_W) + nand->select_chip = nand_dm357evm_select_chip2; + return 0; +} + --- u-boot-arm.orig/include/configs/davinci_dm357_evm.h 2009-05-10 19:41:44.000000000 -0700 +++ u-boot-arm/include/configs/davinci_dm357_evm.h 2009-05-10 20:43:28.000000000 -0700 @@ -107,9 +105,16 @@ #endif #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ #define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ -#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE0_BASE #define CONFIG_SYS_NAND_HW_ECC -#define CONFIG_SYS_MAX_NAND_DEVICE 1 +/* + * Boot NAND, small page, has one chipselect (nCE0) + * Storage NAND has two chipselects, nCE2 gated by address BIT(3) + */ +#define CONFIG_SYS_NAND_BASE_LIST \ + { 0x02000000 , 0x06000000, } +#define CONFIG_SYS_MAX_NAND_DEVICE 2 +#define CONFIG_SYS_NAND_MAX_CHIPS 2 + #define CONFIG_ENV_OFFSET 0x0 #endif /*

1 0

[U-Boot] Complement of the day
by mrlile22＠optonline.net 10 May '09

10 May '09

Complement of the day,I am Mr.Song Lile and i work with Hang Seng Bank Hong Kong, i have a business proposal for you please get back to me for detailed message.Kind Regards,Mr Song Lile.

1 0

[U-Boot] [PATCH] tools/envcrc: add --binary option to export embedded env
by Mike Frysinger 10 May '09

10 May '09

The --binary option to envcrc can be used to export the embedded env as a binary blob so that it can be manipulated/examined/whatever externally. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- tools/envcrc.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/tools/envcrc.c b/tools/envcrc.c index 4334cdf..ac24967 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdint.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> #ifndef __ASSEMBLY__ @@ -77,19 +78,55 @@ extern unsigned char environment; int main (int argc, char **argv) { #ifdef ENV_IS_EMBEDDED + unsigned char pad = 0x00; uint32_t crc; unsigned char *envptr = &environment, *dataptr = envptr + ENV_HEADER_SIZE; unsigned int datasize = ENV_SIZE; + unsigned int eoe; + + if (argv[1] && !strncmp(argv[1], "--binary=", 9)) { + int ipad; + sscanf(argv[1] + 9, "%i", &ipad); + pad = ipad; + } + + if (pad) { + /* find the end of env */ + for (eoe = 0; eoe < datasize - 1; ++eoe) + if (!dataptr[eoe] && !dataptr[eoe+1]) { + eoe += 2; + break; + } + if (eoe < datasize - 1) + memset(dataptr + eoe, pad, datasize - eoe); + } crc = crc32 (0, dataptr, datasize); /* Check if verbose mode is activated passing a parameter to the program */ if (argc > 1) { - printf ("CRC32 from offset %08X to %08X of environment = %08X\n", - (unsigned int) (dataptr - envptr), - (unsigned int) (dataptr - envptr) + datasize, - crc); + if (!strncmp(argv[1], "--binary", 8)) { + int le = (argc > 2 ? !strcmp(argv[2], "le") : 1); + size_t i, start, end, step; + if (le) { + start = 0; + end = ENV_HEADER_SIZE; + step = 1; + } else { + start = ENV_HEADER_SIZE - 1; + end = -1; + step = -1; + } + for (i = start; i != end; i += step) + printf("%c", (crc & (0xFF << (i * 8))) >> (i * 8)); + fwrite(dataptr, 1, datasize, stdout); + } else { + printf("CRC32 from offset %08X to %08X of environment = %08X\n", + (unsigned int) (dataptr - envptr), + (unsigned int) (dataptr - envptr) + datasize, + crc); + } } else { printf ("0x%08X\n", crc); } -- 1.6.2.2

2 8

[U-Boot] Pull request u-boot-blackfin.git
by Mike Frysinger 10 May '09

10 May '09

The following changes since commit 6b8edfde22acc574b5532e9f086e6a7287a9bc78: Wolfgang Denk (1): Prepare v2009.06-rc1 are available in the git repository at: git://www.denx.de/git/u-boot-blackfin.git master Graf Yang (1): Blackfin: bf518f-ezbrd: reset ethernet PHY during init Mike Frysinger (4): Blackfin: recurse with early serial initcode Blackfin: fix booting with older bootroms (no EVT1) Blackfin: avoid get_sclk() with early serial debug Blackfin: bf527-ezkit: fix SPI flash env params blackfin_config.mk | 6 +++- board/bf518f-ezbrd/bf518f-ezbrd.c | 55 ++++++++++++++++++++++++++-- board/bf561-ezkit/u-boot.lds.S | 9 ++++- cpu/blackfin/cpu.c | 10 +++++- cpu/blackfin/initcode.c | 4 ++- cpu/blackfin/serial.h | 10 +++--- include/asm-blackfin/blackfin-config-pre.h | 8 ++++ include/configs/bf527-ezkit.h | 4 +- 8 files changed, 91 insertions(+), 15 deletions(-)

2 1

[U-Boot] Please pull u-boot-ppc4xx/next
by Stefan Roese 10 May '09

10 May '09

Hi Wolfgang, please pull some changes for ppc4xx/next: The following changes since commit 6b8edfde22acc574b5532e9f086e6a7287a9bc78: Wolfgang Denk (1): Prepare v2009.06-rc1 are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git next Ben Warren (1): Enable CONFIG_NET_MULTI on all remaining PPC4xx boards Matthias Fuchs (6): esd/common: extend cpld command with address parameter 4xx: Remove binary cpld bitstream from CMS700 board 4xx: Remove binary cpld bitstream from PMC405 board 4xx: Remove binary cpld bitstream from VOM405 board 4xx: Remove binary cpld bitstream from DP405 board 4xx: Add support for DP405 hardware variants board/esd/cms700/cms700.c | 8 - board/esd/cms700/config.mk | 7 +- board/esd/cms700/fpgadata.c | 1812 ------------------------- board/esd/common/xilinx_jtag/micro.c | 24 +- board/esd/common/xilinx_jtag/ports.c | 10 +- board/esd/dp405/config.mk | 7 +- board/esd/dp405/dp405.c | 40 +- board/esd/dp405/fpgadata.c | 1812 ------------------------- board/esd/pmc405/fpgadata.c | 2472 ---------------------------------- board/esd/pmc405/pmc405.c | 7 - board/esd/vom405/config.mk | 8 +- board/esd/vom405/fpgadata.c | 1812 ------------------------- board/esd/vom405/vom405.c | 7 - include/configs/AR405.h | 1 + include/configs/CMS700.h | 53 +- include/configs/CPCIISER4.h | 1 + include/configs/CRAYL1.h | 1 + include/configs/DP405.h | 86 +-- include/configs/ERIC.h | 1 + include/configs/EXBITGEN.h | 1 + include/configs/HUB405.h | 1 + include/configs/JSE.h | 1 + include/configs/MIP405.h | 1 + include/configs/OCRTC.h | 1 + include/configs/ORSG.h | 1 + include/configs/PIP405.h | 1 + include/configs/PMC405.h | 3 - include/configs/VOM405.h | 21 +- include/configs/W7OLMC.h | 1 + include/configs/W7OLMG.h | 1 + include/configs/WUH405.h | 1 + include/configs/csb272.h | 1 + include/configs/csb472.h | 1 + include/configs/netstal-common.h | 2 +- include/configs/sbc405.h | 1 + 35 files changed, 83 insertions(+), 8125 deletions(-) delete mode 100644 board/esd/cms700/fpgadata.c delete mode 100644 board/esd/dp405/fpgadata.c delete mode 100644 board/esd/pmc405/fpgadata.c delete mode 100644 board/esd/vom405/fpgadata.c

2 1

[U-Boot] [PATCH 1/3] console.h: remove non implement function : console_realloc
by Jean-Christophe PLAGNIOL-VILLARD 10 May '09

10 May '09

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- include/console.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/console.h b/include/console.h index 06ec32a..bc8b139 100644 --- a/include/console.h +++ b/include/console.h @@ -33,6 +33,4 @@ extern device_t *stdio_devices[] ; extern char *stdio_names[MAX_FILES] ; -int console_realloc(int top); - #endif -- 1.6.1.3

3 8