October 2010 - U-Boot

[U-Boot] Pull request: nand flash
by Scott Wood 12 Oct '10

12 Oct '10

The following changes since commit bfc7bea6adc46e1db2f5a5e3464d7652ed67c864: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-x86 are available in the git repository at: git://git.denx.de/u-boot-nand-flash.git master Ben Gardiner (5): mtdparts: regroup calls to get_mtd_device_nm mtd: add an mtd method for get_len_incl_bad() mtdparts: show net size in mtdparts list mtdparts: add new sub-command "spread" mtdparts: new add.spread: add part skipping bad blocks Enric Balletbo i Serra (1): mtd: OneNAND: add support for OneNAND manufactured by Numonyx Scott Wood (7): nand util: read/write: accept unaligned length cmd_nand: some infrastructure fixes and refactoring nand erase: .spread, .part, .chip subcommands nand commands: make only "dump" repeatable. nand: remove dead code and suspend/resume Followup fixes on the mtdparts spread patchset README: Add new NAND env features README | 32 +++- common/cmd_mtdparts.c | 261 ++++++++++++++++++++++++---- common/cmd_nand.c | 339 +++++++++++++++++++++++------------- drivers/mtd/mtdcore.c | 44 +++++ drivers/mtd/mtdpart.c | 16 -- drivers/mtd/nand/nand_base.c | 245 +-------------------------- drivers/mtd/nand/nand_bbt.c | 19 -- drivers/mtd/nand/nand_ecc.c | 17 -- drivers/mtd/nand/nand_util.c | 159 +++++++++--------- drivers/mtd/onenand/onenand_base.c | 1 + include/linux/mtd/mtd.h | 8 +- include/linux/mtd/onenand.h | 1 + include/nand.h | 7 +- 13 files changed, 606 insertions(+), 543 deletions(-)

2 1

[U-Boot] [PATCH][NEXT] arm-reloc: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC
by Ben Gardiner 12 Oct '10

12 Oct '10

There were some #undef's of CONFIG_SYS_ARM_WITHOUT_RELOC added to a few board configs as part of the arm relocation series; but these are not needed now as we do not #undef what is not #defined in the first place. Signed-off-by: Ben Gardiner <bengardiner(a)nanometrics.ca> CC: Heiko Schocher <hs(a)denx.de> --- include/configs/da850evm.h | 1 - include/configs/imx27lite-common.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/qong.h | 1 - include/configs/tx25.h | 1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index d02b196..e0a3bae 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -138,7 +138,6 @@ #endif /* additions for new relocation code, must added to all boards */ -#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ #define CONFIG_SYS_SDRAM_BASE 0xc0000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \ CONFIG_SYS_GBL_DATA_SIZE) diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 812e5f2..4f7d61d 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -236,7 +236,6 @@ "mtdparts=" MTDPARTS_DEFAULT "\0" \ /* additions for new relocation code, must added to all boards */ -#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \ CONFIG_SYS_GBL_DATA_SIZE) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 2463be4..ce658d1 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -341,7 +341,6 @@ extern unsigned int boot_flash_type; #endif /* additions for new relocation code, must added to all boards */ -#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (LOW_LEVEL_SRAM_STACK - CONFIG_SYS_GBL_DATA_SIZE) diff --git a/include/configs/qong.h b/include/configs/qong.h index 7a68b7b..b9144eb 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -283,7 +283,6 @@ extern int qong_nand_rdy(void *chip); "128k(env2),2432k(kernel),13m(ramdisk),-(user)" /* additions for new relocation code, must added to all boards */ -#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_END IRAM_SIZE diff --git a/include/configs/tx25.h b/include/configs/tx25.h index c798570..85f166e 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -177,7 +177,6 @@ "upd=run load update\0" \ /* additions for new relocation code, must added to all boards */ -#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \ CONFIG_SYS_GBL_DATA_SIZE) -- 1.7.0.4

3 2

[U-Boot] [PATCH] [NEXT] arm, relocation: fix typo in comment
by Heiko Schocher 12 Oct '10

