June 2007 - U-Boot

[U-Boot-Users] [PATCH] TQM85xx: add support for Spansion 'N' type flashes.
by Martin Krause 22 Jun '07

22 Jun '07

From: Thomas Waehner <thomas.waehner(a)tqs.de> The 'N' typ flashes have bigger sectors, than the formerly used 'M' types, so the flash layout has to be changed -> new start address of the environment. Signed-off-by: Martin Krause <martin.krause(a)tqs.de> --- include/configs/TQM85xx.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index f45f3a2..6c74add 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -149,7 +149,7 @@ #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET #define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256kB for Mon*/ -#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ +#define CFG_MALLOC_LEN (256 * 1024) /* Reserved for malloc */ /* Serial Port */ #if defined(CONFIG_TQM8560) @@ -346,8 +346,8 @@ * Environment */ #define CFG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x20000) -#define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ +#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x40000) +#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector (N)) for env */ #define CFG_ENV_SIZE 0x2000 #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)

3 2

[U-Boot-Users] [PATCH] TQM85xx: bugfix in the SDRAM Initialisation for the TQM85xx boards.
by Martin Krause 22 Jun '07

22 Jun '07

The CS0_BNDS register is now set according to the detected memory size. Signed-off-by Martin Krause <martin.krause(a)tqs.de> --- board/tqm85xx/sdram.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/board/tqm85xx/sdram.c b/board/tqm85xx/sdram.c index 9c1f087..04e6784 100644 --- a/board/tqm85xx/sdram.c +++ b/board/tqm85xx/sdram.c @@ -106,8 +106,10 @@ long int sdram_setup(int casl) if (get_ram_size(0, ddr_cs_conf[i].size) == ddr_cs_conf[i].size) { /* - * OK, size detected -> all done + * size detected -> set Chip Select Bounds Register */ + ddr->cs0_bnds = (ddr_cs_conf[i].size - 1) >> 24; + return ddr_cs_conf[i].size; } }

1 0

[U-Boot-Users] [PATCH] TQM834x: cleanup configuraton
by Martin Krause 22 Jun '07

22 Jun '07

Remove irritating #undef DEBUG Signed-off-by: Martin Krause <martin.krause(a)tqs.de> --- include/configs/TQM834x.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index ed03577..9d99629 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -28,9 +28,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define DEBUG -#undef DEBUG - /* * High Level Configuration Options */

1 0

[U-Boot-Users] [PATCH] TQM85xx: fix pin configuration
by Martin Krause 22 Jun '07

22 Jun '07

