September 2012 - U-Boot

[U-Boot] [PATCH 1/2] libfdt: Add support for appending the values to a existing property
by Kim Phillips 13 Nov '12

13 Nov '12

From: Minghuan Lian <Minghuan.Lian(a)freescale.com> Some properties may contain multiple values, these values may need to be added to the property respectively. this patch provides this functionality. The main purpose of fdt_append_prop() is to append the values to a existing property, or create a new property if it dose not exist. Signed-off-by: Minghuan Lian <Minghuan.Lian(a)freescale.com> Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au> --- include/libfdt.h | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/libfdt/fdt_rw.c | 27 +++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/include/libfdt.h b/include/libfdt.h index de82ed5..78798e8 100644 --- a/include/libfdt.h +++ b/include/libfdt.h @@ -1134,6 +1134,101 @@ static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name, fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1) /** + * fdt_appendprop - append to or create a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to append to + * @val: pointer to data to append to the property value + * @len: length of the data to append to the property value + * + * fdt_appendprop() appends the value to the named property in the + * given node, creating the property if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +int fdt_appendprop(void *fdt, int nodeoffset, const char *name, + const void *val, int len); + +/** + * fdt_appendprop_cell - append a single cell value to a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @val: 32-bit integer value to append to the property (native endian) + * + * fdt_appendprop_cell() appends the given cell value (converting to + * big-endian if necessary) to the value of the named property in the + * given node, or creates a new property with that value if it does + * not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +static inline int fdt_appendprop_cell(void *fdt, int nodeoffset, + const char *name, uint32_t val) +{ + val = cpu_to_fdt32(val); + return fdt_appendprop(fdt, nodeoffset, name, &val, sizeof(val)); +} + +/** + * fdt_appendprop_string - append a string to a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @str: string value to append to the property + * + * fdt_appendprop_string() appends the given string to the value of + * the named property in the given node, or creates a new property + * with that value if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +#define fdt_appendprop_string(fdt, nodeoffset, name, str) \ + fdt_appendprop((fdt), (nodeoffset), (name), (str), strlen(str)+1) + +/** * fdt_delprop - delete a property * @fdt: pointer to the device tree blob * @nodeoffset: offset of the node whose property to nop diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c index 5c27a67..5ed23d6 100644 --- a/lib/libfdt/fdt_rw.c +++ b/lib/libfdt/fdt_rw.c @@ -293,6 +293,33 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, return 0; } +int fdt_appendprop(void *fdt, int nodeoffset, const char *name, + const void *val, int len) +{ + struct fdt_property *prop; + int err, oldlen, newlen; + + FDT_RW_CHECK_HEADER(fdt); + + prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen); + if (prop) { + newlen = len + oldlen; + err = _fdt_splice_struct(fdt, prop->data, + FDT_TAGALIGN(oldlen), + FDT_TAGALIGN(newlen)); + if (err) + return err; + prop->len = cpu_to_fdt32(newlen); + memcpy(prop->data + oldlen, val, len); + } else { + err = _fdt_add_property(fdt, nodeoffset, name, len, &prop); + if (err) + return err; + memcpy(prop->data, val, len); + } + return 0; +} + int fdt_delprop(void *fdt, int nodeoffset, const char *name) { struct fdt_property *prop; -- 1.7.12

4 8

[U-Boot] kwboot: Boot Marvell Kirkwood SoCs over a serial link.
by Daniel Stodden 13 Nov '12

13 Nov '12

Hey. I wrote a utility to boot Marvell SoCs over serial. If that sounds generally useful, would you be so kind to merge git://github.com/dns42/u-boot.git at dns/kwboot-1 If it's missing sth for that to happen, lemme know. Cheers, Daniel

6 8

[U-Boot] [PATCH] arm1136: cosmetic: Remove double test on CONFIG_SYS_DCACHE_OFF
by Benoît Thébaudeau 10 Nov '12

10 Nov '12

Remove a redundant '#ifndef CONFIG_SYS_DCACHE_OFF' nested in the same #ifndef. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> --- .../arch/arm/cpu/arm1136/cpu.c | 2 -- 1 file changed, 2 deletions(-) diff --git u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/cpu.c u-boot-4d3c95f/arch/arm/cpu/arm1136/cpu.c index b98e3d9..1136c1d 100644 --- u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/cpu.c +++ u-boot-4d3c95f/arch/arm/cpu/arm1136/cpu.c @@ -146,9 +146,7 @@ void enable_caches(void) #ifndef CONFIG_SYS_ICACHE_OFF icache_enable(); #endif -#ifndef CONFIG_SYS_DCACHE_OFF dcache_enable(); -#endif } #else /* #ifndef CONFIG_SYS_DCACHE_OFF */

