May 2007 - U-Boot

[U-Boot-Users] U boot modification...
by Kiran Jammula 23 May '12

23 May '12

Hi, I am using U boot for my project. I need to configure the console while booting by prompting the user from target board LCD and Keypad. So please let me know which file of the U-boot I have to modify to achieve this. Kiran _________________________________________________________________ Special offer for NRIs! http://creative.mediaturf.net/creatives/citibankrca/rca_msntagofline.htm Get a zero balance account for next 20 years. From Citibank

4 5

[U-Boot-Users] Ethernet loopback command
by Thomas Schäfer 17 Apr '12

17 Apr '12

Hi, The patch attached provides a command called 'ethloop' which allows to perform loopback testing on the current eth device. To achieve this, a new ethernet packet type (PROT_TEST, 0x0808, AFAIK this is not used otherwise) is introduced in net/net.c. The patch is against SF CVS from 20050307. The functions EthLoopStart, EthLoopSend and EthLoopHandler generate a simple ethernet frame with NetOurEther as destination address and packet type PROT_TEST. The looped back package is compared with the original one and a message is displayed. It is necessary to set the ethernet line into loopback mode either by programming the PHY or using a loopback plug. I've tested this on our PPC405 custom board, but it should also work on all other systems because packet generation is independent of the underlying ethernet hardware. Example usage: => mii w 0 0 7100 <-- sets PHY into loopback mode => ethloop Using ppc_405x_eth0 device Got ethernet loopback frame, len=64 loopback test successfully completed => mii w 0 0 8000 <-- PHY reset after test is completed Maybe this is also useful for others.. Best regards, Thomas Schäfer ____________________________________ Kontron Modular Computers GmbH Konrad-Zuse-Str. 9 66115 Saarbrücken Tel.: + 49 (0)681 / 95916 - 203 Fax: + 49 (0)681 / 95916 - 100 E-mail: thomas.schaefer(a)kontron.com

5 5

[U-Boot-Users] Add a new command to U-Boot
by Carlos Filipe Silva 20 May '09

20 May '09

Hi all! I have one doubt. How can I add a new command to U-Boot? Do I have to use only the macro U_BOOT_CMD() like files .../common/cmd_* or do I have to do more things, like defines, etc.? And after this is compliled with no error, if I type help in U-Boot's shell, do I see this command like the others? Best regards, Carlos Silva

11 24

Re: [U-Boot-Users] NAND boot from file
by Charles Krinke 06 Mar '09

06 Mar '09

Dear Wolfgang: >Um... if this is JFFS2, then why not simply "fsload" + "bootm" ? Although I can format the flash in Linux and run fsinfo, ls or fsload in u-boot, there is a time of several minutes after Scanning JFFS2 FS Before ls can find the directory or fsload can attempt to load the uImage file. I am thinking that the 'flash_eraseall -j' command I am using may not be quite setup correctly with the u-boot environment. It should not take several minutes to pull a directory off a formatted flash. Here is what I do: Linux# flash_eraseall -j /dev/mtd0 Linux# mount -t jffs2 /dev/mtdblock0 /mnt/flash1 Linux# cp /uImage /mnt/flash1 Linux# ls /mnt/flash1 uImage is here, now reboot uboot> ls uImage is here, but it takes several minutes to get the listing. Fsload takes several minutes also. Can you think of what other assumptions I may be making that may be invalid? Charles

3 2

[U-Boot-Users] [PATCH] part 2. Embedded PlanetBoards
by Jeff Mann 29 Nov '08

29 Nov '08

*CHANGELOG Added Support for Embedded Planet Boards EP852 EP866 and EP85xxm. See respective board config file for original author information. Merged from internal company port and QUICCstart kit into the most recent u-boot git by J. Mann, Embedded Planet, 2006-JUL-27. (this is part 2 of 2 split in half for size reasons.) (the first attempt to send this e-mail resulted in a message too big error. Sorry if you get two on acident)

2 1

[U-Boot-Users] how to support usbtty
by zhuzhenhua 31 Aug '08

31 Aug '08

becides set CONFIG_USB_TTY, what other modification need to do for the usbtty support? thanks for any hints

5 10

[U-Boot-Users] bootargs for partitioned nand flash
by Terence Soh 30 Apr '08

30 Apr '08

Hi, I'm trying to get a 64 MByte nand flash to be partitioned in a 32MB cramfs and 32MB jffs2 partition. In case anyone's curious, I would like the cramfs to be root as it would be a faster mount and its read-only feature. I tried to do this in the kernel by static struct mtd_partition partition_info[] = { [0] = { .name = "CRAM", .offset = 0, .size = 32 * 1024 * 1024, .mask_flags = MTD_WRITEABLE, /* force read-only */ }, [1] = { .name = "JFFS2", .offset = 32 * 1024 * 1024, .size = MTDPART_SIZ_FULL, } }; but when I cat/proc/mtd, I get / # cat /proc/mtd dev: size erasesize name mtd0: 04000000 00004000 "rootfs" so I realise that this is affected by the bootargs passed by u-bootloader which is "bootargs=console=ttyS0 mtdparts=a9m9750:0x4000000@0(rootfs) root=mtdblock/0 rootfstype=jffs2" How should I passed the bootargs? Thanks in advance, Terence.

4 3

[U-Boot-Users] [MPC82xx] Fixes for MPC8272
by Wolfgang Denk 26 Apr '08

26 Apr '08

The following changes since commit 14da5f7675bbb427c469e3f45006e027b6e21db9: Wolfgang Denk (1): Cleanup compiler warnings, update CHANGELOG are found in the git repository at: git://www.denx.de/git/u-boot-mpc82xx.git Heiko Schocher (1): [MPC826x] update defines in include/mpc8260.h for the MPC8272 family include/mpc8260.h | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 89 insertions(+), 1 deletions(-) Please help testing this code. If there are no complaints, it will be merged into the master repo in aboutr 3 weeks from now. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk Office: Kirchenstr. 5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "If God had wanted us to use the metric system, Jesus would have had 10 apostles."

6 97

[U-Boot-Users] CramFS endianness
by Laurent Pinchart 04 Mar '08

04 Mar '08

Hi everybody, I recently had a problem with cramfs endianness. cramfs tools generates a host-endian file system, which was incompatible with my big-endian MPC8260 system. I patched mkcramfs to reverse the bit order, and was able to read the cramfs image from Linux. However, even though Linux doesn't do any byte swapping, U-Boot assumes little-endian byte order and swap bytes on big-endian architectures. Why is that ? U-Boot and Linux are clearly not compatible on big-endian architectures, and I'd like to fix the problem in the right place. Laurent Pinchart

3 10

[U-Boot-Users] [PATCH] Add S3C2410 MMC/SD support
by Harald Welte 28 Jan '08

28 Jan '08

This patch adds MMC/SD support to the S3C2410 SoC code in u-boot Signed-off-by: Harald Welte <laforge(a)openmoko.org> Index: u-boot/cpu/arm920t/s3c24x0/Makefile =================================================================== --- u-boot.orig/cpu/arm920t/s3c24x0/Makefile 2007-02-16 23:42:19.000000000 +0100 +++ u-boot/cpu/arm920t/s3c24x0/Makefile 2007-02-16 23:42:19.000000000 +0100 @@ -26,7 +26,7 @@ LIB = $(obj)lib$(SOC).a COBJS = i2c.o interrupts.o serial.o speed.o \ - usb_ohci.o nand_read.o nand.o cmd_s3c2410.o + usb_ohci.o nand_read.o nand.o mmc.o cmd_s3c2410.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) Index: u-boot/cpu/arm920t/s3c24x0/mmc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ u-boot/cpu/arm920t/s3c24x0/mmc.c 2007-02-16 23:43:28.000000000 +0100 @@ -0,0 +1,504 @@ +/* + * u-boot S3C2410 MMC/SD card driver + * (C) Copyright 2006 by OpenMoko, Inc. + * Author: Harald Welte <laforge(a)openmoko.org> + * + * based on u-boot pxa MMC driver and linux/drivers/mmc/s3c2410mci.c + * (C) 2005-2005 Thomas Kleffel + * + * 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 + */ + +#include <config.h> +#include <common.h> +#include <mmc.h> +#include <asm/errno.h> +#include <asm/io.h> +#include <s3c2410.h> +#include <part.h> + +#ifdef CONFIG_MMC + +#define CONFIG_MMC_WIDE + +//#define MMC_DEBUG + +#ifdef MMC_DEBUG +#define DEBUGP printf +#else +#define DEBUGP(x, args ...) do { } while(0) +#endif + +static S3C2410_SDI *sdi; + +extern int +fat_register_device(block_dev_desc_t *dev_desc, int part_no); + +static block_dev_desc_t mmc_dev; + +block_dev_desc_t * mmc_get_dev(int dev) +{ + return ((block_dev_desc_t *)&mmc_dev); +} + +/* + * FIXME needs to read cid and csd info to determine block size + * and other parameters + */ +static uchar mmc_buf[MMC_BLOCK_SIZE]; +static mmc_csd_t mmc_csd; +static int mmc_ready = 0; +static int wide = 0; + + +#define CMD_F_RESP 0x01 +#define CMD_F_RESP_LONG 0x02 + +static u_int32_t * +/****************************************************/ +mmc_cmd(ushort cmd, ulong arg, ushort flags) +/****************************************************/ +{ + static u_int32_t resp[5]; + ulong status; + int i; + + u_int32_t ccon, csta; + u_int32_t csta_rdy_bit = S3C2410_SDICMDSTAT_CMDSENT; + + memset(resp, 0, sizeof(resp)); + + DEBUGP("mmc_cmd CMD%d arg=0x%08x flags=%x\n", cmd, arg, flags); + + sdi->SDICSTA = 0xffffffff; + sdi->SDIDSTA = 0xffffffff; + sdi->SDIFSTA = 0xffffffff; + + sdi->SDICARG = arg; + + ccon = cmd & S3C2410_SDICMDCON_INDEX; + ccon |= S3C2410_SDICMDCON_SENDERHOST|S3C2410_SDICMDCON_CMDSTART; + + if (flags & CMD_F_RESP) { + ccon |= S3C2410_SDICMDCON_WAITRSP; + csta_rdy_bit = S3C2410_SDICMDSTAT_RSPFIN; /* 1 << 9 */ + } + + if (flags & CMD_F_RESP_LONG) + ccon |= S3C2410_SDICMDCON_LONGRSP; + + sdi->SDICCON = ccon; + + while (1) { + csta = sdi->SDICSTA; + if (csta & csta_rdy_bit) + break; + if (csta & S3C2410_SDICMDSTAT_CMDTIMEOUT) { + printf("===============> MMC CMD Timeout\n"); + sdi->SDICSTA |= S3C2410_SDICMDSTAT_CMDTIMEOUT; + break; + } + } + + DEBUGP("final MMC CMD status 0x%x\n", csta); + + sdi->SDICSTA |= csta_rdy_bit; + + if (flags & CMD_F_RESP) { + resp[0] = sdi->SDIRSP0; + resp[1] = sdi->SDIRSP1; + resp[2] = sdi->SDIRSP2; + resp[3] = sdi->SDIRSP3; + } + + return resp; +} + +#define FIFO_FILL(host) ((host->SDIFSTA & S3C2410_SDIFSTA_COUNTMASK) >> 2) + +static int +/****************************************************/ +mmc_block_read(uchar *dst, ulong src, ulong len) +/****************************************************/ +{ + u_int32_t dcon, fifo; + u_int32_t *dst_u32 = (u_int32_t *)dst; + u_int32_t *resp; + + if (len == 0) { + return 0; + } + + DEBUGP("mmc_block_rd dst %lx src %lx len %d\n", (ulong)dst, src, len); + + /* set block len */ + resp = mmc_cmd(MMC_CMD_SET_BLOCKLEN, len, CMD_F_RESP); + sdi->SDIBSIZE = len; + + //sdi->SDIPRE = 0xff; + + /* setup data */ + dcon = (len >> 9) & S3C2410_SDIDCON_BLKNUM_MASK; + dcon |= S3C2410_SDIDCON_BLOCKMODE; + dcon |= S3C2410_SDIDCON_RXAFTERCMD|S3C2410_SDIDCON_XFER_RXSTART; + if (wide) + dcon |= S3C2410_SDIDCON_WIDEBUS; + sdi->SDIDCON = dcon; + + /* send read command */ + resp = mmc_cmd(MMC_CMD_READ_BLOCK, src, CMD_F_RESP); + + while (len > 0) { + u_int32_t sdidsta = sdi->SDIDSTA; + fifo = FIFO_FILL(sdi); + if (sdidsta & (S3C2410_SDIDSTA_FIFOFAIL| + S3C2410_SDIDSTA_CRCFAIL| + S3C2410_SDIDSTA_RXCRCFAIL| + S3C2410_SDIDSTA_DATATIMEOUT)) { + printf("mmc_block_read: err SDIDSTA=0x%08x\n", sdidsta); + return -EIO; + } + + while (fifo--) { + //DEBUGP("dst_u32 = 0x%08x\n", dst_u32); + *(dst_u32++) = sdi->SDIDAT; + if (len >= 4) + len -= 4; + else { + len = 0; + break; + } + } + } + + DEBUGP("waiting for SDIDSTA (currently 0x%08x\n", sdi->SDIDSTA); + while (!(sdi->SDIDSTA & (1 << 4))) {} + DEBUGP("done waiting for SDIDSTA (currently 0x%08x\n", sdi->SDIDSTA); + + sdi->SDIDCON = 0; + + if (!(sdi->SDIDSTA & S3C2410_SDIDSTA_XFERFINISH)) + DEBUGP("mmc_block_read; transfer not finished!\n"); + + return 0; +} + +static int +/****************************************************/ +mmc_block_write(ulong dst, uchar *src, int len) +/****************************************************/ +{ + printf("MMC block write not yet supported on S3C2410!\n"); + return -1; +} + + +int +/****************************************************/ +mmc_read(ulong src, uchar *dst, int size) +/****************************************************/ +{ + ulong end, part_start, part_end, part_len, aligned_start, aligned_end; + ulong mmc_block_size, mmc_block_address; + + if (size == 0) { + return 0; + } + + if (!mmc_ready) { + printf("Please initialize the MMC first\n"); + return -1; + } + + mmc_block_size = MMC_BLOCK_SIZE; + mmc_block_address = ~(mmc_block_size - 1); + + src -= CFG_MMC_BASE; + end = src + size; + part_start = ~mmc_block_address & src; + part_end = ~mmc_block_address & end; + aligned_start = mmc_block_address & src; + aligned_end = mmc_block_address & end; + + /* all block aligned accesses */ + DEBUGP("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + if (part_start) { + part_len = mmc_block_size - part_start; + DEBUGP("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) { + return -1; + } + memcpy(dst, mmc_buf+part_start, part_len); + dst += part_len; + src += part_len; + } + DEBUGP("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + for (; src < aligned_end; src += mmc_block_size, dst += mmc_block_size) { + DEBUGP("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + if ((mmc_block_read((uchar *)(dst), src, mmc_block_size)) < 0) { + return -1; + } + } + DEBUGP("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + if (part_end && src < end) { + DEBUGP("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + if ((mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0) { + return -1; + } + memcpy(dst, mmc_buf, part_end); + } + return 0; +} + +int +/****************************************************/ +mmc_write(uchar *src, ulong dst, int size) +/****************************************************/ +{ + ulong end, part_start, part_end, part_len, aligned_start, aligned_end; + ulong mmc_block_size, mmc_block_address; + + if (size == 0) { + return 0; + } + + if (!mmc_ready) { + printf("Please initialize the MMC first\n"); + return -1; + } + + mmc_block_size = MMC_BLOCK_SIZE; + mmc_block_address = ~(mmc_block_size - 1); + + dst -= CFG_MMC_BASE; + end = dst + size; + part_start = ~mmc_block_address & dst; + part_end = ~mmc_block_address & end; + aligned_start = mmc_block_address & dst; + aligned_end = mmc_block_address & end; + + /* all block aligned accesses */ + DEBUGP("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + if (part_start) { + part_len = mmc_block_size - part_start; + DEBUGP("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + (ulong)src, dst, end, part_start, part_end, aligned_start, aligned_end); + if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) { + return -1; + } + memcpy(mmc_buf+part_start, src, part_len); + if ((mmc_block_write(aligned_start, mmc_buf, mmc_block_size)) < 0) { + return -1; + } + dst += part_len; + src += part_len; + } + DEBUGP("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + for (; dst < aligned_end; src += mmc_block_size, dst += mmc_block_size) { + DEBUGP("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + if ((mmc_block_write(dst, (uchar *)src, mmc_block_size)) < 0) { + return -1; + } + } + DEBUGP("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + if (part_end && dst < end) { + DEBUGP("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", + src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end); + if ((mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0) { + return -1; + } + memcpy(mmc_buf, src, part_end); + if ((mmc_block_write(aligned_end, mmc_buf, mmc_block_size)) < 0) { + return -1; + } + } + return 0; +} + +ulong +/****************************************************/ +mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong *dst) +/****************************************************/ +{ + int mmc_block_size = MMC_BLOCK_SIZE; + ulong src = blknr * mmc_block_size + CFG_MMC_BASE; + + mmc_read(src, (uchar *)dst, blkcnt*mmc_block_size); + return blkcnt; +} + +static u_int16_t rca = MMC_DEFAULT_RCA; + +static u_int32_t mmc_size(const struct mmc_csd *csd) +{ + u_int32_t block_len, mult, blocknr; + + block_len = csd->read_bl_len << 12; + mult = csd->c_size_mult1 << 8; + blocknr = (csd->c_size+1) * mult; + + return blocknr * block_len; +} + +int +/****************************************************/ +mmc_init(int verbose) +/****************************************************/ +{ + int retries, rc = -ENODEV; + int is_sd = 0; + u_int32_t *resp; + S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER(); + + sdi = S3C2410_GetBase_SDI(); + + DEBUGP("mmc_init(PCLK=%u)\n", get_PCLK()); + + clk_power->CLKCON |= (1 << 9); + + /* S3C2410 has some bug that prevents reliable operation at higher speed */ + //sdi->SDIPRE = 0x3e; /* SDCLK = PCLK/2 / (SDIPRE+1) = 396kHz */ + sdi->SDIPRE = 0x02; /* SDCLK = PCLK/2 / (SDIPRE+1) = 396kHz */ + sdi->SDIBSIZE = 512; + sdi->SDIDTIMER = 0xffff; + sdi->SDIIMSK = 0x0; + sdi->SDICON = S3C2410_SDICON_FIFORESET|S3C2440_SDICON_MMCCLOCK; + udelay(125000); /* FIXME: 74 SDCLK cycles */ + + mmc_csd.c_size = 0; + + /* reset */ + retries = 10; + resp = mmc_cmd(MMC_CMD_RESET, 0, 0); + + printf("trying to detect SD Card...\n"); + while (retries--) { + int i; + udelay(100000); + resp = mmc_cmd(55, 0x00000000, CMD_F_RESP); + resp = mmc_cmd(41, 0x00300000, CMD_F_RESP); + + if (resp[0] & (1 << 31)) { + is_sd = 1; + break; + } + } + + if (retries == 0 && !is_sd) { + retries = 10; + printf("failed to detect SD Card, trying MMC\n"); + resp = mmc_cmd(MMC_CMD_SEND_OP_COND, 0x00ffc000, CMD_F_RESP); + while (retries-- && resp && !(resp[4] & 0x80)) { + DEBUGP("resp %x %x\n", resp[0], resp[1]); + udelay(50); + resp = mmc_cmd(1, 0x00ffff00, CMD_F_RESP); + } + } + + /* try to get card id */ + resp = mmc_cmd(MMC_CMD_ALL_SEND_CID, 0, CMD_F_RESP|CMD_F_RESP_LONG); + if (resp) { + /* TODO configure mmc driver depending on card attributes */ + mmc_cid_t *cid = (mmc_cid_t *)resp; + if (verbose) { + printf("MMC found. Card desciption is:\n"); + printf("Manufacturer ID = %02x%02x%02x\n", + cid->id[0], cid->id[1], cid->id[2]); + printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev); + cid->hwrev = cid->fwrev = 0; /* null terminate string */ + printf("Product Name = %s\n",cid->name); + printf("Serial Number = %02x%02x%02x\n", + cid->sn[0], cid->sn[1], cid->sn[2]); + printf("Month = %d\n",cid->month); + printf("Year = %d\n",1997 + cid->year); + } + /* fill in device description */ + mmc_dev.if_type = IF_TYPE_MMC; + mmc_dev.part_type = PART_TYPE_DOS; + mmc_dev.dev = 0; + mmc_dev.lun = 0; + mmc_dev.type = 0; + /* FIXME fill in the correct size (is set to 32MByte) */ + mmc_dev.blksz = 512; + mmc_dev.lba = 0x10000; + sprintf(mmc_dev.vendor,"Man %02x%02x%02x Snr %02x%02x%02x", + cid->id[0], cid->id[1], cid->id[2], + cid->sn[0], cid->sn[1], cid->sn[2]); + sprintf(mmc_dev.product,"%s",cid->name); + sprintf(mmc_dev.revision,"%x %x",cid->hwrev, cid->fwrev); + mmc_dev.removable = 0; + mmc_dev.block_read = mmc_bread; + + /* MMC exists, get CSD too */ + resp = mmc_cmd(MMC_CMD_SET_RCA, MMC_DEFAULT_RCA, CMD_F_RESP); + if (is_sd) + rca = resp[0] >> 16; + + resp = mmc_cmd(MMC_CMD_SEND_CSD, rca<<16, CMD_F_RESP|CMD_F_RESP_LONG); + if (resp) { + mmc_csd_t *csd = (mmc_csd_t *)resp; + memcpy(&mmc_csd, csd, sizeof(csd)); + rc = 0; + mmc_ready = 1; + /* FIXME add verbose printout for csd */ + printf("READ_BL_LEN=%u, C_SIZE_MULT=%u, C_SIZE=%u\n", + csd->read_bl_len, csd->c_size_mult1, csd->c_size); + printf("size = %u\n", mmc_size(csd)); + } + } + + resp = mmc_cmd(MMC_CMD_SELECT_CARD, rca<<16, CMD_F_RESP); + +#ifdef CONFIG_MMC_WIDE + if (is_sd) { + resp = mmc_cmd(55, rca<<16, CMD_F_RESP); + resp = mmc_cmd(6, 0x02, CMD_F_RESP); + wide = 1; + } +#endif + + fat_register_device(&mmc_dev,1); /* partitions start counting with 1 */ + + return rc; +} + +int +mmc_ident(block_dev_desc_t *dev) +{ + return 0; +} + +int +mmc2info(ulong addr) +{ + /* FIXME hard codes to 32 MB device */ + if (addr >= CFG_MMC_BASE && addr < CFG_MMC_BASE + 0x02000000) { + return 1; + } + return 0; +} + +#endif /* CONFIG_MMC */ Index: u-boot/include/asm-arm/arch-s3c24x0/mmc.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ u-boot/include/asm-arm/arch-s3c24x0/mmc.h 2007-02-16 23:42:19.000000000 +0100 @@ -0,0 +1,112 @@ +/* + * linux/drivers/mmc/mmc_pxa.h + * + * Author: Vladimir Shebordaev, Igor Oblakov + * Copyright: MontaVista Software Inc. + * + * $Id: mmc_pxa.h,v 0.3.1.6 2002/09/25 19:25:48 ted Exp ted $ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __MMC_PXA_P_H__ +#define __MMC_PXA_P_H__ + +#include <asm/arch/regs-sdi.h> + +#define MMC_DEFAULT_RCA (1<<16) + +#define MMC_BLOCK_SIZE 512 +#define MMC_CMD_RESET 0 +#define MMC_CMD_SEND_OP_COND 1 +#define MMC_CMD_ALL_SEND_CID 2 +#define MMC_CMD_SET_RCA 3 +#define MMC_CMD_SELECT_CARD 7 +#define MMC_CMD_SEND_CSD 9 +#define MMC_CMD_SEND_CID 10 +#define MMC_CMD_SEND_STATUS 13 +#define MMC_CMD_SET_BLOCKLEN 16 +#define MMC_CMD_READ_BLOCK 17 +#define MMC_CMD_RD_BLK_MULTI 18 +#define MMC_CMD_WRITE_BLOCK 24 + +#define MMC_MAX_BLOCK_SIZE 512 + +#define MMC_R1_IDLE_STATE 0x01 +#define MMC_R1_ERASE_STATE 0x02 +#define MMC_R1_ILLEGAL_CMD 0x04 +#define MMC_R1_COM_CRC_ERR 0x08 +#define MMC_R1_ERASE_SEQ_ERR 0x01 +#define MMC_R1_ADDR_ERR 0x02 +#define MMC_R1_PARAM_ERR 0x04 + +#define MMC_R1B_WP_ERASE_SKIP 0x0002 +#define MMC_R1B_ERR 0x0004 +#define MMC_R1B_CC_ERR 0x0008 +#define MMC_R1B_CARD_ECC_ERR 0x0010 +#define MMC_R1B_WP_VIOLATION 0x0020 +#define MMC_R1B_ERASE_PARAM 0x0040 +#define MMC_R1B_OOR 0x0080 +#define MMC_R1B_IDLE_STATE 0x0100 +#define MMC_R1B_ERASE_RESET 0x0200 +#define MMC_R1B_ILLEGAL_CMD 0x0400 +#define MMC_R1B_COM_CRC_ERR 0x0800 +#define MMC_R1B_ERASE_SEQ_ERR 0x1000 +#define MMC_R1B_ADDR_ERR 0x2000 +#define MMC_R1B_PARAM_ERR 0x4000 + +typedef struct mmc_cid +{ +/* FIXME: BYTE_ORDER */ + uchar year:4, + month:4; + uchar sn[3]; + uchar fwrev:4, + hwrev:4; + uchar name[6]; + uchar id[3]; +} mmc_cid_t; + +typedef struct mmc_csd +{ + uchar ecc:2, + file_format:2, + tmp_write_protect:1, + perm_write_protect:1, + copy:1, + file_format_grp:1; + uint64_t content_prot_app:1, + rsvd3:4, + write_bl_partial:1, + write_bl_len:4, + r2w_factor:3, + default_ecc:2, + wp_grp_enable:1, + wp_grp_size:5, + erase_grp_mult:5, + erase_grp_size:5, + c_size_mult1:3, + vdd_w_curr_max:3, + vdd_w_curr_min:3, + vdd_r_curr_max:3, + vdd_r_curr_min:3, + c_size:12, + rsvd2:2, + dsr_imp:1, + read_blk_misalign:1, + write_blk_misalign:1, + read_bl_partial:1; + + ushort read_bl_len:4, + ccc:12; + uchar tran_speed; + uchar nsac; + uchar taac; + uchar rsvd1:2, + spec_vers:4, + csd_structure:2; +} mmc_csd_t; + + +#endif /* __MMC_PXA_P_H__ */ Index: u-boot/include/asm-arm/arch-s3c24x0/regs-sdi.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ u-boot/include/asm-arm/arch-s3c24x0/regs-sdi.h 2007-02-16 23:42:19.000000000 +0100 @@ -0,0 +1,110 @@ +/* linux/include/asm/arch-s3c2410/regs-sdi.h + * + * Copyright (c) 2004 Simtec Electronics <linux(a)simtec.co.uk> + * http://www.simtec.co.uk/products/SWLINUX/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * S3C2410 MMC/SDIO register definitions + * + * Changelog: + * 18-Aug-2004 Ben Dooks Created initial file + * 29-Nov-2004 Koen Martens Added some missing defines, fixed duplicates + * 29-Nov-2004 Ben Dooks Updated Koen's patch +*/ + +#ifndef __ASM_ARM_REGS_SDI +#define __ASM_ARM_REGS_SDI "regs-sdi.h" + +#define S3C2440_SDICON_SDRESET (1<<8) +#define S3C2440_SDICON_MMCCLOCK (1<<5) +#define S3C2410_SDICON_BYTEORDER (1<<4) +#define S3C2410_SDICON_SDIOIRQ (1<<3) +#define S3C2410_SDICON_RWAITEN (1<<2) +#define S3C2410_SDICON_FIFORESET (1<<1) +#define S3C2410_SDICON_CLOCKTYPE (1<<0) + +#define S3C2410_SDICMDCON_ABORT (1<<12) +#define S3C2410_SDICMDCON_WITHDATA (1<<11) +#define S3C2410_SDICMDCON_LONGRSP (1<<10) +#define S3C2410_SDICMDCON_WAITRSP (1<<9) +#define S3C2410_SDICMDCON_CMDSTART (1<<8) +#define S3C2410_SDICMDCON_SENDERHOST (1<<6) +#define S3C2410_SDICMDCON_INDEX (0x3f) + +#define S3C2410_SDICMDSTAT_CRCFAIL (1<<12) +#define S3C2410_SDICMDSTAT_CMDSENT (1<<11) +#define S3C2410_SDICMDSTAT_CMDTIMEOUT (1<<10) +#define S3C2410_SDICMDSTAT_RSPFIN (1<<9) +#define S3C2410_SDICMDSTAT_XFERING (1<<8) +#define S3C2410_SDICMDSTAT_INDEX (0xff) + +#define S3C2440_SDIDCON_DS_BYTE (0<<22) +#define S3C2440_SDIDCON_DS_HALFWORD (1<<22) +#define S3C2440_SDIDCON_DS_WORD (2<<22) +#define S3C2410_SDIDCON_IRQPERIOD (1<<21) +#define S3C2410_SDIDCON_TXAFTERRESP (1<<20) +#define S3C2410_SDIDCON_RXAFTERCMD (1<<19) +#define S3C2410_SDIDCON_BUSYAFTERCMD (1<<18) +#define S3C2410_SDIDCON_BLOCKMODE (1<<17) +#define S3C2410_SDIDCON_WIDEBUS (1<<16) +#define S3C2410_SDIDCON_DMAEN (1<<15) +#define S3C2410_SDIDCON_STOP (1<<14) +#define S3C2440_SDIDCON_DATSTART (1<<14) +#define S3C2410_SDIDCON_DATMODE (3<<12) +#define S3C2410_SDIDCON_BLKNUM (0x7ff) + +/* constants for S3C2410_SDIDCON_DATMODE */ +#define S3C2410_SDIDCON_XFER_READY (0<<12) +#define S3C2410_SDIDCON_XFER_CHKSTART (1<<12) +#define S3C2410_SDIDCON_XFER_RXSTART (2<<12) +#define S3C2410_SDIDCON_XFER_TXSTART (3<<12) + +#define S3C2410_SDIDCON_BLKNUM_MASK (0xFFF) +#define S3C2410_SDIDCNT_BLKNUM_SHIFT (12) + +#define S3C2410_SDIDSTA_RDYWAITREQ (1<<10) +#define S3C2410_SDIDSTA_SDIOIRQDETECT (1<<9) +#define S3C2410_SDIDSTA_FIFOFAIL (1<<8) /* reserved on 2440 */ +#define S3C2410_SDIDSTA_CRCFAIL (1<<7) +#define S3C2410_SDIDSTA_RXCRCFAIL (1<<6) +#define S3C2410_SDIDSTA_DATATIMEOUT (1<<5) +#define S3C2410_SDIDSTA_XFERFINISH (1<<4) +#define S3C2410_SDIDSTA_BUSYFINISH (1<<3) +#define S3C2410_SDIDSTA_SBITERR (1<<2) /* reserved on 2410a/2440 */ +#define S3C2410_SDIDSTA_TXDATAON (1<<1) +#define S3C2410_SDIDSTA_RXDATAON (1<<0) + +#define S3C2440_SDIFSTA_FIFORESET (1<<16) +#define S3C2440_SDIFSTA_FIFOFAIL (3<<14) /* 3 is correct (2 bits) */ +#define S3C2410_SDIFSTA_TFDET (1<<13) +#define S3C2410_SDIFSTA_RFDET (1<<12) +#define S3C2410_SDIFSTA_TFHALF (1<<11) +#define S3C2410_SDIFSTA_TFEMPTY (1<<10) +#define S3C2410_SDIFSTA_RFLAST (1<<9) +#define S3C2410_SDIFSTA_RFFULL (1<<8) +#define S3C2410_SDIFSTA_RFHALF (1<<7) +#define S3C2410_SDIFSTA_COUNTMASK (0x7f) + +#define S3C2410_SDIIMSK_RESPONSECRC (1<<17) +#define S3C2410_SDIIMSK_CMDSENT (1<<16) +#define S3C2410_SDIIMSK_CMDTIMEOUT (1<<15) +#define S3C2410_SDIIMSK_RESPONSEND (1<<14) +#define S3C2410_SDIIMSK_READWAIT (1<<13) +#define S3C2410_SDIIMSK_SDIOIRQ (1<<12) +#define S3C2410_SDIIMSK_FIFOFAIL (1<<11) +#define S3C2410_SDIIMSK_CRCSTATUS (1<<10) +#define S3C2410_SDIIMSK_DATACRC (1<<9) +#define S3C2410_SDIIMSK_DATATIMEOUT (1<<8) +#define S3C2410_SDIIMSK_DATAFINISH (1<<7) +#define S3C2410_SDIIMSK_BUSYFINISH (1<<6) +#define S3C2410_SDIIMSK_SBITERR (1<<5) /* reserved 2440/2410a */ +#define S3C2410_SDIIMSK_TXFIFOHALF (1<<4) +#define S3C2410_SDIIMSK_TXFIFOEMPTY (1<<3) +#define S3C2410_SDIIMSK_RXFIFOLAST (1<<2) +#define S3C2410_SDIIMSK_RXFIFOFULL (1<<1) +#define S3C2410_SDIIMSK_RXFIFOHALF (1<<0) + +#endif /* __ASM_ARM_REGS_SDI */ Index: u-boot/include/s3c24x0.h =================================================================== --- u-boot.orig/include/s3c24x0.h 2007-02-16 23:42:02.000000000 +0100 +++ u-boot/include/s3c24x0.h 2007-02-16 23:42:19.000000000 +0100 @@ -637,13 +637,7 @@ S3C24X0_REG32 SDIDCNT; S3C24X0_REG32 SDIDSTA; S3C24X0_REG32 SDIFSTA; -#ifdef __BIG_ENDIAN - S3C24X0_REG8 res[3]; - S3C24X0_REG8 SDIDAT; -#else - S3C24X0_REG8 SDIDAT; - S3C24X0_REG8 res[3]; -#endif + S3C24X0_REG32 SDIDAT; S3C24X0_REG32 SDIIMSK; } /*__attribute__((__packed__))*/ S3C2410_SDI; @@ -1123,11 +1117,7 @@ #define rSDIDatCnt (*(volatile unsigned *)0x5A000030) #define rSDIDatSta (*(volatile unsigned *)0x5A000034) #define rSDIFSTA (*(volatile unsigned *)0x5A000038) -#ifdef __BIG_ENDIAN -#define rSDIDAT (*(volatile unsigned char *)0x5A00003F) -#else -#define rSDIDAT (*(volatile unsigned char *)0x5A00003C) -#endif +#define rSDIDAT (*(volatile unsigned *)0x5A00003C) #define rSDIIntMsk (*(volatile unsigned *)0x5A000040) #endif -- - Harald Welte <laforge(a)openmoko.org> http://openmoko.org/ ============================================================================ Software for the world's first truly open Free Software mobile phone

6 9

[U-Boot-Users] Linux kernel hang (infinite loop)
by Madhu Saravana Sibi Govindan 02 Jan '08

02 Jan '08

Hello all, I'm using U-boot to bring up a custom 440gp-based board. We are able to transfer the kernel image (uImage) to the target board's memory and jump to it. But, the kernel seems to hang after that. We have verified that the board info struct and the clock frequencies are ok. We also have a BDI2000 hardware debugger with us, but we are unable to set any breakpoints using this (both using telnet or using gdb). However, I can use the telnet interface and single-step the 440gp after it seems to hang. I found that 440gp is infinitely looping through the "DataTLBError" routine. It is unclear to me what might have caused this in the first place. Has anyone seen this behaviour before? We are currently working on getting breakpoints to work using the BDI2000. Any help is greatly appreciated. Regards, G.Sibi

4 11

Re: [U-Boot-Users] boot up u-boot from RAM
by Nghiem, Tien 26 Nov '07

26 Nov '07

