September 2012 - U-Boot

[U-Boot] Please pull u-boot-ppc4xx/master
by Stefan Roese 03 Sep '12

03 Sep '12

The following changes since commit a005f19eff946454985785788c344f10616d571e: hush: Don't parse the contents of a dereferenced var (2012-09-02 20:31:21 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master for you to fetch changes up to 5d1c88332951d2f58e9f7000a0523543b22d9a90: ppc4xx: Canyonlands/Glacier: Squeeze NAND image a bit to fit again (2012-09-03 11:29:07 +0200) ---------------------------------------------------------------- Stefan Roese (1): ppc4xx: Canyonlands/Glacier: Squeeze NAND image a bit to fit again nand_spl/board/amcc/canyonlands/ddr2_fixed.c | 3 --- 1 file changed, 3 deletions(-)

2 1

[U-Boot] [PATCH] Add winbond W25Q64DW SPI flash support
by 402jagan＠gmail.com 03 Sep '12

03 Sep '12

From: Jagannadha Sutradharudu Teki <402jagan(a)gmail.com> Tested on respective boards and hence move on mainline. Thanks, Jagan. Jagannadha Sutradharudu Teki (1): sf: winbond: Add support for W25Q64DW drivers/mtd/spi/winbond.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)

1 0

[U-Boot] [PATCH] ppc4xx: Canyonlands/Glacier: Squeeze NAND image a bit to fit again
by Stefan Roese 03 Sep '12

03 Sep '12

This patch removes some superfluous SDRAM init calls to fit the NAND_SPL image into 4k again. Signed-off-by: Stefan Roese <sr(a)denx.de> --- nand_spl/board/amcc/canyonlands/ddr2_fixed.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/nand_spl/board/amcc/canyonlands/ddr2_fixed.c b/nand_spl/board/amcc/canyonlands/ddr2_fixed.c index f71ecfb..10f62cc 100644 --- a/nand_spl/board/amcc/canyonlands/ddr2_fixed.c +++ b/nand_spl/board/amcc/canyonlands/ddr2_fixed.c @@ -92,14 +92,11 @@ static void ddr_init_common(void) mtsdram(SDRAM_INITPLR11, 0x80000432); mtsdram(SDRAM_INITPLR12, 0x808103C0); mtsdram(SDRAM_INITPLR13, 0x80810040); - mtsdram(SDRAM_INITPLR14, 0x00000000); - mtsdram(SDRAM_INITPLR15, 0x00000000); mtsdram(SDRAM_RDCC, 0x40000000); mtsdram(SDRAM_RQDC, 0x80000038); mtsdram(SDRAM_RFDC, 0x00000257); mtdcr(SDRAM_R0BAS, 0x0000F800); /* MQ0_B0BAS */ - mtdcr(SDRAM_R1BAS, 0x0400F800); /* MQ0_B1BAS */ } phys_size_t initdram(int board_type) -- 1.7.12

1 1

[U-Boot] [PATCH] ubifs: Fix memory leak in ubifs_finddir
by Stefan Roese 03 Sep '12

03 Sep '12