2 9

[U-Boot] [PATCH] MAKEALL: Add spear platform target to compile all SPEAr boards
by Stefan Roese 07 Nov '12

07 Nov '12

Signed-off-by: Stefan Roese <sr(a)denx.de> --- MAKEALL | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAKEALL b/MAKEALL index 2e8b997..a553521 100755 --- a/MAKEALL +++ b/MAKEALL @@ -365,6 +365,12 @@ LIST_pxa="$(boards_by_cpu pxa)" LIST_ixp="$(boards_by_cpu ixp)" ######################################################################### +## SPEAr Systems +######################################################################### + +LIST_spear="$(boards_by_soc spear)" + +######################################################################### ## ARM groups ######################################################################### -- 1.7.10.3

2 1

[U-Boot] [PATCH 0/7] lcd/video: Add parameter API and compressed bitmaps
by Simon Glass 07 Nov '12

07 Nov '12

This series contains patches to create an API to read lcd/video parameters such as the screen size. It also adds support for displaying compressed bitmaps. Ultimately it would be nice to unify lcd and video more, and this is a step towards that. Board files still need to decide which to use, but the same parameters are available in both. Stefan Reinauer (2): video: Provide an API to access video parameters video: Implement additional video API functions in cfb_console Tom Wai-Hong Tam (3): lcd: Fix BMP decode bug that skips the wrong padded row lcd: Fix fb offset calculation for bpix == 16 in BMP display lcd: Implement RLE8 bitmap decoding Vadim Bendebury (2): lcd: Provide an API to access LCD parameters video: Skip bitmaps which do not fit into the screen in cfb_console README | 5 + common/cmd_bmp.c | 4 +- common/lcd.c | 184 +++++++++++++++++++++++++++++++++++++++++-- drivers/video/cfb_console.c | 39 +++++++++ include/lcd.h | 36 +++++++++ include/video.h | 48 +++++++++++ 6 files changed, 307 insertions(+), 9 deletions(-) -- 1.7.7.3

4 14

[U-Boot] [PATCH 2/3] mmc: sdhci: add the DMA select for SDMA
by Jaehoon Chung 06 Nov '12

06 Nov '12

In host-control register, DMA select bit field is present. BUt in sdhci.c, didn't select for DMA. if set CONFIG_MMC_SDMA, we need to set SDMA-select bit. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- drivers/mmc/sdhci.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 9329874..15b4686 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -82,6 +82,13 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data, unsigned int start_addr) { unsigned int stat, rdy, mask, timeout, block = 0; +#ifdef CONFIG_MMC_SDMA + unsigned char ctrl; + ctrl = sdhci_readl(host, SDHCI_HOST_CONTROL); + ctrl &= ~SDHCI_CTRL_DMA_MASK; + ctrl |= SDHCI_CTRL_SDMA; + sdhci_writel(host, ctrl, SDHCI_HOST_CONTROL); +#endif timeout = 1000000; rdy = SDHCI_INT_SPACE_AVAIL | SDHCI_INT_DATA_AVAIL; -- 1.7.4.1

3 3

[U-Boot] [PATCH 1/2] part_dos: allocate cacheline aligned buffers
by Thierry Reding 06 Nov '12

06 Nov '12