Lei, You have to rebuild your code to put your code in the RAM area (other than the FLASH area). Don't use the address 0x00-0x2fff because its reserved for the exception vectors usually. I have a Lite5200 EVB. I use the address 0x20000 to put my u-boot in RAM and it works. I don't know if it could be done for the mpc8270. Tien -----Original Message----- From: u-boot-users-bounces(a)lists.sourceforge.net [mailto:u-boot-users-bounces@lists.sourceforge.net]On Behalf Of Lei Sun Sent: Thursday, October 26, 2006 4:15 PM To: u-boot-users(a)lists.sourceforge.net Subject: [U-Boot-Users] boot up u-boot from RAM Hi all: I am debugging a costomized board based on mpc8270, due to the design flaw, we can't boot up the system using flash, so I was trying to debug u-boot by loading it into the RAM. I used JTAG debugger to initialize the SDRAM and load the u-boot to 0x0, after reset, the PC is at 0x100. the disassembled code looks correct on that location, however, i can't single step start from 0x100. Is that because 0x100 is the reset vector ? I tried to put some breakpoint at some places not far from start point, but it gave me "unknown halt at 0x00000000" error after "run" command. after that the memory seems corrupted. Too bad I was using a bad debugger(Guardian-SE), I have a evaluation copy of the codewarrior plus USB+TAP from freescale. I tried that on our PQ2FADS-VR SDK. After reset, and CPU halt, I can't see any disassembed code on 0x100 (the uboot is already in the flash, and I assume it should read data from CS0 upon reset). Although the code does execute after hitting "run" button. I wonder why can't I see the disassembed code after reset? Thanks lei ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ U-Boot-Users mailing list U-Boot-Users(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users

4 3

[U-Boot-Users] AMCC440SPe & PCI Express
by Patil, Pankaj P. 26 Nov '07

26 Nov '07

Hi, I have been using u-boot-1.1.5 on my custom 440SPe based board. I am able to establish a link on PCIE0. However, I am having trouble accessing outbound Memory on PCIE0. My memory map seetings for Outbound PCIE memory are the default U-boot Settings. I was curious if anybody's tried accessing PCIE Outbound memory with the default settings. I seem to get a bus error when I try to access that region. Thanks Pankaj

3 3

Re: [U-Boot-Users] adding support to new board
by Jeff Mann 26 Sep '07

26 Sep '07

See http://www.freescale.com/files/32bit/doc/app_note/AN3220.pdf -JM -----Original Message----- From: u-boot-users-bounces(a)lists.sourceforge.net [mailto:u-boot-users-bounces@lists.sourceforge.net] On Behalf Of Maximus Sent: Saturday, July 15, 2006 5:31 AM To: U-Boot-Users(a)lists.sourceforge.net Subject: [U-Boot-Users] adding support to new board Hi, Is there any document (step by step) approach on how to add u-boot support to a new board? any advices, Regards, jo ------------------------------------------------------------------------ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ U-Boot-Users mailing list U-Boot-Users(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users

4 3

[U-Boot-Users] helloworld app from flash?
by Ram 08 Sep '07

08 Sep '07

Hi, im trying to run the helloworld application 1st Option: download the hello_world.bin to some location on RAM and execute it OMAP5912OSK: tftpboot 0x10000000 hello_world.bin OMAP5912OSK: go 0x10000004 This works fine. no problem 2nd Option: I want to burn the hello_world.bin into flash. During startup i want u-boot to launch it after booting - just like the way it boots the kernel. It does not work for me, this is what i did. $ ../tools/mkimage -A arm -O linux -T kernel -C gzip -a 0x10000000 -e 0x10000004 -n 'Hello Image' -d hello_world.bin.gz hello.img I downloaded the hello.img and burnt it to 0x40000 I did: setenv bootcmd bootm 0x40000 Now when i restarted the boot i get the following:- Example expects ABI version 2 Actual U-Boot ABI version 2 Hello World argc = 0 data abort pc : [<10000058>] lr : [<10000048>] sp : 1103fc10 ip : ffffffff fp : 00000001 r10: 110996d8 r9 : 1103fca4 r8 : 1103ffdc r7 : 110996d8 r6 : 00000203 r5 : 00000000 r4 : 00000000 r3 : 00000020 r2 : 00000001 r1 : 0000000a r0 : 00000000 Flags: nZCv IRQs off FIQs off Mode SVC_32 Resetting CPU ... All i am doing in the hello world example is to read a line and print the line entered. I am using readline function for doing that. The programs works fine if i download it to RAM and say go. but if i flash it it does not work?. Am i missing something?. Regards, sriram

4 6

[U-Boot-Users] CFG_MONITOR_BASE < CFG_FLASH_BASE
by Timur Tabi 16 Aug '07

16 Aug '07

In several board config files (namely 8xxx boards), I see code that looks like this: #if (CFG_MONITOR_BASE < CFG_FLASH_BASE) #define CFG_RAMBOOT #else #undef CFG_RAMBOOT #endif ... #ifndef CFG_RAMBOOT #define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CFG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_SIZE 0x2000 #endif So CFG_RAMBOOT is defined if U-Boot is located in RAM instead of in Flash. On a system that has flash, why would we ever support this configuration? It doesn't even make any sense, because a whole bunch of DDR and LAWBAR setup needs to happen before RAM can even be accessed, so you can't copy u-boot to RAM and reset the system. -- Timur Tabi Linux Kernel Developer @ Freescale

6 16

[U-Boot-Users] New architecture -- TI DaVinci
by Peter Pearse 18 Jul '07

18 Jul '07

Sergey Apologies - you fooled me with the "New Architecture". I did a quick google & found the TMS320DM6443 was a DSP, so assumed it would be a new DSP architecture, rather than being part of arm. I don't always know where ARM cores have been used - it helps if the email subject mentions ARM. I'll add your patch to my list. Peter -- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

5 8

[U-Boot-Users] [PATCH 2/3] Added USB PCI-OHCI chips support, interrupt pipe support and usb event poll support.
by Zhang Wei 03 Jul '07

03 Jul '07

This patch added USB PCI-OHCI chips support, interrupt pipe support and usb event poll support. For supporting the USB interrupt pipe, the globe urb_priv is moved to purb in ed struct. Now, we can process several urbs at one time. The interrupt pipe support codes are ported from Linux kernel 2.4. Signed-off-by: Zhang Wei <wei.zhang(a)freescale.com> --- drivers/usb_ohci.c | 310 +++++++++++++++++++++++++++++++++++++++++++--------- drivers/usb_ohci.h | 12 ++- 2 files changed, 267 insertions(+), 55 deletions(-) diff --git a/drivers/usb_ohci.c b/drivers/usb_ohci.c index 70cb6a3..459c809 100644 --- a/drivers/usb_ohci.c +++ b/drivers/usb_ohci.c @@ -1,5 +1,11 @@ /* - * URB OHCI HCD (Host Controller Driver) for USB on the AT91RM9200. + * URB OHCI HCD (Host Controller Driver) for USB on the AT91RM9200 and PCI bus. + * + * Interrupt support is added. Now, it has been tested + * on ULI1575 chip and works well with USB keyboard. + * + * (C) Copyright 2007 + * Zhang Wei, Freescale Semiconductor, Inc. <wei.zhang(a)freescale.com> * * (C) Copyright 2003 * Gary Jennejohn, DENX Software Engineering <gj(a)denx.de> @@ -35,7 +41,7 @@ * 1 - you MUST define LITTLEENDIAN in the configuration file for the * board or this driver will NOT work! * 2 - this driver is intended for use with USB Mass Storage Devices - * (BBB) ONLY. There is NO support for Interrupt or Isochronous pipes! + * (BBB) and USB keyboard. There is NO support for Isochronous pipes! * 3 - when running on a PQFP208 AT91RM9200, define CONFIG_AT91C_PQFP_UHPBUG * to activate workaround for bug #41 or this driver will NOT work! */ @@ -56,6 +62,8 @@ # include <asm/arch/pxa-regs.h> #elif defined(CONFIG_MPC5200) # include <mpc5xxx.h> +#elif defined(CONFIG_PCI_OHCI) +# include <pci.h> #endif #include <malloc.h> @@ -66,6 +74,7 @@ defined(CONFIG_S3C2400) || \ defined(CONFIG_S3C2410) || \ defined(CONFIG_440EP) || \ + defined(CONFIG_PCI_OHCI) || \ defined(CONFIG_MPC5200) # define OHCI_USE_NPS /* force NoPowerSwitching mode */ #endif @@ -79,12 +88,19 @@ #define OHCI_CONTROL_INIT \ (OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE -#define readl(a) (*((vu_long *)(a))) -#define writel(a, b) (*((vu_long *)(b)) = ((vu_long)a)) +#define readl(a) m32_swap(*((vu_long *)(a))) +#define writel(a, b) (*((vu_long *)(b)) = m32_swap((vu_long)a)) #define min_t(type,x,y) ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) -#undef DEBUG +#ifdef CONFIG_PCI_OHCI +static struct pci_device_id ohci_pci_ids[] = { + {0x10b9, 0x5237}, /* ULI1575 PCI OHCI module ids */ + /* Please add supported PCI OHCI controller ids here */ + {0, 0} +}; +#endif + #ifdef DEBUG #define dbg(format, arg...) printf("DEBUG: " format "\n", ## arg) #else @@ -114,15 +130,11 @@ struct ohci_hcca ghcca[1]; struct ohci_hcca *phcca; /* this allocates EDs for all possible endpoints */ struct ohci_device ohci_dev; -/* urb_priv */ -urb_priv_t urb_priv; /* RHSC flag */ int got_rhsc; /* device which was disconnected */ struct usb_device *devgone; -/* flag guarding URB transation */ -int urb_finished = 0; /*-------------------------------------------------------------------------*/ @@ -177,6 +189,7 @@ static void urb_free_priv (urb_priv_t * urb) } } } + free(urb); } /*-------------------------------------------------------------------------*/ @@ -187,11 +200,10 @@ static int sohci_get_current_frame_number (struct usb_device * dev); /* debug| print the main components of an URB * small: 0) header + data packets 1) just header */ -static void pkt_print (struct usb_device * dev, unsigned long pipe, void * buffer, +static void pkt_print (urb_priv_t *purb, struct usb_device * dev, + unsigned long pipe, void * buffer, int transfer_len, struct devrequest * setup, char * str, int small) { - urb_priv_t * purb = &urb_priv; - dbg("%s URB:[%4x] dev:%2d,ep:%2d-%c,type:%s,len:%d/%d stat:%#lx", str, sohci_get_current_frame_number (dev), @@ -200,7 +212,7 @@ static void pkt_print (struct usb_device * dev, unsigned long pipe, void * buffe usb_pipeout (pipe)? 'O': 'I', usb_pipetype (pipe) < 2? (usb_pipeint (pipe)? "INTR": "ISOC"): (usb_pipecontrol (pipe)? "CTRL": "BULK"), - purb->actual_length, + (purb ? purb->actual_length : 0), transfer_len, dev->status); #ifdef OHCI_VERBOSE_DEBUG if (!small) { @@ -214,10 +226,11 @@ static void pkt_print (struct usb_device * dev, unsigned long pipe, void * buffe } if (transfer_len > 0 && buffer) { printf (__FILE__ ": data(%d/%d):", - purb->actual_length, + (purb ? purb->actual_length : 0), transfer_len); len = usb_pipeout (pipe)? - transfer_len: purb->actual_length; + transfer_len: + (purb ? purb->actual_length : 0); for (i = 0; i < 16 && i < len; i++) printf (" %02x", ((__u8 *) buffer) [i]); printf ("%s\n", i < len? "...": ""); @@ -413,13 +426,17 @@ static void ohci_dump (ohci_t *controller, int verbose) /* get a transfer request */ -int sohci_submit_job(struct usb_device *dev, unsigned long pipe, void *buffer, - int transfer_len, struct devrequest *setup, int interval) +int sohci_submit_job(urb_priv_t *urb, struct devrequest *setup) { ohci_t *ohci; ed_t * ed; - urb_priv_t *purb_priv; + urb_priv_t *purb_priv = urb; int i, size = 0; + struct usb_device *dev = urb->dev; + unsigned long pipe = urb->pipe; + void *buffer = urb->transfer_buffer; + int transfer_len = urb->transfer_buffer_length; + int interval = urb->interval; ohci = &gohci; @@ -430,18 +447,11 @@ int sohci_submit_job(struct usb_device *dev, unsigned long pipe, void *buffer, return -1; } - /* if we have an unfinished URB from previous transaction let's - * fail and scream as quickly as possible so as not to corrupt - * further communication */ - if (!urb_finished) { - err("sohci_submit_job: URB NOT FINISHED"); - return -1; - } /* we're about to begin a new transaction here so mark the URB unfinished */ - urb_finished = 0; + urb->finished = 0; /* every endpoint has a ed, locate and fill it */ - if (!(ed = ep_add_ed (dev, pipe))) { + if (!(ed = ep_add_ed (dev, pipe, interval, 1))) { err("sohci_submit_job: ENOMEM"); return -1; } @@ -455,13 +465,17 @@ int sohci_submit_job(struct usb_device *dev, unsigned long pipe, void *buffer, size = (transfer_len == 0)? 2: (transfer_len - 1) / 4096 + 3; break; + case PIPE_INTERRUPT: /* 1 TD */ + size = 1; + break; } + ed->purb = urb; + if (size >= (N_URB_TD - 1)) { err("need %d TDs, only have %d", size, N_URB_TD); return -1; } - purb_priv = &urb_priv; purb_priv->pipe = pipe; /* fill the private part of the URB */ @@ -497,6 +511,40 @@ int sohci_submit_job(struct usb_device *dev, unsigned long pipe, void *buffer, return 0; } +static inline int sohci_return_job(struct ohci *hc, urb_priv_t *urb) +{ + struct ohci_regs *regs = hc->regs; + + switch (usb_pipetype (urb->pipe)) { + case PIPE_INTERRUPT: + /* implicitly requeued */ + if (urb->dev->irq_handle && + (urb->dev->irq_act_len = urb->actual_length)) { + writel (OHCI_INTR_WDH, &regs->intrenable); + readl (&regs->intrenable); /* PCI posting flush */ + urb->dev->irq_handle(urb->dev); + writel (OHCI_INTR_WDH, &regs->intrdisable); + readl (&regs->intrdisable); /* PCI posting flush */ + } + urb->actual_length = 0; + td_submit_job ( + urb->dev, + urb->pipe, + urb->transfer_buffer, + urb->transfer_buffer_length, + NULL, + urb, + urb->interval); + break; + case PIPE_CONTROL: + case PIPE_BULK: + break; + default: + return 0; + } + return 1; +} + /*-------------------------------------------------------------------------*/ #ifdef DEBUG @@ -514,13 +562,73 @@ static int sohci_get_current_frame_number (struct usb_device *usb_dev) * ED handling functions *-------------------------------------------------------------------------*/ +/* search for the right branch to insert an interrupt ed into the int tree + * do some load ballancing; + * returns the branch and + * sets the interval to interval = 2^integer (ld (interval)) */ + +static int ep_int_ballance (ohci_t * ohci, int interval, int load) +{ + int i, branch = 0; + + /* search for the least loaded interrupt endpoint + * branch of all 32 branches + */ + for (i = 0; i < 32; i++) + if (ohci->ohci_int_load [branch] > ohci->ohci_int_load [i]) + branch = i; + + branch = branch % interval; + for (i = branch; i < 32; i += interval) + ohci->ohci_int_load [i] += load; + + return branch; +} + +/*-------------------------------------------------------------------------*/ + +/* 2^int( ld (inter)) */ + +static int ep_2_n_interval (int inter) +{ + int i; + for (i = 0; ((inter >> i) > 1 ) && (i < 5); i++); + return 1 << i; +} + +/*-------------------------------------------------------------------------*/ + +/* the int tree is a binary tree + * in order to process it sequentially the indexes of the branches have to be mapped + * the mapping reverses the bits of a word of num_bits length */ + +static int ep_rev (int num_bits, int word) +{ + int i, wout = 0; + + for (i = 0; i < num_bits; i++) + wout |= (((word >> i) & 1) << (num_bits - i - 1)); + return wout; +} + +/*-------------------------------------------------------------------------* + * ED handling functions + *-------------------------------------------------------------------------*/ + /* link an ed into one of the HC chains */ static int ep_link (ohci_t *ohci, ed_t *edi) { volatile ed_t *ed = edi; + int int_branch; + int i; + int inter; + int interval; + int load; + __u32 * ed_p; ed->state = ED_OPER; + ed->int_interval = 0; switch (ed->type) { case PIPE_CONTROL: @@ -554,12 +662,49 @@ static int ep_link (ohci_t *ohci, ed_t *edi) } ohci->ed_bulktail = edi; break; + + case PIPE_INTERRUPT: + load = ed->int_load; + interval = ep_2_n_interval (ed->int_period); + ed->int_interval = interval; + int_branch = ep_int_ballance (ohci, interval, load); + ed->int_branch = int_branch; + + for (i = 0; i < ep_rev (6, interval); i += inter) { + inter = 1; + for (ed_p = &(ohci->hcca->int_table[ep_rev (5, i) + int_branch]); + (*ed_p != 0) && (((ed_t *)ed_p)->int_interval >= interval); + ed_p = &(((ed_t *)ed_p)->hwNextED)) + inter = ep_rev (6, ((ed_t *)ed_p)->int_interval); + ed->hwNextED = *ed_p; + *ed_p = m32_swap(ed); + } + break; } return 0; } /*-------------------------------------------------------------------------*/ +/* scan the periodic table to find and unlink this ED */ +static void periodic_unlink ( struct ohci *ohci, volatile struct ed *ed, + unsigned index, unsigned period) +{ + for (; index < NUM_INTS; index += period) { + __u32 *ed_p = &ohci->hcca->int_table [index]; + + /* ED might have been unlinked through another path */ + while (*ed_p != 0) { + if (((struct ed *)m32_swap (ed_p)) == ed) { + *ed_p = ed->hwNextED; + break; + } + ed_p = & (((struct ed *)m32_swap (ed_p))->hwNextED); + } + } +} + + /* unlink an ed from one of the HC chains. * just the link to the ed is unlinked. * the link from the ed still points to another operational ed or 0 @@ -568,6 +713,7 @@ static int ep_link (ohci_t *ohci, ed_t *edi) static int ep_unlink (ohci_t *ohci, ed_t *edi) { volatile ed_t *ed = edi; + int i; ed->hwINFO |= m32_swap (OHCI_ED_SKIP); @@ -605,6 +751,12 @@ static int ep_unlink (ohci_t *ohci, ed_t *edi) ((ed_t *)m32_swap (*((__u32 *)&ed->hwNextED)))->ed_prev = ed->ed_prev; } break; + + case PIPE_INTERRUPT: + periodic_unlink (ohci, ed, 0, 1); + for (i = ed->int_branch; i < 32; i += ed->int_interval) + ohci->ohci_int_load[i] -= ed->int_load; + break; } ed->state = ED_UNLINK; return 0; @@ -621,7 +773,8 @@ static int ep_unlink (ohci_t *ohci, ed_t *edi) * info fields are setted anyway even though most of them should not * change */ -static ed_t * ep_add_ed (struct usb_device *usb_dev, unsigned long pipe) +static ed_t * ep_add_ed (struct usb_device *usb_dev, unsigned long pipe, + int interval, int load) { td_t *td; ed_t *ed_ret; @@ -654,6 +807,11 @@ static ed_t * ep_add_ed (struct usb_device *usb_dev, unsigned long pipe) | usb_pipeslow (pipe) << 13 | usb_maxpacket (usb_dev, pipe) << 16); + if (ed->type == PIPE_INTERRUPT && ed->state == ED_UNLINK) { + ed->int_period = interval; + ed->int_load = load; + } + return ed_ret; } @@ -768,6 +926,13 @@ static void td_submit_job (struct usb_device *dev, unsigned long pipe, void *buf if (!ohci->sleeping) writel (OHCI_CLF, &ohci->regs->cmdstatus); /* start Control list */ break; + + case PIPE_INTERRUPT: + info = usb_pipeout (urb->pipe)? + TD_CC | TD_DP_OUT | toggle: + TD_CC | TD_R | TD_DP_IN | toggle; + td_fill (ohci, info, data, data_len, dev, cnt++, urb); + break; } if (urb->length != cnt) dbg("TD LENGTH %d != CNT %d", urb->length, cnt); @@ -783,7 +948,7 @@ static void td_submit_job (struct usb_device *dev, unsigned long pipe, void *buf static void dl_transfer_length(td_t * td) { __u32 tdINFO, tdBE, tdCBP; - urb_priv_t *lurb_priv = &urb_priv; + urb_priv_t *lurb_priv = td->ed->purb; tdINFO = m32_swap (td->hwINFO); tdBE = m32_swap (td->hwBE); @@ -820,7 +985,7 @@ static td_t * dl_reverse_done_list (ohci_t *ohci) td_list = (td_t *)td_list_hc; if (TD_CC_GET (m32_swap (td_list->hwINFO))) { - lurb_priv = &urb_priv; + lurb_priv = td_list->ed->purb; dbg(" USB-error/status: %x : %p", TD_CC_GET (m32_swap (td_list->hwINFO)), td_list); if (td_list->ed->hwHeadP & m32_swap (0x1)) { @@ -860,10 +1025,10 @@ static int dl_done_list (ohci_t *ohci, td_t *td_list) while (td_list) { td_list_next = td_list->next_dl_td; - lurb_priv = &urb_priv; tdINFO = m32_swap (td_list->hwINFO); ed = td_list->ed; + lurb_priv = ed->purb; dl_transfer_length(td_list); @@ -882,14 +1047,16 @@ static int dl_done_list (ohci_t *ohci, td_t *td_list) (lurb_priv->state != URB_DEL)) #else if ((ed->state & (ED_OPER | ED_UNLINK))) - urb_finished = 1; +#endif + lurb_priv->finished = sohci_return_job(ohci, + lurb_priv); else dbg("dl_done_list: strange.., ED state %x, ed->state\n"); } else dbg("dl_done_list: processing TD %x, len %x\n", lurb_priv->td_cnt, lurb_priv->length); -#endif - if (ed->state != ED_NEW) { + if (ed->state != ED_NEW && + (usb_pipetype (lurb_priv->pipe) != PIPE_INTERRUPT)) { edHeadP = m32_swap (ed->hwHeadP) & 0xfffffff0; edTailP = m32_swap (ed->hwTailP); @@ -1063,8 +1230,7 @@ static int ohci_submit_rh_msg(struct usb_device *dev, unsigned long pipe, __u16 wLength; #ifdef DEBUG -urb_priv.actual_length = 0; -pkt_print(dev, pipe, buffer, transfer_len, cmd, "SUB(rh)", usb_pipein(pipe)); +pkt_print(NULL, dev, pipe, buffer, transfer_len, cmd, "SUB(rh)", usb_pipein(pipe)); #else wait_ms(1); #endif @@ -1279,9 +1445,7 @@ pkt_print(dev, pipe, buffer, transfer_len, cmd, "SUB(rh)", usb_pipein(pipe)); dev->status = stat; #ifdef DEBUG - if (transfer_len) - urb_priv.actual_length = transfer_len; - pkt_print(dev, pipe, buffer, transfer_len, cmd, "RET(rh)", 0/*usb_pipein(pipe)*/); + pkt_print(NULL, dev, pipe, buffer, transfer_len, cmd, "RET(rh)", 0/*usb_pipein(pipe)*/); #else wait_ms(1); #endif @@ -1299,6 +1463,16 @@ int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer, int stat = 0; int maxsize = usb_maxpacket(dev, pipe); int timeout; + urb_priv_t *urb; + + urb = malloc(sizeof(urb_priv_t)); + memset(urb, 0, sizeof(urb_priv_t)); + + urb->dev = dev; + urb->pipe = pipe; + urb->transfer_buffer = buffer; + urb->transfer_buffer_length = transfer_len; + urb->interval = interval; /* device pulled? Shortcut the action. */ if (devgone == dev) { @@ -1307,8 +1481,8 @@ int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer, } #ifdef DEBUG - urb_priv.actual_length = 0; - pkt_print(dev, pipe, buffer, transfer_len, setup, "SUB", usb_pipein(pipe)); + urb->actual_length = 0; + pkt_print(urb, dev, pipe, buffer, transfer_len, setup, "SUB", usb_pipein(pipe)); #else wait_ms(1); #endif @@ -1318,7 +1492,7 @@ int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer, return -1; } - if (sohci_submit_job(dev, pipe, buffer, transfer_len, setup, interval) < 0) { + if (sohci_submit_job(urb, setup) < 0) { err("sohci_submit_job failed"); return -1; } @@ -1353,18 +1527,20 @@ int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer, * finished we need to re-iterate this loop so as * hc_interrupt() gets called again as there needs to be some * more TD's to process still */ - if ((stat >= 0) && (stat != 0xff) && (urb_finished)) { + if ((stat >= 0) && (stat != 0xff) && (urb->finished)) { /* 0xff is returned for an SF-interrupt */ break; } if (--timeout) { wait_ms(1); + if (!urb->finished) + dbg("\%"); + } else { err("CTL:TIMEOUT "); dbg("submit_common_msg: TO status %x\n", stat); - stat = USB_ST_CRC_ERR; - urb_finished = 1; + urb->finished = 1; stat = USB_ST_CRC_ERR; break; } @@ -1374,13 +1550,14 @@ int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer, dev->act_len = transfer_len; #ifdef DEBUG - pkt_print(dev, pipe, buffer, transfer_len, setup, "RET(ctlr)", usb_pipein(pipe)); + pkt_print(urb, dev, pipe, buffer, transfer_len, setup, "RET(ctlr)", usb_pipein(pipe)); #else wait_ms(1); #endif /* free TDs in urb_priv */ - urb_free_priv (&urb_priv); + if (usb_pipetype (pipe) != PIPE_INTERRUPT) + urb_free_priv (urb); return 0; } @@ -1399,8 +1576,7 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer, info("submit_control_msg"); #ifdef DEBUG - urb_priv.actual_length = 0; - pkt_print(dev, pipe, buffer, transfer_len, setup, "SUB", usb_pipein(pipe)); + pkt_print(NULL, dev, pipe, buffer, transfer_len, setup, "SUB", usb_pipein(pipe)); #else wait_ms(1); #endif @@ -1423,7 +1599,8 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, int transfer_len, int interval) { info("submit_int_msg"); - return -1; + return submit_common_msg(dev, pipe, buffer, transfer_len, NULL, + interval); } /*-------------------------------------------------------------------------* @@ -1537,6 +1714,12 @@ static int hc_start (ohci_t * ohci) /*-------------------------------------------------------------------------*/ +/* Poll USB interrupt. */ +void usb_event_poll(void) +{ + hc_interrupt(); +} + /* an interrupt happens */ static int hc_interrupt (void) @@ -1587,8 +1770,10 @@ static int hc_interrupt (void) if (ints & OHCI_INTR_WDH) { wait_ms(1); writel (OHCI_INTR_WDH, &regs->intrdisable); + (void)readl (&regs->intrdisable); /* flush */ stat = dl_done_list (&gohci, dl_reverse_done_list (&gohci)); writel (OHCI_INTR_WDH, &regs->intrenable); + (void)readl (&regs->intrdisable); /* flush */ } if (ints & OHCI_INTR_SO) { @@ -1634,6 +1819,9 @@ static char ohci_inited = 0; int usb_lowlevel_init(void) { +#ifdef CONFIG_PCI_OHCI + pci_dev_t pdev; +#endif #ifdef CFG_USB_OHCI_CPU_INIT /* cpu dependant init */ @@ -1647,7 +1835,6 @@ int usb_lowlevel_init(void) return -1; #endif memset (&gohci, 0, sizeof (ohci_t)); - memset (&urb_priv, 0, sizeof (urb_priv_t)); /* align the storage */ if ((__u32)&ghcca[0] & 0xff) { @@ -1673,7 +1860,25 @@ int usb_lowlevel_init(void) gohci.disabled = 1; gohci.sleeping = 0; gohci.irq = -1; +#ifdef CONFIG_PCI_OHCI + pdev = pci_find_devices(ohci_pci_ids, 0); + + if (pdev != -1) { + u16 vid, did; + u32 base; + pci_read_config_word(pdev, PCI_VENDOR_ID, &vid); + pci_read_config_word(pdev, PCI_DEVICE_ID, &did); + printf("OHCI pci controller (%04x, %04x) found @(%d:%d:%d)\n", + vid, did, (pdev >> 16) & 0xff, + (pdev >> 11) & 0x1f, (pdev >> 8) & 0x7); + pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &base); + printf("OHCI regs address 0x%08x\n", base); + gohci.regs = (struct ohci_regs *)base; + } else + return -1; +#else gohci.regs = (struct ohci_regs *)CFG_USB_OHCI_REGS_BASE; +#endif gohci.flags = 0; gohci.slot_name = CFG_USB_OHCI_SLOT_NAME; @@ -1716,7 +1921,6 @@ int usb_lowlevel_init(void) ohci_dump (&gohci, 1); #else wait_ms(1); - urb_finished = 1; #endif ohci_inited = 1; return 0; diff --git a/drivers/usb_ohci.h b/drivers/usb_ohci.h index 95fbc44..64fa614 100644 --- a/drivers/usb_ohci.h +++ b/drivers/usb_ohci.h @@ -64,7 +64,8 @@ struct ed { struct ed *ed_rm_list; struct usb_device *usb_dev; - __u32 unused[3]; + void *purb; + __u32 unused[2]; } __attribute((aligned(16))); typedef struct ed ed_t; @@ -349,9 +350,14 @@ typedef struct ed_t *ed; __u16 length; /* number of tds associated with this request */ __u16 td_cnt; /* number of tds already serviced */ + struct usb_device *dev; int state; unsigned long pipe; + void *transfer_buffer; + int transfer_buffer_length; + int interval; int actual_length; + int finished; td_t *td[N_URB_TD]; /* list pointer to all corresponding TDs associated with this request */ } urb_priv_t; #define URB_DEL 1 @@ -375,6 +381,7 @@ typedef struct ohci { struct ohci_regs *regs; /* OHCI controller's memory */ + int ohci_int_load[32]; /* load of the 32 Interrupt Chains (for load balancing)*/ ed_t *ed_rm_list[2]; /* lists of all endpoints to be removed */ ed_t *ed_bulktail; /* last endpoint of bulk list */ ed_t *ed_controltail; /* last endpoint of control list */ @@ -397,7 +404,8 @@ struct ohci_device { /* endpoint */ static int ep_link(ohci_t * ohci, ed_t * ed); static int ep_unlink(ohci_t * ohci, ed_t * ed); -static ed_t * ep_add_ed(struct usb_device * usb_dev, unsigned long pipe); +static ed_t * ep_add_ed(struct usb_device * usb_dev, unsigned long pipe, + int interval, int load); /*-------------------------------------------------------------------------*/ -- 1.5.1

5 16

[U-Boot-Users] u-boot for MPC8548
by Rupesh S 07 Jun '07

07 Jun '07

Hi Does u-boot support any evaluation boards based on the MPC8548 processor ? Thanks in advance -- Rupesh S

2 1

[U-Boot-Users] PCI OHCI / testing-USB branch
by Matthias Fuchs 07 Jun '07

07 Jun '07

Hi, is someone currently working on the testing-USB branch? Does it contain the most up to date USB code? I have to add support for a PCI OHCI controller on a 405 board. This will result in some modifications (endianess + bus offsets) of drivers/usb_ohci.c. Is someone else using a PCI OHCI controller on a board that I might have missed to check? Matthias

4 6

[U-Boot-Users] [PATCH] bug in README and soft_i2c.c
by Andrew Dyer 07 Jun '07

07 Jun '07

Hi, I noticed a bug in soft_i2c.c (or in the README depending on how you think about it). If CONFIG_SOFT_I2C is defined and using open-collector I/O, then the README says that I2C_TRISTATE can be defined as null. If this is the case, then doing: imd 29 0.0 2 will cause the following chain of calls in soft_i2c.c: send_start() write_byte() read_byte() read_byte() send_stop() The first read_byte() calls send_ack(0). send_ack(0) drives the data line low without releasing it. The following call to read_byte() calls I2C_TRISTATE, but in this case it is defined as NULL per the README. This leaves the data line driven low during the read of the 2nd byte causing data^h^h^h^hhair loss that I can ill afford :-) I propose the following fix - modify the README to make say that I2C_TRISTATE should be defined even for open-collector setups, and add code to soft_i2c.c to explictly tristate the data at the end of send_ack(0) Signed-off-by: Andrew Dyer <amdyer(a)gmail.com> -- Hardware, n.: The parts of a computer system that can be kicked.

5 8

[U-Boot-Users] U-boot runtime detection
by Florian Fainelli 06 Jun '07

06 Jun '07

Hi all, I am currently working on the adm5120 target under Linux and this board is available with at least 4 bootloaders, including U-boot. We manage getting runtime bootloader detection working using the fw_arg0-3 values for CFE, RouterBoot, Bootbase. Now I would like to do so for U-boot and I could not find any informations if U-boot fills the fw_arg0-3 with some specific values that could let us identify it at runtime. Can you indicate me if such identification is possible ? If not, would another method (like reading the first flash block) work ? Thank you very much in advance for your answer. -- Cordialement, Florian Fainelli ---------------------------------------------

3 5

[U-Boot-Users] Patch fixes bug for clearing the bss section
by mushtaq khan 05 Jun '07

05 Jun '07

Hi, There is a bug in the code of clearing the bss section for processor i386.(File: cpu/i386/start.S) In the code, bss_start addr (starting addr of bss section) is put into the register %eax, but the code which clears the bss section refers to the addr pointed by %edi. This patch fixes this bug by putting bss_start into %edi register. Author: Mushtaq Khan <mushtaq_k(a)procsys.com> Date: Thu Apr 30 15:40:45 2007 Signed-off-by: Mushtaq Khan <mushtaq_k(a)procsys.com> diff -purN u-boot/cpu/i386/start.S u-boot_chg/cpu/i386/start.S --- u-boot/cpu/i386/start.S 2007-02-21 10:59:41.000000000 +0530 +++ u-boot_chg/cpu/i386/start.S 2007-04-30 14:51:48.000000000 +0530 @@ -149,7 +149,7 @@ data_ok: .progress3: /* clear bss section in ram, size must be 4-byte aligned */ - movl $_i386boot_bss_start, %eax /* BSS start */ + movl $_i386boot_bss_start, %edi /* MK_CHG BSS start */ movl $_i386boot_bss_size, %ecx /* BSS size */ movl %ecx, %eax andl $3, %eax

2 4

[U-Boot-Users] Altera Stratix II support
by eran liberty 04 Jun '07

04 Jun '07

Hi All, I am already knee deep in adding Altera Stratix II support to the u-boot via the fpga command (currently xlinix & acex1k are supported)... of course I will re-post when i am done. My only question is, Am i reinventing the wheel? Is it already implemented anywhere? If i am, where can I find a reference to the work already done? If not I will soon give you one :) Liberty

3 8

[U-Boot-Users] "1.at45":(1 of 4) [PATCH] [ARM] Merge to two files into a common file and split.
by Ulf Samuelsson 04 Jun '07

04 Jun '07