12 Oct '10

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/configs/imx27lite-common.h | 2 +- include/configs/km_arm.h | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/qong.h | 2 +- include/configs/tx25.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 812e5f2..905a292 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -235,7 +235,7 @@ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ -/* additions for new relocation code, must added to all boards */ +/* additions for new relocation code, must be added to all boards */ #undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \ diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index 8673e6f..faa0f50 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -180,7 +180,7 @@ int get_scl (void); #undef CONFIG_JFFS2_CMDLINE #endif -/* additions for new relocation code, must added to all boards */ +/* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix this */ \ CONFIG_SYS_GBL_DATA_SIZE) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 2463be4..21078cf 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -340,7 +340,7 @@ extern unsigned int boot_flash_sec; extern unsigned int boot_flash_type; #endif -/* additions for new relocation code, must added to all boards */ +/* additions for new relocation code, must be added to all boards */ #undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (LOW_LEVEL_SRAM_STACK - CONFIG_SYS_GBL_DATA_SIZE) diff --git a/include/configs/qong.h b/include/configs/qong.h index 7a68b7b..16478e6 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -282,7 +282,7 @@ extern int qong_nand_rdy(void *chip); "mtdparts=physmap-flash.0:384k(U-Boot),128k(env1)," \ "128k(env2),2432k(kernel),13m(ramdisk),-(user)" -/* additions for new relocation code, must added to all boards */ +/* additions for new relocation code, must be added to all boards */ #undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR diff --git a/include/configs/tx25.h b/include/configs/tx25.h index c798570..7faa453 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -176,7 +176,7 @@ "update=nand erase 0 40000;nand write ${loadaddr} 0 40000\0" \ "upd=run load update\0" \ -/* additions for new relocation code, must added to all boards */ +/* additions for new relocation code, must be added to all boards */ #undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \ -- 1.7.2.3

2 1

[U-Boot] U-boot hangs at command prompt if unattended for sometime (30 seconds)
by StephenPaulraj Chinnadurai-ERS,HCLTech 12 Oct '10

12 Oct '10

Hi Marek, I have modified the Voipac PXA270 u-boot source code for my customized board. Everything is working fine except suspend/resume. When in u-boot prompt, if unattended for some time (30 seconds), the u-boot hangs. The u-boot is not taking any input from the keyboard, the only way to resume the u-boot is through controller reset. Which part of the u-boot source code I should concentrate/modify to come of this issue? Thanks and Regards Stephen Paulraj C DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or HCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of HCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. Before opening any mail and attachments please check them for viruses and defect. -----------------------------------------------------------------------------------------------------------------------

3 4

[U-Boot] hi.. i am new to uboot concept..
by dakshayini A 12 Oct '10

12 Oct '10

hi.. i wanted to know.... where exactly.. the MAC address.. set in uboot code where can i find those files...how.can.i read MAC adress from flash..i am using 6280 ubootlader version.....please guide me.. thanks & regards,

1 0

[U-Boot] [PATCH 0/5] da850evm NAND support
by Ben Gardiner 12 Oct '10

12 Oct '10

This patch series adds NAND support to the da850evm. The support is in the spirit of that found in the omap-l1 and u-boot-davinci trees where NAND support can be enabled with the addition of a single '#define CONFIG_USE_NAND' to the top of the include/configs/da850evm.h file. Pinmux entries are added for NAND so that NAND is usable even when the boot mode is not from NAND. Also the mtdpart, ubi and ubifs commands are proposed to be added to the NAND support because of their importance when using NAND. Ben Gardiner (5): davinci_nand, trivial : use symbolic ECC start command da850evm : enable NAND even when not in NAND boot mode da850evm: setup the NAND flash timings da850evm: setup NAND support under CONFIG_USE_NAND da850evm: add mtdpart and ubi commands with NAND support board/davinci/da8xxevm/da850evm.c | 40 +++++++++++++++++++++++++++++++++++++ drivers/mtd/nand/davinci_nand.c | 3 +- include/configs/da850evm.h | 37 ++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletions(-)

1 5

[U-Boot] [PATCH] cfi_flash: Fix "Unknown FLASH" error message
by Peter Tyser 12 Oct '10

12 Oct '10