Some hardware requires the data buffers to be cacheline-aligned to make sure DMA operations can be properly executed. This patch uses the ALLOC_CACHE_ALIGN_BUFFER macro to allocate buffers with proper alignment. The same was already done for EFI partitions in commit f75dd58 "part_efi: dcache: allocate cacheline aligned buffers". Signed-off-by: Thierry Reding <thierry.reding(a)avionic-design.de> --- This fixes boot failures on Avionic Design Plutux and Medcom boards. disk/part_dos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/disk/part_dos.c b/disk/part_dos.c index b5bcb37..c028aaf 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -87,7 +87,7 @@ static int test_block_type(unsigned char *buffer) int test_part_dos (block_dev_desc_t *dev_desc) { - unsigned char buffer[dev_desc->blksz]; + ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz); if ((dev_desc->block_read(dev_desc->dev, 0, 1, (ulong *) buffer) != 1) || (buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) || @@ -102,7 +102,7 @@ int test_part_dos (block_dev_desc_t *dev_desc) static void print_partition_extended (block_dev_desc_t *dev_desc, int ext_part_sector, int relative, int part_num) { - unsigned char buffer[dev_desc->blksz]; + ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz); dos_partition_t *pt; int i; @@ -166,7 +166,7 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part int relative, int part_num, int which_part, disk_partition_t *info) { - unsigned char buffer[dev_desc->blksz]; + ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz); dos_partition_t *pt; int i; -- 1.7.10

5 20

[U-Boot] [PATCH 00/14] Nokia RX-51 support
by Pali Rohár 02 Nov '12

02 Nov '12

This patch series add support for new board Nokia RX-51 (aka N900). Last two patches adding on screen bootmenu support. This series supersedes the last sent version. Pali Rohár (14): arm,omap3: Define save_boot_params in lowlevel_init.S for SPL only arm: Optionally use existing atags in bootm.c Add power bus message definitions in twl4030.h Fix function readline in main.c cfb_console: Fix function console_scrollup cfb_console: Add function console_clear and console_clear_line cfb_console: Add functions for moving with cursor cfb_console: Add support for some ANSI terminal escape codes New command clear: Clear the ANSI terminal New config variable CONFIG_MENUCMD New config variable CONFIG_PREMONITOR New board support: Nokia RX-51 aka N900 New command bootmenu: ANSI terminal Boot Menu support RX-51: Add support for bootmenu README | 2 + arch/arm/cpu/armv7/omap3/lowlevel_init.S | 4 +- arch/arm/lib/bootm.c | 39 +++- board/nokia/rx51/Makefile | 46 ++++ board/nokia/rx51/lowlevel_init.S | 79 ++++++ board/nokia/rx51/rx51.c | 381 ++++++++++++++++++++++++++++++ board/nokia/rx51/rx51.h | 378 +++++++++++++++++++++++++++++ boards.cfg | 1 + common/Makefile | 2 + common/cmd_bootmenu.c | 366 ++++++++++++++++++++++++++++ common/cmd_clear.c | 42 ++++ common/env_common.c | 3 + common/main.c | 89 ++++++- drivers/video/cfb_console.c | 346 +++++++++++++++++++++++++-- include/common.h | 20 ++ include/config_cmd_all.h | 2 + include/configs/nokia_rx51.h | 375 +++++++++++++++++++++++++++++ include/twl4030.h | 98 ++++++++ 18 files changed, 2233 insertions(+), 40 deletions(-) create mode 100644 board/nokia/rx51/Makefile create mode 100644 board/nokia/rx51/lowlevel_init.S create mode 100644 board/nokia/rx51/rx51.c create mode 100644 board/nokia/rx51/rx51.h create mode 100644 common/cmd_bootmenu.c create mode 100644 common/cmd_clear.c create mode 100644 include/configs/nokia_rx51.h -- 1.7.5.4

12 219

[U-Boot] [PATCH v4 0/6] tegra: Add NAND flash support
by Simon Glass 02 Nov '12

02 Nov '12