Author: Ulf Samuelsson <ulf(a)atmel.com> Date: 2007-03-27 Subject: "1.at45":(1 of 4) [PATCH] [ARM] Merge to two files into a common file and split. CHANGELOG: [PATCH] [ARM] Merge to two files into a common file and split. Merge to two virtually identical files. "board/at91rm9200dk/at45.c" "board/cmc_pu2/at45.c" (one bug fixed first) into "driver/at45.c" then move at91rm9200 specific functions from "driver/at45.c" to: "cpu/arm920t/at91rm9200/spi.c Update Makefiles to reflect change Patch generated from files: drivers_at45.c.patch drivers_Makefile.patch include_at45.h.patch Signed-off-by: Ulf Samuelsson --------------------------------------------------------------------------------------------------------------------------------- diff -urN u-boot-1.2.0-0rig/drivers/at45.c u-boot-1.2.0-atmel/drivers/at45.c --- u-boot-1.2.0-0rig/drivers/at45.c 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-1.2.0-atmel/drivers/at45.c 2007-03-24 20:07:32.000000000 +0100 @@ -0,0 +1,514 @@ +/* Driver for ATMEL DataFlash support + * Author : Hamid Ikdoumi (Atmel) + * + * 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 + * + */ + +#include <config.h> +#include <common.h> + +#ifdef CONFIG_HAS_DATAFLASH +#include <dataflash.h> + + +#define AT91C_TIMEOUT_WRDY 200000 + + +/*----------------------------------------------------------------------*/ +/* \fn AT91F_DataFlashSendCommand */ +/* \brief Generic function to send a command to the dataflash */ +/*----------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_DataFlashSendCommand( + AT91PS_DataFlash pDataFlash, + unsigned char OpCode, + unsigned int CmdSize, + unsigned int DataflashAddress) +{ + unsigned int adr; + + if ( (pDataFlash->pDataFlashDesc->state) != IDLE) + return DATAFLASH_BUSY; + + /* process the address to obtain page address and byte address */ + adr = ((DataflashAddress / (pDataFlash->pDevice->pages_size)) << pDataFlash->pDevice->page_offset) + (DataflashAddress % (pDataFlash->pDevice->pages_size)); + + /* fill the command buffer */ + pDataFlash->pDataFlashDesc->command[0] = OpCode; + if (pDataFlash->pDevice->pages_number >= 16384) { + pDataFlash->pDataFlashDesc->command[1] = (unsigned char)((adr & 0x0F000000) >> 24); + pDataFlash->pDataFlashDesc->command[2] = (unsigned char)((adr & 0x00FF0000) >> 16); + pDataFlash->pDataFlashDesc->command[3] = (unsigned char)((adr & 0x0000FF00) >> 8); + pDataFlash->pDataFlashDesc->command[4] = (unsigned char)(adr & 0x000000FF); + } else { + pDataFlash->pDataFlashDesc->command[1] = (unsigned char)((adr & 0x00FF0000) >> 16); + pDataFlash->pDataFlashDesc->command[2] = (unsigned char)((adr & 0x0000FF00) >> 8); + pDataFlash->pDataFlashDesc->command[3] = (unsigned char)(adr & 0x000000FF) ; + pDataFlash->pDataFlashDesc->command[4] = 0; + } + pDataFlash->pDataFlashDesc->command[5] = 0; + pDataFlash->pDataFlashDesc->command[6] = 0; + pDataFlash->pDataFlashDesc->command[7] = 0; + + /* Initialize the SpiData structure for the spi write fuction */ + pDataFlash->pDataFlashDesc->tx_cmd_pt = pDataFlash->pDataFlashDesc->command ; + pDataFlash->pDataFlashDesc->tx_cmd_size = CmdSize ; + pDataFlash->pDataFlashDesc->rx_cmd_pt = pDataFlash->pDataFlashDesc->command ; + pDataFlash->pDataFlashDesc->rx_cmd_size = CmdSize ; + + /* send the command and read the data */ + return AT91F_SpiWrite (pDataFlash->pDataFlashDesc); +} + + +/*----------------------------------------------------------------------*/ +/* \fn AT91F_DataFlashGetStatus */ +/* \brief Read the status register of the dataflash */ +/*----------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_DataFlashGetStatus(AT91PS_DataflashDesc pDesc) +{ + AT91S_DataFlashStatus status; + + /* if a transfert is in progress ==> return 0 */ + if( (pDesc->state) != IDLE) + return DATAFLASH_BUSY; + + /* first send the read status command (D7H) */ + pDesc->command[0] = DB_STATUS; + pDesc->command[1] = 0; + + pDesc->DataFlash_state = GET_STATUS; + pDesc->tx_data_size = 0 ; /* Transmit the command and receive response */ + pDesc->tx_cmd_pt = pDesc->command ; + pDesc->rx_cmd_pt = pDesc->command ; + pDesc->rx_cmd_size = 2 ; + pDesc->tx_cmd_size = 2 ; + status = AT91F_SpiWrite (pDesc); + + pDesc->DataFlash_state = *( (unsigned char *) (pDesc->rx_cmd_pt) +1); + + return status; +} + + +/*----------------------------------------------------------------------*/ +/* \fn AT91F_DataFlashWaitReady */ +/* \brief wait for dataflash ready (bit7 of the status register == 1) */ +/*----------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc pDataFlashDesc, unsigned int timeout) +{ + pDataFlashDesc->DataFlash_state = IDLE; + + do { + AT91F_DataFlashGetStatus(pDataFlashDesc); + timeout--; + } while( ((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) && (timeout > 0) ); + + if((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) + return DATAFLASH_ERROR; + + return DATAFLASH_OK; +} + + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_DataFlashContinuousRead */ +/* Object : Continuous stream Read */ +/* Input Parameters : DataFlash Service */ +/* : <src> = dataflash address */ +/* : <*dataBuffer> = data buffer pointer */ +/* : <sizeToRead> = data buffer size */ +/* Return value : State of the dataflash */ +/*------------------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_DataFlashContinuousRead ( + AT91PS_DataFlash pDataFlash, + int src, + unsigned char *dataBuffer, + int sizeToRead ) +{ + AT91S_DataFlashStatus status; + /* Test the size to read in the device */ + if ( (src + sizeToRead) > (pDataFlash->pDevice->pages_size * (pDataFlash->pDevice->pages_number))) + return DATAFLASH_MEMORY_OVERFLOW; + + pDataFlash->pDataFlashDesc->rx_data_pt = dataBuffer; + pDataFlash->pDataFlashDesc->rx_data_size = sizeToRead; + pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer; + pDataFlash->pDataFlashDesc->tx_data_size = sizeToRead; + + status = AT91F_DataFlashSendCommand (pDataFlash, DB_CONTINUOUS_ARRAY_READ, 8, src); + /* Send the command to the dataflash */ + return(status); +} + + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_DataFlashPagePgmBuf */ +/* Object : Main memory page program through buffer 1 or buffer 2 */ +/* Input Parameters : DataFlash Service */ +/* : <*src> = Source buffer */ +/* : <dest> = dataflash destination address */ +/* : <SizeToWrite> = data buffer size */ +/* Return value : State of the dataflash */ +/*------------------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf( + AT91PS_DataFlash pDataFlash, + unsigned char *src, + unsigned int dest, + unsigned int SizeToWrite) +{ + int cmdsize; + pDataFlash->pDataFlashDesc->tx_data_pt = src ; + pDataFlash->pDataFlashDesc->tx_data_size = SizeToWrite ; + pDataFlash->pDataFlashDesc->rx_data_pt = src; + pDataFlash->pDataFlashDesc->rx_data_size = SizeToWrite; + + cmdsize = 4; + /* Send the command to the dataflash */ + if (pDataFlash->pDevice->pages_number >= 16384) + cmdsize = 5; + return(AT91F_DataFlashSendCommand (pDataFlash, DB_PAGE_PGM_BUF1, cmdsize, dest)); +} + + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_MainMemoryToBufferTransfert */ +/* Object : Read a page in the SRAM Buffer 1 or 2 */ +/* Input Parameters : DataFlash Service */ +/* : Page concerned */ +/* : */ +/* Return value : State of the dataflash */ +/*------------------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert( + AT91PS_DataFlash pDataFlash, + unsigned char BufferCommand, + unsigned int page) +{ + int cmdsize; + /* Test if the buffer command is legal */ + if ((BufferCommand != DB_PAGE_2_BUF1_TRF) && (BufferCommand != DB_PAGE_2_BUF2_TRF)) + return DATAFLASH_BAD_COMMAND; + + /* no data to transmit or receive */ + pDataFlash->pDataFlashDesc->tx_data_size = 0; + cmdsize = 4; + if (pDataFlash->pDevice->pages_number >= 16384) + cmdsize = 5; + return(AT91F_DataFlashSendCommand (pDataFlash, BufferCommand, cmdsize, page*pDataFlash->pDevice->pages_size)); +} + + +/*----------------------------------------------------------------------------- */ +/* Function Name : AT91F_DataFlashWriteBuffer */ +/* Object : Write data to the internal sram buffer 1 or 2 */ +/* Input Parameters : DataFlash Service */ +/* : <BufferCommand> = command to write buffer1 or buffer2 */ +/* : <*dataBuffer> = data buffer to write */ +/* : <bufferAddress> = address in the internal buffer */ +/* : <SizeToWrite> = data buffer size */ +/* Return value : State of the dataflash */ +/*------------------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer ( + AT91PS_DataFlash pDataFlash, + unsigned char BufferCommand, + unsigned char *dataBuffer, + unsigned int bufferAddress, + int SizeToWrite ) +{ + int cmdsize; + /* Test if the buffer command is legal */ + if ((BufferCommand != DB_BUF1_WRITE) && (BufferCommand != DB_BUF2_WRITE)) + return DATAFLASH_BAD_COMMAND; + + /* buffer address must be lower than page size */ + if (bufferAddress > pDataFlash->pDevice->pages_size) + return DATAFLASH_BAD_ADDRESS; + + if ( (pDataFlash->pDataFlashDesc->state) != IDLE) + return DATAFLASH_BUSY; + + /* Send first Write Command */ + pDataFlash->pDataFlashDesc->command[0] = BufferCommand; + pDataFlash->pDataFlashDesc->command[1] = 0; + if (pDataFlash->pDevice->pages_number >= 16384) { + pDataFlash->pDataFlashDesc->command[2] = 0; + pDataFlash->pDataFlashDesc->command[3] = (unsigned char)(((unsigned int)(bufferAddress & pDataFlash->pDevice->byte_mask)) >> 8) ; + pDataFlash->pDataFlashDesc->command[4] = (unsigned char)((unsigned int)bufferAddress & 0x00FF) ; + cmdsize = 5; + } else { + pDataFlash->pDataFlashDesc->command[2] = (unsigned char)(((unsigned int)(bufferAddress & pDataFlash->pDevice->byte_mask)) >> 8) ; + pDataFlash->pDataFlashDesc->command[3] = (unsigned char)((unsigned int)bufferAddress & 0x00FF) ; + pDataFlash->pDataFlashDesc->command[4] = 0; + cmdsize = 4; + } + + pDataFlash->pDataFlashDesc->tx_cmd_pt = pDataFlash->pDataFlashDesc->command ; + pDataFlash->pDataFlashDesc->tx_cmd_size = cmdsize ; + pDataFlash->pDataFlashDesc->rx_cmd_pt = pDataFlash->pDataFlashDesc->command ; + pDataFlash->pDataFlashDesc->rx_cmd_size = cmdsize ; + + pDataFlash->pDataFlashDesc->rx_data_pt = dataBuffer ; + pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer ; + pDataFlash->pDataFlashDesc->rx_data_size = SizeToWrite ; + pDataFlash->pDataFlashDesc->tx_data_size = SizeToWrite ; + + return AT91F_SpiWrite(pDataFlash->pDataFlashDesc); +} + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_PageErase */ +/* Object : Erase a page */ +/* Input Parameters : DataFlash Service */ +/* : Page concerned */ +/* : */ +/* Return value : State of the dataflash */ +/*------------------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_PageErase( + AT91PS_DataFlash pDataFlash, + unsigned int page) +{ + int cmdsize; + /* Test if the buffer command is legal */ + /* no data to transmit or receive */ + pDataFlash->pDataFlashDesc->tx_data_size = 0; + + cmdsize = 4; + if (pDataFlash->pDevice->pages_number >= 16384) + cmdsize = 5; + return(AT91F_DataFlashSendCommand (pDataFlash, DB_PAGE_ERASE, cmdsize, page*pDataFlash->pDevice->pages_size)); +} + + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_BlockErase */ +/* Object : Erase a Block */ +/* Input Parameters : DataFlash Service */ +/* : Page concerned */ +/* : */ +/* Return value : State of the dataflash */ +/*------------------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_BlockErase( + AT91PS_DataFlash pDataFlash, + unsigned int block) +{ + int cmdsize; + /* Test if the buffer command is legal */ + /* no data to transmit or receive */ + pDataFlash->pDataFlashDesc->tx_data_size = 0; + cmdsize = 4; + if (pDataFlash->pDevice->pages_number >= 16384) + cmdsize = 5; + return(AT91F_DataFlashSendCommand (pDataFlash, DB_BLOCK_ERASE,cmdsize, block*8*pDataFlash->pDevice->pages_size)); +} + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_WriteBufferToMain */ +/* Object : Write buffer to the main memory */ +/* Input Parameters : DataFlash Service */ +/* : <BufferCommand> = command to send to buffer1 or buffer2 */ +/* : <dest> = main memory address */ +/* Return value : State of the dataflash */ +/*------------------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_WriteBufferToMain ( + AT91PS_DataFlash pDataFlash, + unsigned char BufferCommand, + unsigned int dest ) +{ + int cmdsize; + /* Test if the buffer command is correct */ + if ((BufferCommand != DB_BUF1_PAGE_PGM) && + (BufferCommand != DB_BUF1_PAGE_ERASE_PGM) && + (BufferCommand != DB_BUF2_PAGE_PGM) && + (BufferCommand != DB_BUF2_PAGE_ERASE_PGM) ) + return DATAFLASH_BAD_COMMAND; + + /* no data to transmit or receive */ + pDataFlash->pDataFlashDesc->tx_data_size = 0; + + cmdsize = 4; + if (pDataFlash->pDevice->pages_number >= 16384) + cmdsize = 5; + /* Send the command to the dataflash */ + return(AT91F_DataFlashSendCommand (pDataFlash, BufferCommand, cmdsize, dest)); +} + + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_PartialPageWrite */ +/* Object : Erase partielly a page */ +/* Input Parameters : <page> = page number */ +/* : <AdrInpage> = adr to begin the fading */ +/* : <length> = Number of bytes to erase */ +/*------------------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_PartialPageWrite ( + AT91PS_DataFlash pDataFlash, + unsigned char *src, + unsigned int dest, + unsigned int size) +{ + unsigned int page; + unsigned int AdrInPage; + + page = dest / (pDataFlash->pDevice->pages_size); + AdrInPage = dest % (pDataFlash->pDevice->pages_size); + + /* Read the contents of the page in the Sram Buffer */ + AT91F_MainMemoryToBufferTransfert(pDataFlash, DB_PAGE_2_BUF1_TRF, page); + AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY); + /*Update the SRAM buffer */ + AT91F_DataFlashWriteBuffer(pDataFlash, DB_BUF1_WRITE, src, AdrInPage, size); + + AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY); + + /* Erase page if a 128 Mbits device */ + if (pDataFlash->pDevice->pages_number >= 16384) { + AT91F_PageErase(pDataFlash, page); + /* Rewrite the modified Sram Buffer in the main memory */ + AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY); + } + + /* Rewrite the modified Sram Buffer in the main memory */ + return(AT91F_WriteBufferToMain(pDataFlash, DB_BUF1_PAGE_ERASE_PGM, (page*pDataFlash->pDevice->pages_size))); +} + + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_DataFlashWrite */ +/* Object : */ +/* Input Parameters : <*src> = Source buffer */ +/* : <dest> = dataflash adress */ +/* : <size> = data buffer size */ +/*------------------------------------------------------------------------------*/ +AT91S_DataFlashStatus AT91F_DataFlashWrite( + AT91PS_DataFlash pDataFlash, + unsigned char *src, + int dest, + int size ) +{ + unsigned int length; + unsigned int page; + unsigned int status; + + AT91F_SpiEnable(pDataFlash->pDevice->cs); + + if ( (dest + size) > (pDataFlash->pDevice->pages_size * (pDataFlash->pDevice->pages_number))) + return DATAFLASH_MEMORY_OVERFLOW; + + /* If destination does not fit a page start address */ + if ((dest % ((unsigned int)(pDataFlash->pDevice->pages_size))) != 0 ) { + length = pDataFlash->pDevice->pages_size - (dest % ((unsigned int)(pDataFlash->pDevice->pages_size))); + + if (size < length) + length = size; + + if(!AT91F_PartialPageWrite(pDataFlash,src, dest, length)) + return DATAFLASH_ERROR; + + AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY); + + /* Update size, source and destination pointers */ + size -= length; + dest += length; + src += length; + } + + while (( size - pDataFlash->pDevice->pages_size ) >= 0 ) { + /* program dataflash page */ + page = (unsigned int)dest / (pDataFlash->pDevice->pages_size); + + status = AT91F_DataFlashWriteBuffer(pDataFlash, DB_BUF1_WRITE, src, 0, pDataFlash->pDevice->pages_size); + AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY); + + status = AT91F_PageErase(pDataFlash, page); + AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY); + if (!status) + return DATAFLASH_ERROR; + + status = AT91F_WriteBufferToMain (pDataFlash, DB_BUF1_PAGE_PGM, dest); + if(!status) + return DATAFLASH_ERROR; + + AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY); + + /* Update size, source and destination pointers */ + size -= pDataFlash->pDevice->pages_size ; + dest += pDataFlash->pDevice->pages_size ; + src += pDataFlash->pDevice->pages_size ; + } + + /* If still some bytes to read */ + if ( size > 0 ) { + /* program dataflash page */ + if(!AT91F_PartialPageWrite(pDataFlash, src, dest, size) ) + return DATAFLASH_ERROR; + + AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY); + } + return DATAFLASH_OK; +} + + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_DataFlashRead */ +/* Object : Read a block in dataflash */ +/* Input Parameters : */ +/* Return value : */ +/*------------------------------------------------------------------------------*/ +int AT91F_DataFlashRead( + AT91PS_DataFlash pDataFlash, + unsigned long addr, + unsigned long size, + char *buffer) +{ + unsigned long SizeToRead; + + AT91F_SpiEnable(pDataFlash->pDevice->cs); + + if(AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY) != DATAFLASH_OK) + return -1; + + while (size) { + SizeToRead = (size < 0x8000)? size:0x8000; + + if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY) != DATAFLASH_OK) + return -1; + + if (AT91F_DataFlashContinuousRead (pDataFlash, addr, (uchar *) buffer, SizeToRead) != DATAFLASH_OK) + return -1; + + size -= SizeToRead; + addr += SizeToRead; + buffer += SizeToRead; + } + + return DATAFLASH_OK; +} + + +/*------------------------------------------------------------------------------*/ +/* Function Name : AT91F_DataflashProbe */ +/* Object : */ +/* Input Parameters : */ +/* Return value : Dataflash status register */ +/*------------------------------------------------------------------------------*/ +int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc) +{ + AT91F_SpiEnable(cs); + AT91F_DataFlashGetStatus(pDesc); + return((pDesc->command[1] == 0xFF)? 0: pDesc->command[1] & 0x3C); +} + +#endif diff -urN u-boot-1.2.0-0rig/drivers/Makefile u-boot-1.2.0-atmel/drivers/Makefile --- u-boot-1.2.0-0rig/drivers/Makefile 2007-01-07 00:13:11.000000000 +0100 +++ u-boot-1.2.0-atmel/drivers/Makefile 2007-03-24 20:07:32.000000000 +0100 @@ -27,7 +27,7 @@ LIB = $(obj)libdrivers.a -COBJS = 3c589.o 5701rls.o ali512x.o atmel_usart.o \ +COBJS = 3c589.o 5701rls.o ali512x.o at45.o atmel_usart.o \ bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \ cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \ e1000.o eepro100.o \ diff -urN u-boot-1.2.0/include/at45.h u-boot-1.2.0-atmel/include/at45.h --- u-boot-1.2.0/include/at45.h 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-1.2.0-atmel/include/at45.h 2007-03-24 20:07:33.000000000 +0100 @@ -0,0 +1,66 @@ + +#ifndef _AT45_H_ +#define _AT45_H_ +#ifdef DATAFLASH_MMC_SELECT +extern void AT91F_SelectMMC(void); +extern void AT91F_SelectSPI(void); +extern int AT91F_GetMuxStatus(void); +#endif +extern void AT91F_SpiInit(void); +extern void AT91F_SpiEnable(int cs); +extern unsigned int AT91F_SpiWrite ( AT91PS_DataflashDesc pDesc ); +extern AT91S_DataFlashStatus AT91F_DataFlashSendCommand( + AT91PS_DataFlash pDataFlash, + unsigned char OpCode, + unsigned int CmdSize, + unsigned int DataflashAddress); +extern AT91S_DataFlashStatus AT91F_DataFlashGetStatus(AT91PS_DataflashDesc pDesc); +extern AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc pDataFlashDesc, unsigned int timeout); +extern AT91S_DataFlashStatus AT91F_DataFlashContinuousRead ( + AT91PS_DataFlash pDataFlash, + int src, + unsigned char *dataBuffer, + int sizeToRead ); +extern AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf( + AT91PS_DataFlash pDataFlash, + unsigned char *src, + unsigned int dest, + unsigned int SizeToWrite); +extern AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert( + AT91PS_DataFlash pDataFlash, + unsigned char BufferCommand, + unsigned int page); +extern AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer ( + AT91PS_DataFlash pDataFlash, + unsigned char BufferCommand, + unsigned char *dataBuffer, + unsigned int bufferAddress, + int SizeToWrite ); +extern AT91S_DataFlashStatus AT91F_PageErase( + AT91PS_DataFlash pDataFlash, + unsigned int page); +extern AT91S_DataFlashStatus AT91F_BlockErase( + AT91PS_DataFlash pDataFlash, + unsigned int block); +extern AT91S_DataFlashStatus AT91F_WriteBufferToMain ( + AT91PS_DataFlash pDataFlash, + unsigned char BufferCommand, + unsigned int dest ); +extern AT91S_DataFlashStatus AT91F_PartialPageWrite ( + AT91PS_DataFlash pDataFlash, + unsigned char *src, + unsigned int dest, + unsigned int size); +extern AT91S_DataFlashStatus AT91F_DataFlashWrite( + AT91PS_DataFlash pDataFlash, + unsigned char *src, + int dest, + int size ); +extern int AT91F_DataFlashRead( + AT91PS_DataFlash pDataFlash, + unsigned long addr, + unsigned long size, + char *buffer); +extern int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc); + +#endif -- Best Regards, Ulf Samuelsson

6 10

[U-Boot-Users] [PATCH] Fix ppc4xx bootstrap letter displayed on startup
by Benoit Monin 04 Jun '07

04 Jun '07

The attached patch is mainly cosmetic, allowing u-boot to display the correct bootstrap option letter according to the datasheets. Signed-off-by: Benoît Monin <bmonin <at> adeneo.eu> --- The patch is against U-Boot 1.2.0. -- Créez votre adresse électronique prenom.nom(a)laposte.net 1 Go d'espace de stockage, anti-spam et anti-virus intégrés.

2 1

[U-Boot-Users] [PATCH] Fix initrd booting
by Andy Fleming 02 Jun '07

02 Jun '07

The device tree needs to be passed to Linux within CFG_BOOTMAPSZ. The current code places the device tree right before the initrd if it exists, and that will usually be closer to the end of memory. Instead, we should always put the device tree right before the bd_info structure, thus ensuring it is within CFG_BOOTMAPSZ. We do, however, allow for FDTs in uImages to shoot themselves in the foot by requesting a location outside of CFG_BOOTMAPSZ. Signed-off-by: Andy Fleming <afleming(a)freescale.com> --- common/cmd_bootm.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index a6499e8..d12ef76 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -753,10 +753,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, #else if (*(ulong *)of_flat_tree == OF_DT_HEADER) { #endif -#ifndef CFG_NO_FLASH - if (addr2info((ulong)of_flat_tree) != NULL) - of_data = (ulong)of_flat_tree; -#endif + of_data = (ulong)of_flat_tree; } else if (ntohl(hdr->ih_magic) == IH_MAGIC) { printf("## Flat Device Tree Image at %08lX\n", hdr); print_image_hdr(hdr); @@ -939,11 +936,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, ulong of_start, of_len; of_len = be32_to_cpu(fdt_totalsize(of_data)); + /* position on a 4K boundary before the initrd/kbd */ - if (initrd_start) - of_start = initrd_start - of_len; - else - of_start = (ulong)kbd - of_len; + of_start = (ulong)kbd - of_len; of_start &= ~(4096 - 1); /* align on page */ debug ("## device tree at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n", of_data, of_data + of_len - 1, of_len, of_len); @@ -955,6 +950,8 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, if (err != 0) { printf ("libfdt: %s " __FILE__ " %d\n", fdt_strerror(err), __LINE__); } + printf("OK\n"); + /* * Add the chosen node if it doesn't exist, add the env and bd_t * if the user wants it (the logic is in the subroutines). @@ -982,11 +979,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, if (of_data) { ulong of_start, of_len; of_len = ((struct boot_param_header *)of_data)->totalsize; + /* provide extra 8k pad */ - if (initrd_start) - of_start = initrd_start - of_len - 8192; - else - of_start = (ulong)kbd - of_len - 8192; + of_start = (ulong)kbd - of_len - 8192; of_start &= ~(4096 - 1); /* align on page */ debug ("## device tree at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n", of_data, of_data + of_len - 1, of_len, of_len); @@ -995,6 +990,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, printf (" Loading Device Tree to %08lx, end %08lx ... ", of_start, of_start + of_len - 1); memmove ((void *)of_start, (void *)of_data, of_len); + printf ("OK\n"); } #endif -- 1.5.0.2.230.gfbe3d-dirty

2 1

[U-Boot-Users] U-boot tag / release
by Benedict, Michael 01 Jun '07

01 Jun '07

It looks like the latest u-boot tag/snapshot is LABEL_2006_06_30_2020. Are there any plans to do a snapshot release anytime soon? Thanks! Michael

2 1

[U-Boot-Users] [PATCH] add missing 'console' var to default mpc8349itx config
by Nikita V. Youshchenko 01 Jun '07

01 Jun '07

Default environment defined inside include/configs/MPC8349ITX.h file, references 'console' variable, but does not define it. This patch fixes this. Also it adds usage of new CONFIG_CONSOLE macro in default bootargs, for consistency. Signed-Off-By: Nikita Youshchenko <yoush(a)debian.org> --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -289,6 +289,7 @@ boards, we say we have two, but don't di #define CFG_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} +#define CONFIG_CONSOLE ttyS0 #define CONFIG_BAUDRATE 115200 #define CFG_NS16550_COM1 (CFG_IMMR + 0x4500) @@ -670,9 +679,10 @@ boards, we say we have two, but don't di " ip=" MK_STR(CONFIG_IPADDR) ":" MK_STR(CONFIG_SERVERIP) ":" \ MK_STR(CONFIG_GATEWAYIP) ":" MK_STR(CONFIG_NETMASK) ":" \ MK_STR(CONFIG_HOSTNAME) ":" MK_STR(CONFIG_NETDEV) ":off" \ - " console=ttyS0," MK_STR(CONFIG_BAUDRATE) + " console=" MK_STR(CONFIG_CONSOLE) "," MK_STR(CONFIG_BAUDRATE) #define CONFIG_EXTRA_ENV_SETTINGS \ + "console=" MK_STR(CONFIG_CONSOLE) "\0" \ "netdev=" MK_STR(CONFIG_NETDEV) "\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \

3 2

[U-Boot-Users] [PATCH] fix compilation problem for mpc8349itx CFG_RAMBOOT
by Nikita V. Youshchenko 01 Jun '07

01 Jun '07

Current include/configs/MPC8349ITX.h does contain some support for building image that will be started from memory (without putting in into flash). It could be triggered by building with TEXT_BASE set to a low value. However, this support is incomplete: using of low TEXT_BASE causes defining configuration macros in inconsistent way, which later leads to compilation errors. In particular. flash support is being disabled, but then flash structures get referenced. This patch fixes this, making it possible to build with low TEXT_BASE. Signed-Off-By: Nikita Youshchenko <yoush(a)debian.org> --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -408,6 +409,7 @@ boards, we say we have two, but don't di #define CFG_ENV_SIZE 0x2000 #else #define CFG_NO_FLASH /* Flash is not usable now */ + #undef CFG_FLASH_CFI_DRIVER #define CFG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_SIZE 0x2000 @@ -436,7 +438,14 @@ boards, we say we have two, but don't di #define CONFIG_COMMANDS_I2C 0 #endif -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ +#ifdef CFG_NO_FLASH +#define CONFIG_COMMANDS_DEFAULT (CONFIG_CMD_DFL & ~(CFG_CMD_FLASH | \ + CFG_CMD_IMLS)) +#else +#define CONFIG_COMMANDS_DEFAULT CONFIG_CMD_DFL +#endif + +#define CONFIG_COMMANDS (CONFIG_COMMANDS_DEFAULT | \ CONFIG_COMMANDS_CF | \ CFG_CMD_NET | \ CFG_CMD_PING | \

7 25

Re: [U-Boot-Users] Porting U-Boot on to Cogent CSB535FS
by TXEMA LOPEZ 01 Jun '07

01 Jun '07

-----Mensaje original----- De: u-boot-users-bounces(a)lists.sourceforge.net [mailto:u-boot-users-bounces@lists.sourceforge.net] En nombre de Midhun Agnihotram Enviado el: jueves, 31 de mayo de 2007 15:25 Para: TXEMA LOPEZ; u-boot-users(a)lists.sourceforge.net Asunto: Re: [U-Boot-Users] Porting U-Boot on to Cogent CSB535FS Hi Txema, I will indeed use your patch. But I would also like to have some pointers as to how to develop this patch. I am new to the embedded world although not that new to Linux. I want to fully port U-boot to CSB535FS as we require the support for SD card and Compact Flash. Hi Midhun, The support for the SD Card an CompactFlash is needed in U-Boot or only in Linux? If your really need it in U-Boot one good starting point could be the Linux existing drivers. How do I start porting U-Boot to a new board? I have read the README of U-Boot. And I know that I need to set a lot of parameters - but they are Greek and Latin for me. How do I start off? Any web sites?? Books?? Links?? Were do I get these parameters from?? From the board manufacturer / supplier?? Usually, you can use a porting done to a board similar to your new board. You need a new configuration file and a new directory where you must put the board related code. But in your case this work is done in my patch: I got the IMX porting as a reference. But my tree structure was not accepted and this is what Wolfgang suggested: "So if you have a IMX serial driver that should go to drivers/serial/imx.c and an ethernet driver to drivers/net/imx.c and your I2C driver to drivers/i2c/imx.c As a minimum, you should start this new directory structure and use it for the IMX related code (and leave the cleanup of the other, already existing code in the drivers/ directory to others). Even better, you would include this restructuring of the existing code, too. [And ideally, you would clean up all the U-Boot code, merge all open patches and fix all the remaining bugs as well. But I guess I'm asking for too much :-) ] Best regards, Wolfgang Denk " So the code I put in cpu/arm926ejs/imx21 was in the wrong place. And it was very similar to the IMX related code and another suggestion was to use only one source file for both boards with some ifdef's. I don't know where you can find some information about the porting of U-Boot to a new board. My experience is that all the documentation is in the U-Boot source code. Good luck. Best Regards, Txema. Thanks and Regards, Midhun Agnihotram. On 5/30/07, Txema Lopez <tlopez(a)aotek.es> wrote: > Midhun Agnihotram wrote: > > > Hi Txema, > > > > I got the patch and I have gone through the conversation - when you > > submitted the patch. But I did not really understand the "threats". > > What is all about. > > The discussion was about how the patch must be done to be accepted and > more exactly where to put the porting related code in the U-Boot > directory tree. > > > Is porting U-Boot to CSB535 not advised?? > > I don't think so. We have developped a CSB535 based custom board and > U-Boot is working fine. > > > Or is it > > that there is more work to be done?? > > The patch has not support for USB, SD Card or CF, but you can launch a > linux kernel from flash or tftp. > > > > > Thanks & Regards, > > Midhun Agnihotram, > > > > On 5/30/07, TXEMA LOPEZ <tlopez(a)aotek.es> wrote: > > > >> Hi Midhun, > >> > >> I sent a patch for a U-Boot 1.2.0 version but It was not accepted. > >> See the threats "Support for csb535fs / i.MX21 LiteKit" and "arm SoC > >> code in U-Boot". I pushed this work in my "todo stack" but > >> unfortunately it's still there (And I'm afraid It will be for long > >> time). The patch It's working fine and you can get it from the U-Boot > >> users mailing list or I can resend it to you. > >> > >> Best Regards > >> > >> J.M. Lopez. > >> > > > ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users

2 1

[U-Boot-Users] tsec-small patch
by Monstr＠seznam.cz 31 May '07

31 May '07

Hi, I look at tsec driver and I found small code redundancy. Please look at the patch. Best regards Michal Simek

3 3

[U-Boot-Users] bootcmd
by Matt Gessner 31 May '07

31 May '07

Hi, I'm trying to figure out how to make my software field update process robust. Currently, my bootcmd is 'fsload 20000000 uImage; bootm 20000000' Is there anyway for u-boot to determine, in one of these commands, that some command failed, and to do something else instead? For example, if I failed to load uImage, could I check for its existence, and boot that instead? My update process will copy the new image into the same partition as uImage, as uImage.new, and then rename uImage to uImage.old, rename uImage.new to uImage, and then delete uImage.old. If something untoward should happen (like the idiot turns off the power in the middle of the update), I'm wondering how I can have u-boot get around this. Thanks, Matt

3 6

[U-Boot-Users] [patch] stand alone updates final
by Jeffrey Mann 31 May '07

31 May '07

Wolfgang and list: Attached is the final patch for the stand alone program feature updates. This patch eliminates the #ifdef maze, it adds a simple optional way to specify a stand alone program directory when configuring u-boot (make board_config SA=directory), and it adds a few more functions to the exports list. The documentation has also been updated. It has been tested against the newest version of ELDK (4.1). The patch is against the current top-of tree so you shouldn't have any probrems applying the patch. -Jeffrey Mann

1 0

Re: [U-Boot-Users] Porting U-Boot on to Cogent CSB535FS
by TXEMA LOPEZ 31 May '07

31 May '07

Hi Midhun, I sent a patch for a U-Boot 1.2.0 version but It was not accepted. See the threats "Support for csb535fs / i.MX21 LiteKit" and "arm SoC code in U-Boot". I pushed this work in my "todo stack" but unfortunately it's still there (And I'm afraid It will be for long time). The patch It's working fine and you can get it from the U-Boot users mailing list or I can resend it to you. Best Regards J.M. Lopez.

3 3

[U-Boot-Users] TSEC - PQ II Pro
by Monstr＠seznam.cz 31 May '07

31 May '07

Hi everybody, I port U-BOOT to one proprietary board with PQ II Pro 8343E and I have connected both TSEC to Vitesse switch. And I have problem with unrealizable condition in tsec_recv function !(rtx.rxbd[rxIdx].status & RXBD_STATS). I have in rtx.rxbd[rxIdx].status word setting third bit (0x04). When I make ping command I have Got error 4 I look at tsec.h and bit 4 in status is RXBD_CRCERR. I made temporary solution but it is unacceptable. if (!(rtx.rxbd[rxIdx].status & (RXBD_STATS & ~RXBD_CRCERR))) { NetReceive(NetRxPackets[rxIdx], length - 4); /* puts("*"); */ } Can you help me where is the problem? Best regards, Michal Simek

1 0

[U-Boot-Users] what is BOOT_TEXT_BASE stands for?
by jack 31 May '07

31 May '07

Hi all: Can anybody tell me what is "BOOT_TEXT_BASE" stands for? Thanks.

4 5

[U-Boot-Users] IXP425 NPE
by Ori Idan 31 May '07

31 May '07

I am trying to port U-boot to a custom board based on IXDP425 The board needs to use network using the IXP425 NPE. I defined CONFIG_IXP4XX_NPE After compiling U-boot I got errors regarding CONFIG_PHYS_ADDR and CFG_CACHELINE_SIZE that are undefined. I need some more information about these constants so I know how to define them. -- Ori Idan

1 0

[U-Boot-Users] FW: what is BOOT_TEXT_BASE stands for?
by jack 31 May '07

31 May '07

Hi all: Can anybody tell me what is "BOOT_TEXT_BASE" stands for? Thanks.

1 0

Re: [U-Boot-Users] Question about CFG_ENV_ADDR during RAMBOOT
by Ulf Samuelsson 31 May '07

31 May '07

Best Regards Ulf Samuelsson Atmel Nordic AB Visit: Kavalleriv?gen 24, 174 58 Sundbyberg Mail: Box 2033 174 52 Sundbyberg SWEDEN mail:ulf@atmel.com Tel: +46 706 224457 ________________ Sidrubrik f?r svar ________________ ?rende: Re: [U-Boot-Users] Question about CFG_ENV_ADDR during RAMBOOT F?rfattare: Ladislav Michl <ladis(a)linux-mips.org> Datum: 2007 maj 30:e 10:54 On Wed, May 30, 2007 at 08:57:50AM +0200, Wolfgang Denk wrote: > In message <465CC968.6090801(a)atmel.com> you wrote: > > The dataflash partitioning scheme is static, which is a disadvantage, but > > If I fix anything, I probably make the partition sizes a configurable item > > in my buildroot and generate the warning there, if the kernel size is non compliant. > > If you fix anything, then please by making it compatible with the > poublic U-Boot source tree,i. e. by using the mtdparts command for > this purpose. Here it might be usefull to avoid modifications of certain partition sizes. For example partition containing environment shouldn't be modified, because code which read it from U-Boot has size and offset hardcoded, therefore modifying it will result to bad surprise... => We also need to understand if we are talking about the same thing. I have this feeling that mtdparts exist to divide the rootfs into several areas while the dataflash partioning is there purely for U-boot purposes. The partion use is: 1) AT91 bootstrap. 2) U-boot environment 3) U-boot image. 4) Kernel image 5) Root FS. The sum of 1+2+3 is always 256kB due to df sector size. The only programmable value is the kernel size. Nothing is ever written to the dataflash to indicate partion info and nothing is passed to Linux except rootfs start adress in bootargs. The df partion is just for setttins protection and (in my 1 year+ old patch) sets a few environment variables to contain the start adress of kernel & rootfs. Can someone confirm that mtdparts is the right way to go? Best Regards Ulf Samuelsson Best Regards Ulf Samuelsson Best Regards Ulf Samuelsson

3 4

[U-Boot-Users] how can i change the amount of flash memory?
by sapirf fersht 30 May '07

30 May '07

I need to program a new board for a customer which is based on ixdp-425. I need to change the flash memory from 256mb to 128mb. How can i do it? I am new to this, so please try to help me. Thanks in advance sapir

2 1

[U-Boot-Users] [PATCH] LOGO: Adds LCD color map 565 support.
by Rodolfo Giometti 30 May '07

30 May '07

Signed-off-by: Rodolfo Giometti <giometti(a)linux.it> --- README | 4 +++ common/lcd.c | 41 ++++++++++++++++++++++++++++++++++---- tools/bmp_logo.c | 56 +++++++++++++++++++++++++++++++++++------------------ 3 files changed, 77 insertions(+), 24 deletions(-) diff --git a/README b/README index b78ea61..207c881 100644 --- a/README +++ b/README @@ -2209,6 +2209,10 @@ Low Level (hardware related) configuration options: CFG_POCMR2_MASK_ATTRIB: (MPC826x only) Overrides the default PCI memory map in cpu/mpc8260/pci.c if set. +- CFG_LOGO_CMAP_MODE + Define the current LCD color map mode. Default value is 444 but + 565 can also be used. + - CONFIG_ETHER_ON_FEC[12] Define to enable FEC[12] on a 8xx series processor. diff --git a/common/lcd.c b/common/lcd.c index eaed2ab..dfbc4d0 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -52,6 +52,10 @@ #ifdef CONFIG_LCD +#ifndef CFG_LOGO_CMAP_MODE +#define CFG_LOGO_CMAP_MODE 444 /* the default */ +#endif + /************************************************************************/ /* ** FONT DATA */ /************************************************************************/ @@ -62,7 +66,7 @@ /************************************************************************/ #ifdef CONFIG_LCD_LOGO # include <bmp_logo.h> /* Get logo data, width and height */ -# if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) +# if (LCD_BPP < LCD_COLOR16) && (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) # error Default Color Map overlaps with Logo Color Map # endif #endif @@ -317,7 +321,11 @@ static void test_pattern (void) ushort v_step = (v_max + N_BLK_VERT - 1) / N_BLK_VERT; ushort h_step = (h_max + N_BLK_HOR - 1) / N_BLK_HOR; ushort v, h; +#if LCD_BPP == LCD_COLOR16 + ushort *pix = (ushort *)lcd_base; +#else uchar *pix = (uchar *)lcd_base; +#endif printf ("[LCD] Test Pattern: %d x %d [%d x %d]\n", h_max, v_max, h_step, v_step); @@ -519,10 +527,11 @@ void bitmap_plot (int x, int y) volatile immap_t *immr = (immap_t *) CFG_IMMR; volatile cpm8xx_t *cp = &(immr->im_cpm); #endif + uint palette; debug ("Logo: width %d height %d colors %d cmap %d\n", BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS, - sizeof(bmp_logo_palette)/(sizeof(ushort))); + sizeof(bmp_logo_palette)/(sizeof(uint))); bmap = &bmp_logo_bitmap[0]; fb = (uchar *)(lcd_base + y * lcd_line_length + x); @@ -538,8 +547,20 @@ void bitmap_plot (int x, int y) WATCHDOG_RESET(); /* Set color map */ - for (i=0; i<(sizeof(bmp_logo_palette)/(sizeof(ushort))); ++i) { - ushort colreg = bmp_logo_palette[i]; + for (i=0; i<(sizeof(bmp_logo_palette)/(sizeof(uint))); ++i) { + palette = bmp_logo_palette[i]; +#if CFG_LOGO_CMAP_MODE == 444 + ushort colreg = ((palette & 0xf00000)>>12) | \ + ((palette & 0x00f000)>>8) | \ + ((palette & 0x0000f0)>>4); +#elif CFG_LOGO_CMAP_MODE == 565 + ushort colreg = ((palette & 0xf80000)>>8) | \ + ((palette & 0x00fc00)>>5) | \ + ((palette & 0x0000f8)>>3); +#else +# error "Unsupported CMAP mode" +#endif + #ifdef CFG_INVERT_COLORS *cmap++ = 0xffff - colreg; #else @@ -559,8 +580,18 @@ void bitmap_plot (int x, int y) fb16 = (ushort *)(lcd_base + y * lcd_line_length + x); for (i=0; i<BMP_LOGO_HEIGHT; ++i) { for (j=0; j<BMP_LOGO_WIDTH; j++) { - fb16[j] = bmp_logo_palette[(bmap[j])]; + palette = bmp_logo_palette[bmap[j]-BMP_LOGO_OFFSET]; +#if CFG_LOGO_CMAP_MODE == 444 + fb16[j] = ((palette & 0xf00000)>>12) | \ + ((palette & 0x00f000)>>8) | \ + ((palette & 0x0000f0)>>4); +#elif CFG_LOGO_CMAP_MODE == 565 + fb16[j] = ((palette & 0xf80000)>>8) | \ + ((palette & 0x00fc00)>>5) | \ + ((palette & 0x0000f8)>>3); +#endif } + bmap += BMP_LOGO_WIDTH; fb16 += panel_info.vl_col; } diff --git a/tools/bmp_logo.c b/tools/bmp_logo.c index 98be617..cc1663a 100644 --- a/tools/bmp_logo.c +++ b/tools/bmp_logo.c @@ -14,7 +14,6 @@ typedef struct bitmap_s { /* bitmap description */ uint16_t width; uint16_t height; - uint8_t palette[256*3]; uint8_t *data; } bitmap_t; @@ -42,11 +41,12 @@ void skip_bytes (FILE *fp, int n) int main (int argc, char *argv[]) { - int i, x; + int i, x, d; FILE *fp; bitmap_t bmp; bitmap_t *b = &bmp; - uint16_t data_offset, n_colors; + uint16_t data_offset, bit_count, n_colors; + uint32_t red, green, blue; if (argc < 2) { fprintf (stderr, "Usage: %s file\n", argv[0]); @@ -73,7 +73,9 @@ int main (int argc, char *argv[]) fread (&b->width, sizeof (uint16_t), 1, fp); skip_bytes (fp, 2); fread (&b->height, sizeof (uint16_t), 1, fp); - skip_bytes (fp, 22); + skip_bytes (fp, 4); + fread (&bit_count, sizeof (uint16_t), 1, fp); + skip_bytes (fp, 16); fread (&n_colors, sizeof (uint16_t), 1, fp); skip_bytes (fp, 6); @@ -83,10 +85,20 @@ int main (int argc, char *argv[]) data_offset = le_short(data_offset); b->width = le_short(b->width); b->height = le_short(b->height); + bit_count = le_short(bit_count); n_colors = le_short(n_colors); - /* assume we are working with an 8-bit file */ - if ((n_colors == 0) || (n_colors > 256 - DEFAULT_CMAP_SIZE)) { + /* + * Sanity checks. + */ + if (bit_count != 8) { + fprintf (stderr, "%s is not a 8bpp image.\n", argv[1]); + exit (EXIT_FAILURE); + } + + if (n_colors == 0) + n_colors = 1 << bit_count; + if (n_colors > 256 - DEFAULT_CMAP_SIZE) { /* reserve DEFAULT_CMAP_SIZE color map entries for default map */ n_colors = 256 - DEFAULT_CMAP_SIZE; } @@ -115,25 +127,26 @@ int main (int argc, char *argv[]) } /* read and print the palette information */ - printf ("unsigned short bmp_logo_palette[] = {\n"); + printf ("unsigned int bmp_logo_palette[] = {\n"); for (i=0; i<n_colors; ++i) { - b->palette[(int)(i*3+2)] = fgetc(fp); - b->palette[(int)(i*3+1)] = fgetc(fp); - b->palette[(int)(i*3+0)] = fgetc(fp); - x=fgetc(fp); + blue = fgetc(fp); + green = fgetc(fp); + red = fgetc(fp); + x = fgetc(fp); - printf ("%s0x0%X%X%X,%s", + printf ("%s0x%06X,%s", ((i%8) == 0) ? "\t" : " ", - (b->palette[(int)(i*3+0)] >> 4) & 0x0F, - (b->palette[(int)(i*3+1)] >> 4) & 0x0F, - (b->palette[(int)(i*3+2)] >> 4) & 0x0F, + (red<<16) | (green<<8) | blue, ((i%8) == 7) ? "\n" : "" ); } /* seek to offset indicated by file header */ - fseek(fp, (long)data_offset, SEEK_SET); + if (fseek(fp, (long)data_offset, SEEK_SET) < 0) { + fprintf (stderr, "cannot fseek!\n"); + exit (EXIT_FAILURE); + } /* read the bitmap; leave room for default color map */ printf ("\n"); @@ -142,8 +155,13 @@ int main (int argc, char *argv[]) printf ("unsigned char bmp_logo_bitmap[] = {\n"); for (i=(b->height-1)*b->width; i>=0; i-=b->width) { for (x = 0; x < b->width; x++) { - b->data[(uint16_t) i + x] = (uint8_t) fgetc (fp) \ - + DEFAULT_CMAP_SIZE; + d = fgetc (fp); + if (feof(fp)) { + fprintf (stderr, "unaspected end-of-file!\n"); + exit (EXIT_FAILURE); + } + + *(b->data + i + x) = d + DEFAULT_CMAP_SIZE; } } fclose (fp); @@ -152,7 +170,7 @@ int main (int argc, char *argv[]) if ((i%8) == 0) putchar ('\t'); printf ("0x%02X,%c", - b->data[i], + *(b->data + i), ((i%8) == 7) ? '\n' : ' ' ); } -- 1.5.1.1