From: John Schmoller <jschmoller(a)xes-inc.com> When a CFI flash chip could not be detected an error message similar to the following would be printed on bootup: FLASH: ## Unknown FLASH on Bank 1 - Size = 0x01000000 = 0 MB The printf incorrectly converted the flash size into megabytes. This patch fixes the printing of the flash size in megabytes: FLASH: ## Unknown FLASH on Bank 1 - Size = 0x01000000 = 16 MB Signed-off-by: John Schmoller <jschmoller(a)xes-inc.com> Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- drivers/mtd/cfi_flash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 02dd27f..798902f 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -2033,7 +2033,7 @@ unsigned long flash_init (void) printf ("## Unknown FLASH on Bank %d " "- Size = 0x%08lx = %ld MB\n", i+1, flash_info[i].size, - flash_info[i].size << 20); + flash_info[i].size >> 20); #endif /* CONFIG_SYS_FLASH_QUIET_TEST */ } #ifdef CONFIG_SYS_FLASH_PROTECTION -- 1.7.0.4

2 1

[U-Boot] [PATCH 0/2] More rework on at91_emac
by Andreas Bießmann 12 Oct '10

12 Oct '10

This series does some more rework on at91_emac driver. Reinhard, I know your position to merge at91_emac and macb driver and also favor this. But for now I'd like to get some cleanups in the at91/at91rm9200 mess. Therefore these patches are needed to get at least at91rm9200ek working with at91 code. Andreas Bießmann (2): drivers/net/at91_emac.c: increase timeout for autonegotiation drivers/net/at91_emac.c: change return values drivers/net/at91_emac.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) -- 1.7.3.1

3 7

[U-Boot] [PATCH] smc91111: add write_hwaddr
by Thomas Chou 12 Oct '10

12 Oct '10