This series adds NAND flash support to Tegra and enables it on Seaboard. Included here is a proposed device tree binding with most of the properties private to "nvidia,". The binding includes information about the NAND controller as well as the connected NAND device. The Seaboard has a Hynix HY27UF4G2B. The driver supports ECC-based access and uses DMA and NAND acceleration features of the Tegra SOC to provide access at reasonable speed. Changes in v2: - Add new patch to align default buffers in nand_base - Added comment about the behaviour of the 'resp' register - Call set_bus_width_page_size() at init to report errors earlier - Change set_bus_width_page_size() to return an error when needed - Change timing structure member to u32 to match device tree - Check for supported bus width in board_nand_init() - Fix tegra nand header file to remove BIT defines - Implement a dummy nand_select_chip() instead of nand_hwcontro() - Make nand_command() display an error on an unknown command - Minor code tidy-ups in driver for style - Move cache logic into a separate dma_prepare() function - Remove CMD_TRANS_SIZE_BYTESx enum - Remove space after casts - Remove use of 'register' variables - Rename struct nand_info to struct nand_drv to avoid nand_info_t confusion - Support 4096 byte page devices, drop 1024 and 2048 - Tidy up nand_waitfor_cmd_completion() logic - Update NAND binding to add "nvidia," prefix - Use s32 for device tree integer values Changes in v3: - Add reg property for unit address (should be used for chip select) - Change note in fdt binding about the need for a hardware-specific binding - Fix up typos in fdt binding, and rename the file - Update fdt binding to make everything Nvidia-specific Changes in v4: - Align buffer length to cache line size in dma_prepare() - Fix "Write Page 0x0 timeout with ECC" error on 4.4.1 - Fix the issue that read_byte can read at most 4 times - Get some information from Read ID data instead of from device tree - In nand_command, set NAND_CMD_RNDOUT as unsupported command - Modify eccoob layout - Move to using CONFIG_SYS_NAND_SELF_INIT - Remove "DEFAULT" from comment because that function is not default - Remove fdt bindings related to page structure - Remove local read_buf and write_buf functions - Remove some fields in fdt_nand structure - Rename CONFIG_TEGRA2_NAND to CONFIG_TEGRA_NAND - Rename variables my_* as our_* - Use virt_to_phys() when filling address register Jim Lin (1): tegra: nand: Add Tegra NAND driver Simon Glass (5): nand: Try to align the default buffers tegra: Add NAND support to funcmux tegra: fdt: Add NAND controller binding and definitions tegra: fdt: Add NAND definitions to fdt tegra: Enable NAND on Seaboard arch/arm/cpu/tegra20-common/funcmux.c | 7 + arch/arm/dts/tegra20.dtsi | 7 + arch/arm/include/asm/arch-tegra20/funcmux.h | 3 + arch/arm/include/asm/arch-tegra20/tegra20.h | 1 + board/nvidia/dts/tegra20-seaboard.dts | 10 + .../nand/nvidia,tegra20-nand.txt | 53 + drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/nand_base.c | 3 +- drivers/mtd/nand/tegra_nand.c | 1026 ++++++++++++++++++++ drivers/mtd/nand/tegra_nand.h | 257 +++++ include/configs/seaboard.h | 9 + include/configs/tegra20-common.h | 2 + include/fdtdec.h | 1 + include/linux/mtd/nand.h | 7 +- lib/fdtdec.c | 1 + 15 files changed, 1384 insertions(+), 4 deletions(-) create mode 100644 doc/device-tree-bindings/nand/nvidia,tegra20-nand.txt create mode 100644 drivers/mtd/nand/tegra_nand.c create mode 100644 drivers/mtd/nand/tegra_nand.h -- 1.7.7.3

7 29

[U-Boot] [PATCH 1/6] fdt: Check error codes returned from fdtlib when loading ITB
by Joe Hershberger 29 Oct '12

29 Oct '12

Before this patch, error codes returned from fdtlib were ignored and continued access would cause a crash. Now just check if the image is truncated and error if so. Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> --- common/image.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/image.c b/common/image.c index 91954ac..4252e63 100644 --- a/common/image.c +++ b/common/image.c @@ -2818,6 +2818,11 @@ int fit_image_check_hashes(const void *fit, int image_noffset) } } + if (noffset == -FDT_ERR_TRUNCATED || noffset == -FDT_ERR_BADSTRUCTURE) { + err_msg = " error!\nCorrupted or truncated tree"; + goto error; + } + return 1; error: -- 1.7.11.5

6 17