4 11

Re: [U-Boot-Users] Question about CFG_ENV_ADDR during RAMBOOT
by Ulf Samuelsson 30 May '07

30 May '07

> We also have board with NAND FLASH only and the number of those boards will > grow in the near future. The NAND command interface of course need a little > more typing, but I always configure a few environment variables to update the > images in the NAND FLASH. Something like: > > => setenv nload 'tftp 200000 board/u-boot.bin' > => setenv nupdate 'nand erase 0 40000;nand write 200000 0 40000' > => setenv nupd 'run nload nupdate' Yes, yes :-) Here I agree with Wolfgand and Stefan. U-Boot should provide commands which reflect principle of device without any abstraction. Knowing principle means usually less bad surprises coming out from some hidden abstraction implementation details. That's good for power users. => OK, then tell me how to compare a 6 MB file in flash with a 6MB file in SDRAM when your SDRAM is 8 MB. We are *not* running on PC's. There is nothing that stops "power users" from copying from dataflash to SDRAM and then doing a compare. Power Users are limited by implementations which waste enormous resources. I would have more respects for exhibited views if writes to parallel flash is removed from cp.b... Parallel flash is clearly not "memory" for write purposes, only for read purposes. Its existence in cp.b will force endless #ifdefs or support for parallel flash will have to remain and bloat code. You could then argue that support for parallel flash should be removed from all commands to remove inconsistencies... I do not think this will happen because it is *useful* and because this affects boards which people that makes decisions works with this. They do not work with dataflash and do not care about people that wants this. I think that consistency in argumentation is a reasonable demand. * BYTE WRITE Why should you waste time on copying dataflash to SDRAM when you can do operations inside the internal SRAM. It is not desirable to transfer 20,000 bits between CPU and dataflash when 100-200 are sufficient. Personally I would like everyone that did not bother to read and under stand the AT45 dataflash datasheets to do so before sending comments about how the internal implementation should look like. Best Regards Ulf Samuelsson

4 17

[U-Boot-Users] Relocatable U-Boot
by Josh Boyer 30 May '07

30 May '07

Hi All, My apologies if this has been discussed before, but I could not find it in the archives I have. I'm wondering if anyone has spent time on making u-boot relocatable. A handful of projects I have worked on use multiple copies of u-boot stored in different locations of flash and a small assembly stub determines which to boot. Currently, to do that u-boot has to be compiled two different times with different settings to accommodate the different base addresses. Is there a way to use a single build of u-boot which can be placed at two different addresses in flash? That seems to me that it would be a useful general feature. josh

3 5

[U-Boot-Users] [PATCH libfdt 1/3] Fix errors when CONFIG_OF_LIBFDT is enabled
by Jerry Van Baren 30 May '07

30 May '07

Several node strings were not correct (trailing slashes and properties in the strings) Added setting of the timebase-frequency (if OF_TBCLK is defined). Added more error printouts. Signed-off-by: Gerald Van Baren <vanbaren(a)cideas.com> --- Kim: Please ack/nack. Thanks, gvb cpu/mpc83xx/cpu.c | 63 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 19 deletions(-) diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 01d4dd6..42c32c3 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -337,7 +337,7 @@ static int fdt_set_eth0(void *fdt, int nodeoffset, const char *name, bd_t *bd) if (fdt_get_property(fdt, nodeoffset, name, 0)) { return fdt_setprop(fdt, nodeoffset, name, bd->bi_enetaddr, 6); } - return -FDT_ERR_NOTFOUND; + return 0; /* doesn't exist, but is not a problem. */ } #ifdef CONFIG_HAS_ETH1 /* second onboard ethernet port */ @@ -349,7 +349,7 @@ static int fdt_set_eth1(void *fdt, int nodeoffset, const char *name, bd_t *bd) if (fdt_get_property(fdt, nodeoffset, name, 0)) { return fdt_setprop(fdt, nodeoffset, name, bd->bi_enet1addr, 6); } - return -FDT_ERR_NOTFOUND; + return 0; /* doesn't exist, but is not a problem. */ } #endif #ifdef CONFIG_HAS_ETH2 @@ -362,7 +362,7 @@ static int fdt_set_eth2(void *fdt, int nodeoffset, const char *name, bd_t *bd) if (fdt_get_property(fdt, nodeoffset, name, 0)) { return fdt_setprop(fdt, nodeoffset, name, bd->bi_enet2addr, 6); } - return -FDT_ERR_NOTFOUND; + return 0; /* doesn't exist, but is not a problem. */ } #endif #ifdef CONFIG_HAS_ETH3 @@ -375,7 +375,7 @@ static int fdt_set_eth3(void *fdt, int nodeoffset, const char *name, bd_t *bd) if (fdt_get_property(fdt, nodeoffset, name, 0)) { return fdt_setprop(fdt, nodeoffset, name, bd->bi_enet3addr, 6); } - return -FDT_ERR_NOTFOUND; + return 0; /* doesn't exist, but is not a problem. */ } #endif @@ -389,6 +389,19 @@ static int fdt_set_busfreq(void *fdt, int nodeoffset, const char *name, bd_t *bd return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); } +#ifdef OF_TBCLK +static int fdt_set_tbfreq(void *fdt, int nodeoffset, const char *name, bd_t *bd) +{ + u32 tmp; + /* + * Create or update the property. + */ + tmp = cpu_to_be32(OF_TBCLK); + return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} +#endif + + /* * Fixups to the fdt. If "create" is TRUE, the node is created * unconditionally. If "create" is FALSE, the node is updated @@ -399,19 +412,25 @@ static const struct { char *prop; int (*set_fn)(void *fdt, int nodeoffset, const char *name, bd_t *bd); } fixup_props[] = { +#ifdef OF_TBCLK { "/cpus/" OF_CPU, - "bus-frequency", - fdt_set_busfreq + "timebase-frequency", + fdt_set_tbfreq }, - { "/cpus/" OF_SOC, +#endif + { "/cpus/" OF_CPU, "bus-frequency", fdt_set_busfreq }, - { "/" OF_SOC "/serial@4500/", + { "/cpus/" OF_CPU, + "clock-frequency", + fdt_set_busfreq + }, + { "/" OF_SOC "/serial@4500", "clock-frequency", fdt_set_busfreq }, - { "/" OF_SOC "/serial@4600/", + { "/" OF_SOC "/serial@4600", "clock-frequency", fdt_set_busfreq }, @@ -437,20 +456,20 @@ static const struct { #endif #ifdef CONFIG_UEC_ETH1 #if CFG_UEC1_UCC_NUM == 0 /* UCC1 */ - { "/" OF_QE "/ucc@2000/mac-address", + { "/" OF_QE "/ucc@2000", "mac-address", fdt_set_eth0 }, - { "/" OF_QE "/ucc@2000/mac-address", + { "/" OF_QE "/ucc@2000", "local-mac-address", fdt_set_eth0 }, #elif CFG_UEC1_UCC_NUM == 2 /* UCC3 */ - { "/" OF_QE "/ucc@2200/mac-address", + { "/" OF_QE "/ucc@2200", "mac-address", fdt_set_eth0 }, - { "/" OF_QE "/ucc@2200/mac-address", + { "/" OF_QE "/ucc@2200", "local-mac-address", fdt_set_eth0 }, @@ -458,20 +477,20 @@ static const struct { #endif #ifdef CONFIG_UEC_ETH2 #if CFG_UEC2_UCC_NUM == 1 /* UCC2 */ - { "/" OF_QE "/ucc@3000/mac-address", + { "/" OF_QE "/ucc@3000", "mac-address", fdt_set_eth1 }, - { "/" OF_QE "/ucc@3000/mac-address", + { "/" OF_QE "/ucc@3000", "local-mac-address", fdt_set_eth1 }, #elif CFG_UEC1_UCC_NUM == 3 /* UCC4 */ - { "/" OF_QE "/ucc@3200/mac-address", + { "/" OF_QE "/ucc@3200", "mac-address", fdt_set_eth1 }, - { "/" OF_QE "/ucc@3200/mac-address", + { "/" OF_QE "/ucc@3200", "local-mac-address", fdt_set_eth1 }, @@ -489,12 +508,18 @@ ft_cpu_setup(void *blob, bd_t *bd) for (j = 0; j < (sizeof(fixup_props) / sizeof(fixup_props[0])); j++) { nodeoffset = fdt_find_node_by_path(fdt, fixup_props[j].node); if (nodeoffset >= 0) { - err = fixup_props[j].set_fn(blob, nodeoffset, fixup_props[j].prop, bd); + err = fixup_props[j].set_fn( + blob, nodeoffset, fixup_props[j].prop, bd); if (err < 0) - printf("set_fn/libfdt: %s %s returned %s\n", + printf("set_fn(%s, %s) returned %s\n", fixup_props[j].node, fixup_props[j].prop, fdt_strerror(err)); + } else { + printf("fdt_find_node_by_path(%s) returned %s\n", + fixup_props[j].node, + fdt_strerror(nodeoffset)); + } } } -- 1.4.4.4

3 4

[U-Boot-Users] Trouble building u-boot 1.2 with NAND support
by Philip Balister 30 May '07

30 May '07

I've been trying to compile u-boot with support for NAND flash for the Lyrtech SFFSDR board (TI davinci based). I've acquired various davinci patches, but keep getting linking errors. Currently, I am working with patches from http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/27603 applied to u-boot 1.2, but I ahve also seen this problem with patches based of TI's u-boot. Does anyone have any suggestions? I am really new to u-boot ... Philip cd /home/balister/src/sffsdr/koi8_u-boot && arm-angstrom-linux-gnueabi-ld -Bstatic -T /home/balister/src/sffsdr/koi8_u-boot/board/davinci/u-boot.lds -Ttext 0x81080000 $UNDEF_SYM cpu/arm926ejs/start.o \ --start-group lib_generic/libgeneric.a board/davinci/libdavinci.a cpu/arm926ejs/libarm926ejs.a cpu/arm926ejs/tms320dm6446/libtms320dm6446.a lib_arm/libarm.a fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a net/libnet.a disk/libdisk.a rtc/librtc.a dtt/libdtt.a drivers/libdrivers.a drivers/nand/libnand.a drivers/nand_legacy/libnand_legacy.a drivers/sk98lin/libsk98lin.a post/libpost.a post/cpu/libcpu.a common/libcommon.a --end-group -L /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2 -lgcc \ -Map u-boot.map -o u-boot /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2/libgcc.a(_udivsi3.o): In function `__aeabi_uidiv': /home/balister/oe_home/tmp/work/armv5te-angstrom-linux-gnueabi/gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/lib1funcs.asm:730: multiple definition of `__udivsi3' lib_arm/libarm.a(_udivsi3.o):/home/balister/src/sffsdr/koi8_u-boot/lib_arm/_udivsi3.S:17: first defined here arm-angstrom-linux-gnueabi-ld: Warning: size of symbol `__udivsi3' changed from 152 in lib_arm/libarm.a(_udivsi3.o) to 252 in /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2/libgcc.a(_udivsi3.o) arm-angstrom-linux-gnueabi-ld: ERROR: Source object /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2/libgcc.a(_udivdi3.o) has EABI version 4, but target u-boot has EABI version 0 arm-angstrom-linux-gnueabi-ld: failed to merge target specific data of file /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2/libgcc.a(_udivdi3.o) arm-angstrom-linux-gnueabi-ld: ERROR: Source object /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2/libgcc.a(_udivsi3.o) has EABI version 4, but target u-boot has EABI version 0 arm-angstrom-linux-gnueabi-ld: failed to merge target specific data of file /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2/libgcc.a(_udivsi3.o) arm-angstrom-linux-gnueabi-ld: ERROR: Source object /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2/libgcc.a(_clz.o) has EABI version 4, but target u-boot has EABI version 0 arm-angstrom-linux-gnueabi-ld: failed to merge target specific data of file /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2/libgcc.a(_clz.o) /home/balister/oe_home/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2/libgcc.a(_udivdi3.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0' make: *** [u-boot] Error 1

1 1

[U-Boot-Users] [PATCH libfdt 3/3] More clean up of cmd_bootm.c
by Jerry Van Baren 30 May '07

30 May '07

