August 2012 - U-Boot

[U-Boot] [PATCH 0/5] Cleanup and extend env vars
by Benoît Thébaudeau 18 Sep '12

18 Sep '12

Hi all, This series does some cleanup regarding env vars, and it adds a new env var for the board revision. Best regards, Benoît

5 33

[U-Boot] [PATCH] spl: remove forced linking of commands into SPL
by Tyler Olmstead 18 Sep '12

18 Sep '12

Remove linker command line options from the SPL makefile that force the inclusion of unreferenced command code from linked object files. As commands are not used in the SPL, these options resulted in an unnecessary increase in the image size, in addition to introducing the possibility of tricky link errors in the case where the command code contained symbols that were not resolved by linking in the limited objects compiled in the SPL build. Signed-off-by: Tyler Olmstead <tyler.j.olmstead(a)gmail.com> --- spl/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spl/Makefile b/spl/Makefile index ea7d475..0c30a85 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -126,9 +126,7 @@ $(obj)u-boot-spl.bin: $(obj)u-boot-spl $(OBJCOPY) $(OBJCFLAGS) -O binary $< $@ GEN_UBOOT = \ - UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) | \ - sed -n -e 's/.*$$(SYM_PREFIX)__u_boot_cmd_.*$/-u\1/p'|sort|uniq`;\ - cd $(obj) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $$UNDEF_SYM $(__START) \ + cd $(obj) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $(__START) \ --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \ -Map u-boot-spl.map -o u-boot-spl -- 1.7.9.5

2 6

[U-Boot] [PATCH 4/7] FAT: Fix file contents listed as directory
by Benoît Thébaudeau 18 Sep '12

18 Sep '12

With: fatls mmc 0 /dir/file dir: regular directory file: regular file The previous code read the contents of file as if it were directory entries to list. This patch refuses to list file contents as if it were a folder. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Wolfgang Denk <wd(a)denx.de> --- .../fs/fat/fat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git u-boot-66714b1.orig/fs/fat/fat.c u-boot-66714b1/fs/fat/fat.c index fcce412..943cdb6 100644 --- u-boot-66714b1.orig/fs/fat/fat.c +++ u-boot-66714b1/fs/fat/fat.c @@ -1105,11 +1105,11 @@ rootdir_done: goto exit; } - if (idx >= 0) { - if (!(dentptr->attr & ATTR_DIR)) - goto exit; + if (isdir && !(dentptr->attr & ATTR_DIR)) + goto exit; + + if (idx >= 0) subname = nextname; - } } ret = get_contents(mydata, dentptr, buffer, maxsize);

3 4

[U-Boot] Pull request - microblaze
by Michal Simek 18 Sep '12

18 Sep '12

Dear Wolfgang Denk, please pull the following changes. Thanks, Michal The following changes since commit 99ffccbd3e5b7bc715e2eed6ea6d36f4020b56d8: Diana CRACIUN (1): Flush cache after the OS image is loaded into the memory. are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git master Michal Simek (25): net: emaclite: Change driver name and add address net: emaclite: Remove deviceid property net: emaclite: Use calloc instead of malloc net: emaclite: Remove baseaddress from xemaclite net: emaclite: Use dynamic allocation net: emaclite: Setup RX/TX ping pong for every instance net: emaclite: Move RX/TX ping pong initialization to board net: emaclite: Use helper function for io accesses net: emaclite: Fix coding style net: emaclite: Use unsigned long for baseaddr net: emaclite: Use PKTSIZE directly microblaze: Fix in/out_be8/16/32 functions microblaze: Support CTRL+C when tftp is running microblaze: Support flashes on lower addresses microblaze: Initialize jumptable and console microblaze: Fix unaligned.h for endians microblaze: Copy bootfile from variables microblaze: Remove debug saving value microblaze: Setup MB vectors if feature is enable for u-boot microblaze: Save and restore first unused vector microblaze: Clean up reset asm code microblaze: Do not select NFS for platforms without ethernet microblaze: Remove address offset for uart16550 microblaze: Fix no return statement from microblaze-generic board microblaze: Enable FDT/FIT support arch/microblaze/cpu/start.S | 66 ++--- arch/microblaze/include/asm/io.h | 33 ++- arch/microblaze/include/asm/unaligned.h | 17 +-- arch/microblaze/lib/board.c | 17 ++ .../xilinx/microblaze-generic/microblaze-generic.c | 18 +- drivers/net/xilinx_emaclite.c | 285 +++++++++++--------- include/configs/microblaze-generic.h | 9 +- include/netdev.h | 3 +- 8 files changed, 251 insertions(+), 197 deletions(-) -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian

3 18

[U-Boot] [PATCH] mtd: nand: allow NAND_NO_SUBPAGE_WRITE to be set from driver
by Marek Vasut 18 Sep '12

18 Sep '12

This is based on Linux kernel -next: commit a1256b0e087ed3cdb584c683acb966ee885f733c Author: Brian Norris <computersforpeace(a)gmail.com> Date: Fri Jul 13 09:28:24 2012 -0700 mtd: nand: allow NAND_NO_SUBPAGE_WRITE to be set from driver The NAND_CHIPOPTIONS_MSK has limited utility and is causing real bugs. It silently masks off at least one flag that might be set by the driver (NAND_NO_SUBPAGE_WRITE). This breaks the GPMI NAND driver and possibly others. Really, as long as driver writers exercise a small amount of care with NAND_* options, this mask is not necessary at all; it was only here to prevent certain options from accidentally being set by the driver. But the original thought turns out to be a bad idea occasionally. Thus, kill it. Note, this patch fixes some major gpmi-nand breakage. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Brian Norris <computersforpeace(a)gmail.com> Cc: Eric Nelson <eric.nelson(a)boundarydevices.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Otavio Salvador <otavio(a)ossystems.com.br> Cc: Scott Wood <scottwood(a)freescale.com> --- drivers/mtd/nand/nand_base.c | 7 ++----- include/linux/mtd/nand.h | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) NOTE: Please test before applying, I'd like to know it doesn't cause breakage. diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index bfd668f..658b3ad 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2578,9 +2578,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, if (le16_to_cpu(p->features) & 1) *busw = NAND_BUSWIDTH_16; - chip->options &= ~NAND_CHIPOPTIONS_MSK; - chip->options |= (NAND_NO_READRDY | - NAND_NO_AUTOINCR) & NAND_CHIPOPTIONS_MSK; + chip->options |= NAND_NO_READRDY | NAND_NO_AUTOINCR; return 1; } @@ -2752,8 +2750,7 @@ static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, } } /* Get chip options, preserve non chip based options */ - chip->options &= ~NAND_CHIPOPTIONS_MSK; - chip->options |= type->options & NAND_CHIPOPTIONS_MSK; + chip->options |= type->options; /* Check if chip is a not a samsung device. Do not clear the * options for chips which are not having an extended id. diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 82704de..0a5aa64 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -205,9 +205,6 @@ typedef enum { #define NAND_SUBPAGE_READ(chip) ((chip->ecc.mode == NAND_ECC_SOFT) \ && (chip->page_shift > 9)) -/* Mask to zero out the chip options, which come from the id table */ -#define NAND_CHIPOPTIONS_MSK (0x0000ffff & ~NAND_NO_AUTOINCR) - /* Non chip related options */ /* * Use a flash based bad block table. OOB identifier is saved in OOB area. -- 1.7.10.4

3 6

[U-Boot] [PATCH v4 0/5] OMAP: SPL networking support
by Ilya Yanok 17 Sep '12

17 Sep '12

These series provides support for networking in SPL. These patches try to use network infrasctructure as is, without trying to cut some minimal set of it, so the resulting SPL image is quite big and only useful for boards with plenty of SRAM/OCRAM (like TI AM335x based ones). Changes in v3: - add support for setting different VCI in SPL - set Vendor Class Identifier for SPL - use BOOTP in SPL regardless of CONFIG_CMD_DHCP Changes in v4: and CONFIG_BOOTD defined - SPL_BOARD_INIT is not needed anymore - fix compilation of SPL's libcommon with CONFIG_HUSH_PARSER - moved vci_strlen var inside macro - rename spl_eth.c to spl_net.c - set ethact variable if device name is passed - used strlen instead of sizeof Ilya Yanok (5): net/bootp: add VCI support for BOOTP also spl: don't mark __u_boot_cmd* as undefined OMAP: spl: call timer_inti() from SPL OMAP: networking support for SPL am335x_evm: enable networking in SPL arch/arm/cpu/armv7/omap-common/Makefile | 3 ++ arch/arm/cpu/armv7/omap-common/spl.c | 11 +++++++ arch/arm/cpu/armv7/omap-common/spl_net.c | 52 ++++++++++++++++++++++++++++++ arch/arm/include/asm/omap_common.h | 4 +++ common/Makefile | 6 ++++ common/cmd_nvedit.c | 6 ++-- common/command.c | 2 +- common/env_common.c | 3 +- common/main.c | 4 +-- include/configs/am335x_evm.h | 5 ++- lib/Makefile | 10 ++++-- lib/vsprintf.c | 2 +- net/bootp.c | 30 +++++++++++++---- net/net.c | 3 ++ spl/Makefile | 5 +-- 15 files changed, 128 insertions(+), 18 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap-common/spl_net.c -- 1.7.9.5

3 31

[U-Boot] [PATCH 1/4] spiflash: at25: using common spi flash operation
by Bo Shen 17 Sep '12

17 Sep '12

Using common spi flash operation function to replace private operation funtion This patch is based on http://patchwork.ozlabs.org/patch/177896/ which has been merged by Mike frysinger Signed-off-by: Bo Shen <voice.shen(a)atmel.com> --- drivers/mtd/spi/atmel.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi/atmel.c b/drivers/mtd/spi/atmel.c index 89ebe9d..006f6d5 100644 --- a/drivers/mtd/spi/atmel.c +++ b/drivers/mtd/spi/atmel.c @@ -518,13 +518,19 @@ struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode) asf->flash.erase = dataflash_erase_p2; } + asf->flash.page_size = page_size; + asf->flash.sector_size = page_size; break; case DF_FAMILY_AT26F: case DF_FAMILY_AT26DF: asf->flash.read = spi_flash_cmd_read_fast; - asf->flash.write = dataflash_write_p2; - asf->flash.erase = dataflash_erase_p2; + asf->flash.write = spi_flash_cmd_write_multi; + asf->flash.erase = spi_flash_cmd_erase; + asf->flash.page_size = page_size; + asf->flash.sector_size = 4096; + /* clear SPRL# bit for locked flash */ + spi_flash_cmd_write_status(&asf->flash, 0); break; default: @@ -532,7 +538,6 @@ struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode) goto err; } - asf->flash.sector_size = page_size; asf->flash.size = page_size * params->pages_per_block * params->blocks_per_sector * params->nr_sectors; -- 1.7.9.5

3 14

[U-Boot] [PATCH 0/3] Enable at91sam9x5 boot from serial flash
by Bo Shen 17 Sep '12

17 Sep '12

This series patches enable at91sam9x5 boot from serial flash Bo Shen (3): spi: add atmel at25db321 serial flash support arm : at91sam9x5 : enable serial flash boot arm : at91sam9x5 : make nand available when not boot from nand arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 4 ++-- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 2 ++ boards.cfg | 1 + drivers/mtd/spi/atmel.c | 10 ++++++++++ include/configs/at91sam9x5ek.h | 18 ++++++++++++++---- 5 files changed, 29 insertions(+), 6 deletions(-) -- 1.7.9.5

3 11

[U-Boot] [PATCH] phy: Add support for Marvell 88E1118R
by Michal Simek 17 Sep '12

17 Sep '12

Marvell 88E1118R has different uid then 88E1118. Signed-off-by: Michal Simek <monstr(a)monstr.eu> CC: Andy Fleming <afleming(a)freescale.com> CC: Zang Roy-R61911 <tie-fei.zang(a)freescale.com> CC: Kumar Gala <galak(a)kernel.crashing.org> --- drivers/net/phy/marvell.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index e51e799..4b27198 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -425,6 +425,16 @@ static struct phy_driver M88E1118_driver = { .shutdown = &genphy_shutdown, }; +static struct phy_driver M88E1118R_driver = { + .name = "Marvell 88E1118R", + .uid = 0x1410e40, + .mask = 0xffffff0, + .features = PHY_GBIT_FEATURES, + .config = &m88e1118_config, + .startup = &m88e1118_startup, + .shutdown = &genphy_shutdown, +}; + static struct phy_driver M88E1121R_driver = { .name = "Marvell 88E1121R", .uid = 0x1410cb0, @@ -461,6 +471,7 @@ int phy_marvell_init(void) phy_register(&M88E1145_driver); phy_register(&M88E1121R_driver); phy_register(&M88E1118_driver); + phy_register(&M88E1118R_driver); phy_register(&M88E1111S_driver); phy_register(&M88E1011S_driver); -- 1.7.0.4

2 4

[U-Boot] [PATCH 1/6] davinci: ea20: reorganisation LCD startup
by Bastian Ruppert 17 Sep '12

17 Sep '12

Signed-off-by: Bastian Ruppert <Bastian.Ruppert(a)Sewerin.de> CC: Tom Rini <trini(a)ti.com> CC: Stefano Babic <sbabic(a)denx.de> --- board/davinci/ea20/ea20.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c index 7e00040..69307e4 100644 --- a/board/davinci/ea20/ea20.c +++ b/board/davinci/ea20/ea20.c @@ -176,6 +176,9 @@ int board_early_init_f(void) if (davinci_configure_pin_mux(gpio_pins, ARRAY_SIZE(gpio_pins)) != 0) return 1; + /* Set DISP_ON high to enable LCD output*/ + gpio_direction_output(97, 1); + /* Set the RESETOUTn low */ gpio_direction_output(111, 0); @@ -188,9 +191,6 @@ int board_early_init_f(void) /* Set LCD_B_PWR low to power down LCD Backlight*/ gpio_direction_output(102, 0); - /* Set DISP_ON low to disable LCD output*/ - gpio_direction_output(97, 0); - #ifndef CONFIG_USE_IRQ irq_init(); #endif @@ -250,11 +250,6 @@ int board_early_init_f(void) writel(readl(&davinci_syscfg_regs->mstpri[2]) & 0x0fffffff, &davinci_syscfg_regs->mstpri[2]); - /* Set LCD_B_PWR low to power up LCD Backlight*/ - gpio_set_value(102, 1); - - /* Set DISP_ON low to disable LCD output*/ - gpio_set_value(97, 1); return 0; } @@ -276,6 +271,9 @@ int board_init(void) int board_late_init(void) { + unsigned char buf[2]; + int ret; + /* PinMux for HALTEN */ if (davinci_configure_pin_mux(halten_pin, ARRAY_SIZE(halten_pin)) != 0) return 1; @@ -285,6 +283,15 @@ int board_late_init(void) setenv("stdout", "serial"); + /* Set fixed contrast settings for LCD via I2C potentiometer */ + buf[0] = 0x00; + buf[1] = 0xd7; + ret = i2c_write(0x2e, 6, 1, buf, 2); + if (ret) + puts("\nContrast Settings FAILED\n"); + + /* Set LCD_B_PWR high to power up LCD Backlight*/ + gpio_set_value(102, 1); return 0; } #endif /* CONFIG_BOARD_LATE_INIT */ -- 1.7.0.4

7 39