TQM85xx: do not configure port pins PD30/PD31 as SCC1 TxD/RxD except for the TQM8560 board. On the other TQM85xx boards (TQM8540, TQM8541 and TQM8555) SCC1 is not used as serial interface anyway. Worse, on some board variants configuring the pins for SCC1 leads to short circuits (for example on the TQM8541-BG). Signed-off-by: Martin Krause <martin.krause(a)tqs.de> --- board/tqm85xx/tqm85xx.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/board/tqm85xx/tqm85xx.c b/board/tqm85xx/tqm85xx.c index 256c076..f6d0dd8 100644 --- a/board/tqm85xx/tqm85xx.c +++ b/board/tqm85xx/tqm85xx.c @@ -167,9 +167,14 @@ const iop_conf_t iop_conf_tab[4][32] = { /* Port D */ { /* conf ppar psor pdir podr pdat */ +#ifdef CONFIG_TQM8560 /* PD31 */ { 1, 1, 0, 0, 0, 0 }, /* SCC1 EN RxD */ /* PD30 */ { 1, 1, 1, 1, 0, 0 }, /* SCC1 EN TxD */ - /* PD29 */ { 1, 1, 0, 1, 0, 0 }, /* SCC1 EN TENA */ +#else /* ! TQM8560 */ + /* PD31 */ { 0, 0, 0, 0, 0, 0 }, /* PD31 */ + /* PD30 */ { 0, 0, 0, 0, 0, 0 }, /* PD30 */ +#endif + /* PD29 */ { 0, 0, 0, 0, 0, 0 }, /* PD29 */ /* PD28 */ { 1, 1, 0, 0, 0, 0 }, /* PD28 */ /* PD27 */ { 1, 1, 0, 1, 0, 0 }, /* PD27 */ /* PD26 */ { 1, 1, 0, 1, 0, 0 }, /* PD26 */

1 0

[U-Boot-Users] [patch] add nand_init() prototype to nand.h
by Mike Frysinger 22 Jun '07

22 Jun '07

since nand_init() is expected to be called by other parts of u-boot, there should be a prototype for it in nand.h Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- diff --git a/include/nand.h b/include/nand.h index 23493f7..3c0752e 100644 --- a/include/nand.h +++ b/include/nand.h @@ -32,6 +32,7 @@ typedef struct mtd_info nand_info_t; extern int nand_curr_device; extern nand_info_t nand_info[]; +extern void nand_init(void); static inline int nand_read(nand_info_t *info, ulong ofs, ulong *len, u_char *buf) {

2 2

[U-Boot-Users] [patch] nicer version handling
by Mike Frysinger 22 Jun '07

22 Jun '07

this patch adds support to the setlocalversion script for u-boot in subversion repos and for 'localversion-' version files like the kernel ive also fixed up the version target in the toplevel Makefile so that it only updates the $(VERSION_FILE) as needed so that it wont wrongly trigger rebuilds in files that include version.h Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- diff --git a/Makefile b/Makefile index 2d8cff3..41661e3 100644 --- a/Makefile +++ b/Makefile @@ -290,11 +290,15 @@ $(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin version: - @echo -n "#define U_BOOT_VERSION \"U-Boot " > $(VERSION_FILE); \ - echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE); \ - echo -n $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion \ - $(TOPDIR)) >> $(VERSION_FILE); \ - echo "\"" >> $(VERSION_FILE) + @echo -n "#define U_BOOT_VERSION \"U-Boot " > $(VERSION_FILE).tmp; \ + echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE).tmp; \ + echo -n "$(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion $(TOPDIR))" >> $(VERSION_FILE).tmp; \ + echo "\"" >> $(VERSION_FILE).tmp + @if ! cmp -s $(VERSION_FILE) $(VERSION_FILE).tmp; then \ + mv -f $(VERSION_FILE).tmp $(VERSION_FILE); \ + else \ + rm -f $(VERSION_FILE).tmp; \ + fi gdbtools: $(MAKE) -C tools/gdb all || exit 1 diff --git a/tools/setlocalversion b/tools/setlocalversion index 9a23825..25072fd 100755 --- a/tools/setlocalversion +++ b/tools/setlocalversion @@ -20,3 +20,11 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then printf '%s' -dirty fi fi + +# Check for svn and a svn repo. +if rev=`svn info 2>/dev/null | grep '^Revision' | awk '{print $NF}'` ; then + printf -- '-svn%s' $rev +fi + +# Check for any localversion-* files +printf '%s' "`cat localversion-* 2>/dev/null`"

1 0

[U-Boot-Users] [patch] drop ppc default for size in MAKEALL
by Mike Frysinger 22 Jun '07

22 Jun '07

the host `size` should be sufficient for most cases when CROSS_COMPILE is not set when running MAKEALL ... better than getting a weird warning about ppc_8xx-size not being found Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- diff --git a/MAKEALL b/MAKEALL index a9969a3..2ef75e9 100755 --- a/MAKEALL +++ b/MAKEALL @@ -339,7 +339,7 @@ build_target() { ${MAKE} ${JOBS} all 2>&1 >${LOG_DIR}/$target.MAKELOG \ | tee ${LOG_DIR}/$target.ERR - ${CROSS_COMPILE:-ppc_8xx-}size ${BUILD_DIR}/u-boot \ + ${CROSS_COMPILE}size ${BUILD_DIR}/u-boot \ | tee -a ${LOG_DIR}/$target.MAKELOG }

1 0

[U-Boot-Users] [PATCH] adds loadi sub command to fpag
by eran liberty 22 Jun '07

22 Jun '07

fpga loadi <dev> <image addr> Signed-off-by: Eran Liberty diff -x .svn -Nuar u-boot.git-5ffa76a032279bc6d3230b703eda32d13305ba13/common/cmd_fpga.c u-boot.exsw6000/common/cmd_fpga.c --- u-boot.git-5ffa76a032279bc6d3230b703eda32d13305ba13/common/cmd_fpga.c 2007-06-18 22:38:46.000000000 +0300 +++ u-boot.exsw6000/common/cmd_fpga.c 2007-06-20 19:25:51.000000000 +0300 @@ -32,6 +32,7 @@ #endif #include <fpga.h> #include <malloc.h> +#include <bzlib.h> #if 0 #define FPGA_DEBUG @@ -45,6 +46,8 @@ #if defined (CONFIG_FPGA) && ( CONFIG_COMMANDS & CFG_CMD_FPGA ) +extern int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); + /* Local functions */ static void fpga_usage (cmd_tbl_t * cmdtp); static int fpga_get_op (char *opstr); @@ -56,6 +59,89 @@ #define FPGA_LOADB 2 #define FPGA_DUMP 3 #define FPGA_LOADMK 4 +#define FPGA_LOADI 5 + +/* Load an image */ +int fpga_loadi( int devnum, void *buf) +{ + ulong addr = (ulong)(buf); + ulong data, len, checksum; + image_header_t hdr; + unsigned int unc_len; + unsigned int *punc_len = &unc_len; + int i; + + /* Copy header so we can blank CRC field for re-calculation */ +#ifdef CONFIG_HAS_DATAFLASH + if (addr_dataflash(addr)){ + read_dataflash(addr, sizeof(image_header_t), (char *)&hdr); + } else +#endif + memmove (&hdr, (char *)addr, sizeof(image_header_t)); + if (ntohl(hdr.ih_magic) != IH_MAGIC) { + puts ("Bad Magic Number\n"); + return 1; + } + data = (ulong)&hdr; + len = sizeof(image_header_t); + + checksum = ntohl(hdr.ih_hcrc); + hdr.ih_hcrc = 0; + + if (crc32 (0, (uchar *)data, len) != checksum) { + puts ("Bad Header Checksum\n"); + return 1; + } +#ifdef CONFIG_HAS_DATAFLASH + if (addr_dataflash(addr)){ + len = ntohl(hdr.ih_size) + sizeof(image_header_t); + read_dataflash(addr, len, (char *)CFG_LOAD_ADDR); + addr = CFG_LOAD_ADDR; + } +#endif + + print_image_hdr ((image_header_t *)addr); + + data = addr + sizeof(image_header_t); + len = ntohl(hdr.ih_size); + + puts (" Verifying Checksum ... "); + if (crc32 (0, (uchar *)data, len) != ntohl(hdr.ih_dcrc)) { + printf ("Bad Data CRC\n"); + return 1; + } + puts ("OK\n"); + + switch (hdr.ih_comp) { + case IH_COMP_NONE: + memmove ((char *)CFG_LOAD_ADDR,(void *)data,len); + break; + case IH_COMP_GZIP: + if (gunzip ((char *)CFG_LOAD_ADDR,unc_len,(uchar *)data, &len) != 0) { + puts ("GUNZIP ERROR - FPGA not loaded\n"); + return 1; + } + len = unc_len; + break; + +#ifdef CONFIG_BZIP2 + case IH_COMP_BZIP2: + i = BZ2_bzBuffToBuffDecompress ((char *)CFG_LOAD_ADDR,punc_len, (char *)data, len, + 1, 0); + if (i != BZ_OK) { + printf ("BUNZIP2 ERROR %d - FPGA not loaded!\n", i); + return 1; + } + len = unc_len; + break; +#endif /* CONFIG_BZIP2 */ + default: + printf ("Unimplemented compression type %d\n", hdr.ih_comp); + return 1; + } + + return fpga_load(devnum,(char *)CFG_LOAD_ADDR,len); +} /* Convert bitstream data and load into the fpga */ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size) @@ -248,6 +334,10 @@ rc = fpga_load (dev, fpga_data, data_size); break; + case FPGA_LOADI: + rc = fpga_loadi (dev, fpga_data); + break; + case FPGA_LOADB: rc = fpga_loadbitstream(dev, fpga_data, data_size); break; @@ -298,6 +388,8 @@ op = FPGA_INFO; } else if (!strcmp ("loadb", opstr)) { op = FPGA_LOADB; + } else if (!strcmp ("loadi", opstr)) { + op = FPGA_LOADI; } else if (!strcmp ("load", opstr)) { op = FPGA_LOAD; } else if (!strcmp ("loadmk", opstr)) { @@ -317,6 +409,7 @@ "fpga [operation type] [device number] [image address] [image size]\n" "fpga operations:\n" "\tinfo\tlist known device information\n" + "\tloadi\tLoad device from u-boot image\n" "\tload\tLoad device from memory buffer\n" "\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n" "\tloadmk\tLoad device generated with mkimage\n"

3 3

[U-Boot-Users] [PATCH] Adds ndelay() common function (like udelay)
by eran liberty 22 Jun '07

22 Jun '07

Signed-off-by: Eran Liberty diff -x .svn -Nuar u-boot.git-5ffa76a032279bc6d3230b703eda32d13305ba13/include/common.h u-boot.exsw6000/include/common.h --- u-boot.git-5ffa76a032279bc6d3230b703eda32d13305ba13/include/common.h 2007-06-18 22:38:46.000000000 +0300 +++ u-boot.exsw6000/include/common.h 2007-06-20 19:04:44.000000000 +0300 @@ -559,6 +559,7 @@ /* lib_$(ARCH)/time.c */ void udelay (unsigned long); +void ndelay (unsigned long); ulong usec2ticks (unsigned long usec); ulong ticks2usec (unsigned long ticks); int init_timebase (void); diff -x .svn -Nuar u-boot.git-5ffa76a032279bc6d3230b703eda32d13305ba13/include/exports.h u-boot.exsw6000/include/exports.h --- u-boot.git-5ffa76a032279bc6d3230b703eda32d13305ba13/include/exports.h 2007-06-18 22:38:46.000000000 +0300 +++ u-boot.exsw6000/include/exports.h 2007-06-20 19:04:44.000000000 +0300 @@ -17,6 +17,7 @@ void *malloc(size_t); void free(void*); void udelay(unsigned long); +void ndelay(unsigned long); unsigned long get_timer(unsigned long); void vprintf(const char *, va_list); void do_reset (void); diff -x .svn -Nuar u-boot.git-5ffa76a032279bc6d3230b703eda32d13305ba13/lib_ppc/time.c u-boot.exsw6000/lib_ppc/time.c --- u-boot.git-5ffa76a032279bc6d3230b703eda32d13305ba13/lib_ppc/time.c 2007-06-18 22:38:46.000000000 +0300 +++ u-boot.exsw6000/lib_ppc/time.c 2007-06-20 19:04:39.000000000 +0300 @@ -60,6 +60,15 @@ /* ------------------------------------------------------------------------- */ +void ndelay(unsigned long nsec) +{ + ulong ticks = usec2ticks(1)*nsec/1000 +1; + + wait_ticks (ticks); +} + +/* ------------------------------------------------------------------------- */ + unsigned long ticks2usec(unsigned long ticks) { ulong tbclk = get_tbclk();

2 2

[U-Boot-Users] problem of malloc return 0
by 朱洪亮 21 Jun '07

21 Jun '07

Hi i am new to uboot, I am porting uboot to lpc2220 on my board,and when run at env_relocate() in start_armboot(void), i get sometrouble. /**** code from lib_arm/board.c ***/ void env_relocate (void) { DEBUGF ("%s[%d] offset = 0x%lx\n", __FUNCTION__,__LINE__, gd->reloc_off); #ifdef CONFIG_AMIGAONEG3SE enable_nvram(); #endif #ifdef ENV_IS_EMBEDDED /* * The environment buffer is embedded with the text segment, * just relocate the environment pointer */ env_ptr = (env_t *)((ulong)env_ptr + gd->reloc_off); DEBUGF ("%s[%d] embedded ENV at %p\n", __FUNCTION__,__LINE__,env_ptr); #else /* * We must allocate a buffer for the environment */ env_ptr = (env_t *)malloc (CFG_ENV_SIZE); DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr); #endif /* ****** code end *******/ after the code "env_ptr = (env_t *)malloc (CFG_ENV_SIZE)" the env_ptr is 0x0; i change the toolchain from arm-linux to arm-elf and the return value is also 0x0,so what should i do if i want to initial for malloc, and I don't know why we call mem_malloc_init, /******** code from lib_arm/borad.c ***/ static ulong mem_malloc_start = 0; static ulong mem_malloc_end = 0; static ulong mem_malloc_brk = 0; static void mem_malloc_init (ulong dest_addr) { mem_malloc_start = dest_addr; mem_malloc_end = dest_addr + CFG_MALLOC_LEN; mem_malloc_brk = mem_malloc_start; memset ((void *) mem_malloc_start, 0, mem_malloc_end - mem_malloc_start); } /********* **/ the variables are all static, does it have any relation with malloc(); and I find there is a function malloc_bin_reloc in dlmalloc.c , and the change the "static mbinptr av_[NAV * 2 + 2] " with the gd->reloc_off,what i should set the gd->reloc_off if there are something relation,the code below /***** code from common/dlmalloc.c ****/ void malloc_bin_reloc (void) { unsigned long *p = (unsigned long *)(&av_[2]); int i; for (i=2; i<(sizeof(av_)/sizeof(mbinptr)); ++i) { *p++ += gd->reloc_off; } } /***** code end ****/ looking for some help,thanks

4 4