Removed redundant calls to fdt_chosen(), fdt_env(), and fdt_bd_t() Fixed most overlength lines. Some lines remain longer than 80 characters, but it isn't obvious to the author how to wrap them in a readable way. Signed-off-by: Gerald Van Baren <vanbaren(a)cideas.com> --- common/cmd_bootm.c | 98 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 65 insertions(+), 33 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 25b9d74..786ff6e 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -514,6 +514,19 @@ fixup_silent_linux () } #endif /* CONFIG_SILENT_CONSOLE */ +/* + * Some FDT-related defines to reduce clutter in the main code. + */ +#if defined(CONFIG_OF_FLAT_TREE) +#define FDT_VALIDATE \ + (*((ulong *)(of_flat_tree + sizeof(image_header_t))) != OF_DT_HEADER) +#endif +#if defined(CONFIG_OF_LIBFDT) +#define FDT_VALIDATE \ + (fdt_check_header(of_flat_tree + sizeof(image_header_t)) != 0) +#endif + + #ifdef CONFIG_PPC static void __attribute__((noinline)) do_bootm_linux (cmd_tbl_t *cmdtp, int flag, @@ -748,11 +761,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, if(argc > 3) { of_flat_tree = (char *) simple_strtoul(argv[3], NULL, 16); hdr = (image_header_t *)of_flat_tree; -#if defined(CONFIG_OF_LIBFDT) - if (fdt_check_header(of_flat_tree) == 0) { -#else - if (*(ulong *)of_flat_tree == OF_DT_HEADER) { -#endif + if (FDT_VALIDATE) { #ifndef CFG_NO_FLASH if (addr2info((ulong)of_flat_tree) != NULL) of_data = (ulong)of_flat_tree; @@ -763,7 +772,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, if ((ntohl(hdr->ih_load) < ((unsigned long)hdr + ntohl(hdr->ih_size) + sizeof(hdr))) && ((ntohl(hdr->ih_load) + ntohl(hdr->ih_size)) > (unsigned long)hdr)) { - puts ("ERROR: Load address overwrites Flat Device Tree uImage\nMust RESET board to recover\n"); + puts ("ERROR: Load address overwrites the " + "Flat Device Tree uImage.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } @@ -773,7 +784,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, header.ih_hcrc = 0; if(checksum != crc32(0, (uchar *)&header, sizeof(image_header_t))) { - puts ("ERROR: Flat Device Tree header checksum is invalid\nMust RESET board to recover\n"); + puts ("ERROR: The Flat Device Tree header " + "checksum is invalid.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } @@ -781,25 +794,28 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, addr = (ulong)((uchar *)(hdr) + sizeof(image_header_t)); if(checksum != crc32(0, (uchar *)addr, ntohl(hdr->ih_size))) { - puts ("ERROR: Flat Device Tree checksum is invalid\nMust RESET board to recover\n"); + puts ("ERROR: The Flat Device Tree checksum " + "is invalid.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } printf("OK\n"); if (ntohl(hdr->ih_type) != IH_TYPE_FLATDT) { - puts ("ERROR: uImage not Flat Device Tree type\nMust RESET board to recover\n"); + puts ("ERROR: uImage is not a " + "Flat Device Tree type.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } if (ntohl(hdr->ih_comp) != IH_COMP_NONE) { - puts ("ERROR: uImage is not uncompressed\nMust RESET board to recover\n"); + puts ("ERROR: uImage is not uncompressed.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } -#if defined(CONFIG_OF_LIBFDT) - if (fdt_check_header(of_flat_tree + sizeof(image_header_t)) != 0) { -#else - if (*((ulong *)(of_flat_tree + sizeof(image_header_t))) != OF_DT_HEADER) { -#endif - puts ("ERROR: uImage data is not a flat device tree\nMust RESET board to recover\n"); + if (FDT_VALIDATE) { + puts ("ERROR: uImage data is not " + "a Flat Device Tree.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } @@ -808,10 +824,11 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, ntohl(hdr->ih_size)); of_flat_tree = (char *)ntohl(hdr->ih_load); } else { - puts ("Did not find a flat flat device tree\nMust RESET board to recover\n"); + puts ("Did not find a flat Flat Device Tree.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } - printf (" Booting using flat device tree at 0x%x\n", + printf (" Booting using the Flat Device Tree at 0x%x\n", of_flat_tree); } else if ((hdr->ih_type==IH_TYPE_MULTI) && (len_ptr[1]) && (len_ptr[2])) { u_long tail = ntohl(len_ptr[0]) % 4; @@ -835,12 +852,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, of_data += 4 - tail; } -#if defined(CONFIG_OF_LIBFDT) - if (fdt_check_header((void *)of_data) != 0) { -#else - if (((struct boot_param_header *)of_data)->magic != OF_DT_HEADER) { -#endif - puts ("ERROR: image is not a flat device tree\nMust RESET board to recover\n"); + if (FDT_VALIDATE) { + puts ("ERROR: image is not a Flat Device Tree.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } @@ -849,7 +863,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, #else if (((struct boot_param_header *)of_data)->totalsize != ntohl(len_ptr[2])) { #endif - puts ("ERROR: flat device tree size does not agree with image\nMust RESET board to recover\n"); + puts ("ERROR: Flat Device Tree size does not " + "agree with the image size.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } } @@ -944,25 +960,30 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, of_start, of_start + of_len - 1); err = fdt_open_into((void *)of_data, (void *)of_start, of_len); if (err != 0) { - printf ("libfdt: %s " __FILE__ " %d\n", fdt_strerror(err), __LINE__); + puts ("ERROR: Failed to move the Flat Device Tree.\n" + "Must RESET the board to recover.\n"); + do_reset (cmdtp, flag, argc, argv); } /* * Add the chosen node if it doesn't exist, add the env and bd_t * if the user wants it (the logic is in the subroutines). */ if (fdt_chosen(of_flat_tree, initrd_start, initrd_end, 0) < 0) { - puts ("ERROR: Failed creating the /chosen node, aborting.\nMust RESET board to recover\n"); + puts ("ERROR: Failed creating the /chosen node.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } #ifdef CONFIG_OF_HAS_UBOOT_ENV if (fdt_env(of_flat_tree) < 0) { - puts ("ERROR: Failed creating the /u-boot-env node, aborting.\nMust RESET board to recover\n"); + puts ("ERROR: Failed creating the /u-boot-env node.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } #endif #ifdef CONFIG_OF_HAS_BD_T if (fdt_bd_t(of_flat_tree) < 0) { - puts ("ERROR: Failed creating the /bd_t node, aborting.\nMust RESET board to recover\n"); + puts ("ERROR: Failed creating the /bd_t node.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } #endif @@ -989,23 +1010,34 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, } #endif #if defined(CONFIG_OF_FLAT_TREE) + /* + * Create the /chosen node and modify the blob with board specific + * values as needed. + */ ft_setup(of_flat_tree, kbd, initrd_start, initrd_end); /* ft_dump_blob(of_flat_tree); */ #endif #if defined(CONFIG_OF_LIBFDT) + /* + * Create the /chosen node and modify the blob with board specific + * values as needed. + */ if (fdt_chosen(of_flat_tree, initrd_start, initrd_end, 0) < 0) { - puts ("ERROR: Failed to create the /chosen node, aborting.\nMust RESET board to recover\n"); + puts ("ERROR: Failed to create the /chosen node.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } #ifdef CONFIG_OF_HAS_UBOOT_ENV if (fdt_env(of_flat_tree) < 0) { - puts ("ERROR: Failed to create the /u-boot-env node, aborting.\nMust RESET board to recover\n"); + puts ("ERROR: Failed to create the /u-boot-env node.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } #endif #ifdef CONFIG_OF_HAS_BD_T if (fdt_bd_t(of_flat_tree) < 0) { - puts ("ERROR: Failed to create the /bd_t node, aborting.\nMust RESET board to recover\n"); + puts ("ERROR: Failed to create the /bd_t node, aborting.\n" + "Must RESET the board to recover.\n"); do_reset (cmdtp, flag, argc, argv); } #endif @@ -1024,7 +1056,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, if (of_flat_tree) { /* device tree; boot new style */ /* * Linux Kernel Parameters (passing device tree): - * r3: ptr to flattened device tree, followed by the board info data + * r3: pointer to the fdt, followed by the board info data * r4: physical pointer to the kernel itself * r5: NULL * r6: NULL -- 1.4.4.4

3 4

[U-Boot-Users] [PATCH 2/3] Fix fdt_chosen() to call ft_board_setup(), clean up long lines.
by Jerry Van Baren 30 May '07

30 May '07

The fdt_chosen() function was adding/seting some properties ad-hoc improperly and duplicated (poorly) what was done in ft_board_setup() Clean up long lines (setting properties, printing errors). Signed-off-by: Gerald Van Baren <vanbaren(a)cideas.com> --- Kim: Can I have an ack/nack on this? Thanks, gvb common/fdt_support.c | 113 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 74 insertions(+), 39 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index efa63f0..d12c751 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -32,6 +32,10 @@ #include <libfdt.h> #include <fdt_support.h> +#ifdef CONFIG_OF_BOARD_SETUP +void ft_board_setup(void *blob, bd_t *bd); +#endif + /* * Global data (for the gd->bd) */ @@ -42,7 +46,6 @@ DECLARE_GLOBAL_DATA_PTR; */ struct fdt_header *fdt; - /********************************************************************/ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) @@ -50,9 +53,8 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) bd_t *bd = gd->bd; int nodeoffset; int err; - u32 tmp; /* used to set 32 bit integer properties */ - char *str; /* used to set string properties */ - ulong clock; + u32 tmp; /* used to set 32 bit integer properties */ + char *str; /* used to set string properties */ err = fdt_check_header(fdt); if (err < 0) { @@ -60,6 +62,17 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) return err; } +#ifdef CONFIG_OF_BOARD_SETUP + /* + * ft_board_setup() sets various board-specific properties to + * the proper values. + * + * STRICTLY SPEAKING, this is out of place, but it isn't clear + * where a better place would be. + */ + ft_board_setup(fdt, bd); +#endif + if (initrd_start && initrd_end) { struct fdt_reserve_entry re; int used; @@ -72,7 +85,8 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) return err; } if (used >= total) { - printf("WARNING fdt_chosen: no room in the reserved map (%d of %d)\n", + printf("WARNING fdt_chosen: " + "no room in the reserved map (%d of %d)\n", used, total); return -1; } @@ -115,7 +129,10 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) */ nodeoffset = fdt_add_subnode(fdt, 0, "chosen"); if (nodeoffset < 0) { - printf("WARNING fdt_chosen: could not create the \"/chosen node\" (libfdt error %s).\n", fdt_strerror(nodeoffset)); + printf("WARNING fdt_chosen: " + "could not create the \"/chosen node\" " + "(libfdt error %s).\n", + fdt_strerror(nodeoffset)); return nodeoffset; } } @@ -125,42 +142,42 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) */ str = getenv("bootargs"); if (str != NULL) { - err = fdt_setprop(fdt, nodeoffset, "bootargs", str, strlen(str)+1); + err = fdt_setprop(fdt, nodeoffset, + "bootargs", str, strlen(str)+1); if (err < 0) - printf("WARNING fdt_chosen: could not set \"bootargs\" (libfdt error %s).\n", fdt_strerror(err)); + printf("WARNING fdt_chosen: " + "could not set \"bootargs\" " + "(libfdt error %s).\n", + fdt_strerror(err)); } if (initrd_start && initrd_end) { tmp = __cpu_to_be32(initrd_start); - err = fdt_setprop(fdt, nodeoffset, "linux,initrd-start", &tmp, sizeof(tmp)); + err = fdt_setprop(fdt, nodeoffset, + "linux,initrd-start", &tmp, sizeof(tmp)); if (err < 0) - printf("WARNING fdt_chosen: could not set \"linux,initrd-start\" (libfdt error %s).\n", fdt_strerror(err)); + printf("WARNING fdt_chosen: " + "could not set \"linux,initrd-start\" " + "(libfdt error %s).\n", + fdt_strerror(err)); tmp = __cpu_to_be32(initrd_end); - err = fdt_setprop(fdt, nodeoffset, "linux,initrd-end", &tmp, sizeof(tmp)); + err = fdt_setprop(fdt, nodeoffset, + "linux,initrd-end", &tmp, sizeof(tmp)); if (err < 0) - printf("WARNING fdt_chosen: could not set \"linux,initrd-end\" (libfdt error %s).\n", fdt_strerror(err)); + printf("WARNING fdt_chosen: " + "could not set \"linux,initrd-end\" " + "(libfdt error %s).\n", + fdt_strerror(err)); } #ifdef OF_STDOUT_PATH - err = fdt_setprop(fdt, nodeoffset, "linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1); + err = fdt_setprop(fdt, nodeoffset, + "linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1); if (err < 0) - printf("WARNING fdt_chosen: could not set \"linux,stdout-path\" (libfdt error %s).\n", fdt_strerror(err)); + printf("WARNING fdt_chosen: " + "could not set \"linux,stdout-path\" " + "(libfdt error %s).\n", + fdt_strerror(err)); #endif - nodeoffset = fdt_find_node_by_path (fdt, "/cpus"); - if (nodeoffset >= 0) { - clock = cpu_to_be32(bd->bi_intfreq); - err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4); - if (err < 0) - printf("WARNING fdt_chosen: could not set \"clock-frequency\" (libfdt error %s).\n", fdt_strerror(err)); - } -#ifdef OF_TBCLK - nodeoffset = fdt_find_node_by_path (fdt, "/cpus/" OF_CPU "/timebase-frequency"); - if (nodeoffset >= 0) { - clock = cpu_to_be32(OF_TBCLK); - err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4); - if (err < 0) - printf("WARNING fdt_chosen: could not set \"clock-frequency\" (libfdt error %s).\n", fdt_strerror(err)); - } -#endif return err; } @@ -203,7 +220,10 @@ int fdt_env(void *fdt) */ nodeoffset = fdt_add_subnode(fdt, 0, "u-boot-env"); if (nodeoffset < 0) { - printf("WARNING fdt_env: could not create the \"/u-boot-env node\" (libfdt error %s).\n", fdt_strerror(nodeoffset)); + printf("WARNING fdt_env: " + "could not create the \"/u-boot-env node\" " + "(libfdt error %s).\n", + fdt_strerror(nodeoffset)); return nodeoffset; } @@ -231,7 +251,10 @@ int fdt_env(void *fdt) continue; err = fdt_setprop(fdt, nodeoffset, lval, rval, strlen(rval)+1); if (err < 0) { - printf("WARNING fdt_env: could not set \"%s\" (libfdt error %s).\n", lval, fdt_strerror(err)); + printf("WARNING fdt_env: " + "could not set \"%s\" " + "(libfdt error %s).\n", + lval, fdt_strerror(err)); return err; } } @@ -297,7 +320,7 @@ int fdt_bd_t(void *fdt) bd_t *bd = gd->bd; int nodeoffset; int err; - u32 tmp; /* used to set 32 bit integer properties */ + u32 tmp; /* used to set 32 bit integer properties */ int i; err = fdt_check_header(fdt); @@ -323,7 +346,10 @@ int fdt_bd_t(void *fdt) */ nodeoffset = fdt_add_subnode(fdt, 0, "bd_t"); if (nodeoffset < 0) { - printf("WARNING fdt_bd_t: could not create the \"/bd_t node\" (libfdt error %s).\n", fdt_strerror(nodeoffset)); + printf("WARNING fdt_bd_t: " + "could not create the \"/bd_t node\" " + "(libfdt error %s).\n", + fdt_strerror(nodeoffset)); printf("libfdt: %s\n", fdt_strerror(nodeoffset)); return nodeoffset; } @@ -332,20 +358,29 @@ int fdt_bd_t(void *fdt) */ for (i = 0; i < sizeof(bd_map)/sizeof(bd_map[0]); i++) { tmp = cpu_to_be32(getenv("bootargs")); - err = fdt_setprop(fdt, nodeoffset, bd_map[i].name, &tmp, sizeof(tmp)); + err = fdt_setprop(fdt, nodeoffset, + bd_map[i].name, &tmp, sizeof(tmp)); if (err < 0) - printf("WARNING fdt_bd_t: could not set \"%s\" (libfdt error %s).\n", bd_map[i].name, fdt_strerror(err)); + printf("WARNING fdt_bd_t: " + "could not set \"%s\" " + "(libfdt error %s).\n", + bd_map[i].name, fdt_strerror(err)); } /* * Add a couple of oddball entries... */ err = fdt_setprop(fdt, nodeoffset, "enetaddr", &bd->bi_enetaddr, 6); if (err < 0) - printf("WARNING fdt_bd_t: could not set \"enetaddr\" (libfdt error %s).\n", fdt_strerror(err)); + printf("WARNING fdt_bd_t: " + "could not set \"enetaddr\" " + "(libfdt error %s).\n", + fdt_strerror(err)); err = fdt_setprop(fdt, nodeoffset, "ethspeed", &bd->bi_ethspeed, 4); if (err < 0) - printf("WARNING fdt_bd_t: could not set \"ethspeed\" (libfdt error %s).\n", fdt_strerror(err)); - + printf("WARNING fdt_bd_t: " + "could not set \"ethspeed\" " + "(libfdt error %s).\n", + fdt_strerror(err)); return 0; } #endif /* ifdef CONFIG_OF_HAS_BD_T */ -- 1.4.4.4

2 3

[U-Boot-Users] problem with ethernet after boot into uClinux
by Allen Liu 30 May '07

30 May '07

I am running uboot 1.1.5 and I have uClinux image that include kernel and romfs. I download to my board (M5272C3 based) using tftpboot. Everything looks fine but, dhcpcd failed to get ip address and Ethernet packet transmit kept timeout. Buffer descriptor got dumped eveny few seconds. The same image (elf file instead of bin file) download under umon that works fine on that part. Anyone has idea? Oh, I have set my Ethernet address, but it did not help. Thanks! Allen

2 1

[U-Boot-Users] Porting U-Boot on to Cogent CSB535FS
by Midhun Agnihotram 30 May '07

30 May '07

Hi All, I have a Cogent CSB535FS board which has come with uMOn Boot loader. I would like to replace it with U-Boot. Has anybody done this before?? I see that U-boot has been ported to CSB226, CSB272, CSB472 and CSB637. Does anybody have pointers to any related stuff?? Thanks & Regards, Midhun Agnihotram.

1 0

[U-Boot-Users] Changing memory for ixdp
by sapirf fersht 30 May '07

30 May '07

Hello Everyone I need some help regarding changing flash memory on a board that is based on ixdp-425. This is my first time with u-boot and i need to change the memory from 256Mb to 128Mb. How can i do it? Thanks in advance, Sapir

1 0

Re: [U-Boot-Users] OneNAND alternative to X-Load
by Kyungmin Park 30 May '07

30 May '07

Hi Pete Mackay, Before the main story, I explain the history of x-loader. First, it was designed for NAND boot from TI for their platforms. With simple code and similar structure of U-Boot, it's easy to modify for OneNAND. And at that time, we also considered another bootloader, of course, including U-Boot. So we released the X-loader for OneNAND as 1st bootloader. Now you want to add the 1KB bootloader (1st bootloader) for OneNAND at U-Boot. I think there's no problem except the handling of code position at OneNAND. The original handling of xloader is like this 1. The xloader (less than 1KB) loads u-boot image to DRAM using BufferRAM0. 2. Jump to DRAM address 3. run u-boot at DRAM 0x0000 (BootRAM0) __xloader_start --> load u-boot code to BufferRAM0 0x03fff __xloader_end 0x0400 (not valid) 0x0800 (BufferRAM0) used for xloader buffer ram --> u-boot code 0x0bff 0x0c00 (BufferRAM1) not used --> used for u-boot buffer ram 0x0fff But as you mentioned, you can make a u-boot.bin image with linker script handling. Overall structures are similar except that it's built with one time. Also you can find the similar idea at http://linuxdevices.com/articles/AT2779754250.html And please see the below comment. Thank you, Kyungmin Park > > We're developing a PXA-270-based machine that will boot from > OneNAND. I > wanted to share my ideas (and code) with anyone faced with > this challenge, > since this forum (esp. Kyungmin Park - thank you!!) was quite helpful. > I'll start off explaining my u-boot code, then when I get > some time I'll > submit my PXA-270 platform driver as a patch (currently works > on 2.6.18). > > We use a common approach: in lacking JTAG we have chip select > jumpers that > swap CS0/CS1 between NOR and OneNAND. The OneNAND has a > bottom-mapped 2K > boot buffer of which 1K is valid, which is where the level 1 > boot loader > fits. It uses two memory-mapped 'bufferrams' to ping-pong > data out of the > NAND pages, but you want to use BUFFERRAM1 only as writing > BUFFERRAM0 can > corrupt BOOTRAM0 on some revs of the chip. (We're executing out of > BOOTRAM0 so that's bad :). > > There is open-source code called "x-loader" that is a > stripped-down u-boot > for the level 1 boot loader. What I did was integrate the level 1 > function into u-boot itself with a custom configuration and > linker script. > In the top u-boot Makefile I added this: > > myboard_config : unconfig > @./mkconfig $(@:_config=) arm pxa myboard > > myboard_onenand_config : unconfig > @./mkconfig $(@:_config=) arm pxa myboard > @echo "LDSCRIPT := > $(TOPDIR)/board/myboard/u-boot.onenand.lds" >> > include/config.mk > > In include/configs/myboard_onenand.h I simply define > CONFIG_BOOT_ONENAND > and then include myboard.h, with conditional switches inside for base > address, etc (i.e. define CONFIG_IDENT_STRING as " from > OneNAND" or " from > NOR"). > > The linker script replaces cpu/pxa/start.S with oneboot.S and > makes sure > the C code to load the other pages positions there too. Then > it aligns > the rest of u-boot at the 2K boundary (NAND page 1). The > oneboot.S code > melds start.S with lowlevel_init but calls C code to read the > rest of the > block 0 pages into RAM. I later optimized it to replace > start.S entirely > for the NOR version. > > BTW, I lacked originality and stole (liked) the name: oneboot > is not to be > confused with the script that merges x-load and u-boot into one binary > image. > > This is the relevant portion of the u-boot linker script: > > . = 0x00000000; > > . = ALIGN(4); > .text : > { > board/myboard/oneboot.o (.text) > board/myboard/onenand_boot.o (.text) The onenand_boot.c is common code for all platforms. I think it's located in drivers/onenand or onenand_spl as nand_spl in U-Boot. Yes I know the OneNAND patch for U-Boot is not merged yet. In this code, however, there's no problem to boot with OneNAND. > __oneboot_end = .; /* must not exceed 0x400! */ > > . = 0x800; /* reposition to 2K page boundary */ > __page1_start = .; /* OneNAND loading starts here */ > * (.text) > } > > Look at System.map to make sure your level 1 code fits within > 1K. Also in > oneboot.S I commented out labels and used relative branches > to save symbol > space and replaced ldr with mov wherever possible. And with the 270 > optimizations in oneboot.S our system screams! > > The full code is at http://code.architechnical.net/onenand, > including the > 2.6.18 pxa27x OneNAND driver. Please don't laugh at my lame > ancient web > site. > > > > ______________________________________________________ > Linux MTD discussion mailing list > http://lists.infradead.org/mailman/listinfo/linux-mtd/ > >

1 0

[U-Boot-Users] Effect of Large flash memories
by Ulf Samuelsson 30 May '07

30 May '07

I think when we do a new interface we need to look at how we handle situations where the flash is much larger than the SDRAM. It is conceivable that you would want to copy a 300 MB JFFS2 file system from a USB key to internal NAND flash in a system which only has 64-128 MB of SDRAM. An explicit command loop to do this is IMHO too complex and error prone. A command which copies between different storage locations is therefore desirable. (It would need intermediate SDRAM buffers) -- Best Regards, Ulf Samuelsson

1 0

[U-Boot-Users] [PATCH] cosmetic changes to the 5704 driver
by Vadim Bendebury 30 May '07

30 May '07

This is a purely cosmetic change, it does not introduce any generated code changes, done to allow for coding standards compliant driver modifications in the future. The patch is too large, posted right here: http://www.vsbe.com/u-boot/patch.txt -- Vadim Bendebury Platforms SW - (650) 253-7486 - mailto:vbendeb@google.com

2 3

[U-Boot-Users] loads command is not working
by Vaibhav Hiremath 29 May '07

29 May '07

Hi All, Can anyone tell me how to test loads command? I have tested loadb and loady command, and they are working fine. While testing loads uboot console only displays message "Ready for loading s-record file" but doing nothing. I think I am testing this command with wrong procedure, I hav used hyperterminal to test loadb and loady commands. So please guide me to test this out. Thanks in advance. Thanks, Vaibhav

6 10

[U-Boot-Users] How to reduce the U-boot image size?
by jack 29 May '07

29 May '07

Hi all: I remove most of commands form u-boot, after I entering bootloader type ?, I can see the command are much less. But why does the size of u-boot.bin still the same, basically it shall be smaller right? I already change the variable "CFG_MONITOR_LEN" and "UBOOT_IMAGE_SIZE" but not working. Can anybody tell me how to make a smaller u-boot image and what variables shall I modify, thanks a lot. jack

1 0

[U-Boot-Users] RAM version of U-Boot
by Midhun Agnihotram 29 May '07

29 May '07

Hi All, I am pretty new to U-boot and the embedded world too. I have a kit with an ARM 926EJ-S based processor and Micromonitor as the boot loader. But we are facing some problems with Micromonitor. So we would like to change it. U-boot seems be a very good option. But I would like to test out my applications on U-boot before I burn it on to the flash. So can U-boot be made as an application ?? So that I can load it into RAM and then run my application without loosing Micromonitor?? Thanks a lot, Midhun Agnihotram.

2 1

[U-Boot-Users] mixup
by maarten 28 May '07

28 May '07

ok my fault, when clicking the downoad I got a .bin, witch I supposed was a binary file of some sort, but after renaming it to .gz and unpacking it, all apears well.

1 0

[U-Boot-Users] [PATCH] LOGO: All logos must be placed into the "logos" directory.
by Rodolfo Giometti 28 May '07

28 May '07

Signed-off-by: Rodolfo Giometti <giometti(a)linux.it> --- tools/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 6177f90..14eedf0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -40,7 +40,7 @@ endif LOGO_H = $(OBJTREE)/include/bmp_logo.h ifeq ($(LOGO_BMP),) -LOGO_BMP= logos/denx.bmp +LOGO_BMP= denx.bmp endif #------------------------------------------------------------------------- @@ -203,8 +203,8 @@ $(obj)crc32.c: @rm -f $(obj)crc32.c ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c -$(LOGO_H): $(obj)bmp_logo $(LOGO_BMP) - $(obj)./bmp_logo $(LOGO_BMP) >$@ +$(LOGO_H): $(obj)bmp_logo logos/$(LOGO_BMP) + $(obj)./bmp_logo logos/$(LOGO_BMP) >$@ ######################################################################### -- 1.5.1.1

3 7

Re: [U-Boot-Users] U-Boot-Users Digest, Vol 12, Issue 98
by 白栋贤 28 May '07

28 May '07

Sorry, I forgeted to check its formatting before sending last mail. My board's info as following: 1 CPU: PXA270 2 SDRAM :0xA0000000 - 0xA4000000 64M 3 BOOT: nCS<0> CODE: 0x00000000 4 FFUART GPIO34 FFRXD GPIO35 FFCTS GPIO36 FFDCD GPIO37 FFDSR GPIO38 FFRI GPIO39 FFTXD GPIO40 FFDTR GPIO41 FFRTS As I'm a newer to uboot and PXA270, so in my opine, after patched the uboot114 directory, I just need to modify the mainstone.h to fit my board. But I failed. Then after compared with start.S for other cpus such as ixp, I found that the reset code are very similar to each other. At first I doubted about the reset code, so I modified start.S and lowlevel_Init.S with the start code of blob. But I failed yet. Could you possible give me some suggestion? Thank you very much. Best regards John> From: u-boot-users-request(a)lists.sourceforge.net> Subject: U-Boot-Users Digest, Vol 12, Issue 98> To: u-boot-users(a)lists.sourceforge.net> Date: Fri, 25 May 2007 07:29:03 -0700> > Send U-Boot-Users mailing list submissions to> u-boot-users(a)lists.sourceforge.net> > To subscribe or unsubscribe via the World Wide Web, visit> https://lists.sourceforge.net/lists/listinfo/u-boot-users> or, via email, send a message with subject or body 'help' to> u-boot-users-request(a)lists.sourceforge.net> > You can reach the person managing the list at> u-boot-users-owner(a)lists.sourceforge.net> > When replying, please edit your Subject line so it is more specific> than "Re: Contents of U-Boot-Users digest..."> > > Today's Topics:> > 1. Re: Imminent u-boot-fdt pull request (Jerry Van Baren)> 2. Abour JFFS2 commands (Vaibhav Hiremath)> 3. Re: Abour JFFS2 commands (Ladislav Michl)> 4. [PATCH] Fix ppc4xx bootstrap letter displayed on startup> (Benoit Monin)> 5. Re: [RFC] logos directory & default logo (Rodolfo Giometti)> 6. [PATCH] LOGO: All logos must be placed into the "logos"> directory. (Rodolfo Giometti)> 7. [PATCH] LOGO: Allow define "LOGO_BMP" to be globally defined.> (Rodolfo Giometti)> 8. Re: [PATCH] LOGO: All logos must be placed into the "logos"> directory. (Wolfgang Denk)> 9. Re: [PATCH] LOGO: Allow define "LOGO_BMP" to be globally> defined. (Wolfgang Denk)> > > ----------------------------------------------------------------------> > Message: 1> Date: Fri, 25 May 2007 07:54:47 -0400> From: Jerry Van Baren <gerald.vanbaren(a)smiths-aerospace.com>> Subject: Re: [U-Boot-Users] Imminent u-boot-fdt pull request> To: Kim Phillips <kim.phillips(a)freescale.com>> Cc: u-boot-users(a)lists.sourceforge.net> Message-ID: <4656CE87.8080200(a)smiths-aerospace.com>> Content-Type: text/plain; charset=ISO-8859-1; format=flowed> > Kim Phillips wrote:> > On Tue, 22 May 2007 00:06:06 -0400> > Jerry Van Baren <gvb.uboot(a)gmail.com> wrote:> > > >> Dear all,> >>> >> Please review the u-boot-fdt changes. I intend to request Wolfgang pull > >> the pending changes soon. All of the changes (except the last trivial > > > > I have properties being placed at the wrong level, timebase- and> > bus-frequencies not being updated, there are multiple copies of the> > code, and, it is hard to read - I saw a line length of 139!> > > > Please work on your CodingStyle. I haven't finished debugging here.> > > > Kim> > Hi Kim,> > Thanks for the feedback, I'll check things. Pointers to files (and > lines) would be helpful. :-/> > WRT line lengths, Wolfgang dinged me on them so I created a cleanup > patch. As a result, one patch has line length violations and a later > patch fixes them. This may be related to your line length and multiple > copy comment.> > Thanks,> gvb> > > > ------------------------------> > Message: 2> Date: Fri, 25 May 2007 17:41:01 +0530> From: "Vaibhav Hiremath" <hvaibhav(a)gmail.com>> Subject: [U-Boot-Users] Abour JFFS2 commands> To: u-boot-users(a)lists.sourceforge.net> Message-ID:> <fde666620705250511l1c5002fcy5a312f19f4423552(a)mail.gmail.com>> Content-Type: text/plain; charset="iso-8859-1"> > Hi All,> > How many JFFS commands uboot supports?> > Actually,> I have ported UBoot for ARM1176 CPU, and I am using Intel NOR Flash.> After mounting JFFS2 on to Flash memory I am able to see only "fsinfo" and> "ls" command only.> > There should be rm, cd, etc.. commands. Is I am missing something?> > Thanks in advance.> > Thanks,> Vaibhav> -------------- next part --------------> An HTML attachment was scrubbed...> > ------------------------------> > Message: 3> Date: Fri, 25 May 2007 14:22:56 +0200> From: Ladislav Michl <ladis(a)linux-mips.org>> Subject: Re: [U-Boot-Users] Abour JFFS2 commands> To: Vaibhav Hiremath <hvaibhav(a)gmail.com>> Cc: u-boot-users(a)lists.sourceforge.net> Message-ID: <20070525122256.GA10916(a)michl.2n.cz>> Content-Type: text/plain; charset="us-ascii"> > On Fri, May 25, 2007 at 05:41:01PM +0530, Vaibhav Hiremath wrote:> > Hi All,> > > > How many JFFS commands uboot supports?> > > > Actually,> > I have ported UBoot for ARM1176 CPU, and I am using Intel NOR Flash.> > After mounting JFFS2 on to Flash memory I am able to see only "fsinfo" and> > "ls" command only.> > > > There should be rm, cd, etc.. commands. Is I am missing something?> > jffs2 is read-only in u-boot, there fore there is no 'rm' command.> Change directory is not implemented. The only command are:> fsinfo, fsload and ls (it takes agrument: directory to list files in)> > Best regards,> ladis> > > > > ------------------------------> > Message: 4> Date: Fri, 25 May 2007 14:56:05 +0200> From: "Benoit Monin" <benoit.monin(a)laposte.net>> Subject: [U-Boot-Users] [PATCH] Fix ppc4xx bootstrap letter displayed> on startup> To: "wd" <wd(a)denx.de>> Cc: u-boot-users <u-boot-users(a)lists.sourceforge.net>> Message-ID: <JILL9H$2EBD6CBE5F7929B929E9F4475080EFCD(a)laposte.net>> Content-Type: text/plain; charset="iso-8859-1"> > The attached patch is mainly cosmetic, allowing u-boot to> display the correct bootstrap option letter according to the> datasheets.> > Signed-off-by: Beno?t Monin <bmonin <at> adeneo.eu>> ---> The patch is against U-Boot 1.2.0.> > --> > > Cr?ez votre adresse ?lectronique prenom.nom(a)laposte.net > 1 Go d'espace de stockage, anti-spam et anti-virus int?gr?s.> -------------- next part --------------> A non-text attachment was scrubbed...> Name: fix_ppc4xx_bootstrap_letter.patch> Type: text/x-patch> Size: 1511 bytes> Desc: not available> > ------------------------------> > Message: 5> Date: Fri, 25 May 2007 15:26:13 +0200> From: Rodolfo Giometti <giometti(a)enneenne.com>> Subject: Re: [U-Boot-Users] [RFC] logos directory & default logo> To: u-boot-users(a)lists.sourceforge.net> Message-ID: <20070525132610.GC4199(a)enneenne.com>> Content-Type: text/plain; charset=us-ascii> > On Thu, May 24, 2007 at 04:34:57PM +0200, Rodolfo Giometti wrote:> > > > I'd like to modify the logo support. Currently I notice that there are> > only one logo file into "u-boot/tools/logos", however I think is> > About this topic I suppose is better define a "default" logo. My idea> is to leave to the developer the ability to specify its preferre logo> as follow:> > wwpc1100_config : unconfig> @$(MKCONFIG) $(@:_config=) arm pxa wwpc1100> @echo "LOGO_BMP = wwpc1100.bmp" >> include/config.mk> > if no LOGO_BMP is specified then the system uses a "default" logo> which can still be the "denx.bmp".> > Comments?> > Rodolfo> > -- > > GNU/Linux Solutions e-mail: giometti(a)enneenne.com> Linux Device Driver giometti(a)gnudd.com> Embedded Systems giometti(a)linux.it> UNIX programming phone: +39 349 2432127> > > > ------------------------------> > Message: 6> Date: Fri, 25 May 2007 16:20:01 +0200> From: Rodolfo Giometti <giometti(a)linux.it>> Subject: [U-Boot-Users] [PATCH] LOGO: All logos must be placed into> the "logos" directory.> To: u-boot-users(a)lists.sourceforge.net> Message-ID: <20070525142001.GD4199(a)enneenne.com>> Content-Type: text/plain; charset=us-ascii> > Signed-off-by: Rodolfo Giometti <giometti(a)linux.it>> ---> tools/Makefile | 6 +++---> 1 files changed, 3 insertions(+), 3 deletions(-)> > diff --git a/tools/Makefile b/tools/Makefile> index 6177f90..14eedf0 100644> --- a/tools/Makefile> +++ b/tools/Makefile> @@ -40,7 +40,7 @@ endif> LOGO_H = $(OBJTREE)/include/bmp_logo.h> > ifeq ($(LOGO_BMP),)> -LOGO_BMP= logos/denx.bmp> +LOGO_BMP= denx.bmp> endif> > #-------------------------------------------------------------------------> @@ -203,8 +203,8 @@ $(obj)crc32.c:> @rm -f $(obj)crc32.c> ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c> > -$(LOGO_H): $(obj)bmp_logo $(LOGO_BMP)> - $(obj)./bmp_logo $(LOGO_BMP) >$@> +$(LOGO_H): $(obj)bmp_logo logos/$(LOGO_BMP)> + $(obj)./bmp_logo logos/$(LOGO_BMP) >$@> > #########################################################################> > -- > 1.5.1.1> > > > > ------------------------------> > Message: 7> Date: Fri, 25 May 2007 16:20:55 +0200> From: Rodolfo Giometti <giometti(a)linux.it>> Subject: [U-Boot-Users] [PATCH] LOGO: Allow define "LOGO_BMP" to be> globally defined.> To: u-boot-users(a)lists.sourceforge.net> Message-ID: <20070525142054.GE4199(a)enneenne.com>> Content-Type: text/plain; charset=us-ascii> > This allow developers to define per board logo file into main configuration> file as follow:> > wwpc1100_config : unconfig> @$(MKCONFIG) $(@:_config=) arm pxa wwpc1100> @echo "LOGO_BMP = wwpc1100.bmp" >> include/config.mk> > Signed-off-by: Rodolfo Giometti <giometti(a)linux.it>> ---> Makefile | 4 ++--> 1 files changed, 2 insertions(+), 2 deletions(-)> > diff --git a/Makefile b/Makefile> index 093df4e..c819afb 100644> --- a/Makefile> +++ b/Makefile> @@ -115,7 +115,7 @@ ifeq ($(OBJTREE)/include/config.mk,$(wildcard $(OBJTREE)/include/config.mk))> > # load ARCH, BOARD, and CPU configuration> include $(OBJTREE)/include/config.mk> -export ARCH CPU BOARD VENDOR SOC> +export ARCH CPU BOARD VENDOR SOC LOGO_BMP> > ifndef CROSS_COMPILE> ifeq ($(HOSTARCH),ppc)> @@ -125,7 +125,7 @@ ifeq ($(ARCH),ppc)> CROSS_COMPILE = powerpc-linux-> endif> ifeq ($(ARCH),arm)> -CROSS_COMPILE = arm-eurotech-linux-> +CROSS_COMPILE = arm-linux-> endif> ifeq ($(ARCH),i386)> ifeq ($(HOSTARCH),i386)> -- > 1.5.1.1> > > > > ------------------------------> > Message: 8> Date: Fri, 25 May 2007 16:26:04 +0200> From: Wolfgang Denk <wd(a)denx.de>> Subject: Re: [U-Boot-Users] [PATCH] LOGO: All logos must be placed> into the "logos" directory.> To: Rodolfo Giometti <giometti(a)linux.it>> Cc: u-boot-users(a)lists.sourceforge.net> Message-ID: <20070525142604.C486C352B1F(a)atlas.denx.de>> Content-Type: text/plain; charset=ISO-8859-1> > In message <20070525142001.GD4199(a)enneenne.com> you wrote:> >> > Subject: ... All logos must be placed into the "logos" directory.> > Why?> > > ifeq ($(LOGO_BMP),)> > -LOGO_BMP= logos/denx.bmp> > +LOGO_BMP= denx.bmp> > Which problem is this supposed to fix? I don't see any advantage, but> I see the disadvantage that with your patch you cannot chose to place> your logo - say - in board/.../ any more.> > Best regards,> > Wolfgang Denk> > -- > DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de> Landing: a controlled mid-air collision with a planet.> > > > ------------------------------> > Message: 9> Date: Fri, 25 May 2007 16:29:13 +0200> From: Wolfgang Denk <wd(a)denx.de>> Subject: Re: [U-Boot-Users] [PATCH] LOGO: Allow define "LOGO_BMP" to> be globally defined.> To: Rodolfo Giometti <giometti(a)linux.it>> Cc: u-boot-users(a)lists.sourceforge.net> Message-ID: <20070525142913.0675C352B1F(a)atlas.denx.de>> Content-Type: text/plain; charset=ISO-8859-1> > In message <20070525142054.GE4199(a)enneenne.com> you wrote:> > This allow developers to define per board logo file into main configuration> > file as follow:> > > > wwpc1100_config : unconfig> > @$(MKCONFIG) $(@:_config=) arm pxa wwpc1100> > @echo "LOGO_BMP = wwpc1100.bmp" >> include/config.mk> > I don't like this. This adds configuration information into Makefile,> where it does not belong.> > Please don't do this.> > > > --- a/Makefile> > +++ b/Makefile> > @@ -115,7 +115,7 @@ ifeq ($(OBJTREE)/include/config.mk,$(wildcard $(OBJTREE)/include/config.mk))> ...> > @@ -125,7 +125,7 @@ ifeq ($(ARCH),ppc)> > CROSS_COMPILE = powerpc-linux-> > endif> > ifeq ($(ARCH),arm)> > -CROSS_COMPILE = arm-eurotech-linux-> ^^^^^^^^^^^^^^^^^^^ What's that?> > +CROSS_COMPILE = arm-linux-> > Also, this patch does not apply.> > Best regards,> > Wolfgang Denk> > -- > DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de> "Just think of a computer as hardware you can program."> - Nigel de la Tierre> > > > ------------------------------> > -------------------------------------------------------------------------> This SF.net email is sponsored by DB2 Express> Download DB2 Express C - the FREE version of DB2 express and take> control of your XML. No limits. Just data. Click to get it now.> http://sourceforge.net/powerbar/db2/> > ------------------------------> > _______________________________________________> U-Boot-Users mailing list> U-Boot-Users(a)lists.sourceforge.net> https://lists.sourceforge.net/lists/listinfo/u-boot-users> > > End of U-Boot-Users Digest, Vol 12, Issue 98> ******************************************** _________________________________________________________________ 探索 Windows Vista 的世界 http://search.live.com/results.aspx?q=windows+vista&mkt=zh-cn&FORM=LIVSOP

1 0

[U-Boot-Users] FW: RE: about the softgun
by MPE Visitor MPEV4 27 May '07

27 May '07

Hi everyone, I set the bootargs root=/dev/mtdblock/2 rw mem=64M But when boot the kernel, it seems not working that show NULL As below Any one can help me? Joe Uncompressing Linux................................................................ done, booting the kernel. Starting kernel............. Linux version 2.4.20-mx2bsp, BSP version mx21_to3_rel_3.2 - (root@joenote) (gcc version 3.2.3) #164 Sun May 27 22:12:33 CST 2007 Processor: ARM ARM926EJ-Ssid(wb) revision 4 Architecture: Freescale MX2ADS Command line is :<NULL> On node 0 totalpages: 12288 zone(0): 12288 pages. zone(1): 0 pages. zone(2): 0 pages. Kernel command line:

2 1

[U-Boot-Users] How I can write testing for the SDRAM in PPC in UBOOT source
by hamid khateb 27 May '07

27 May '07

Hi How I can write testing for the SDRAM in PPC in UBOOT source best regards hamid _________________________________________________________________ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/

2 1

[U-Boot-Users] what's the problem?
by MPE Visitor MPEV4 27 May '07

27 May '07

Hi everyone, I'm working on a mx21ads like board and have ported u-boot-1.1.4 to it. When I boot my linux 2.4.20 on it, it seems not working so better. The messages are as below 1. Firstly, I think my initialize is not complete, but the older bootloader run in my u-boot Without initialize (I recommend all code, just remain the boot kernel code) can boot the Same linux kernel yet! The messages are as below 2. So, what's the problem? Thanks Joe 1. <Information from my termitate> Filename 'image.bootm'. Load address: 0xc3000000 Loading: ################################################################# ################################################################# ########################################################### done Bytes transferred = 966136 (ebdf8 hex) # bootm c3000000 ## Booting image at c3000000 ... Image Name: image Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 966072 Bytes = 943.4 kB Load Address: c0008000 Entry Point: c0008000 Verifying Checksum ... OK OK Starting kernel ... Uncompressing Linux............................................................. .... done, booting the kernel. 2. # tftp c3000000 bootloader.bin TFTP from server 172.20.40.68; our IP address is 172.20.40.69 Filename 'bootloader.bin'. Load address: 0xc3000000 Loading: ########## done Bytes transferred = 46656 (b640 hex) # go c3000400 DBMX21 Linux Bootloader ver mx21_to2_rel_beta_1.0 Copyright (C) 2003 Freescale Semiconductors Suzhou Ltd. root=/dev/mtdblock/2 rw mem=64M MPLL = 266, FCLK = 266, BCLK = 133 Press any key for alternate boot-up options ... 07 Copying kernel from Flash to RAM ... Booting kernel ... Uncompressing Linux............................................................. .... done, booting the kernel. Starting kernel............. Linux version 2.4.20-mx2bsp, BSP version mx21_to3_rel_3.2 - (root(a)localhost.loca ldomain) (gcc version 3.2.3) #122 Fri Mar 24 01:58:09 ACT 2006 Processor: ARM ARM926EJ-Ssid(wb) revision 4 Architecture: Freescale MX2ADS root=/dev/mtdblock/2 rw mem=64M MPLL = 266, FCLK = 266, BCLK = 133 Press any key for alternate boot-up options ... 00 Copying kernel from Flash to RAM ... Booting kernel ... Uncompressing Linux............................................................. .... done, booting the kernel. Starting kernel............. Linux version 2.4.20-mx2bsp, BSP version mx21_to3_rel_3.2 - (root(a)localhost.loca ldomain) (gcc version 3.2.3) #122 Fri Mar 24 01:58:09 ACT 2006 Processor: ARM ARM926EJ-Ssid(wb) revision 4 Architecture: Freescale MX2ADS Command line is :root=/dev/mtdblock/2 rw mem=64M On node 0 totalpages: 16384 zone(0): 16384 pages. zone(1): 0 pages. zone(2): 0 pages. Kernel command line: root=/dev/mtdblock/2 rw mem=64M Console: colour dummy device 80x30 Calibrating delay loop...

2 1

[U-Boot-Users] How I can write testing for the SDRAM in PPC in UBOOT source
by hamid khateb 27 May '07

27 May '07

Hi How I can write testing for the SDRAM in PPC in UBOOT source best regards hamid _________________________________________________________________ FREE pop-up blocking with the new MSN Toolbar - get it now! http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/

1 0

[U-Boot-Users] [PATCH] LOGO: Allow define "LOGO_BMP" to be globally defined.
by Rodolfo Giometti 26 May '07

26 May '07

This allow developers to define per board logo file into main configuration file as follow: wwpc1100_config : unconfig @$(MKCONFIG) $(@:_config=) arm pxa wwpc1100 @echo "LOGO_BMP = wwpc1100.bmp" >> include/config.mk Signed-off-by: Rodolfo Giometti <giometti(a)linux.it> --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 093df4e..c819afb 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ ifeq ($(OBJTREE)/include/config.mk,$(wildcard $(OBJTREE)/include/config.mk)) # load ARCH, BOARD, and CPU configuration include $(OBJTREE)/include/config.mk -export ARCH CPU BOARD VENDOR SOC +export ARCH CPU BOARD VENDOR SOC LOGO_BMP ifndef CROSS_COMPILE ifeq ($(HOSTARCH),ppc) @@ -125,7 +125,7 @@ ifeq ($(ARCH),ppc) CROSS_COMPILE = powerpc-linux- endif ifeq ($(ARCH),arm) -CROSS_COMPILE = arm-eurotech-linux- +CROSS_COMPILE = arm-linux- endif ifeq ($(ARCH),i386) ifeq ($(HOSTARCH),i386) -- 1.5.1.1

3 6

[U-Boot-Users] [PATCH libfdt 0/3] Fix CONFIG_OF_LIBFDT problems discussed yesterday
by Jerry Van Baren 26 May '07

26 May '07

Hi Kim et al. I dug into the CONFIG_OF_LIBFDT issue discussed 2007-05-25 and it turns out that my guess that OF_CPU was undefined was wrong. The problem was actually errors in my adapting of the original code to LIBFDT. This is a 3x patch set, the first two patches fix the problems that Kim noted and the third is a related clean up of cmd_bootm.c An explanation of what when wrong, starting with some historical background: the original CONFIG_OF_FLAT_TREE has a utility routine ft_setup() which it calls just before booting the linux kernel. This routine does some significant modifications to the fdt blob and then starts the kernel. The only way to see what it did to the fdt was to uncomment a fdt printout call which dumped the blob out the console and then started the kernel. NOT friendly. With the libfdt utilities and the "fdt" command, I modified this rather nasty behavior to give the user the ability to do the modifications of the fdt blob at the command line, observe what was done, hand edit it, and _then_ boot linux. Much friendlier. In order to do this, I had to break up what ft_setup() was doing in one unobservable step into three functions, fdt_chosen(), fdt_env(), and fdt_bd_t() which I then was able to invoke for the "fdt chosen", "fdt env", and "fdt bd_t" commands. There also is a ft_board() utility (which potentially calls ft_cpu_setup() and ft_pci_setup() functions) that does (board, CPU, PCI)-specific fdt fixups. I adapted the versions used by the MPC8360EMDS (the board I have) to use libfdt. So far, so good. The problem was that, in my adaption (breaking up) of ft_setup(), I missed the call to ft_board() and thus the (board, CPU, PCI)-specific fdt modifications were not done. IIRC, factoring into this omision was the fact that ft_setup() does /some/ of the CPU-specific modifications itself (improperly IMHO). This confused me and I made two errors: 1) I didn't call ft_board() to properly do the (board, CPU, PCI)-specific modifications and, worse, 2) I adapted the (misplaced IMHO) duplicated fdt modifications INCORRECTLY. This is why/where "clock-frequency" was incorrectly set as "/cpu/clock-frequency" instead of "/cpu/PowerPC,8360@0/clock-frequency" (I lost the OF_CPU part of the node path when I did the adaption). Once I figured out my errors (above), I changed fdt_chosen() to remove the erroneous sets and, instead, call ft_board() to properly set the (board, CPU, PCI)-specific fdt values. This turned up some errors in the table fixup_props[] property strings: I had some trailing "/"s on node paths and some node paths still had the property name appended. Sloppy coding that makes me ashamed to have my --signed-off-by on. :-( Because of my other errors (previous paragraph), these functions were never called and thus I did not detect the errors in my testing. :-( Anyway, this above novelette could have been more concisely written "I'm sorry and ashamed, please accept the following patches as an indication of my resolve to be more thorough in the future." Best regards, gvb

1 0

[U-Boot-Users] Imminent u-boot-fdt pull request
by Jerry Van Baren 25 May '07

25 May '07

Dear all, Please review the u-boot-fdt changes. I intend to request Wolfgang pull the pending changes soon. All of the changes (except the last trivial patch "For fdt_find_node_by_path(), handle the root path properly.") have been previously published to the list. The following changes are pending: libfdt: Conditionally compile based on CONFIG_OF_LIBFDT <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=6b…> Improve error messages, more informative. <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=5a…> Minor code clean up. <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=19…> Improve fdt move length handling. <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=4b…> Fix bugs in the CONFIG_OF_LIBFDT <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=3c…> Reorganize and fix problems (returns) in the bootm command. <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=74…> FDT command improvements. <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=f2…> Fix cmd_fdt line lengths, refactor code. <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=79…> Replace fdt_node_offset() with fdt_find_node_by_path(). <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=5e…> Add fdt_find_node_by_type() and fdt_find_compatible_node() to LIBFDT <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=ef…> For fdt_find_node_by_path(), handle the root path properly. <http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-fdt.git;a=commit;h=cd…> Best regards, gvb

7 18

[U-Boot-Users] dataflash broken on at91sam9260ek
by Jonathan Kotta 25 May '07

25 May '07

Hello, I have a at91sam9260ek with a DataFlash on CS1. It seems like U-boot is detecting the flash, but it is not working properly. I uncommented the printf()s in drivers/dataflash.c, and I think it has something to do with how it's configuring the partitions. The "found * dataflash" lines are printf()s I put in the first switch statement of AT91F_DataflashInit(). I am using U-Boot 1.2.0 within Ulf's buildroot. found no dataflash found AT45DB642 dataflash Start=C0000000, End (computed)=C0000000, To: , From: Data To: Data, From: Data Start=BFFFFFFF, End=C0000000, Invalid To: , From: <Invalid> To: <Invalid>, From: <Invalid> Start=BFFFFFFF, End=C0000000, Invalid To: , From: <Invalid> To: <Invalid>, From: <Invalid> Start=BFFFFFFF, End=C0000000, Invalid To: , From: <Invalid> To: <Invalid>, From: <Invalid> Start=BFFFFFFF, End=C0000000, Invalid To: , From: <Invalid> To: <Invalid>, From: <Invalid> Start=BFFFFFFF, End=C0000000, Invalid To: , From: <Invalid> To: <Invalid>, From: <Invalid> -- Thanks, Jonathan Kotta Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law.

1 1

[U-Boot-Users] [PATCH] remove #ifdef maze from stand alone program support
by Jeffrey Mann 25 May '07

25 May '07

[PATCH] update stand alone program support to remove #ifdef maze Based upon an idea by Håvard Skinnemoen <hskinnemoen(a)gmail.com>, the #if-def maze in the initialization of the jumptable for stand alone programs has been removed. Signed-off-by: Jeffrey Mann <mannj(a)embeddedplanet.com> ------ Could someone else please check this patch and ack it? Documentation updates will follow.

1 0

[U-Boot-Users] [PATCH] PXAFB: Adds 16bits color depth support.
by Rodolfo Giometti 25 May '07

25 May '07

Signed-off-by: Rodolfo Giometti <giometti(a)linux.it> --- cpu/pxa/pxafb.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu/pxa/pxafb.c b/cpu/pxa/pxafb.c index b2caa73..cd529e3 100644 --- a/cpu/pxa/pxafb.c +++ b/cpu/pxa/pxafb.c @@ -148,7 +148,7 @@ vidinfo_t panel_info = { /*----------------------------------------------------------------------*/ -#if LCD_BPP == LCD_COLOR8 +#if LCD_BPP == LCD_COLOR8 || LCD_BPP == LCD_COLOR16 void lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue); #endif #if LCD_BPP == LCD_MONOCHROME @@ -200,7 +200,7 @@ lcd_getcolreg (ushort regno, ushort *red, ushort *green, ushort *blue) #endif /* NOT_USED_SO_FAR */ /*----------------------------------------------------------------------*/ -#if LCD_BPP == LCD_COLOR8 +#if LCD_BPP == LCD_COLOR8 || LCD_BPP == LCD_COLOR16 void lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue) { @@ -225,7 +225,7 @@ lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue) red, green, blue, palette[regno]); } -#endif /* LCD_COLOR8 */ +#endif /* LCD_COLOR8 || LCD_BPP == LCD_COLOR16 */ /*----------------------------------------------------------------------*/ #if LCD_BPP == LCD_MONOCHROME -- 1.5.1.1

1 0

[U-Boot-Users] [RFC] logos directory
by Rodolfo Giometti 25 May '07

25 May '07

Hello, I'd like to modify the logo support. Currently I notice that there are only one logo file into "u-boot/tools/logos", however I think is better move each board's logo into itsown directories. So, for example, if "foo" board wants to use the "foo.bmp" logo it should add this file into "u-boot/board/foo" directory. Comments? :) Rodolfo -- GNU/Linux Solutions e-mail: giometti(a)enneenne.com Linux Device Driver giometti(a)gnudd.com Embedded Systems giometti(a)linux.it UNIX programming phone: +39 349 2432127

2 3

[U-Boot-Users] Abour JFFS2 commands
by Vaibhav Hiremath 25 May '07

25 May '07

Hi All, How many JFFS commands uboot supports? Actually, I have ported UBoot for ARM1176 CPU, and I am using Intel NOR Flash. After mounting JFFS2 on to Flash memory I am able to see only "fsinfo" and "ls" command only. There should be rm, cd, etc.. commands. Is I am missing something? Thanks in advance. Thanks, Vaibhav

2 1

[U-Boot-Users] [PATCH] ARM Versatile PB926EJ-S, Rev.D: Added support for flash 28F256L30B, Resend
by Josef Meser 25 May '07

25 May '07

Current u-boot works with ARM Versatile PB926EJ-S, HW- Rev.C (NOR flash 28F256K3). This patch adds support for 28F256L30B (asymmetrical sectors: 4 small sectors at bottom) used on HW-Rev.D. Resend: patch was line wrapped. This patch might be obsolete because of CFI flash driver: http://sourceforge.net/mailarchive/forum.php?thread_name=000201c79ea4%24be3… Signed-off-by: Josef Meser <josef.meser(a)odm.at> --- board/versatile/flash.c | 84 +++++++++++++++++++++++++++++++++++-------- include/configs/versatile.h | 2 +- include/flash.h | 10 ++++-- 3 files changed, 77 insertions(+), 19 deletions(-) diff --git a/board/versatile/flash.c b/board/versatile/flash.c index 7153371..b79761f 100644 --- a/board/versatile/flash.c +++ b/board/versatile/flash.c @@ -31,7 +31,9 @@ #include <common.h> #include <linux/byteorder/swab.h> -#define PHYS_FLASH_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */ +#define PHYS_FLASH_SECT_SIZE 0x00020000 /* *2 = 256 KB sectors */ +#define PHYS_FLASH_MAIN_SECT_SIZE 0x00020000 /* *2 = 256 KB sectors */ +#define PHYS_FLASH_PARAM_SECT_SIZE 0x00008000 /* *2 = 64 KB sectors */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ /* Board support for 1 or 2 flash devices */ @@ -62,10 +64,19 @@ typedef struct OrgDef { /* Flash Organizations */ -OrgDef OrgIntel_28F256K3[] = { +OrgDef OrgIntel_28F256K3[] = { /* for Hw-Rev. C */ {256, 128 * 1024}, /* 256 * 128kBytes sectors */ }; +OrgDef OrgIntel_28F256L18T[] = { + {255, 128 * 1024}, /* 255 * 128kBytes sectors */ + { 4, 32 * 1024}, /* 4 * 32kBytes sectors */ +}; + +OrgDef OrgIntel_28F256L30B[] = { /* for Hw-Rev. D */ + { 4, 32 * 1024}, /* 4 * 32kBytes sectors */ + {255, 128 * 1024}, /* 255 * 128kBytes sectors */ +}; /*----------------------------------------------------------------------- * Functions @@ -132,23 +143,55 @@ static void flash_get_offsets (ulong base, flash_info_t * info) int i; OrgDef *pOrgDef; - pOrgDef = OrgIntel_28F256K3; - if (info->flash_id == FLASH_UNKNOWN) { + switch (info->flash_id & FLASH_VENDMASK) { + case FLASH_MAN_INTEL: + break; + default: return; } - if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) { + switch (info->flash_id & FLASH_TYPEMASK) { + case FLASH_28F256K3: + pOrgDef = OrgIntel_28F256K3; for (i = 0; i < info->sector_count; i++) { + info->start[i] = base + (i * PHYS_FLASH_SECT_SIZE); + info->protect[i] = 0; + } + break; + case FLASH_28F256L18T: + pOrgDef = OrgIntel_28F256L18T; + for (i = 0; i < info->sector_count; i++) { + /* top param block type */ if (i > 255) { - info->start[i] = base + (i * 0x8000); - info->protect[i] = 0; + info->start[i] = base + + (255 * PHYS_FLASH_MAIN_SECT_SIZE) + + ((i -255)* PHYS_FLASH_PARAM_SECT_SIZE); + } else { + info->start[i] = base + + (i * PHYS_FLASH_MAIN_SECT_SIZE); + } + info->protect[i] = 0; + } + break; + case FLASH_28F256L30B: + pOrgDef = OrgIntel_28F256L30B; + for (i = 0; i < info->sector_count; i++) { + /* bottom param block type */ + if (i < 4) { + info->start[i] = base + + (i * PHYS_FLASH_PARAM_SECT_SIZE); } else { info->start[i] = base + - (i * PHYS_FLASH_SECT_SIZE); - info->protect[i] = 0; + ((i - 3) * PHYS_FLASH_MAIN_SECT_SIZE); } + info->protect[i] = 0; } + break; + default: + return; } + + return; } /*----------------------------------------------------------------------- @@ -172,11 +215,14 @@ void flash_print_info (flash_info_t * info) } switch (info->flash_id & FLASH_TYPEMASK) { + case FLASH_28F256K3: + printf ("FLASH 28F256K3\n"); + break; case FLASH_28F256L18T: printf ("FLASH 28F256L18T\n"); break; - case FLASH_28F256K3: - printf ("FLASH 28F256K3\n"); + case FLASH_28F256L30B: + printf ("FLASH 28F256L30B\n"); break; default: printf ("Unknown Chip Type\n"); @@ -221,6 +267,7 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info) info->flash_id = FLASH_UNKNOWN; info->sector_count = 0; info->size = 0; + printf ("Unknown flash vendor %0x\n", value); addr[0] = (FPW) 0x00FF00FF; /* restore read mode */ return (0); /* no or unknown flash */ } @@ -229,20 +276,27 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info) value = addr[1]; /* device ID */ switch (value) { + case (FPW)(INTEL_ID_28F256K3): + info->flash_id += FLASH_28F256K3; + info->sector_count = 256; + info->size = 0x02000000; + break; + case (FPW) (INTEL_ID_28F256L18T): info->flash_id += FLASH_28F256L18T; info->sector_count = 259; info->size = 0x02000000; break; /* => 32 MB */ - case (FPW)(INTEL_ID_28F256K3): - info->flash_id += FLASH_28F256K3; - info->sector_count = 256; - info->size = 0x02000000; + case (FPW)(INTEL_ID_28F256L30B): + info->flash_id += FLASH_28F256L30B; + info->sector_count = 259; + info->size = 0x02000000; /* 32 MB */ break; default: info->flash_id = FLASH_UNKNOWN; + printf ("Unknown chip type %0x\n", value); break; } diff --git a/include/configs/versatile.h b/include/configs/versatile.h index 16db43b..fe26c42 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -166,7 +166,7 @@ /* timeout values are in ticks */ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_MAX_FLASH_SECT (256) +#define CFG_MAX_FLASH_SECT (259) #define PHYS_FLASH_1 (CFG_FLASH_BASE) diff --git a/include/flash.h b/include/flash.h index 43b9c6b..c1e327f 100644 --- a/include/flash.h +++ b/include/flash.h @@ -284,10 +284,12 @@ extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int of #define INTEL_ID_28F640J3A 0x00170017 /* 64M = 128K x 64 */ #define INTEL_ID_28F128J3A 0x00180018 /* 128M = 128K x 128 */ #define INTEL_ID_28F256J3A 0x001D001D /* 256M = 128K x 256 */ +#define INTEL_ID_28F64K3 0x88018801 /* 64M = 32K x 256 */ +#define INTEL_ID_28F128K3 0x88028802 /* 128M = 64K x 256 */ +#define INTEL_ID_28F256K3 0x88038803 /* 256M = 128K x 256 */ #define INTEL_ID_28F256L18T 0x880D880D /* 256M = 128K x 255 + 32k x 4 */ -#define INTEL_ID_28F64K3 0x88018801 /* 64M = 32K x 255 + 32k x 4 */ -#define INTEL_ID_28F128K3 0x88028802 /* 128M = 64K x 255 + 32k x 4 */ -#define INTEL_ID_28F256K3 0x88038803 /* 256M = 128K x 255 + 32k x 4 */ +#define INTEL_ID_28F256L30T 0x88138813 /* 256M = 128K x 255 + 32k x 4 */ +#define INTEL_ID_28F256L30B 0x88168816 /* 256M = 128K x 255 + 32k x 4 */ #define INTEL_ID_28F64P30T 0x88178817 /* 64M = 32K x 255 + 32k x 4 */ #define INTEL_ID_28F64P30B 0x881A881A /* 64M = 32K x 255 + 32k x 4 */ #define INTEL_ID_28F128P30T 0x88188818 /* 128M = 64K x 255 + 32k x 4 */ @@ -420,6 +422,8 @@ extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int of #define FLASH_28F64K3 0x00B4 /* Intel 28F64K3 ( 64M) */ #define FLASH_28F128K3 0x00B6 /* Intel 28F128K3 ( 128M = 8M x 16 ) */ #define FLASH_28F256K3 0x00B8 /* Intel 28F256K3 ( 256M = 16M x 16 ) */ +#define FLASH_28F256L30T 0x00B9 /* Intel 28F256L30T ( 256M = 16M x 16 ) */ +#define FLASH_28F256L30B 0x00BA /* Intel 28F256L30B ( 256M = 16M x 16 ) */ #define FLASH_28F320J3A 0x00C0 /* INTEL 28F320J3A ( 32M = 128K x 32) */ #define FLASH_28F640J3A 0x00C2 /* INTEL 28F640J3A ( 64M = 128K x 64) */ -- 1.5.0.2