Add smc_write_hwaddr() to set mac address. Clear dev before use. Signed-off-by: Thomas Chou <thomas(a)wytron.com.tw> --- drivers/net/smc91111.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index 54a1bfb..ba9c67e 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -654,6 +654,28 @@ again: return length; } +static int smc_write_hwaddr(struct eth_device *dev) +{ + int i; + + swap_to(ETHERNET); + SMC_SELECT_BANK (dev, 1); +#ifdef USE_32_BIT + for (i = 0; i < 6; i += 2) { + word address; + + address = dev->enetaddr[i + 1] << 8; + address |= dev->enetaddr[i]; + SMC_outw(dev, address, (ADDR0_REG + i)); + } +#else + for (i = 0; i < 6; i++) + SMC_outb(dev, dev->enetaddr[i], (ADDR0_REG + i)); +#endif + swap_to(FLASH); + return 0; +} + /* * Open and Initialize the board * @@ -662,8 +684,6 @@ again: */ static int smc_init(struct eth_device *dev, bd_t *bd) { - int i; - swap_to(ETHERNET); PRINTK2 ("%s: smc_init\n", SMC_DEV_NAME); @@ -680,20 +700,6 @@ static int smc_init(struct eth_device *dev, bd_t *bd) /* conservative setting (10Mbps, HalfDuplex, no AutoNeg.) */ /* SMC_SELECT_BANK(dev, 0); */ /* SMC_outw(dev, 0, RPC_REG); */ - SMC_SELECT_BANK (dev, 1); - -#ifdef USE_32_BIT - for (i = 0; i < 6; i += 2) { - word address; - - address = dev->enetaddr[i + 1] << 8; - address |= dev->enetaddr[i]; - SMC_outw(dev, address, (ADDR0_REG + i)); - } -#else - for (i = 0; i < 6; i++) - SMC_outb(dev, dev->enetaddr[i], (ADDR0_REG + i)); -#endif printf(SMC_DEV_NAME ": MAC %pM\n", dev->enetaddr); @@ -1360,6 +1366,7 @@ int smc91111_initialize(u8 dev_num, int base_addr) return 0; } + memset(dev, 0, sizeof(*dev)); priv->dev_num = dev_num; dev->priv = priv; dev->iobase = base_addr; @@ -1374,6 +1381,7 @@ int smc91111_initialize(u8 dev_num, int base_addr) dev->halt = smc_halt; dev->send = smc_send; dev->recv = smc_rcv; + dev->write_hwaddr = smc_write_hwaddr; sprintf(dev->name, "%s-%hu", SMC_DEV_NAME, dev_num); eth_register(dev); -- 1.7.1.86.g0e460

5 7

[U-Boot] [PATCH] rarp: Condtionally compile rarp support
by Peter Tyser 12 Oct '10

12 Oct '10

Most people don't use the 'rarpboot' command, so only enable it when CONFIG_CMD_RARP is defined. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- common/cmd_net.c | 2 ++ include/config_cmd_all.h | 1 + net/Makefile | 2 +- net/net.c | 11 +++++++++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/common/cmd_net.c b/common/cmd_net.c index 3ffb9df..44d17db 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -54,6 +54,7 @@ U_BOOT_CMD( "[loadAddress] [[hostIPaddr:]bootfilename]" ); +#ifdef CONFIG_CMD_RARP int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { return netboot_common (RARP, cmdtp, argc, argv); @@ -64,6 +65,7 @@ U_BOOT_CMD( "boot image via network using RARP/TFTP protocol", "[loadAddress] [[hostIPaddr:]bootfilename]" ); +#endif #if defined(CONFIG_CMD_DHCP) int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 746bf18..cdc5ff1 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -70,6 +70,7 @@ #define CONFIG_CMD_PORTIO /* Port I/O */ #define CONFIG_CMD_REGINFO /* Register dump */ #define CONFIG_CMD_REISER /* Reiserfs support */ +#define CONFIG_CMD_RARP /* rarpboot support */ #define CONFIG_CMD_RUN /* run command in env variable */ #define CONFIG_CMD_SAVEENV /* saveenv */ #define CONFIG_CMD_SAVES /* save S record dump */ diff --git a/net/Makefile b/net/Makefile index 4f819dd..216d1ec 100644 --- a/net/Makefile +++ b/net/Makefile @@ -32,7 +32,7 @@ COBJS-$(CONFIG_CMD_DNS) += dns.o COBJS-$(CONFIG_CMD_NET) += eth.o COBJS-$(CONFIG_CMD_NET) += net.o COBJS-$(CONFIG_CMD_NFS) += nfs.o -COBJS-$(CONFIG_CMD_NET) += rarp.o +COBJS-$(CONFIG_CMD_RARP) += rarp.o COBJS-$(CONFIG_CMD_SNTP) += sntp.o COBJS-$(CONFIG_CMD_NET) += tftp.o diff --git a/net/net.c b/net/net.c index 33fcd90..d5a5429 100644 --- a/net/net.c +++ b/net/net.c @@ -80,7 +80,9 @@ #include <net.h> #include "bootp.h" #include "tftp.h" +#ifdef CONFIG_CMD_RARP #include "rarp.h" +#endif #include "nfs.h" #ifdef CONFIG_STATUS_LED #include <status_led.h> @@ -401,11 +403,13 @@ restart: BootpRequest (); break; +#if defined(CONFIG_CMD_RARP) case RARP: RarpTry = 0; NetOurIP = 0; RarpRequest (); break; +#endif #if defined(CONFIG_CMD_PING) case PING: PingStart(); @@ -1492,6 +1496,7 @@ NetReceive(volatile uchar * inpkt, int len) } break; +#ifdef CONFIG_CMD_RARP case PROT_RARP: debug("Got RARP\n"); arp = (ARP_t *)ip; @@ -1515,7 +1520,7 @@ NetReceive(volatile uchar * inpkt, int len) (*packetHandler)(0,0,0,0); } break; - +#endif case PROT_IP: debug("Got IP\n"); /* Before we start poking the header, make sure it is there */ @@ -1729,10 +1734,12 @@ static int net_check_prereq (proto_t protocol) } /* Fall through */ - case DHCP: +#ifdef CONFIG_CMD_RARP case RARP: +#endif case BOOTP: case CDP: + case DHCP: if (memcmp (NetOurEther, "\0\0\0\0\0\0", 6) == 0) { #ifdef CONFIG_NET_MULTI extern int eth_get_dev_index (void); -- 1.7.0.4

2 1