This patch fixes a memory leak in ubifs_finddir(). Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: dev.ma.dma(a)gmail.com --- fs/ubifs/ubifs.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 604eb8f..c68802b 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -295,6 +295,7 @@ static int ubifs_finddir(struct super_block *sb, char *dirname, struct file *file; struct dentry *dentry; struct inode *dir; + int ret = 0; file = kzalloc(sizeof(struct file), 0); dentry = kzalloc(sizeof(struct dentry), 0); @@ -336,7 +337,8 @@ static int ubifs_finddir(struct super_block *sb, char *dirname, if ((strncmp(dirname, (char *)dent->name, nm.len) == 0) && (strlen(dirname) == nm.len)) { *inum = le64_to_cpu(dent->inum); - return 1; + ret = 1; + goto out_free; } /* Switch to the next entry */ @@ -355,11 +357,10 @@ static int ubifs_finddir(struct super_block *sb, char *dirname, } out: - if (err != -ENOENT) { + if (err != -ENOENT) ubifs_err("cannot find next direntry, error %d", err); - return err; - } +out_free: if (file->private_data) kfree(file->private_data); if (file) @@ -369,7 +370,7 @@ out: if (dir) free(dir); - return 0; + return ret; } static unsigned long ubifs_findfile(struct super_block *sb, char *filename) -- 1.7.12

2 1

[U-Boot] [PATCH 1/2] cfi: Check for blank before erase
by Joe Hershberger 03 Sep '12

03 Sep '12

Added an optional check in the CFI driver to evaluate if the sector is already blank before issuing an erase command. Improves erase time by over a factor of 10 if already blank. Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/mtd/cfi_flash.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index f0f301a..97a4fd7 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1078,6 +1078,32 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) for (sect = s_first; sect <= s_last; sect++) { if (info->protect[sect] == 0) { /* not protected */ +#ifdef CONFIG_SYS_FLASH_CHECK_BLANK_BEFORE_ERASE + int k; + int size; + int erased; + u32 *flash; + + /* + * Check if whole sector is erased + */ + size = flash_sector_size(info, sect); + erased = 1; + flash = (u32 *)info->start[sect]; + /* divide by 4 for longword access */ + size = size >> 2; + for (k = 0; k < size; k++) { + if (flash_read32(flash++) != 0xffffffff) { + erased = 0; + break; + } + } + if (erased) { + if (flash_verbose) + putc(','); + continue; + } +#endif switch (info->vendor) { case CFI_CMDSET_INTEL_PROG_REGIONS: case CFI_CMDSET_INTEL_STANDARD: -- 1.7.11.5

2 3

[U-Boot] [PATCH] lsxl: support power switch
by Michael Walle 03 Sep '12

03 Sep '12

This patch restores the Linkstation's original behaviour when powering off. Once the (soft) power switch is turned off, linux will reboot and the bootloader turns off HDD and USB power. Then it loops as long as the switch is in the off position, before continuing the boot process again. Additionally, this patch fixes the board function set_led(LED_OFF). Signed-off-by: Michael Walle <michael(a)walle.cc> Cc: Prafulla Wadaskar <prafulla(a)marvell.com> --- board/buffalo/lsxl/lsxl.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c index fe15511..b3f31d6 100644 --- a/board/buffalo/lsxl/lsxl.c +++ b/board/buffalo/lsxl/lsxl.c @@ -158,7 +158,7 @@ static void set_led(int state) { switch (state) { case LED_OFF: - __set_led(0, 0, 0, 0, 0, 0); + __set_led(0, 0, 0, 1, 1, 1); break; case LED_ALARM_ON: __set_led(0, 0, 0, 0, 1, 1); @@ -192,6 +192,25 @@ int board_init(void) } #ifdef CONFIG_MISC_INIT_R +static void check_power_switch(void) +{ + if (kw_gpio_get_value(GPIO_POWER_SWITCH)) { + /* turn off HDD and USB power */ + kw_gpio_set_value(GPIO_HDD_POWER, 0); + kw_gpio_set_value(GPIO_USB_VBUS, 0); + set_led(LED_OFF); + + /* loop until released */ + while (kw_gpio_get_value(GPIO_POWER_SWITCH)) + ; + + /* turn power on again */ + kw_gpio_set_value(GPIO_HDD_POWER, 1); + kw_gpio_set_value(GPIO_USB_VBUS, 1); + set_led(LED_POWER_BLINKING); + } +} + void check_enetaddr(void) { uchar enetaddr[6]; @@ -261,6 +280,7 @@ static void check_push_button(void) int misc_init_r(void) { + check_power_switch(); check_enetaddr(); check_push_button(); -- 1.7.2.5

2 6

[U-Boot] [PATCH] cosmetic: Better explain how to use the kirkwood kwbimage.cfg file.
by Karl O. Pinc 03 Sep '12

03 Sep '12

Hi, This adds to the documenation to explain how to use the kwbimage.cfg file necessary to generate an image with prefixed board setup values necessary for the kirkwood boards. Signed-off-by: Karl O. Pinc <kop(a)meme.com> --- doc/README.kwbimage | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/README.kwbimage b/doc/README.kwbimage index 7f15e6d..e91c387 100644 --- a/doc/README.kwbimage +++ b/doc/README.kwbimage @@ -25,13 +25,24 @@ for ex. -T kwbimage -a 0x00600000 -e 0x00600000 \ -d u-boot.bin u-boot.kwb + kwbimage support available with mkimage utility will generate kirkwood boot -image that can be flashed on the board NAND/SPI flash +image that can be flashed on the board NAND/SPI flash. The make target +which uses mkimage to produce such an image is "u-boot.kwb". For example: + + export BUILD_DIR=/tmp/build + make distclean + make yourboard_config + make $BUILD_DIR/u-boot.kwb + Board specific configuration file specifications: ------------------------------------------------ -1. This file must present in the $(BOARDDIR) and the name should be - kwbimage.cfg (since this is used in Makefile) +1. This file must present in the $(BOARDDIR). The default name is + kwbimage.cfg. The name can be set as part of the full path + to the file using CONFIG_SYS_KWD_CONFIG (probably in + include/configs/<yourboard>.h). The path should look like: + $(SRCTREE)/$(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg 2. This file can have empty lines and lines starting with "#" as first character to put comments 3. This file can have configuration command lines as mentioned below, -- 1.7.2.5

2 2

[U-Boot] [PATCH v2] Cosmetic doc typo fixes to the kwbimage feature docs
by Karl O. Pinc 03 Sep '12

03 Sep '12

This is a resend of the first email I tried sending to the list. I don't believe the original email went through, probably due to my weak git skills. This fixes a few obvious typos in the kirkwood docs. Karl O. Pinc (1): Cosmetic doc typo fixes to the kwbimage feature docs board/Marvell/sheevaplug/kwbimage.cfg | 4 ++-- doc/README.kwbimage | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 1.7.2.5

2 3

[U-Boot] [PATCH] arm/km: remove unused code
by Holger Brunck 03 Sep '12

03 Sep '12

For some reasons we had an own implementaion of dram_init and dram_init_banksize. This is not needed anymore, use the standard kirkwood functions instead. Signed-off-by: Holger Brunck <holger.brunck(a)keymile.com> cc: Prafulla Wadaskar <prafulla(a)marvell.com> cc: Valentin Longchamp <valentin.longchamp(a)keymile.com> cc: Gerlando Falauto <gerlando.falauto(a)keymile.com> --- board/keymile/km_arm/km_arm.c | 20 -------------------- include/configs/km/keymile-common.h | 1 - 2 files changed, 0 insertions(+), 21 deletions(-) diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index ac14a2f..2068b00 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -332,26 +332,6 @@ void board_spi_release_bus(struct spi_slave *slave) kw_gpio_set_value(KM_FLASH_GPIO_PIN, 1); } -int dram_init(void) -{ - /* dram_init must store complete ramsize in gd->ram_size */ - /* Fix this */ - gd->ram_size = get_ram_size((void *)kw_sdram_bar(0), - kw_sdram_bs(0)); - return 0; -} - -void dram_init_banksize(void) -{ - int i; - - for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { - gd->bd->bi_dram[i].start = kw_sdram_bar(i); - gd->bd->bi_dram[i].size = get_ram_size((long *)kw_sdram_bar(i), - kw_sdram_bs(i)); - } -} - #if (defined(CONFIG_KM_PIGGY4_88E6061)) #define PHY_LED_SEL_REG 0x18 diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 7ed9958..9983104 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -81,7 +81,6 @@ #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE -#define CONFIG_SYS_BOARD_DRAM_INIT /* Used board specific dram_init */ #define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_MAX_I2C_BUS 1 -- 1.7.1

2 2

[U-Boot] [PATCH] arm/km: fix frequency of the SPI NOR Flash
by Valentin Longchamp 03 Sep '12

03 Sep '12

According to our last HW measures, this could be raised while still compatible with the potential delays on the lines. Signed-off-by: Valentin Longchamp <valentin.longchamp(a)keymile.com> cc: Holger Brunck <holger.brunck(a)keymile.com> --- include/configs/km/km_arm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 3aa5ca1..2d573e4 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -60,7 +60,7 @@ #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 5000000 +#define CONFIG_ENV_SPI_MAX_HZ 8100000 #define CONFIG_ENV_SPI_MODE SPI_MODE_3 #endif -- 1.7.1

2 2