1 0

[U-Boot-Users] Question about CFG_ENV_ADDR during RAMBOOT
by Timur Tabi 25 May '07

25 May '07

On a lot of boards, if CFG_RAMBOOT is defined, the following code is compiled: #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_SIZE 0x2000 This means that the environment is stored 0x1000 bytes before the start of u-boot.bin. Doesn't that mean that if the environment is larger than 0x1000 bytes, that it will overwrite the beginning of u-boot.bin whenever someone does a saveenv? -- Timur Tabi Linux Kernel Developer @ Freescale

7 39

Re: [U-Boot-Users] [PATCH] ARM Versatile PB926EJ-S, Rev.D: Added support for flash 28F256L30B
by Josef Meser 25 May '07

25 May '07

> From: Stefan Roese [mailto:sr@denx.de] > Sent: Friday, May 25, 2007 8:03 AM > To: u-boot-users(a)lists.sourceforge.net > Cc: Josef Meser; Peter Pearse > Subject: Re: [U-Boot-Users] [PATCH] ARM Versatile PB926EJ-S, > Rev.D: Added support for flash 28F256L30B > > Hi Josef, > > On Friday 25 May 2007, Josef Meser wrote: > > Current u-boot works with ARM Versatile PB926EJ-S, HW- Rev.C > > (NOR flash 28F256K3). > > This patch adds support for 28F256L30B (asymmetrical sectors: > > 4 small sectors at bottom) used on HW-Rev.D. > > Your patch is line wrapped. Please fix and resend. Hi Stefan, sorry about that. Yesterday I sent the patch to myself and it was not line wrapped. Now I learned that this is a feature of our famous M$-MUA, which does line wraps in plain text messages, when sending to "Internet addresses". I will fix this by using a real MUA. > One question: Why can't you use the common CFI driver on this board? I have to admit that I am not familiar with the CFI driver. I made the patch for u-boot-1.1.5 which we used up to now. There it makes a []> make versatile_config []> make all work on the new HW. Rev.D. As i did not find the new type of flash in the current source tree, I submitted my changes. This changes are minimal (in terms of size and function) for me, which does not mean that they are optimal for someone who is more into u-boot. Regards, Josef

3 2

[U-Boot-Users] [PATCH] ARM Versatile PB926EJ-S, Rev.D: Added support for flash 28F256L30B
by Josef Meser 25 May '07

25 May '07

Current u-boot works with ARM Versatile PB926EJ-S, HW- Rev.C (NOR flash 28F256K3). This patch adds support for 28F256L30B (asymmetrical sectors: 4 small sectors at bottom) used on HW-Rev.D. Signed-off-by: Josef Meser <josef.meser(a)odm.at> --- board/versatile/flash.c | 84 +++++++++++++++++++++++++++++++++++-------- include/configs/versatile.h | 2 +- include/flash.h | 10 ++++-- 3 files changed, 77 insertions(+), 19 deletions(-) diff --git a/board/versatile/flash.c b/board/versatile/flash.c index 7153371..b79761f 100644 --- a/board/versatile/flash.c +++ b/board/versatile/flash.c @@ -31,7 +31,9 @@ #include <common.h> #include <linux/byteorder/swab.h> -#define PHYS_FLASH_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */ +#define PHYS_FLASH_SECT_SIZE 0x00020000 /* *2 = 256 KB sectors */ +#define PHYS_FLASH_MAIN_SECT_SIZE 0x00020000 /* *2 = 256 KB sectors */ +#define PHYS_FLASH_PARAM_SECT_SIZE 0x00008000 /* *2 = 64 KB sectors */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ /* Board support for 1 or 2 flash devices */ @@ -62,10 +64,19 @@ typedef struct OrgDef { /* Flash Organizations */ -OrgDef OrgIntel_28F256K3[] = { +OrgDef OrgIntel_28F256K3[] = { /* for Hw-Rev. C */ {256, 128 * 1024}, /* 256 * 128kBytes sectors */ }; +OrgDef OrgIntel_28F256L18T[] = { + {255, 128 * 1024}, /* 255 * 128kBytes sectors */ + { 4, 32 * 1024}, /* 4 * 32kBytes sectors */ +}; + +OrgDef OrgIntel_28F256L30B[] = { /* for Hw-Rev. D */ + { 4, 32 * 1024}, /* 4 * 32kBytes sectors */ + {255, 128 * 1024}, /* 255 * 128kBytes sectors */ +}; /*---------------------------------------------------------------------- - * Functions @@ -132,23 +143,55 @@ static void flash_get_offsets (ulong base, flash_info_t * info) int i; OrgDef *pOrgDef; - pOrgDef = OrgIntel_28F256K3; - if (info->flash_id == FLASH_UNKNOWN) { + switch (info->flash_id & FLASH_VENDMASK) { + case FLASH_MAN_INTEL: + break; + default: return; } - if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) { + switch (info->flash_id & FLASH_TYPEMASK) { + case FLASH_28F256K3: + pOrgDef = OrgIntel_28F256K3; for (i = 0; i < info->sector_count; i++) { + info->start[i] = base + (i * PHYS_FLASH_SECT_SIZE); + info->protect[i] = 0; + } + break; + case FLASH_28F256L18T: + pOrgDef = OrgIntel_28F256L18T; + for (i = 0; i < info->sector_count; i++) { + /* top param block type */ if (i > 255) { - info->start[i] = base + (i * 0x8000); - info->protect[i] = 0; + info->start[i] = base + + (255 * PHYS_FLASH_MAIN_SECT_SIZE) + + ((i -255)* PHYS_FLASH_PARAM_SECT_SIZE); + } else { + info->start[i] = base + + (i * PHYS_FLASH_MAIN_SECT_SIZE); + } + info->protect[i] = 0; + } + break; + case FLASH_28F256L30B: + pOrgDef = OrgIntel_28F256L30B; + for (i = 0; i < info->sector_count; i++) { + /* bottom param block type */ + if (i < 4) { + info->start[i] = base + + (i * PHYS_FLASH_PARAM_SECT_SIZE); } else { info->start[i] = base + - (i * PHYS_FLASH_SECT_SIZE); - info->protect[i] = 0; + ((i - 3) * PHYS_FLASH_MAIN_SECT_SIZE); } + info->protect[i] = 0; } + break; + default: + return; } + + return; } /*---------------------------------------------------------------------- - @@ -172,11 +215,14 @@ void flash_print_info (flash_info_t * info) } switch (info->flash_id & FLASH_TYPEMASK) { + case FLASH_28F256K3: + printf ("FLASH 28F256K3\n"); + break; case FLASH_28F256L18T: printf ("FLASH 28F256L18T\n"); break; - case FLASH_28F256K3: - printf ("FLASH 28F256K3\n"); + case FLASH_28F256L30B: + printf ("FLASH 28F256L30B\n"); break; default: printf ("Unknown Chip Type\n"); @@ -221,6 +267,7 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info) info->flash_id = FLASH_UNKNOWN; info->sector_count = 0; info->size = 0; + printf ("Unknown flash vendor %0x\n", value); addr[0] = (FPW) 0x00FF00FF; /* restore read mode */ return (0); /* no or unknown flash */ } @@ -229,20 +276,27 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info) value = addr[1]; /* device ID */ switch (value) { + case (FPW)(INTEL_ID_28F256K3): + info->flash_id += FLASH_28F256K3; + info->sector_count = 256; + info->size = 0x02000000; + break; + case (FPW) (INTEL_ID_28F256L18T): info->flash_id += FLASH_28F256L18T; info->sector_count = 259; info->size = 0x02000000; break; /* => 32 MB */ - case (FPW)(INTEL_ID_28F256K3): - info->flash_id += FLASH_28F256K3; - info->sector_count = 256; - info->size = 0x02000000; + case (FPW)(INTEL_ID_28F256L30B): + info->flash_id += FLASH_28F256L30B; + info->sector_count = 259; + info->size = 0x02000000; /* 32 MB */ break; default: info->flash_id = FLASH_UNKNOWN; + printf ("Unknown chip type %0x\n", value); break; } diff --git a/include/configs/versatile.h b/include/configs/versatile.h index 16db43b..fe26c42 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -166,7 +166,7 @@ /* timeout values are in ticks */ #define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */ -#define CFG_MAX_FLASH_SECT (256) +#define CFG_MAX_FLASH_SECT (259) #define PHYS_FLASH_1 (CFG_FLASH_BASE) diff --git a/include/flash.h b/include/flash.h index 43b9c6b..c1e327f 100644 --- a/include/flash.h +++ b/include/flash.h @@ -284,10 +284,12 @@ extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int of #define INTEL_ID_28F640J3A 0x00170017 /* 64M = 128K x 64 */ #define INTEL_ID_28F128J3A 0x00180018 /* 128M = 128K x 128 */ #define INTEL_ID_28F256J3A 0x001D001D /* 256M = 128K x 256 */ +#define INTEL_ID_28F64K3 0x88018801 /* 64M = 32K x 256 */ +#define INTEL_ID_28F128K3 0x88028802 /* 128M = 64K x 256 */ +#define INTEL_ID_28F256K3 0x88038803 /* 256M = 128K x 256 */ #define INTEL_ID_28F256L18T 0x880D880D /* 256M = 128K x 255 + 32k x 4 */ -#define INTEL_ID_28F64K3 0x88018801 /* 64M = 32K x 255 + 32k x 4 */ -#define INTEL_ID_28F128K3 0x88028802 /* 128M = 64K x 255 + 32k x 4 */ -#define INTEL_ID_28F256K3 0x88038803 /* 256M = 128K x 255 + 32k x 4 */ +#define INTEL_ID_28F256L30T 0x88138813 /* 256M = 128K x 255 + 32k x 4 */ +#define INTEL_ID_28F256L30B 0x88168816 /* 256M = 128K x 255 + 32k x 4 */ #define INTEL_ID_28F64P30T 0x88178817 /* 64M = 32K x 255 + 32k x 4 */ #define INTEL_ID_28F64P30B 0x881A881A /* 64M = 32K x 255 + 32k x 4 */ #define INTEL_ID_28F128P30T 0x88188818 /* 128M = 64K x 255 + 32k x 4 */ @@ -420,6 +422,8 @@ extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int of #define FLASH_28F64K3 0x00B4 /* Intel 28F64K3 ( 64M) */ #define FLASH_28F128K3 0x00B6 /* Intel 28F128K3 ( 128M = 8M x 16 ) */ #define FLASH_28F256K3 0x00B8 /* Intel 28F256K3 ( 256M = 16M x 16 ) */ +#define FLASH_28F256L30T 0x00B9 /* Intel 28F256L30T ( 256M = 16M x 16 ) */ +#define FLASH_28F256L30B 0x00BA /* Intel 28F256L30B ( 256M = 16M x 16 ) */ #define FLASH_28F320J3A 0x00C0 /* INTEL 28F320J3A ( 32M = 128K x 32) */ #define FLASH_28F640J3A 0x00C2 /* INTEL 28F640J3A ( 64M = 128K x 64) */ -- 1.5.0.2

3 2

Re: [U-Boot-Users] u-boot for PXA270
by 白栋贤 25 May '07

25 May '07

Hi, Thanks a lot for your info, but my board still can't work with binary file building with mainstone patch. My board's info as following: 1 CPU: PXA270 2 SDRAM :0xA0000000 - 0xA4000000 64M 3 BOOT: nCS<0> CODE: 0x00000000 4 FFUART: GPIO34：FFRXD GPIO35：FFCTS GPIO36：FFDCD GPIO37：FFDSR GPIO38：FFRI GPIO39：FFTXD GPIO40：FFDTR GPIO41：FFRTS As I'm a newer to uboot and PXA270, so in my opine, after patched the uboot114 directory, I just need to modify the mainstone.h to fit my board. But I failed. Then after compared with start.S for other cpus such as ixp, I found that the reset code are very similar to each other. At first I doubted about the reset code, so I modified start.S and lowlevel_Init.S with the start code of blob. But I failed yet. Could you possible give me some suggestion? Thank you very much.Best regardsJohn > Date: Wed, 16 May 2007 18:18:30 +0200> From: hbmeier(a)uni-paderborn.de> To: arm.linux(a)koansoftware.com> CC: bdx_1981(a)hotmail.com; u-boot-users(a)lists.sourceforge.net> Subject: Re: [U-Boot-Users] u-boot for PXA270> > Marco Cavallini schrieb:> > John ha scritto:> > > >> Dear all,> >> I am John , and I met a problem about uboot migrate for PXA270.> >> My modification as following:> >> 1 add my board johnPxa in Makefile> >> johnPxa_config : unconfig> >> @$(MKCONFIG) $(@:_config=) arm pxa270 johnPxa> >> 2 add my board directory under board/ with board/lubbock> >> cp -a lubbock johnPxa> >> 3 add johnPxa.h under include/configs/ with lubbock.h> >> cp lubbock.h johnPxa.h> >> and modified it as my board's configuration.> >> 4 add pxa270 directory under cpu/ with cpu/pxa> >> cp -a pxa pxa270> >> 5 modified config.mk under cpu/pxa270/> >> PLATFORM_CPPFLAGS += -mapcs-32 -march=armv5 -mtune=xscale> >> 6 add my board information into mach-types.h> >> 7 modified start.S(cpu/pxa270) with blob's start.S and> >> xlli_LowLev_Init.s> >> ps: this blob could run on my board.> >> and I compiled with arm-linux-gcc 3.4.1> >> At last the u-boot.bin couldn't run on my board.> >> Could you give me some help, thank you very much.> >> Best regards> >> John> >>> >> _________________________________________________________________> >> > >> > FYI> >> > Here you can find some already done work:> > http://www.koansoftware.com/en/prd_svil_projects.htm> >> > u-boot bootloader patch for Intel Mainstone> > (aka HCDDBBVA0) with ethernet support> > patched against 1.1.4 cvs> >> > Other resources are here:> > http://pxa-linux.sourceforge.net> >> > HTH> > > Hi,> > U-Boot already support PXA270. I used ADSVIX for my port.> > regards> Stefan _________________________________________________________________ 探索 Windows Vista 的世界 http://search.live.com/results.aspx?q=windows+vista&mkt=zh-cn&FORM=LIVSOP

1 0

Re: [U-Boot-Users] [PATCH] Functions added to extern for stand alone programs
by Jeff Mann 24 May '07

24 May '07

> > On 5/24/07, Wolfgang Denk <wd(a)denx.de> wrote: > > I never used this assembler trickery before myself. So far, I only > > played with the C variant of it. Like that: > > I just tried to imitate the cond_syscall() macro in the Linux kernel. > Your C variant is perhaps better than the asm trickery -- > cond_syscall() is defined in asm/unistd.h so I suppose it > might be arch-specific. The attribute syntax is of course > gcc-specific, but u-boot doesn't support other compilers > anyway, does it? > The problem I ran into with the C variant was with type conflicts of the function declarations and argument conflicts that I could not find a clean solution to. Without these type conflicts it would have worked. -Jeff

1 0

[U-Boot-Users] [PATCH] fix BRCM570x related bugs
by Vadim Bendebury 24 May '07

24 May '07

This fixes numerous bugs in the u-boot bcm570x driver implementation. The way the driver exists in u-boot before this fix, it allows to ping a host o few times, but could never complete a tftp transfer of a kernel image. The main substance of the fixes is: - make sure that receive buffer descriptors always have buffers associated with them - don't use shared memory structure to assess the chip state (race conditions were causing lost indications and timeouts). Use the chip's registers and queues' contents to determine if the packet has been sent/received - initialize the phy as early as possible and keep it up even if the interface is halted testing included numerous file transfers - no transfer timeouts were exibited. Befoire the fix no one transfer would complete, the system would get stuck after transferring part of the file with numerous timeouts along the way. The MAKEALL is still running, so far so good. Signed-off-by: vbendeb(a)google.com ================================================== diff --git a/drivers/bcm570x.c b/drivers/bcm570x.c index 5f632a6..7e283ee 100644 --- a/drivers/bcm570x.c +++ b/drivers/bcm570x.c @@ -6,8 +6,7 @@ #include <common.h> -#if (CONFIG_COMMANDS & CFG_CMD_NET) && (!defined(CONFIG_NET_MULTI)) && \ - defined(CONFIG_BCM570x) +#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_BCM570x) #ifdef CONFIG_BMW #include <mpc824x.h> @@ -28,7 +27,6 @@ /* * PCI memory base for Ethernet device as well as device Interrupt. */ -#define BCM570X_MBAR 0x80100000 #define BCM570X_ILINE 1 @@ -36,6 +34,15 @@ #define MAX_PACKET_SIZE 1600 #define MAX_UNITS 4 +/* by default this driver uses the first interface's MAC address, + * if this needs to be changed, the platform specific config file + * should define BCM570X_MAC_ADDR_SRC as the appropriate field of the + * board descriptor structure (struct bd_info) + */ +#ifndef BCM570X_MAC_ADDR_SRC +#define BCM570X_MAC_ADDR_SRC bi_enetaddr +#endif + /* Globals to this module */ int initialized = 0; unsigned int ioBase = 0; @@ -116,6 +123,7 @@ typedef enum { BCM5702, BCM5703, BCM5703A31, + BCM5704, TC996T, TC996ST, TC996SSX, @@ -152,6 +160,7 @@ static struct { {"BCM5702"}, {"BCM5703"}, {"BCM5703A31"}, + {"BCM5704"}, {"TC996T"}, {"TC996ST"}, {"TC996SSX"}, @@ -190,6 +199,7 @@ static struct { { "Broadcom BCM5702 1000Base-T" }, { "Broadcom BCM5703 1000Base-T" }, { "Broadcom BCM5703 1000Base-SX" }, + { "Broadcom BCM5704 1000Base-T" }, { "3Com 3C996 10/100/1000 Server NIC" }, { "3Com 3C996 10/100/1000 Server NIC" }, { "3Com 3C996 Gigabit Fiber-SX Server NIC" }, @@ -249,6 +259,7 @@ struct pci_device_table { {0x14e4, 0x1646, 0x14e4, 0x8009, 0, 0, BCM5702 ,128,32}, {0x14e4, 0x1646, 0x0e11, 0xbb, 0, 0, NC7760 ,128,32}, {0x14e4, 0x1646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5702 ,128,32}, + {0x14e4, 0x1648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5704 ,128,32}, {0x14e4, 0x16a6, 0x14e4, 0x8009, 0, 0, BCM5702 ,128,32}, {0x14e4, 0x16a6, 0x0e11, 0xbb, 0, 0, NC7760 ,128,32}, {0x14e4, 0x16a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5702 ,128,32}, @@ -333,7 +344,8 @@ bcm570xReplenishRxBuffers(PUM_DEVICE_BLOCK pUmDevice) /* * Probe, Map, and Init 570x device. */ -int eth_init(bd_t *bis) +int +bcm570x_eth_init(bd_t *bis) { int i, rv, devFound = FALSE; pci_dev_t devbusfn; @@ -358,10 +370,11 @@ int eth_init(bd_t *bis) pci_write_config_dword(devbusfn, PCI_BASE_ADDRESS_1, 0); - ioBase = BCM570X_MBAR; - - pci_write_config_dword(devbusfn, - PCI_BASE_ADDRESS_0, ioBase); + /* read the autoconfigured BAR value (don't forget to mask the + * four LSBs which carry extra information + */ + pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, &ioBase); + ioBase &= ~0xf; /* * Enable PCI memory, IO, and Master -- don't @@ -392,8 +405,6 @@ int eth_init(bd_t *bis) /* Configure pci dev structure */ pUmDevice->pdev = devbusfn; pUmDevice->index = 0; - pUmDevice->tx_pkt = 0; - pUmDevice->rx_pkt = 0; devFound = TRUE; break; } @@ -457,8 +468,8 @@ int eth_init(bd_t *bis) (char*)malloc(strlen(board_info[bcm570xDevices[i].board_id].name)+1); strcpy(pUmDevice->name,board_info[bcm570xDevices[i].board_id].name); - memcpy(pDevice->NodeAddress, bis->bi_enetaddr, 6); - LM_SetMacAddress(pDevice, bis->bi_enetaddr); + memcpy(pDevice->NodeAddress, bis->BCM570X_MAC_ADDR_SRC, 6); + LM_SetMacAddress(pDevice, bis->BCM570X_MAC_ADDR_SRC); /* Init queues .. */ QQ_InitQueue(&pUmDevice->rx_out_of_buf_q.Container, MAX_RX_PACKET_DESC_COUNT); @@ -495,8 +506,6 @@ int eth_init(bd_t *bis) pUmDevice->opened = 1; pUmDevice->tx_full = 0; - pUmDevice->tx_pkt = 0; - pUmDevice->rx_pkt = 0; printf("eth%d: %s @0x%lx,", pDevice->index, pUmDevice->name, (unsigned long)ioBase); printf( "node addr "); @@ -519,14 +528,22 @@ int eth_init(bd_t *bis) printf("Broadcom BCM5701 Integrated Copper "); else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5703_PHY_ID) printf("Broadcom BCM5703 Integrated Copper "); + else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5704_PHY_ID) + printf("Broadcom BCM5704 Integrated Copper "); else if ((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM8002_PHY_ID) printf("Broadcom BCM8002 SerDes "); else if (pDevice->EnableTbi) printf("Agilent HDMP-1636 SerDes "); else - printf("Unknown "); + printf("Unknown (ID:%x)", pDevice->PhyId & PHY_ID_MASK); printf("transceiver found\n"); + /* start up the phy right away, reusing i as a scratch variable */ + LM_ReadPhy(pDevice, PHY_CTRL_REG, (unsigned*) &i); + if (i & PHY_CTRL_LOWER_POWER_MODE) { + LM_WritePhy (pDevice, PHY_CTRL_REG, i & ~PHY_CTRL_LOWER_POWER_MODE); + } + printf("eth%d: %s, MTU: %d,", pDevice->index, pDevice->BusSpeedStr, 1500); @@ -605,39 +622,27 @@ eth_isr(void) } pUmDevice->interrupt = 0; - } int -eth_send(volatile void *packet, int length) +bcm570x_eth_send(volatile void *packet, int length) { - int status = 0; + int start_time, status = 0; #if ET_DEBUG unsigned char* ptr = (unsigned char*)packet; #endif PLM_PACKET pPacket; PUM_PACKET pUmPacket; - /* Link down, return */ - while(pDevice->LinkStatus == LM_STATUS_LINK_DOWN) { -#if 0 - printf("eth%d: link down - check cable or link partner.\n", - pUmDevice->index); -#endif - eth_isr(); - - /* Wait to see link for one-half a second before sending ... */ - udelay(1500000); - - } - - /* Clear sent flag */ - pUmDevice->tx_pkt = 0; - /* Previously blocked */ if(pUmDevice->tx_full){ printf("eth%d: tx blocked.\n", pUmDevice->index); - return 0; + return 1; + } + + if (length <= 0){ + printf("eth: bad packet size: %d\n", length); + return 2; } pPacket = (PLM_PACKET) @@ -646,19 +651,14 @@ eth_send(volatile void *packet, int length) if (pPacket == 0) { pUmDevice->tx_full = 1; printf("bcm570xEndSend: TX full!\n"); - return 0; + return 3; } if (pDevice->SendBdLeft.counter == 0) { pUmDevice->tx_full = 1; printf("bcm570xEndSend: no more TX descriptors!\n"); QQ_PushHead(&pDevice->TxPacketFreeQ.Container, pPacket); - return 0; - } - - if (length <= 0){ - printf("eth: bad packet size: %d\n", length); - goto out; + return 4; } /* Get packet buffers and fragment list */ @@ -671,18 +671,22 @@ eth_send(volatile void *packet, int length) if (pUmPacket->skbuff == NULL){ /* Packet was discarded */ printf("TX: failed (1)\n"); - status = 1; + status = 5; } else{ printf("TX: failed (2)\n"); - status = 2; + status = 6; } QQ_PushHead (&pDevice->TxPacketFreeQ.Container, pPacket); return status; } /* Copy packet to DMA buffer */ - memset(pUmPacket->skbuff, 0x0, MAX_PACKET_SIZE); + if (length < MIN_ENET_FRAME_SIZE) { + length = MIN_ENET_FRAME_SIZE; + } + memcpy((void*)pUmPacket->skbuff, (void*)packet, length); + pPacket->PacketSize = length; pPacket->Flags |= SND_BD_FLAG_END|SND_BD_FLAG_COAL_NOW; pPacket->u.Tx.FragCount = 1; @@ -697,21 +701,30 @@ eth_send(volatile void *packet, int length) if (pUmPacket->skbuff == NULL){ printf("TX failed (1)!\n"); /* Packet was discarded */ - status = 3; + status = 7; } else { /* A resource problem ... */ printf("TX failed (2)!\n"); - status = 4; + status = 8; } if (QQ_GetEntryCnt(&pDevice->TxPacketFreeQ.Container) == 0) { printf("TX: emptyQ!\n"); + status = 5; pUmDevice->tx_full = 1; } + + return status; } - while(pUmDevice->tx_pkt == 0){ - /* Service TX */ + start_time = get_timer(0); + while(!QQ_Empty(&pDevice->TxPacketActiveQ.Container)){ + if (get_timer(start_time) > (CFG_HZ/10)) { + printf("TX: timeout!\n"); + return 9; + } + + /* get tx Serviced */ eth_isr(); } #if ET_DEBUG @@ -722,87 +735,62 @@ eth_send(volatile void *packet, int length) ptr[6],ptr[7],ptr[8],ptr[9],ptr[10],ptr[11],ptr[12], ptr[13],ptr[14],ptr[15]); #endif - pUmDevice->tx_pkt = 0; - QQ_PushHead(&pDevice->TxPacketFreeQ.Container, pPacket); - /* Done with send */ - out: - return status; + return 0; } -/* Ethernet receive */ -int -eth_rx(void) +void +bcm570x_eth_rx(void) { - PLM_PACKET pPacket = NULL; - PUM_PACKET pUmPacket = NULL; - void *skb; - int size=0; + int size=0; - while(TRUE) { - - bcm570x_service_isr: - /* Pull down packet if it is there */ + /* Pull down packets if any */ eth_isr(); - /* Indicate RX packets called */ - if(pUmDevice->rx_pkt){ - /* printf("eth_rx: got a packet...\n"); */ - pUmDevice->rx_pkt = 0; - } else { - /* printf("eth_rx: waiting for packet...\n"); */ - goto bcm570x_service_isr; - } + while(QQ_GetEntryCnt(&pDevice->RxPacketReceivedQ.Container)) { + PLM_PACKET pPacket; + PUM_PACKET pUmPacket; - pPacket = (PLM_PACKET) - QQ_PopHead(&pDevice->RxPacketReceivedQ.Container); + pPacket = (PLM_PACKET) + QQ_PopHead(&pDevice->RxPacketReceivedQ.Container); - if (pPacket == 0){ - printf("eth_rx: empty packet!\n"); - goto bcm570x_service_isr; - } + if (pPacket == 0){ + printf("eth_rx: empty packet!\n"); + continue; + } - pUmPacket = (PUM_PACKET) pPacket; + pUmPacket = (PUM_PACKET) pPacket; #if ET_DEBUG - printf("eth_rx: packet @0x%x\n", - (int)pPacket); + printf("eth_rx: packet @0x%x\n", + (int)pPacket); #endif - /* If the packet generated an error, reuse buffer */ - if ((pPacket->PacketStatus != LM_STATUS_SUCCESS) || - ((size = pPacket->PacketSize) > pDevice->RxMtu)) { - - /* reuse skb */ - QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket); - printf("eth_rx: error in packet dma!\n"); - goto bcm570x_service_isr; - } - - /* Set size and address */ - skb = pUmPacket->skbuff; - size = pPacket->PacketSize; - - /* Pass the packet up to the protocol - * layers. - */ - NetReceive(skb, size); + /* If the packet generated an error, reuse buffer */ + if ((pPacket->PacketStatus != LM_STATUS_SUCCESS) || + ((size = pPacket->PacketSize) > pDevice->RxMtu)) { + printf("eth_rx: error in packet dma!\n"); + } else { + void *skb; - /* Free packet buffer */ - bcm570xPktFree (pUmDevice->index, skb); - pUmPacket->skbuff = NULL; + /* Set size and address */ + skb = pUmPacket->skbuff; + size = pPacket->PacketSize; - /* Reuse SKB */ - QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket); + /* Pass the packet up to the protocol + * layers. + */ + NetReceive(skb, size); + } - return 0; /* Got a packet, bail ... */ - } - return size; + /* Reuse SKB */ + QQ_PushTail(&pDevice->RxPacketFreeQ.Container, pPacket); + } } /* Shut down device */ void -eth_halt(void) +bcm570x_eth_halt(void) { int i; if ( initialized) @@ -1130,7 +1118,6 @@ MM_GetConfig(PLM_DEVICE_BLOCK pDevice) pDevice->WakeUpModeCap = LM_WAKE_UP_MODE_MAGIC_PACKET; pDevice->WakeUpMode = LM_WAKE_UP_MODE_MAGIC_PACKET; } - pDevice->NicSendBd = TRUE; /* Don't update status blocks during interrupt */ pDevice->RxCoalescingTicksDuringInt = 0; @@ -1264,16 +1251,6 @@ MM_CoalesceTxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket) PUM_PACKET pUmPacket = (PUM_PACKET) pPacket; PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice; void *skbnew; - int len = 0; - - if (len == 0) - return (LM_STATUS_SUCCESS); - - if (len > MAX_PACKET_SIZE){ - printf ("eth%d: xmit frame discarded, too big!, size = %d\n", - pUmDevice->index, len); - return (LM_STATUS_FAILURE); - } skbnew = bcm570xPktAlloc(pUmDevice->index, MAX_PACKET_SIZE); @@ -1290,15 +1267,6 @@ MM_CoalesceTxBuffer(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket) return (LM_STATUS_SUCCESS); } - -LM_STATUS -MM_IndicateRxPackets(PLM_DEVICE_BLOCK pDevice) -{ - PUM_DEVICE_BLOCK pUmDevice = (PUM_DEVICE_BLOCK) pDevice; - pUmDevice->rx_pkt = 1; - return LM_STATUS_SUCCESS; -} - LM_STATUS MM_IndicateTxPackets(PLM_DEVICE_BLOCK pDevice) { @@ -1330,7 +1298,6 @@ MM_IndicateTxPackets(PLM_DEVICE_BLOCK pDevice) pUmPacket->skbuff = 0; QQ_PushTail(&pDevice->TxPacketFreeQ.Container, pPacket); - pUmDevice->tx_pkt = 1; } if (pUmDevice->tx_full) { if (QQ_GetEntryCnt(&pDevice->TxPacketFreeQ.Container) >= @@ -1688,4 +1655,230 @@ QQ_GetTail( return pQueue->Array[Idx]; } -#endif /* CFG_CMD_NET, !CONFIG_NET_MULTI, CONFIG_BCM570x */ +#if defined ETHERNET_DEBUG + +static void bcm_5750x_dump_rcb(T3_RCB* rcb, const char* name) +{ + if (rcb->u.s.Flags & T3_RCB_FLAG_RING_DISABLED) { + return; + } + + printf("%s at %p\n", name, rcb->HostRingAddr.Low); +} + +void static bcm570x_dump_status_block(void) +{ + int ii; + T3_RCB rcb; + + printf("Status: 0x%x\n", pDevice->pStatusBlkVirt->Status); + + /* now, check out all three rx producer rings (host to MAC) */ +#define HANDLE_RCB(r, src) \ + r.HostRingAddr.Low = REG_RD(pDevice, RcvDataBdIn.src.HostRingAddr.Low); \ + r.HostRingAddr.High = REG_RD(pDevice, RcvDataBdIn.src.HostRingAddr.High);\ + r.u.MaxLen_Flags = REG_RD(pDevice, RcvDataBdIn.src.u.MaxLen_Flags); \ + bcm_5750x_dump_rcb(&r, #src) + + HANDLE_RCB(rcb, JumboRcvRcb); + HANDLE_RCB(rcb, StdRcvRcb); + HANDLE_RCB(rcb, MiniRcvRcb); + + printf ("Ring Send Consumer Rx producer\n"); + for (ii = 0; ii < 16; ii++) { + printf(" %2.2d %3.3d %3.3d\n", ii, + pDevice->pStatusBlkVirt->Idx[ii].SendConIdx, + pDevice->pStatusBlkVirt->Idx[ii].RcvProdIdx); + } +} + +static void bcm570x_check_status_block(void) +{ + unsigned value; + + memset(pDevice->pStatusBlkVirt, 0, sizeof(*pDevice->pStatusBlkVirt)); + if (pDevice->pStatusBlkVirt->Status) { + /* just in case...*/ + printf("status block not cleared!\n"); + return; + } + + value = REG_RD(pDevice, HostCoalesce.Mode); + REG_WR(pDevice, HostCoalesce.Mode, value | HOST_COALESCE_NOW); + + value = get_timer(0); + while (!pDevice->pStatusBlkVirt->Status) { + if (get_timer(value) > (CFG_HZ/10)) { + printf("%s:%d can't retrieve status!\n", + __FUNCTION__, __LINE__); + return; + } + } + + bcm570x_dump_status_block(); +} + +static void bcm570x_dump(void) +{ + int ii, producer, consumer, ring_size; + T3_RCV_BD* ring; + + producer = MB_REG_RD(pDevice, Mailbox.RcvStdProdIdx.Low); + consumer = pDevice->pStatusBlkVirt->RcvStdConIdx; + + printf("Device base = %p\n", pDevice->pMemView); + printf("UmDevice base = %p\n", pUmDevice); + printf("Rx Producer indx(sw) = %d\n", pDevice->RxStdProdIdx); + printf("Rx Producer indx(hw) = %d\n", producer); + printf("Tx producer indx(sw) = %d\n", pDevice->SendProdIdx); + printf("Rx Status block at = %p\n", pDevice->pStatusBlkVirt); + + bcm570x_dump_status_block(); + + ring = (T3_RCV_BD*) REG_RD(pDevice, + RcvDataBdIn.StdRcvRcb.HostRingAddr.Low); + ring_size = REG_RD(pDevice, RcvDataBdIn.StdRcvRcb.u.MaxLen_Flags)>>16; + + printf("rx buffer list (%d->%d):\n", consumer, producer); + ii = 0; + while (consumer != producer){ + T3_RCV_BD* bd; + bd = ring + consumer++; + if (!(ii++%4)) { + printf ("\n"); + } + printf("%8.8p:%8.8p:%3.3d:%4.4d ", bd, + bd->HostAddr.Low, bd->Index, bd->Len); + if (consumer == ring_size) { + consumer = 0; + } + } + printf ("\n"); +} + +#if defined(CONFIG_NET_MULTI) +static +#endif +void bcm570x_info(struct eth_device* p, int argc, char* argv[]) +{ + if (argc < 1) { + bcm570x_dump(); + return; + } + + if (MATCH(argv[0], "status")) { + bcm570x_check_status_block(); + return; + } +} + +#endif /* ETHERNET_DEBUG ^^^ defined */ + +#if defined(CONFIG_NET_MULTI) + +int bcm570x_init(struct eth_device *dev, bd_t * bd) +{ + if (initialized) { + LM_UINT32 Value32; + LM_ReadPhy(pDevice, PHY_CTRL_REG, &Value32); + + if (Value32 & PHY_CTRL_LOWER_POWER_MODE) { + /* if phy is down - bring it back up */ + LM_WritePhy (pDevice, PHY_CTRL_REG, + Value32 & ~PHY_CTRL_LOWER_POWER_MODE); + } + return 1; + } + return 0; +} + +void bcm570x_halt(struct eth_device *dev) +{ + /* let's do nothing here - why not to keep the interface up at all + * times? */ +} + +int +bcm570x_send(struct eth_device *dev, volatile void *packet, int length) +{ + if (initialized) { + return bcm570x_eth_send( packet, length ); + } + return -1; +} + +int bcm570x_recv( struct eth_device* p ) +{ + if (initialized) { + bcm570x_eth_rx(); + } + return 0; +} + +int bcm570x_initialize( bd_t * bis ) +{ + struct eth_device *dev; + + if (bcm570x_eth_init( bis )) { + printf( "%s:%d - init failed!\n", __FUNCTION__, __LINE__ ); + return -1; + } + + dev = (struct eth_device *)malloc(sizeof *dev); + if ( !dev ) { + printf( "%s:%d - dev allocation failed!\n", + __FUNCTION__, __LINE__ ); + return -1; + } + + memset (dev, 0, sizeof (*dev)); + memcpy (dev->enetaddr, bis->BCM570X_MAC_ADDR_SRC, + sizeof(dev->enetaddr)); + + memcpy(dev->name, pUmDevice->name, + min (strlen (pUmDevice->name), sizeof (dev->name))); + + dev->init = bcm570x_init; + dev->halt = bcm570x_halt; + dev->send = bcm570x_send; + dev->recv = bcm570x_recv; +#if defined ETHERNET_DEBUG + dev->info = bcm570x_info; +#endif + eth_register(dev); + + return 0; +} + +#else /* CONFIG_NET_MULTI ^^^ defined vvv NOT defined */ + +/* wrappers to comply with the non CONFIG_NET_MULTI mode */ + +int +eth_init( bd_t *bis ) +{ + return bcm570x_eth_init(bis); +} + +int +eth_send(volatile void *packet, int length) +{ + return eth_send(packet, length); +} + +int +eth_rx( void ) +{ + bcm570x_eth_rx(); + return 0; +} + +void +eth_halt(void) +{ + bcm570x_eth_halt(); +} + +#endif /* CONFIG_NET_MULTI ^^^ not defined */ + +#endif /* CFG_CMD_NET && CONFIG_BCM570x */ diff --git a/drivers/bcm570x_lm.h b/drivers/bcm570x_lm.h index 607f3fd..40d1946 100644 --- a/drivers/bcm570x_lm.h +++ b/drivers/bcm570x_lm.h @@ -425,7 +425,6 @@ LM_STATUS MM_WriteConfig32(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset, LM_UINT32 Value32); LM_STATUS MM_MapMemBase(PLM_DEVICE_BLOCK pDevice); LM_STATUS MM_MapIoBase(PLM_DEVICE_BLOCK pDevice); -LM_STATUS MM_IndicateRxPackets(PLM_DEVICE_BLOCK pDevice); LM_STATUS MM_IndicateTxPackets(PLM_DEVICE_BLOCK pDevice); LM_STATUS MM_StartTxDma(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket); LM_STATUS MM_CompleteTxDma(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket); diff --git a/drivers/bcm570x_mm.h b/drivers/bcm570x_mm.h index b7cbf8a..88362dd 100644 --- a/drivers/bcm570x_mm.h +++ b/drivers/bcm570x_mm.h @@ -87,8 +87,6 @@ typedef struct _UM_DEVICE_BLOCK { volatile int interrupt; int tasklet_pending; int tasklet_busy; /* new -- unsupported */ - int rx_pkt; - int tx_pkt; #ifdef NICE_SUPPORT /* unsupported, this is a linux ioctl */ void (*nice_rx)(void*, void* ); void* nice_ctx; diff --git a/drivers/tigon3.c b/drivers/tigon3.c index ec2cd2a..5086592 100644 --- a/drivers/tigon3.c +++ b/drivers/tigon3.c @@ -12,8 +12,7 @@ /******************************************************************************/ #include <common.h> #include <asm/types.h> -#if (CONFIG_COMMANDS & CFG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \ - defined(CONFIG_TIGON3) +#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_TIGON3) #ifdef CONFIG_BMW #include <mpc824x.h> #endif @@ -21,7 +20,6 @@ #include <linux/byteorder/big_endian.h> #include "bcm570x_mm.h" -#define EMBEDDED 1 /******************************************************************************/ /* Local functions. */ /******************************************************************************/ @@ -1040,7 +1038,8 @@ PLM_DEVICE_BLOCK pDevice) pDevice->BondId != GRC_MISC_BD_ID_5703 && pDevice->BondId != GRC_MISC_BD_ID_5703S && pDevice->BondId != GRC_MISC_BD_ID_5704 && - pDevice->BondId != GRC_MISC_BD_ID_5704CIOBE) + pDevice->BondId != GRC_MISC_BD_ID_5704CIOBE && + pDevice->BondId != GRC_MISC_BD_ID_5704_A2) { return LM_STATUS_UNKNOWN_ADAPTER; } @@ -1652,15 +1651,14 @@ PLM_DEVICE_BLOCK pDevice) /* Set power state to D0. */ LM_SetPowerState(pDevice, LM_POWER_STATE_D0); +#define QUEUE_INIT(x) QQ_InitQueue(&pDevice->x.Container, \ + ARRAY_SIZE(pDevice->x.EntryBuffer)) /* Intialize the queues. */ - QQ_InitQueue(&pDevice->RxPacketReceivedQ.Container, - MAX_RX_PACKET_DESC_COUNT); - QQ_InitQueue(&pDevice->RxPacketFreeQ.Container, - MAX_RX_PACKET_DESC_COUNT); - - QQ_InitQueue(&pDevice->TxPacketFreeQ.Container,MAX_TX_PACKET_DESC_COUNT); - QQ_InitQueue(&pDevice->TxPacketActiveQ.Container,MAX_TX_PACKET_DESC_COUNT); - QQ_InitQueue(&pDevice->TxPacketXmittedQ.Container,MAX_TX_PACKET_DESC_COUNT); + QUEUE_INIT(RxPacketReceivedQ); + QUEUE_INIT(RxPacketFreeQ); + QUEUE_INIT(TxPacketFreeQ); + QUEUE_INIT(TxPacketActiveQ); + QUEUE_INIT(TxPacketXmittedQ); /* Allocate shared memory for: status block, the buffers for receive */ /* rings -- standard, mini, jumbo, and return rings. */ @@ -1780,13 +1778,17 @@ PLM_DEVICE_BLOCK pDevice) /* Allocate memory for packet descriptors. */ Size = (pDevice->RxPacketDescCnt + pDevice->TxPacketDescCnt) * MM_PACKET_DESC_SIZE; - Status = MM_AllocateMemory(pDevice, Size, (PLM_VOID *) &pPacket); + Status = MM_AllocateMemory(pDevice, Size, (PLM_VOID*)(void*)&pPacket); if(Status != LM_STATUS_SUCCESS) { return Status; } pDevice->pPacketDescBase = (PLM_VOID) pPacket; +#if ET_DEBUG + printf("LM_Init_adapter: TX descriptors located at 0x%x\n", (void *)pPacket); +#endif + /* Create transmit packet descriptors from the memory block and add them */ /* to the TxPacketFreeQ for each send ring. */ for(j = 0; j < pDevice->TxPacketDescCnt; j++) @@ -1803,6 +1805,9 @@ PLM_DEVICE_BLOCK pDevice) pPacket = (PLM_PACKET) ((PLM_UINT8) pPacket + MM_PACKET_DESC_SIZE); } /* for(j.. */ +#if ET_DEBUG + printf("LM_Init_adapter: RX descriptors located at 0x%x\n", (void *)pPacket); +#endif /* Create receive packet descriptors from the memory block and add them */ /* to the RxPacketFreeQ. Create the Standard packet descriptors. */ for(j = 0; j < pDevice->RxStdDescCnt; j++) @@ -2822,7 +2827,14 @@ PLM_DEVICE_BLOCK pDevice) { if (pDevice->ChipRevId == T3_CHIP_ID_5704_A0) { - Value16 = REG_RD(pDevice, PciCfg.PciXCommand); + /* + * Patched to remove warnings; need A0 chip to test. + * If you can test this and find it wrong, please fix. + * Might need BYTE_SWAP_16_BIT() here and on store, + * but that logic is in disarray in this code. + */ + volatile u16 *p16 = &pDevice->pMemView->PciCfg.PciXCommand; + Value16 = *p16; Value16 &= ~(PCIX_CMD_MAX_SPLIT_MASK | PCIX_CMD_MAX_BURST_MASK); Value16 |= ((PCIX_CMD_MAX_BURST_CPIOB << PCIX_CMD_MAX_BURST_SHL) & PCIX_CMD_MAX_BURST_MASK); @@ -2831,7 +2843,7 @@ PLM_DEVICE_BLOCK pDevice) Value16 |= (pDevice->SplitModeMaxReq << PCIX_CMD_MAX_SPLIT_SHL) & PCIX_CMD_MAX_SPLIT_MASK; } - REG_WR(pDevice, PciCfg.PciXCommand, Value16); + *p16 = Value16; } } @@ -3026,137 +3038,6 @@ LM_EnableInterrupt( /* Return: */ /* LM_STATUS_SUCCESS */ /******************************************************************************/ -#if 0 -LM_STATUS -LM_SendPacket(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket) -{ - LM_UINT32 FragCount; - PT3_SND_BD pSendBd; - PT3_SND_BD pShadowSendBd; - LM_UINT32 Value32, Len; - LM_UINT32 Idx; - - if (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5700) { - return LM_5700SendPacket(pDevice, pPacket); - } - - /* Update the SendBdLeft count. */ - atomic_sub(pPacket->u.Tx.FragCount, &pDevice->SendBdLeft); - - /* Initalize the send buffer descriptors. */ - Idx = pDevice->SendProdIdx; - - pSendBd = &pDevice->pSendBdVirt[Idx]; - - /* Next producer index. */ - if (pDevice->NicSendBd == TRUE) - { - T3_64BIT_HOST_ADDR paddr; - - pShadowSendBd = &pDevice->ShadowSendBd[Idx]; - for(FragCount = 0; ; ) - { - MM_MapTxDma(pDevice, pPacket, &paddr, &Len, FragCount); - /* Initialize the pointer to the send buffer fragment. */ - if (paddr.High != pShadowSendBd->HostAddr.High) - { - __raw_writel(paddr.High, &(pSendBd->HostAddr.High)); - pShadowSendBd->HostAddr.High = paddr.High; - } - __raw_writel(paddr.Low, &(pSendBd->HostAddr.Low)); - - /* Setup the control flags and send buffer size. */ - Value32 = (Len << 16) | pPacket->Flags; - - Idx = (Idx + 1) & T3_SEND_RCB_ENTRY_COUNT_MASK; - - FragCount++; - if (FragCount >= pPacket->u.Tx.FragCount) - { - Value32 |= SND_BD_FLAG_END; - if (Value32 != pShadowSendBd->u1.Len_Flags) - { - __raw_writel(Value32, &(pSendBd->u1.Len_Flags)); - pShadowSendBd->u1.Len_Flags = Value32; - } - if (pPacket->Flags & SND_BD_FLAG_VLAN_TAG) { - __raw_writel(pPacket->VlanTag, &(pSendBd->u2.VlanTag)); - } - break; - } - else - { - if (Value32 != pShadowSendBd->u1.Len_Flags) - { - __raw_writel(Value32, &(pSendBd->u1.Len_Flags)); - pShadowSendBd->u1.Len_Flags = Value32; - } - if (pPacket->Flags & SND_BD_FLAG_VLAN_TAG) { - __raw_writel(pPacket->VlanTag, &(pSendBd->u2.VlanTag)); - } - } - - pSendBd++; - pShadowSendBd++; - if (Idx == 0) - { - pSendBd = &pDevice->pSendBdVirt[0]; - pShadowSendBd = &pDevice->ShadowSendBd[0]; - } - } /* for */ - - /* Put the packet descriptor in the ActiveQ. */ - QQ_PushTail(&pDevice->TxPacketActiveQ.Container, pPacket); - - wmb(); - MB_REG_WR(pDevice, Mailbox.SendNicProdIdx[0].Low, Idx); - - } - else - { - for(FragCount = 0; ; ) - { - /* Initialize the pointer to the send buffer fragment. */ - MM_MapTxDma(pDevice, pPacket, &pSendBd->HostAddr, &Len, FragCount); - - pSendBd->u2.VlanTag = pPacket->VlanTag; - - /* Setup the control flags and send buffer size. */ - Value32 = (Len << 16) | pPacket->Flags; - - Idx = (Idx + 1) & T3_SEND_RCB_ENTRY_COUNT_MASK; - - FragCount++; - if (FragCount >= pPacket->u.Tx.FragCount) - { - pSendBd->u1.Len_Flags = Value32 | SND_BD_FLAG_END; - break; - } - else - { - pSendBd->u1.Len_Flags = Value32; - } - pSendBd++; - if (Idx == 0) - { - pSendBd = &pDevice->pSendBdVirt[0]; - } - } /* for */ - - /* Put the packet descriptor in the ActiveQ. */ - QQ_PushTail(&pDevice->TxPacketActiveQ.Container, pPacket); - - wmb(); - MB_REG_WR(pDevice, Mailbox.SendHostProdIdx[0].Low, Idx); - - } - - /* Update the producer index. */ - pDevice->SendProdIdx = Idx; - - return LM_STATUS_SUCCESS; -} -#endif LM_STATUS LM_SendPacket(PLM_DEVICE_BLOCK pDevice, PLM_PACKET pPacket) @@ -3594,9 +3475,6 @@ PLM_DEVICE_BLOCK pDevice) { /* Indicate packets to the protocol. */ MM_IndicateTxPackets(pDevice); - - /* Indicate received packets to the protocols. */ - MM_IndicateRxPackets(pDevice); } else { @@ -4020,14 +3898,6 @@ LM_ServiceInterrupts( LM_ServiceTxInterrupt(pDevice); /* No spinlock for this queue since this routine is serialized. */ - if(!QQ_Empty(&pDevice->RxPacketReceivedQ.Container)) - { - /* Indicate receive packets. */ - MM_IndicateRxPackets(pDevice); - /* LM_QueueRxPackets(pDevice); */ - } - - /* No spinlock for this queue since this routine is serialized. */ if(!QQ_Empty(&pDevice->TxPacketXmittedQ.Container)) { MM_IndicateTxPackets(pDevice); @@ -6197,4 +6067,4 @@ LM_DmaTest(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt, } return LM_STATUS_SUCCESS; } -#endif /* CFG_CMD_NET, !CONFIG_NET_MULTI, CONFIG_TIGON3 */ +#endif /* CFG_CMD_NET, CONFIG_TIGON3 */ diff --git a/drivers/tigon3.h b/drivers/tigon3.h index ea4367d..a2c690c 100644 --- a/drivers/tigon3.h +++ b/drivers/tigon3.h @@ -2403,6 +2403,7 @@ typedef struct { #define GRC_MISC_BD_ID_5702FE 0x00004000 #define GRC_MISC_BD_ID_5704 0x00000000 #define GRC_MISC_BD_ID_5704CIOBE 0x00004000 + #define GRC_MISC_BD_ID_5704_A2 0x00008000 /* Miscellaneous local control register. */ T3_32BIT_REGISTER LocalCtrl; diff --git a/include/common.h b/include/common.h index 3c4b37b..acbbcb2 100644 --- a/include/common.h +++ b/include/common.h @@ -634,4 +634,6 @@ void show_boot_progress (int status); #error Read section CONFIG_SKIP_LOWLEVEL_INIT in README. #endif +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + #endif /* __COMMON_H_ */ diff --git a/include/net.h b/include/net.h index 461e038..e5ac66f 100644 --- a/include/net.h +++ b/include/net.h @@ -84,7 +84,8 @@ typedef void rxhand_f(uchar *, unsigned, unsigned, unsigned); */ typedef void thand_f(void); -#define NAMESIZE 16 +/* some ETH interface names in bcm5704 driver are pretty long...*/ +#define ETH_NAMESIZE 50 enum eth_state_t { ETH_STATE_INIT, @@ -93,7 +94,7 @@ enum eth_state_t { }; struct eth_device { - char name[NAMESIZE]; + char name[ETH_NAMESIZE]; unsigned char enetaddr[6]; int iobase; int state; @@ -105,13 +106,27 @@ struct eth_device { struct eth_device *next; void *priv; +#ifdef ETHERNET_DEBUG + void (*info) (struct eth_device*, int argc, char* argv[]); +#endif }; +#ifdef ETHERNET_DEBUG + +typedef void bypass_rx_f( volatile uchar*, int); + +extern void set_bypass_rx( bypass_rx_f f ); +extern void remove_bypass_rx( void ); + +#endif + 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. */ + /* traverse the list of registered ethernet interfaces */ +extern char *eth_get_next_name (char* this_name); #endif extern struct eth_device *eth_get_dev(void); /* get the current device MAC */ extern struct eth_device *eth_get_dev_by_name(char *devname); /* get device */ @@ -458,4 +473,10 @@ extern void copy_filename (char *dst, char *src, int size); /**********************************************************************/ +/* + * this definition should be used by all ethernet drivers + */ +#define MAC_ADDR_SIZE 6 +#define MIN_ENET_FRAME_SIZE 60 /* crcless */ + #endif /* __NET_H__ */

4 4

[U-Boot-Users] EVPR in PPC interrupts.c
by alina kisley 24 May '07

24 May '07

Ok I read the following note in history of this list: (http://sourceforge.net/mailarchive/message.php?msg_id=20070110001959.35E2C3…) Call me crazy for pursuing but I'm not sure I can have the SDRAM for my Xilinx re-mapped to 0x0000_0000. (They aren't listening yet). lib_ppc/board.c:board_init_f() seems very careful setting up 'addr' to something based off of CFG_SDRAM_BASE, which to me indicates *wanting* to support a non-0 mapping. (I'm an optimist) The relocate code is pretty careful about it also. Then you come to the trap handling, and 2 things may allow it to work: 1. change 'cpu/ppc4xx/interrupts.c:interrupt_init_cpu() call to set_evpr() to pass in CFG_SDRAM_BASE instead of 0x0000_0000. 2. change the 3rd line of cpu/ppc4xx/start.S:trap_init from li r9, 0x100 to li r9, 0x100 + CFG_SDRAM_BASE Then trap handling should work(?). I understand it's the ones I don't see that will kill me, and the Linux kernel change to non-0 based SDRAM is another story completely. But has anyone tried this? Can you comment on this approach or a later gotcha I'm not seeing? The board is PPC405 Xilinx, I am prepping now for bringup soon. --------------------------------- Get the Yahoo! toolbar and be alerted to new email wherever you're surfing.

1 0

[U-Boot-Users] [PATCH] Update board NetStar
by Ladislav Michl 24 May '07

24 May '07

Signed-off-by: Ladislav Michl <ladis(a)linux-mips.org> diff --git a/Makefile b/Makefile index caa5a0e..9a34e14 100644 --- a/Makefile +++ b/Makefile @@ -1954,17 +1954,8 @@ mx1ads_config : unconfig mx1fs2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t mx1fs2 NULL imx -netstar_32_config \ netstar_config: unconfig - @mkdir -p $(obj)include - @if [ "$(findstring _32_,$@)" ] ; then \ - echo "... 32MB SDRAM" ; \ - echo "#define PHYS_SDRAM_1_SIZE SZ_32M" >>$(obj)include/config.h ; \ - else \ - echo "... 64MB SDRAM" ; \ - echo "#define PHYS_SDRAM_1_SIZE SZ_64M" >>$(obj)include/config.h ; \ - fi - @$(MKCONFIG) -a netstar arm arm925t netstar + @$(MKCONFIG) $(@:_config=) arm arm925t netstar omap1510inn_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn diff --git a/board/netstar/nand.c b/board/netstar/nand.c index 7852365..eea7455 100644 --- a/board/netstar/nand.c +++ b/board/netstar/nand.c @@ -45,23 +45,12 @@ static void netstar_nand_hwcontrol(struct mtd_info *mtd, int cmd) this->IO_ADDR_W = (void *) IO_ADDR_W; } -/* - * chip R/B detection - */ -/*** -static int netstar_nand_ready(struct mtd_info *mtd) -{ - return (*(volatile ushort *)GPIO_DATA_INPUT_REG) & 0x02; -} -***/ - int board_nand_init(struct nand_chip *nand) { nand->options = NAND_SAMSUNG_LP_OPTIONS; nand->eccmode = NAND_ECC_SOFT; nand->hwcontrol = netstar_nand_hwcontrol; -/* nand->dev_ready = netstar_nand_ready; */ - nand->chip_delay = 18; + nand->chip_delay = 400; return 0; } #endif diff --git a/include/configs/netstar.h b/include/configs/netstar.h index 697796a..1a685df 100644 --- a/include/configs/netstar.h +++ b/include/configs/netstar.h @@ -48,14 +48,14 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 -#define CFG_DEVICE_NULLDEV 1 /* enable null device */ #define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */ - +#define CFG_CONSOLE_INFO_QUIET /* * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */ +#define PHYS_SDRAM_1_SIZE (64 * 1024 * 1024) #define PHYS_FLASH_1 0x00000000 /* Flash Bank #1 */ /* @@ -63,30 +63,21 @@ */ #define CFG_FLASH_BASE PHYS_FLASH_1 #define CFG_MAX_FLASH_BANKS 1 -#if (PHYS_SDRAM_1_SIZE == SZ_32M) -/*#if 1*/ -#define CFG_FLASH_CFI /* Flash is CFI conformant */ -#define CFG_FLASH_CFI_DRIVER /* Use the common driver */ -#define CFG_FLASH_EMPTY_INFO -#define CFG_MAX_FLASH_SECT 128 -#else -#define PHYS_FLASH_1_SIZE SZ_1M +#define PHYS_FLASH_1_SIZE (1 * 1024 * 1024) #define CFG_MAX_FLASH_SECT 19 #define CFG_FLASH_ERASE_TOUT (5*CFG_HZ) /* in ticks */ #define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) -#endif #define CFG_MONITOR_BASE PHYS_FLASH_1 -#define CFG_MONITOR_LEN SZ_256K +#define CFG_MONITOR_LEN (256 * 1024) /* * Environment settings */ #define CFG_ENV_IS_IN_FLASH -#define ENV_IS_SOLITARY #define CFG_ENV_ADDR 0x4000 -#define CFG_ENV_SIZE SZ_8K -#define CFG_ENV_SECT_SIZE SZ_8K +#define CFG_ENV_SIZE (8 * 1024) +#define CFG_ENV_SECT_SIZE (8 * 1024) #define CFG_ENV_ADDR_REDUND 0x6000 #define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE #define CONFIG_ENV_OVERWRITE @@ -95,14 +86,12 @@ * Size of malloc() pool */ #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -/* XXX #define CFG_MALLOC_LEN (SZ_64K - CFG_GBL_DATA_SIZE)*/ -#define CFG_MALLOC_LEN SZ_4M +#define CFG_MALLOC_LEN (4 * 1024 * 1024) /* * The stack size is set up in start.S using the settings below */ -/* XXX #define CONFIG_STACKSIZE SZ_8K /XXX* regular stack */ -#define CONFIG_STACKSIZE SZ_1M /* regular stack */ +#define CONFIG_STACKSIZE (1 * 1024 * 1024) /* regular stack */ /* * Hardware drivers @@ -132,36 +121,25 @@ #define CFG_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS 1 #define CFG_NAND_BASE 0x04000000 + (2 << 23) +#define NAND_ALLOW_ERASE_ALL 1 /* - * JFFS2 partitions (mtdparts command line support) + * partitions (mtdparts command line support) */ #define CONFIG_JFFS2_CMDLINE #define MTDIDS_DEFAULT "nor0=omapflash.0,nand0=omapnand.0" -#define MTDPARTS_DEFAULT "mtdparts=omapflash.0:8k@16k(env),8k(r_env),448k@576k(u-boot);omapnand.0:48M(rootfs0),48M(rootfs1),-(data)" +#define MTDPARTS_DEFAULT "mtdparts=" \ + "omapflash.0:8k@16k(env),8k(r_env),448k@576k(u-boot);" \ + "omapnand.0:4M(kernel0),40M(rootfs0),4M(kernel1),40M(rootfs1),-(data)" -#if 0 -#define CONFIG_COMMANDS (CFG_CMD_BDI | \ - CFG_CMD_BOOTD | \ - CFG_CMD_DHCP | \ - CFG_CMD_ENV | \ - CFG_CMD_FLASH | \ - CFG_CMD_IMI | \ - CFG_CMD_LOADB | \ - CFG_CMD_NET | \ - CFG_CMD_MEMORY | \ - CFG_CMD_PING | \ - CFG_CMD_RUN) - -#else #define CONFIG_COMMANDS (CFG_CMD_BDI | \ CFG_CMD_BOOTD | \ CFG_CMD_DHCP | \ CFG_CMD_ENV | \ CFG_CMD_FLASH | \ + CFG_CMD_JFFS2 | \ CFG_CMD_NAND | \ CFG_CMD_IMI | \ - CFG_CMD_JFFS2 | \ CFG_CMD_LOADB | \ CFG_CMD_NET | \ CFG_CMD_MEMORY | \ @@ -169,7 +147,6 @@ CFG_CMD_RUN) #define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ -#endif #define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT #define CONFIG_LOOPW @@ -181,36 +158,31 @@ #define CONFIG_ZERO_BOOTDELAY_CHECK /* allow to break in always */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ #define CFG_AUTOLOAD "n" /* No autoload */ -#define CONFIG_BOOTCOMMAND "run nboot" +#define CONFIG_BOOTCOMMAND "run fboot" #define CONFIG_PREBOOT "run setup" #define CONFIG_EXTRA_ENV_SETTINGS \ + "autostart=yes\0" \ + "ospart=0\0" \ "setup=setenv bootargs console=ttyS0,$baudrate " \ "$mtdparts\0" \ - "ospart=0\0" \ "setpart=" \ "if test -n $swapos; then " \ - "if test $ospart -eq 0; then chpart nand0,1; else chpart nand0,0; fi; "\ "setenv swapos; saveenv; " \ - "else " \ - "chpart nand0,$ospart; " \ + "if test $ospart -eq 0; then setenv ospart 1; else setenv ospart 0; fi; "\ "fi\0" \ "nfsargs=setenv bootargs $bootargs " \ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off " \ "nfsroot=$rootpath root=/dev/nfs\0" \ "flashargs=run setpart;setenv bootargs $bootargs " \ - "root=/dev/mtdblock$partition ro " \ + "root=mtd:rootfs$ospart ro " \ "rootfstype=jffs2\0" \ - "initrdargs=setenv bootargs $bootargs " \ - "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off\0" \ - "iboot=bootp;run initrdargs;tftp;bootm\0" \ - "fboot=run flashargs;fsload /boot/uImage;bootm\0" \ - "nboot=bootp;run nfsargs;tftp;bootm\0" + "fboot=run flashargs;nboot kernel$ospart\0" \ + "nboot=bootp;run nfsargs;tftp\0" #if 0 /* feel free to disable for development */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */ -#define CONFIG_AUTOBOOT_PROMPT "\nNetStar PBX - boot in %d sec...\n" -#define CONFIG_AUTOBOOT_DELAY_STR "R" /* 1st "password" */ -#define CONFIG_BOOT_RETRY_TIME 30 +#define CONFIG_AUTOBOOT_PROMPT "\nNetStar PBX - boot in %d secs...\n" +#define CONFIG_AUTOBOOT_DELAY_STR "." /* 1st "password" */ #endif /* @@ -228,7 +200,8 @@ #define CONFIG_AUTO_COMPLETE #define CFG_MEMTEST_START PHYS_SDRAM_1 -#define CFG_MEMTEST_END PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE +#define CFG_MEMTEST_END PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE - \ + (CFG_MONITOR_LEN + CFG_MALLOC_LEN + CONFIG_STACKSIZE) #undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */

2 1

[U-Boot-Users] [PATCH 1/2] NAND: Add support for transparent hardware ECC.
by Scott Wood 24 May '07

24 May '07

Some NAND controllers (such as on the MPC831x chips) have hardware ECC, but can only do it during a transfer (i.e. we can't implement calculate_ecc()). When NAND_ECC_TRANSPARENT is used, then ECC errors on reads are reported through correct_data() (with no arguments other than the mtd device), and on writes through waitfunc()'s return value. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- drivers/nand/nand_base.c | 84 ++++++++++++++++++++++++++++++++-------------- include/linux/mtd/nand.h | 10 +++++ 2 files changed, 69 insertions(+), 25 deletions(-) diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c index 8495829..52c612c 100644 --- a/drivers/nand/nand_base.c +++ b/drivers/nand/nand_base.c @@ -911,6 +911,11 @@ static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int pa this->write_buf(mtd, this->data_poi, mtd->oobblock); break; + case NAND_ECC_TRANSPARENT: + this->enable_hwecc(mtd, NAND_ECC_WRITE); + this->write_buf(mtd, this->data_poi, mtd->oobblock); + break; + /* Software ecc 3/256, write all */ case NAND_ECC_SOFT: for (; eccsteps; eccsteps--) { @@ -992,10 +997,14 @@ static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int int eccsteps = this->eccsteps; int hweccbytes; u_char oobdata[64]; + int eccmode = oobsel->useecc ? this->eccmode : NAND_ECC_NONE; hweccbytes = (this->options & NAND_HWECC_SYNDROME) ? (oobsel->eccbytes / eccsteps) : 0; /* Send command to read back the first page */ + if (eccmode == NAND_ECC_TRANSPARENT) + this->enable_hwecc(mtd, NAND_ECC_READ); + this->cmdfunc (mtd, NAND_CMD_READ0, 0, page); for(;;) { @@ -1019,7 +1028,30 @@ static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int /* check, if we must compare all data or if we just have to * compare the ecc bytes */ - if (oobmode) { + if (eccmode == NAND_ECC_TRANSPARENT) { + if (oobmode) { + /* Compare everything *but* the ECC */ + this->read_buf(mtd, oobdata, mtd->oobsize - + hweccbytes * eccsteps); + + for (i = 0, j = 0; i < mtd->oobsize; i++) { + if (j < oobsel->eccbytes && + i == oobsel->eccpos[j]) { + j++; + continue; + } + + if (oobdata[i] != oob_buf[oobofs + i]) { + DEBUG (MTD_DEBUG_LEVEL0, + "%s: Failed ECC write " + "verify, page 0x%08x, " + "%6i bytes were succesful\n", + __FUNCTION__, page, i); + goto out; + } + } + } + } else if (oobmode) { if (this->verify_buf(mtd, &oob_buf[oobofs], mtd->oobsize - hweccbytes * eccsteps)) { DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page); goto out; @@ -1062,10 +1094,13 @@ static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int if (!numpages) return 0; - /* Check, if the chip supports auto page increment */ - if (!NAND_CANAUTOINCR(this)) + if (!NAND_CANAUTOINCR(this)) { + if (eccmode == NAND_ECC_TRANSPARENT) + this->enable_hwecc(mtd, NAND_ECC_READ); + this->cmdfunc (mtd, NAND_CMD_READ0, 0x00, page); + } } /* * Terminate the read command. We come here in case of an error @@ -1161,7 +1196,8 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, ecc = this->eccsize; eccbytes = this->eccbytes; - if ((eccmode == NAND_ECC_NONE) || (this->options & NAND_HWECC_SYNDROME)) + if (eccmode == NAND_ECC_NONE || eccmode == NAND_ECC_TRANSPARENT || + (this->options & NAND_HWECC_SYNDROME)) compareecc = 0; oobreadlen = mtd->oobsize; @@ -1195,6 +1231,9 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, /* Check, if we must send the read command */ if (sndcmd) { + if (eccmode == NAND_ECC_TRANSPARENT) + this->enable_hwecc(mtd, NAND_ECC_READ); + this->cmdfunc (mtd, NAND_CMD_READ0, 0x00, page); sndcmd = 0; } @@ -1222,6 +1261,18 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, break; } + case NAND_ECC_TRANSPARENT: + this->read_buf(mtd, data_poi, end); + + if (this->correct_data(mtd, NULL, NULL, NULL) == -1) { + DEBUG(MTD_DEBUG_LEVEL0, "nand_read_ecc: " + "Failed ECC read, page 0x%08x on chip %d\n", + page, chipnr); + ecc_failed++; + } + + break; + case NAND_ECC_SOFT: /* Software ECC 3/256: Read in a page + oob data */ this->read_buf(mtd, data_poi, end); for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=3, datidx += ecc) @@ -2530,7 +2581,9 @@ int nand_scan (struct mtd_info *mtd, int maxchips) case NAND_ECC_NONE: printk (KERN_WARNING "NAND_ECC_NONE selected by board driver. This is not recommended !!\n"); - this->eccmode = NAND_ECC_NONE; + /* fall-through */ + case NAND_ECC_TRANSPARENT: + this->eccsize = mtd->oobblock; break; case NAND_ECC_SOFT: @@ -2562,26 +2615,7 @@ int nand_scan (struct mtd_info *mtd, int maxchips) } mtd->eccsize = this->eccsize; - - /* Set the number of read / write steps for one page to ensure ECC generation */ - switch (this->eccmode) { - case NAND_ECC_HW12_2048: - this->eccsteps = mtd->oobblock / 2048; - break; - case NAND_ECC_HW3_512: - case NAND_ECC_HW6_512: - case NAND_ECC_HW8_512: - this->eccsteps = mtd->oobblock / 512; - break; - case NAND_ECC_HW3_256: - case NAND_ECC_SOFT: - this->eccsteps = mtd->oobblock / 256; - break; - - case NAND_ECC_NONE: - this->eccsteps = 1; - break; - } + this->eccsteps = mtd->oobblock / this->eccsize; /* XXX U-BOOT XXX */ #if 0 diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 4b48564..1af0666 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -136,6 +136,16 @@ extern int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from, size_ /* Hardware ECC 12 byte ECC per 2048 Byte data */ #define NAND_ECC_HW12_2048 7 +/* The hardware does ECC transparently on transfers. This is treated + * like NAND_ECC_NONE, except without lecturing the user that they really + * should use ECC. Also, it bypasses verification of OOB data, as the + * ECC written by the hardware will differ from what the generic code + * expects. The calculate_ecc method should not be called. The + * correct_data method is used to return errors on read; only the mtd + * argument is used. + */ +#define NAND_ECC_TRANSPARENT 0x1000 + /* * Constants for Hardware ECC */ -- 1.5.0.3

2 2

[U-Boot-Users] [RFC] LCD support
by Rodolfo Giometti 24 May '07

24 May '07

Hello, I'm planning to modify LCD/logo support and I'd like to know if someone is working on this topic in order to join efforts. First I'd like to add CMAP565 support, then 16bpp LCDs and in the end at least PXA27x LCD support (I also have AU1x00 support but it's old code...). I already have patches to do it, I should only test them. :) Thanks, Rodolfo -- GNU/Linux Solutions e-mail: giometti(a)enneenne.com Linux Device Driver giometti(a)gnudd.com Embedded Systems giometti(a)linux.it UNIX programming phone: +39 349 2432127

1 0

[U-Boot-Users] NAND and JFFS2
by Matt Gessner 24 May '07

24 May '07

Hi, all, I'm using 1.2.0 on an AT91RM9200, along with linux 2.6.20-2 w/ patches from Maxim. I'm looking for info on how compatible the JFFS2 stuff is between u-boot and linux. When I mount a partition (I have JFFS2 debugging turned on in the kernel), I get two kinds of error messages: "jffs2_check_nand_cleanmarker(): Cleanmarker node not detected in block at X" "OOB at X was ...." (lots of data, not all FF) "CLEANMARKER node found at X has totlen 0xc != normal 0x0" OR "jffs2_check_nand_cleanmarker(): Cleanmarker node not detected in block at X" "OOB at X was ...." (lots of FF) I'm wondering if anyone can point me to what I'm doing wrong. I have 3 partitions: boot, backup and config, which I made using mtdparts. When I work with my nand device, I use 'nand erase clean', which I thought would write the nand clean markers. The jffs2 is expecting nand clean markers at every 4K (0x1000) bytes. I'm wondering if my mkfs.jffs2 command is wrong, or if my use of nand erase is wrong, or if I need to specify something in either the kernel or the u-boot config is wrong. Any pointers are appreciated. Thanks for everyone's hard work making u-boot a great tool. Regards, Matt G.

3 3

[U-Boot-Users] different definition of struct bd_info between U-Boot and Linux
by Linux OneAccess 24 May '07

24 May '07

Hi all, I was figuring out how to pass board info from U-Boot to Linux and I saw that Linux references the bd_info structure. I'm not sure, however, which definition to use: In U-Boot, struct bd_info is defined in include/asm/u-boot.h In Linux, it's defined in include/asm-ppc/ppcboot.h. These two are somewhat different (different #ifdefs) which means the first few members (RAM size and such) are the same, but from then on it can diverge. Furthermore, in Linux there are several boards that define their own structure for this. Should we use the ppcboot.h definition, or is it there an intention to push the u-boot.h to the Linux tree one day? Thanks

2 2

[U-Boot-Users] "3.micron":(1 of 1) [PATCH][NAND] Define the Vendor Id for Micron NAND Flash
by Ulf Samuelsson 24 May '07

24 May '07

Author: Ulf Samuelsson <ulf(a)atmel.com> Date: 2007-03-27 Subject: "3.micron":(1 of 1) [PATCH][NAND] Define the Vendor Id for Micron NAND Flash CHANGELOG: [PATCH][NAND] Define the Vendor Id for Micron NAND Flash Patch generated from files: drivers_nand_nand_ids.c.patch include_linux_mtd_nand.h.patch Signed-off-by: Ulf Samuelsson --------------------------------------------------------------------------------------------------------------------------------- diff -urN u-boot-1.2.0/drivers/nand/nand_ids.c u-boot-1.2.0-atmel/drivers/nand/nand_ids.c --- u-boot-1.2.0/drivers/nand/nand_ids.c 2007-01-07 00:13:11.000000000 +0100 +++ u-boot-1.2.0-atmel/drivers/nand/nand_ids.c 2007-03-24 20:07:32.000000000 +0100 @@ -123,6 +123,7 @@ {NAND_MFR_NATIONAL, "National"}, {NAND_MFR_RENESAS, "Renesas"}, {NAND_MFR_STMICRO, "ST Micro"}, + {NAND_MFR_MICRON, "Micron"}, {0x0, "Unknown"} }; #endif diff -urN u-boot-1.2.0/include/linux/mtd/nand.h u-boot-1.2.0-atmel/include/linux/mtd/nand.h --- u-boot-1.2.0/include/linux/mtd/nand.h 2007-01-07 00:13:11.000000000 +0100 +++ u-boot-1.2.0-atmel/include/linux/mtd/nand.h 2007-03-24 20:07:32.000000000 +0100 @@ -348,6 +348,7 @@ #define NAND_MFR_NATIONAL 0x8f #define NAND_MFR_RENESAS 0x07 #define NAND_MFR_STMICRO 0x20 +#define NAND_MFR_MICRON 0x2c /** * struct nand_flash_dev - NAND Flash Device ID Structure -- Best Regards, Ulf Samuelsson

3 2

[U-Boot-Users] OneNAND alternative to X-Load
by Pete MacKay 24 May '07

24 May '07

We're developing a PXA-270-based machine that will boot from OneNAND. I wanted to share my ideas (and code) with anyone faced with this challenge, since this forum (esp. Kyungmin Park - thank you!!) was quite helpful. I'll start off explaining my u-boot code, then when I get some time I'll submit my PXA-270 platform driver as a patch (currently works on 2.6.18). We use a common approach: in lacking JTAG we have chip select jumpers that swap CS0/CS1 between NOR and OneNAND. The OneNAND has a bottom-mapped 2K boot buffer of which 1K is valid, which is where the level 1 boot loader fits. It uses two memory-mapped 'bufferrams' to ping-pong data out of the NAND pages, but you want to use BUFFERRAM1 only as writing BUFFERRAM0 can corrupt BOOTRAM0 on some revs of the chip. (We're executing out of BOOTRAM0 so that's bad :). There is open-source code called "x-loader" that is a stripped-down u-boot for the level 1 boot loader. What I did was integrate the level 1 function into u-boot itself with a custom configuration and linker script. In the top u-boot Makefile I added this: myboard_config : unconfig @./mkconfig $(@:_config=) arm pxa myboard myboard_onenand_config : unconfig @./mkconfig $(@:_config=) arm pxa myboard @echo "LDSCRIPT := $(TOPDIR)/board/myboard/u-boot.onenand.lds" >> include/config.mk In include/configs/myboard_onenand.h I simply define CONFIG_BOOT_ONENAND and then include myboard.h, with conditional switches inside for base address, etc (i.e. define CONFIG_IDENT_STRING as " from OneNAND" or " from NOR"). The linker script replaces cpu/pxa/start.S with oneboot.S and makes sure the C code to load the other pages positions there too. Then it aligns the rest of u-boot at the 2K boundary (NAND page 1). The oneboot.S code melds start.S with lowlevel_init but calls C code to read the rest of the block 0 pages into RAM. I later optimized it to replace start.S entirely for the NOR version. BTW, I lacked originality and stole (liked) the name: oneboot is not to be confused with the script that merges x-load and u-boot into one binary image. This is the relevant portion of the u-boot linker script: . = 0x00000000; . = ALIGN(4); .text : { board/myboard/oneboot.o (.text) board/myboard/onenand_boot.o (.text) __oneboot_end = .; /* must not exceed 0x400! */ . = 0x800; /* reposition to 2K page boundary */ __page1_start = .; /* OneNAND loading starts here */ * (.text) } Look at System.map to make sure your level 1 code fits within 1K. Also in oneboot.S I commented out labels and used relative branches to save symbol space and replaced ldr with mov wherever possible. And with the 270 optimizations in oneboot.S our system screams! The full code is at http://code.architechnical.net/onenand, including the 2.6.18 pxa27x OneNAND driver. Please don't laugh at my lame ancient web site. Oh yeah, I'm using arm-linux-gcc 3.4.4. -- View this message in context: http://www.nabble.com/OneNAND-alternative-to-X-Load-tf3802100.html#a10757753 Sent from the Uboot - Users mailing list archive at Nabble.com.

2 1

[U-Boot-Users] The command of nand write cannot write zImage to nandflash
by zj_31529 24 May '07

24 May '07

Hi all: I patch NAND (including boot-from-NAND via steppingstone) support to the S3C2410 SoC code in u-boot(http://svn.openmoko.org/trunk/src/target/u-boot/patches/uboot-s3c241…. The u-boot-1.1.6 print the nandflash info to DNW,and the command of "tftp 0x31000000 zImage" is ok,but the command of "nand write.jffs2 0x31000000 0x2030000 0xc0000 "cannot write the zImage of Linux 2.4 to the nandflash and the u-boot print "Bad block check failed". When I excuted the command of "nand write 0x31000000 0x2030000 0xc0000",the u-boot print "0 bytes writed". Can you give me a hand. Thank you very much!

2 1

[U-Boot-Users] High quality medications at good prices.
by Bradly West 24 May '07

24 May '07

grapes brought out of the land of Canaan; only an earnest and would tell me, true wisdom consisted in adding house to Christ will, but not completely before the day of our shall I repeat to them that dreadful threatening, “If any man consider the folly of being no more than an almost Christian.Lord; and in that light they see their own darkness; they now by imputing to them the righteousness of the Lord Jesus.to be a Christian.”wrath of God, and sunk into a spiritual death.money, you might say, we are poor, and cannot buy: or, were and yet it is so little regarded, that were we to judge by the upon us; our sanctification at best, in this life, is not the worse for them.He is one that depends much upon being negatively good, on the other hand, so depend on inherent righteousness or Bradly West

1 0

[U-Boot-Users] [PATCH] again, to fix incorrect Strata IDs
by Pete MacKay 24 May '07

24 May '07

diff --git a/include/flash.h b/include/flash.h index 55b6d8f..4b5d814 100644 --- a/include/flash.h +++ b/include/flash.h @@ -290,8 +290,8 @@ extern void flash_read_factory_serial(flash_info_t * info, v #define INTEL_ID_28F64P30B 0x881A881A /* 64M = 32K x 255 + 32k x 4 */ #define INTEL_ID_28F128P30T 0x88188818 /* 128M = 64K x 255 + 32k x 4 */ #define INTEL_ID_28F128P30B 0x881B881B /* 128M = 64K x 255 + 32k x 4 */ -#define INTEL_ID_28F256P30T 0x88198819 /* 256M = 128K x 255 + 32k x 4 */ -#define INTEL_ID_28F256P30B 0x881C881C /* 256M = 128K x 255 + 32k x 4 */ +#define INTEL_ID_28F256P30T 0x89198919 /* 256M = 128K x 255 + 32k x 4 */ +#define INTEL_ID_28F256P30B 0x891C891C /* 256M = 128K x 255 + 32k x 4 */ #define INTEL_ID_28F160S3 0x00D000D0 /* 16M = 512K x 32 (64kB x 32) #define INTEL_ID_28F320S3 0x00D400D4 /* 32M = 512K x 64 (64kB x 64) -- View this message in context: http://www.nabble.com/-PATCH--again%2C-to-fix-incorrect-Strata-IDs-tf380674… Sent from the Uboot - Users mailing list archive at Nabble.com.

2 1

Re: [U-Boot-Users] [PATCH] Functions added to extern for stand alone programs
by Wolfgang Denk 24 May '07

24 May '07

In message <e68c55e80705231347w76d86bf8o1a1f6001e93f3f72(a)mail.gmail.com> you wrote: > > it could't really be that simple, could it? I bet my sintax is wrong, Maybe. > and I still do not compleatly understand how the compiler intreprets > "weak" and "set". But I can see how this would work. I never used this assembler trickery before myself. So far, I only played with the C variant of it. Like that: -> cat foo.c #include <stdio.h> int func(int, int); int main (void) { int i = func (2, 7); printf ("i = %d\n", i); return 0; } -> cat func.c #include <stdio.h> int __func (int a, int b) { printf ("Default func called: %d + %d\n", a, b); return (a + b); } int func(int a, int b) __attribute__ ((weak, alias ("__func"))); -> cat private.c #include <stdio.h> int func (int a, int b) { printf ("Private func called: %d * %d\n", a, b); return (a * b); } -> gcc -c *.c -> gcc -o foo foo.o func.o -> ./foo Default func called: 2 + 7 i = 9 -> gcc -o bar foo.o func.o private.o -> ./bar Private func called: 2 * 7 i = 14 Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de It is a human characteristic to love little animals, especially if they're attractive in some way. -- McCoy, "The Trouble with Tribbles", stardate 4525.6

1 0

Re: [U-Boot-Users] [PATCH] Functions added to extern for stand alone programs
by Jeffrey Mann 23 May '07

23 May '07

> > > > > #define cond_extern(name) asm(".weak\t" #name "\n\t.set\t" #name ", > > > unimpl_extern") > > > > I do not understand what this does. Does it work? > > Yes, it does. See file: gcc.info, node: Function Attributes, > section: 5.24 Declaring Attributes of Functions > > > > static int unimpl_extern(void) > > > { > > > return -ENOSYS; /* or something more appropriate */ > > > } > > > > How is this different that using the dummy function? > > The main difference is that with "normal" functions you must make > sure that the dummy function does not get compiled / linked when you > implement a real function. "Weak" are simply overwritten if any user > provides another (real) function with the same name. No #ifdef mess > any more :-) So in practice, it would look something like this?: void jumptable_init (void) { int i; gd->jt = (void **) malloc (XF_MAX * sizeof (void *)); for (i = 0; i < XF_MAX; i++) gd->jt[i] = (void *) dummy; #define EXPORT_FUNC(name) asm(".weak\t" #name "\n\t.set\t" #name ", dummy"); #include <_exports.h> #undef EXPORT_FUNC gd->jt[XF_get_version] = (void *) get_version; gd->jt[XF_malloc] = (void *) malloc; gd->jt[XF_free] = (void *) free; gd->jt[XF_getenv] = (void *) getenv; gd->jt[XF_setenv] = (void *) setenv; gd->jt[XF_get_timer] = (void *) get_timer; gd->jt[XF_simple_strtoul] = (void *) simple_strtoul; gd->jt[XF_udelay] = (void *) udelay; gd->jt[XF_install_hdlr] = (void *) irq_install_handler; gd->jt[XF_free_hdlr] = (void *) irq_free_handler; gd->jt[XF_i2c_write] = (void *) i2c_write; gd->jt[XF_i2c_read] = (void *) i2c_read; ........ } it could't really be that simple, could it? I bet my sintax is wrong, and I still do not compleatly understand how the compiler intreprets "weak" and "set". But I can see how this would work. -Jeff

1 0

[U-Boot-Users] Imminent pull from u-boot-testing
by Wolfgang Denk 23 May '07

23 May '07

Hi, I intend to merge the code from the u-boot-testing repository in a few days (before the end of the week). Please help reviewing / testing the changes. The following changes since commit 70124c2602ae2d4c5d3dba05b482d91548242de8: Stefano Babic (1): Fix compile problem cause my Microblaze merge are found in the git repository at: u-boot-testing Aubrey.Li (1): Fix compilation issues on MACOSX Grzegorz Wianecki (1): Use PVR to distinguish MPC5200B from MPC5200 in boot message Jeffrey Mann (1): [patch] setenv(...) can delete environmentalvariables Joe Hamman (1): Add support for BCM5464 Quad Phy Jon Loeliger (1): Add LIST_86xx MAKEALL target for PowerPC builds. Kim Phillips (1): Reduce CONFIG_MPC8YXX_TSECx to CONFIG_TSECx Ladislav Michl (1): simplify silent console Mike Frysinger (1): [patch] use unsigned char in smc91111 driver for mac mushtaq khan (2): Fixes bug clearing the bss section for i386 Add driver for S-ATA-controller on Intel processors with South Sergei Shtylyov (1): Avoid assigning PCI resources from zero address Stefan Roese (2): Merge with git://www.denx.de/git/u-boot.git Fix file mode Stephen Williams (1): Fix for compile of JSE target Timur Tabi (1): 5xxx: write MAC address to mac-address and local-mac-address Wolfgang Denk (5): Merge with git://www.denx.de/git/u-boot-testing Merge with /home/git/u-boot Merge with git://www.denx.de/git/u-boot-testing Minor coding style cleanup. Merge with /home/git/u-boot Zang Roy-r61911 (1): Search the exception table with linear algorithm MAKEALL | 11 +- board/cds/mpc8548cds/mpc8548cds.c | 10 +- common/Makefile | 4 +- common/cmd_sata.c | 712 +++++++++++++++++++++++++++++++++++++ common/main.c | 10 +- cpu/i386/start.S | 2 +- cpu/mpc83xx/cpu.c | 8 +- cpu/mpc85xx/cpu.c | 2 +- cpu/mpc86xx/cpu.c | 8 +- drivers/Makefile | 2 +- drivers/ata_piix.c | 216 +++++++++++ drivers/tsec.c | 46 ++- include/ata.h | 60 +++ include/configs/JSE.h | 1 + include/configs/MPC8313ERDB.h | 8 +- include/configs/MPC8349EMDS.h | 8 +- include/configs/MPC8349ITX.h | 14 +- include/configs/MPC8540ADS.h | 8 +- include/configs/MPC8540EVAL.h | 8 +- include/configs/MPC8541CDS.h | 8 +- include/configs/MPC8544DS.h | 8 +- include/configs/MPC8548CDS.h | 16 +- include/configs/MPC8555CDS.h | 8 +- include/configs/MPC8560ADS.h | 8 +- include/configs/MPC8568MDS.h | 12 +- include/configs/MPC8641HPCN.h | 16 +- include/configs/PM854.h | 8 +- include/configs/PM856.h | 8 +- include/configs/TQM834x.h | 8 +- include/configs/TQM85xx.h | 8 +- include/configs/sbc8349.h | 8 +- include/configs/sc520_cdp.h | 9 + include/configs/stxgp3.h | 8 +- include/configs/stxssa.h | 8 +- include/sata.h | 108 ++++++ lib_ppc/extable.c | 39 +-- net/eth.c | 39 +-- tools/Makefile | 2 +- tools/mkimage.c | 4 +- 39 files changed, 1293 insertions(+), 178 deletions(-) create mode 100644 common/cmd_sata.c create mode 100644 drivers/ata_piix.c create mode 100644 include/sata.h Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de When you say "I wrote a program that crashed Windows", people just stare at you blankly and say "Hey, I got those with the system, *for free*". - Linus Torvalds in <3itc77$9lj(a)ninurta.fer.uni-lj.si>

1 0

[U-Boot-Users] [PATCH] Functions added to extern for stand alone programs
by Jeff Mann 23 May '07

23 May '07

[PATCH] Functions added to extern for stand alone programs This patch contains updated to the extern files for stand alone programs: -Functions have been added to the extern list -Function order has been modified to group related function together. -XF_VERSION increased to 4 -Function netboot_common changed from static to extern The patch file is attached This is the second patch This feature does not seem to fall into any category in the list of U-Boot Custodians, so I guess it goes to you, Wolfgang. The patch file is attached. -Jeffrey Mann

5 6

[U-Boot-Users] [PATCH] Add LIST_86xx MAKEALL target for PowerPC builds.
by Jon Loeliger 23 May '07

23 May '07

Signed-off-by: Jon Loeliger <jdl(a)freescale.com> --- Wolfgang, If you don't want to pick this up directly, I can place it in the -mpc86xx tree for a later pull. Thanks, jdl MAKEALL | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/MAKEALL b/MAKEALL index 0f0ec29..a39fdeb 100755 --- a/MAKEALL +++ b/MAKEALL @@ -149,6 +149,14 @@ LIST_85xx=" \ " ######################################################################### +## MPC86xx Systems +######################################################################### + +LIST_86xx=" \ + MPC8641HPCN \ +" + +######################################################################### ## 74xx/7xx Systems ######################################################################### @@ -168,6 +176,7 @@ LIST_ppc="${LIST_5xx} ${LIST_5xxx} \ ${LIST_8220} ${LIST_824x} ${LIST_8260} \ ${LIST_83xx} \ ${LIST_85xx} \ + ${LIST_86xx} \ ${LIST_4xx} \ ${LIST_74xx} ${LIST_7xx}" @@ -354,7 +363,7 @@ do microblaze| \ mips|mips_el| \ nios|nios2| \ - ppc|5xx|5xxx|8xx|8220|824x|8260|83xx|85xx|4xx|7xx|74xx| \ + ppc|5xx|5xxx|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx| \ x86|I486) for target in `eval echo '$LIST_'${arg}` do -- 1.5.0.3

2 1

[U-Boot-Users] Some minor patches
by Detlev Zundel 23 May '07

23 May '07

Hi Wolfgang, The following changes since commit a7676ea7732f3c596805079fed7e5c9fac652cfc: Wolfgang Denk (1): Minor Coding Style cleanup, update CHANGELOG. are found in the git repository at: pollux:/home/dzu/src/git/u-boot Detlev Zundel (2): Fix 'run' not to continue after interrupted command Change 'repeatable' attribute of some commands to sensible values. common/cmd_flash.c | 4 ++-- common/cmd_misc.c | 2 +- common/cmd_pcmcia.c | 2 +- common/main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) Cheers Detlev -- Whenever you find yourself on the side of the majority it is time to pause and reflect. -- Mark Twain -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu(a)denx.de

1 0

[U-Boot-Users] "8.partition":(1 of 1) [PATCH][ARM] Change dataflash partition boundaries to be compatible with Linux 2.6
by Ulf Samuelsson 23 May '07

23 May '07

Author: Ulf Samuelsson <ulf(a)atmel.com> Date: 2007-03-27 Subject: "8.partition":(1 of 1) [PATCH][ARM] Change dataflash partition boundaries to be compatible with Linux 2.6 CHANGELOG: [PATCH][ARM] Change dataflash partition boundaries to be compatible with Linux 2.6 Make partition boundaries align with start of dataflash pages Add partition name to environment automatically Add printing info on protection status Enable by setting CONFIG_NEW_PARTITION in <board>.h Patch generated from files: drivers_dataflash.c.patch include_dataflash.h.patch include_flash.h.patch Signed-off-by: Ulf Samuelsson --------------------------------------------------------------------------------------------------------------------------------- diff -urN u-boot-1.2.0/drivers/dataflash.c u-boot-1.2.0-atmel/drivers/dataflash.c --- u-boot-1.2.0/drivers/dataflash.c 2007-01-07 00:13:11.000000000 +0100 +++ u-boot-1.2.0-atmel/drivers/dataflash.c 2007-03-27 10:30:30.000000000 +0200 @@ -26,18 +26,67 @@ AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS]; static AT91S_DataFlash DataFlashInst; +#ifdef CONFIG_AT91SAM9260EK +int cs[][CFG_MAX_DATAFLASH_BANKS] = { + {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ + {CFG_DATAFLASH_LOGIC_ADDR_CS1, 1} +}; +#elif defined(CONFIG_AT91SAM9263EK) +int cs[][CFG_MAX_DATAFLASH_BANKS] = { + {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0} /* Logical adress, CS */ +}; +#else int cs[][CFG_MAX_DATAFLASH_BANKS] = { {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ {CFG_DATAFLASH_LOGIC_ADDR_CS3, 3} }; +#endif /*define the area offsets*/ +#if defined(CONFIG_AT91SAM9261EK) || defined(CONFIG_AT91SAM9260EK) || defined(CONFIG_AT91SAM9263EK) +#if defined(CONFIG_NEW_PARTITION) +dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { + {0x00000000, 0x00003FFF, FLAG_PROTECT_SET, 0, "Bootstrap"}, /* ROM code */ + {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, /* u-boot environment */ + {0x00008400, 0x0003DDFF, FLAG_PROTECT_SET, 0, "U-Boot"}, /* u-boot code */ + {0x0003DE00, 0x00041FFF, FLAG_PROTECT_CLEAR, FLAG_SETENV, "MON"}, /* Room for alternative boot monitor */ + {0x00042000, 0x0018BFFF, FLAG_PROTECT_CLEAR, FLAG_SETENV, "OS"}, /* data area size to tune */ + {0x0018C000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, FLAG_SETENV, "FS"}, /* data area size to tune */ +}; +#else +dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { + {0, 0x3fff, FLAG_PROTECT_SET}, /* ROM code */ + {0x4000, 0x7fff, FLAG_PROTECT_CLEAR}, /* u-boot environment */ + {0x8000, 0x37fff, FLAG_PROTECT_SET}, /* u-boot code */ + {0x38000, 0x1fffff, FLAG_PROTECT_CLEAR}, /* data area size to tune */ +}; +#endif +#elif defined(CONFIG_NEW_PARTITION) +/*define the area offsets*/ +/* Invalid partitions should be defined with start > end */ +dataflash_protect_t area_list[NB_DATAFLASH_AREA*CFG_MAX_DATAFLASH_BANKS] = { + {0x00000000, 0x000083ff, FLAG_PROTECT_SET, 0, "Bootstrap"}, /* ROM code */ + {0x00008400, 0x00020fff, FLAG_PROTECT_SET, 0, "U-Boot"}, /* u-boot code */ + {0x00021000, 0x000293ff, FLAG_PROTECT_CLEAR, 0, "Environment"}, /* u-boot environment 8Kb */ + {0x00029400, 0x00041fff, FLAG_PROTECT_INVALID, 0, "<Unused>"}, /* Rest of Sector 1 */ + {0x00042000, 0x0018Bfff, FLAG_PROTECT_CLEAR, FLAG_SETENV, "OS"}, /* data area size to tune */ + {0x0018C000, 0xffffffff, FLAG_PROTECT_CLEAR, FLAG_SETENV, "FS"}, /* data area size to tune */ + + {0x00000000, 0xffffffff, FLAG_PROTECT_CLEAR, FLAG_SETENV, "Data"}, /* data area */ + {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID, 0, "<Invalid>"}, /* Invalid */ + {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID, 0, "<Invalid>"}, /* Invalid */ + {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID, 0, "<Invalid>"}, /* Invalid */ + {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID, 0, "<Invalid>"}, /* Invalid */ + {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID, 0, "<Invalid>"}, /* Invalid */ +}; +#else dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { {0, 0x7fff, FLAG_PROTECT_SET}, /* ROM code */ {0x8000, 0x1ffff, FLAG_PROTECT_SET}, /* u-boot code */ {0x20000, 0x27fff, FLAG_PROTECT_CLEAR}, /* u-boot environment */ {0x28000, 0x1fffff, FLAG_PROTECT_CLEAR}, /* data area size to tune */ }; +#endif extern void AT91F_SpiInit (void); extern int AT91F_DataflashProbe (int i, AT91PS_DataflashDesc pDesc); @@ -53,10 +102,15 @@ { int i, j; int dfcode; + int part = 0; + int last_part; + int found[CFG_MAX_DATAFLASH_BANKS]; + unsigned char protected; AT91F_SpiInit (); for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) { + found[i] = 0; dataflash_info[i].Desc.state = IDLE; dataflash_info[i].id = 0; dataflash_info[i].Device.pages_number = 0; @@ -72,6 +126,7 @@ dataflash_info[i].Desc.DataFlash_state = IDLE; dataflash_info[i].logical_address = cs[i][0]; dataflash_info[i].id = dfcode; + found[i] += dfcode;; break; case AT45DB321: @@ -83,6 +138,7 @@ dataflash_info[i].Desc.DataFlash_state = IDLE; dataflash_info[i].logical_address = cs[i][0]; dataflash_info[i].id = dfcode; + found[i] += dfcode;; break; case AT45DB642: @@ -94,6 +150,7 @@ dataflash_info[i].Desc.DataFlash_state = IDLE; dataflash_info[i].logical_address = cs[i][0]; dataflash_info[i].id = dfcode; + found[i] += dfcode;; break; case AT45DB128: dataflash_info[i].Device.pages_number = 16384; @@ -104,26 +161,75 @@ dataflash_info[i].Desc.DataFlash_state = IDLE; dataflash_info[i].logical_address = cs[i][0]; dataflash_info[i].id = dfcode; + found[i] += dfcode;; break; default: + dfcode = 0; break; } /* set the last area end to the dataflash size*/ area_list[NB_DATAFLASH_AREA -1].end = (dataflash_info[i].Device.pages_number * dataflash_info[i].Device.pages_size)-1; - + last_part=0; /* set the area addresses */ for(j = 0; j<NB_DATAFLASH_AREA; j++) { - dataflash_info[i].Device.area_list[j].start = area_list[j].start + dataflash_info[i].logical_address; - dataflash_info[i].Device.area_list[j].end = area_list[j].end + dataflash_info[i].logical_address; - dataflash_info[i].Device.area_list[j].protected = area_list[j].protected; + /* dataflash_info[i].Device.area_list[j].start = area_list[j].start + dataflash_info[i].logical_address;*/ + /* dataflash_info[i].Device.area_list[j].end = area_list[j].end + dataflash_info[i].logical_address;*/ + /* dataflash_info[i].Device.area_list[j].protected = area_list[j].protected;*/ + if(found[i]!=0) { + /* printf("Start=%X, ",area_list[part].start + dataflash_info[i].logical_address);*/ + dataflash_info[i].Device.area_list[j].start = area_list[part].start + dataflash_info[i].logical_address; + if(area_list[part].end == 0xffffffff) { + /* printf("End (computed)=%X, ",dataflash_info[i].end_address + dataflash_info[i].logical_address);*/ + dataflash_info[i].Device.area_list[j].end = dataflash_info[i].end_address + dataflash_info [i].logical_address; + last_part = 1; + } else { + /* printf("End=%X, ",area_list[part].end + dataflash_info[i].logical_address);*/ + dataflash_info[i].Device.area_list[j].end = area_list[part].end + dataflash_info[i].logical_address; + } + protected = area_list[part].protected; + /* Set the environment according to the label...*/ + if(protected == FLAG_PROTECT_INVALID) { + /* printf("Invalid\n");*/ + dataflash_info[i].Device.area_list[j].protected = FLAG_PROTECT_INVALID; + } else { + /* printf("%s\n", (area_list[part].protected==FLAG_PROTECT_SET)?"(RO)":""); */ + dataflash_info[i].Device.area_list[j].protected = protected; + } + /*printf("To: %s, From: %s\n",dataflash_info[i].Device.area_list[j].label,area_list[part].label);*/ + strcpy(dataflash_info[i].Device.area_list[j].label,area_list[part].label); + /*printf("To: %s, From: %s\n",dataflash_info[i].Device.area_list[j].label,area_list[part].label);*/ + } + part++; } } - return (1); + return found[0]; } +#ifdef CONFIG_NEW_DF_PARTITION +int AT91F_DataflashSetEnv (void) +{ + int i, j; + int part; + unsigned char env; + unsigned char s[32]; /* Will fit a long int in hex */ + unsigned long start; + for (i = 0, part= 0; i < CFG_MAX_DATAFLASH_BANKS; i++) { + for(j = 0; j<NB_DATAFLASH_AREA; j++) { + env = area_list[part].setenv; + /* Set the environment according to the label...*/ + if((env & FLAG_SETENV) == FLAG_SETENV) { + start = dataflash_info[i].Device.area_list[j].start; + sprintf(s,"%X",start); + setenv(area_list[part].label,s); + } + part++; + } + } +} +#endif void dataflash_print_info (void) { @@ -159,11 +265,26 @@ dataflash_info[i].Device.pages_size, (unsigned int) dataflash_info[i].logical_address); for (j=0; j< NB_DATAFLASH_AREA; j++) { - printf ("Area %i:\t%08lX to %08lX %s\n", j, - dataflash_info[i].Device.area_list[j].start, - dataflash_info[i].Device.area_list[j].end, - (dataflash_info[i].Device.area_list[j].protected == - FLAG_PROTECT_SET) ? "(RO)" : ""); + switch(dataflash_info[i].Device.area_list[j].protected) { + case FLAG_PROTECT_SET: + case FLAG_PROTECT_CLEAR: + printf ("Area %i:\t%08lX to %08lX %s", j, + dataflash_info[i].Device.area_list[j].start, + dataflash_info[i].Device.area_list[j].end, + (dataflash_info[i].Device.area_list[j].protected==FLAG_PROTECT_SET) ? "(RO)" : " "); +#ifdef CONFIG_NEW_DF_PARTITION + printf(" %s\n", dataflash_info[i].Device.area_list[j].label); +#else + printf("\n"); +#endif + break; +#ifdef CONFIG_NEW_DF_PARTITION + case FLAG_PROTECT_INVALID: + break; +#endif + } + + } } } @@ -204,8 +325,9 @@ int i; for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) { - if ((((int) addr) & 0xFF000000) == - dataflash_info[i].logical_address) { + if ( dataflash_info[i].id + && ((((int) addr) & 0xFF000000) == + dataflash_info[i].logical_address)) { addr_valid = 1; break; } @@ -244,7 +366,7 @@ if (area == NB_DATAFLASH_AREA) return -1; /*test protection value*/ if (pdataFlash->pDevice->area_list[area].protected == FLAG_PROTECT_SET) return 0; - + if (pdataFlash->pDevice->area_list[area].protected == FLAG_PROTECT_INVALID) return 0; return 1; } /*-----------------------------------------------------------------------------*/ @@ -278,9 +400,13 @@ /*set protection value*/ for(j = area1; j < area2+1 ; j++) - if (flag == 0) dataflash_info[i].Device.area_list[j].protected = FLAG_PROTECT_CLEAR; - else dataflash_info[i].Device.area_list[j].protected = FLAG_PROTECT_SET; - + if(dataflash_info[i].Device.area_list[j].protected != FLAG_PROTECT_INVALID) { + if (flag == 0) { + dataflash_info[i].Device.area_list[j].protected = FLAG_PROTECT_CLEAR; + } else { + dataflash_info[i].Device.area_list[j].protected = FLAG_PROTECT_SET; + } + } return (area2-area1+1); } @@ -342,7 +468,7 @@ printf ("Timeout writing to DataFlash\n"); break; case ERR_PROTECTED: - printf ("Can't write to protected DataFlash sectors\n"); + printf ("Can't write to protected/invalid DataFlash sectors\n"); break; case ERR_INVAL: printf ("Outside available DataFlash\n"); diff -urN u-boot-1.2.0/include/dataflash.h u-boot-1.2.0-atmel/include/dataflash.h --- u-boot-1.2.0/include/dataflash.h 2007-01-07 00:13:11.000000000 +0100 +++ u-boot-1.2.0-atmel/include/dataflash.h 2007-03-24 20:07:33.000000000 +0100 @@ -38,13 +38,47 @@ #include "config.h" /*number of protected area*/ +#ifdef CONFIG_NEW_PARTITION +#define NB_DATAFLASH_AREA 6 +#else #define NB_DATAFLASH_AREA 4 +#endif + +#ifdef CFG_NO_FLASH + +/*----------------------------------------------------------------------- + * return codes from flash_write(): + */ +#define ERR_OK 0 +#define ERR_TIMOUT 1 +#define ERR_NOT_ERASED 2 +#define ERR_PROTECTED 4 +#define ERR_INVAL 8 +#define ERR_ALIGN 16 +#define ERR_UNKNOWN_FLASH_VENDOR 32 +#define ERR_UNKNOWN_FLASH_TYPE 64 +#define ERR_PROG_ERROR 128 + +/*----------------------------------------------------------------------- + * Protection Flags for flash_protect(): + */ +#define FLAG_PROTECT_SET 0x01 +#define FLAG_PROTECT_CLEAR 0x02 +#define FLAG_PROTECT_INVALID 0x03 + +/*----------------------------------------------------------------------- + * Set Environment according to label: + */ +#define FLAG_SETENV 0x80 +#endif /* CFG_NO_FLASH */ /*define the area structure*/ typedef struct { unsigned long start; unsigned long end; unsigned char protected; + unsigned char setenv; + unsigned char label[20]; } dataflash_protect_t; typedef unsigned int AT91S_DataFlashStatus; @@ -96,6 +130,7 @@ AT91S_DataflashDesc Desc; AT91S_DataflashFeatures Device; /* Pointer on a dataflash features array */ unsigned long logical_address; + unsigned long end_address; unsigned int id; /* device id */ } AT91S_DATAFLASH_INFO, *AT91PS_DATAFLASH_INFO; @@ -106,7 +141,7 @@ #define AT45DB321 0x34 #define AT45DB642 0x3c #define AT45DB128 0x10 - +#define PAGES_PER_BLOCK 8 #define AT91C_DATAFLASH_TIMEOUT 10000 /* For AT91F_DataFlashWaitReady */ /* DataFlash return value */ @@ -170,9 +205,12 @@ extern int prot_dataflash (AT91PS_DataFlash pdataFlash, unsigned long addr); extern int dataflash_real_protect (int flag, unsigned long start_addr, unsigned long end_addr); extern int addr_dataflash (unsigned long addr); +extern int addr2ram(ulong addr); extern int read_dataflash (unsigned long addr, unsigned long size, char *result); extern int write_dataflash (unsigned long addr, unsigned long dest, unsigned long size); extern void dataflash_print_info (void); extern void dataflash_perror (int err); - +#ifdef CONFIG_NEW_DF_PARTITION +extern int AT91F_DataflashSetEnv (void); +#endif #endif diff -urN u-boot-1.2.0/include/flash.h u-boot-1.2.0-atmel/include/flash.h --- u-boot-1.2.0/include/flash.h 2007-01-07 00:13:11.000000000 +0100 +++ u-boot-1.2.0-atmel/include/flash.h 2007-03-24 20:07:33.000000000 +0100 @@ -119,6 +119,12 @@ */ #define FLAG_PROTECT_SET 0x01 #define FLAG_PROTECT_CLEAR 0x02 +#define FLAG_PROTECT_INVALID 0x03 + +/*----------------------------------------------------------------------- + * Set Environment according to label: + */ +#define FLAG_SETENV 0x80 /*----------------------------------------------------------------------- * Device IDs -- Best Regards, Ulf Samuelsson

2 3

[U-Boot-Users] "2.mach_types":(1 of 1) [PATCH][ARM] Create mach-types for various at91 boards
by Ulf Samuelsson 23 May '07

23 May '07

Author: Ulf Samuelsson <ulf(a)atmel.com> Date: 2007-03-27 Subject: "2.mach_types":(1 of 1) [PATCH][ARM] Create mach-types for various at91 boards CHANGELOG: [PATCH][ARM] Create mach-types for various at91 boards at91rm9200df at91sam9260 at91sam9261 at91sam9263 Patch generated from files: include_asm-arm_mach-types.h.patch Signed-off-by: Ulf Samuelsson --------------------------------------------------------------------------------------------------------------------------------- diff -urN u-boot-1.2.0/include/asm-arm/mach-types.h u-boot-1.2.0-atmel/include/asm-arm/mach-types.h --- u-boot-1.2.0/include/asm-arm/mach-types.h 2007-01-07 00:13:11.000000000 +0100 +++ u-boot-1.2.0-atmel/include/asm-arm/mach-types.h 2007-03-24 20:07:34.000000000 +0100 @@ -736,7 +736,11 @@ #define MACH_TYPE_LN2410SBC 725 #define MACH_TYPE_CB3RUFC 726 #define MACH_TYPE_MP2USB 727 +#define MACH_TYPE_AT91SAM9261EK 848 #define MACH_TYPE_PDNB3 1002 +#define MACH_TYPE_AT91SAM9260EK 1099 +#define MACH_TYPE_AT91RM9200DF 1119 +#define MACH_TYPE_AT91SAM9263EK 1202 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type @@ -9402,6 +9406,66 @@ # define machine_is_mp2usb() (0) #endif +#ifdef CONFIG_MACH_AT91SAM9261EK +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AT91SAM9261EK +# endif +# define machine_is_at91sam9261ek() (machine_arch_type == MACH_TYPE_AT91SAM9261EK) +#else +# define machine_is_at91sam9261ek() (0) +#endif + +#ifdef CONFIG_MACH_AT91SAM9260EK +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AT91SAM9260EK +# endif +# define machine_is_at91sam9260ek() (machine_arch_type == MACH_TYPE_AT91SAM9260EK) +#else +# define machine_is_at91sam9260ek() (0) +#endif + +#ifdef CONFIG_MACH_AT91SAM9263EK +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AT91SAM9263EK +# endif +# define machine_is_at91sam9263ek() (machine_arch_type == MACH_TYPE_AT91SAM9263EK) +#else +# define machine_is_at91sam9263ek() (0) +#endif + +#ifdef CONFIG_MACH_AT91RM9200DF +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AT91RM9200DF +# endif +# define machine_is_at91rm9200df() (machine_arch_type == MACH_TYPE_AT91RM9200DF) +#else +# define machine_is_at91rm9200df() (0) +#endif + +#ifdef CONFIG_MACH_AT91SAM9263EK +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AT91SAM9263EK +# endif +# define machine_is_at91sam9263ek() (machine_arch_type == MACH_TYPE_AT91SAM9263EK) +#else +# define machine_is_at91sam9263ek() (0) +#endif + /* * These have not yet been registered */ -- Best Regards, Ulf Samuelsson

5 8

[U-Boot-Users] [RFC] Complex MAPPING support on CFI driver
by Rui Sousa 23 May '07

23 May '07

Hi, To support the flash one of our boards (no integrated in U-Boot) I need to implement something similar to Linux MTD complex mappings option in the CFI driver. In my case I have a NOR flash chip with an address line connected to a GPIO pin. The GPIO pin needs to be set correctly at each access to the flash. What I wanted to know: Is someone else already working on a solution? Would such a feature have a chance of being integrated in U-boot? My plan was: 1. Add a new CFG_FLASH_COMPLEX_MAPPING option to U-boot. 2. Create map structure to contain functions pointers to flash read/write functions. 3. Modify flash_info_t structure and add a pointer to map structure (if CFG_FLASH_COMPLEX_MAPPING is defined). 4. Add generic map_read(), map_write() functions to CFI driver. 5. Modify CFI driver to access flash using map_read()/map_write() functions. 6. If CFG_FLASH_COMPLEX_MAPPING is not defined the map_read()/map_write() are simple inline functions that access memory directly. 7. If CFG_FLASH_COMPLEX_MAPPING is defined it's up to the board specific code to initialize the map structure pointer in flash_info_t and the generic map_read()/map_write() functions will call board_map_read()/board_map_write() (through a function pointer). Unfortunately this only takes care of writting operations. Support for read would mean further extensive modifications (introduce some flash_read() function and use it from cp, md, jffs2, ... commands). Thanks, Rui

4 10

[U-Boot-Users] "10.flash":(1 of 1) [PATCH] Define Vendor Id for newer Atmel parallel flash
by Ulf Samuelsson 23 May '07

23 May '07

Author: Ulf Samuelsson <ulf(a)atmel.com> Date: 2007-03-27 Subject: "10.flash":(1 of 1) [PATCH] Define Vendor Id for newer Atmel parallel flash CHANGELOG: [PATCH] Define Vendor Id for newer Atmel parallel flash Patch generated from files: include_flash.h.patch Signed-off-by: Ulf Samuelsson --------------------------------------------------------------------------------------------------------------------------------- diff -urN u-boot-1.2.0/include/flash.h u-boot-1.2.0-atmel/include/flash.h --- u-boot-1.2.0/include/flash.h 2007-03-27 12:57:41.000000000 +0200 +++ u-boot-1.2.0-atmel/include/flash.h 2007-03-24 20:07:33.000000000 +0100 @@ -231,9 +231,33 @@ #define AMD_ID_LV640U 0x22D722D7 /* 29LV640U ID (64 M, uniform sectors) */ #define AMD_ID_LV650U 0x22D722D7 /* 29LV650U ID (64 M, uniform sectors) */ -#define ATM_ID_BV1614 0x000000C0 /* 49BV1614 ID */ +/* 16 Mbit Devices */ +#define ATM_ID_BV1614 0x000000C0 /* 49BV1614 ID */ #define ATM_ID_BV1614A 0x000000C8 /* 49BV1614A ID */ -#define ATM_ID_BV6416 0x000000D6 /* 49BV6416 ID */ +#define ATM_ID_BV160D 0x000088C3 /* 49BV160D ID */ +#define ATM_ID_BV160DT 0x000088C2 /* 49BV160DT ID */ +#define ATM_ID_BV163D 0x000001C0 /* 49BV163D ID */ +#define ATM_ID_BV163DT 0x000001C2 /* 49BV163DT ID */ + +/* 32 Mbit Devices */ +#define ATM_ID_BV320C 0x000088C4 /* 49BV320C ID */ +#define ATM_ID_BV320CT 0x000088C5 /* 49BV320CT ID */ +#define ATM_ID_BV322A 0x000000C8 /* 49BV322A ID */ +#define ATM_ID_BV322AT 0x000000C9 /* 49BV322AT ID */ +#define ATM_ID_BV320D 0x000090C5 /* 49BV320D ID */ +#define ATM_ID_BV320DT 0x000090C4 /* 49BV320DT ID */ +#define ATM_ID_BV322D 0x000001C8 /* 49BV322D ID */ +#define ATM_ID_BV322DT 0x000001C9 /* 49BV322DT ID */ + +/* 64 Mbit Devices */ +#define ATM_ID_BV6416 0x000000D6 /* 49BV6416 ID */ +#define ATM_ID_BV6416T 0x000000D2 /* 49BV6416T ID */ +#define ATM_ID_BV6416C 0x000000C5 /* 49BV6416C ID */ +#define ATM_ID_BV6416CT 0x000000DF /* 49BV6416CT ID */ +#define ATM_ID_BV640D 0x000002DE /* 49BV640D ID */ +#define ATM_ID_BV640DT 0x000002DB /* 49BV640DT ID */ +#define ATM_ID_BV642D 0x000001D6 /* 49BV642D ID */ +#define ATM_ID_BV642DT 0x000001D2 /* 49BV642DT ID */ #define FUJI_ID_29F800BA 0x22582258 /* MBM29F800BA ID (8M) */ #define FUJI_ID_29F800TA 0x22D622D6 /* MBM29F800TA ID (8M) */ -- Best Regards, Ulf Samuelsson

2 1