January 2014 - U-Boot

[U-Boot] UBIFS seeing corrupt blank pages when image flashed via u-boot
by Gupta, Pekon 13 Jan '14

13 Jan '14

Hi All, I have been facing a weird problem, may be someone has a solution. *_Case-1_ Flashing UBIFS image from u-boot using 'nand write' utility* For a partially written erased-block.. (a) 1st page is written with 'erase-header' (b) 2nd page is written with 'volume-header' (c) '3rd page' is written with 'some data' (d) '4th to last-page of block' should be left blank, but they are written with 0xFF. As a effect of (d), the ECC calculated for (all 0xff data) is written to OOB area of all pages from 4th-page till last-page of the PEB. As per my understanding, after mounting UBIFS as root, kernel tries to append some data to some files in rootfs, due to which leftover pages (d) get written by appended data, _without_ PEB getting erased. This causes ECC bytes to get corrupted, because OOB of 'unused-pages' was already written with ECC of (all 0xff data) by u-boot in step(d). And on next reboot, kernel sees 'un-corrected ECC' errors while booting. *_Case-2_ Flashing UBIFS image from kernel using 'ubiformat' utility* Whereas when same image is flashed using 'ubiformat' utility, after booting Kernel from other root source. 'ubiformat' automatically skips empty pages (4th to last-page) in erased-block. Thus OOB area of pages from 4th-page till last-page are un-touched. Hence, when kernel 'appends' the rootfs files there is no ECC corruption as the OOB area of 4th to last-page of PEB were blank. So everything works fine. Now my queries: (1) while _appending_ a file (a) does UBIFS writes appended data to same existing PEB, if there is enough space in PEB to accommodate new data ? OR (b) does UBIFS copies the existing data to newer PEB along with the appended data ? (2) In-case (b), then can someone point me to what can possibly be the issue ? (Any references to UBIFS docs on infradead.org may also help). with regards, pekon

4 7

[U-Boot] [PATCH] usb: ums: wait for usb cable connection before enter ums mode
by Przemyslaw Marczak 13 Jan '14

13 Jan '14

Before this change ums mode can not be entered when device was using the same usb port for usb/uart communication. Switching USB cable from UART to USB always causes ums exit. Signed-off-by: Przemyslaw Marczak <p.marczak(a)samsung.com> --- common/cmd_usb_mass_storage.c | 24 ++++++++++++++++++++++++ include/usb_mass_storage.h | 3 +++ 2 files changed, 27 insertions(+) diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 99487f4..5f557d5 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -42,6 +42,30 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, g_dnl_register("ums"); + /* Timeout unit: seconds */ + int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT; + + if (!usb_cable_connected()) { + puts("Please connect USB cable.\n"); + + while (!usb_cable_connected()) { + if (ctrlc()) { + puts("\rCTRL+C - Operation aborted.\n"); + goto exit; + } + if (!cable_ready_timeout) { + puts("\rUSB cable not detected.\n" \ + "Command exit.\n"); + goto exit; + } + + printf("\rAuto exit in: %.2d s.", cable_ready_timeout); + mdelay(1000); + cable_ready_timeout--; + } + puts("\r\n"); + } + while (1) { usb_gadget_handle_interrupts(); diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index 9df3adc..058dcf1 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -20,6 +20,9 @@ #define UMS_NUM_SECTORS 0 #endif +/* Wait at maximum 60 seconds for cable connection */ +#define UMS_CABLE_READY_TIMEOUT 60 + struct ums { int (*read_sector)(struct ums *ums_dev, ulong start, lbaint_t blkcnt, void *buf); -- 1.7.9.5

2 5

[U-Boot] [U-Boot 1/3] spl: common: Properly ignore spl/Makefile in .gitignore
by Dan Murphy 13 Jan '14

13 Jan '14

The spl directory is ignored by git as these objects are created during spl creation. The only file not created is the Makefile. This file can be modified and checked in via git. Due to the order of rule precedence having the whole directory ignored first then indicating not to ignore the Makefile is not correct the message to force adding the Makefile is still shown. So reorder the .gitignore for the Makefile and indicate that the Makefile does not need to be ignored first and then indicate everything else in spl should be ignored after wards. Signed-off-by: Dan Murphy <dmurphy(a)ti.com> --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3b14c25..7f006c8 100644 --- a/.gitignore +++ b/.gitignore @@ -57,8 +57,8 @@ /errlog /reloc_off -/spl/ !/spl/Makefile +/spl/* /tpl/ /include/generated/ -- 1.7.9.5

1 3

[U-Boot] [PATCH] arm: New stack pointer is already aligned
by Tom Rini 13 Jan '14

13 Jan '14

The code in arch/arm/lib/board.c::board_init_f that sets gd->start_addr_sp has already make sure we're 8-byte aligned, so we don't need to do that again. Cc: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Signed-off-by: Tom Rini <trini(a)ti.com> --- arch/arm/lib/crt0.S | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index ac54b93..6b5ec01 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -82,7 +82,6 @@ ENTRY(_main) */ ldr sp, [r9, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ - bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ ldr r9, [r9, #GD_BD] /* r9 = gd->bd */ sub r9, r9, #GD_SIZE /* new GD is below bd */ -- 1.7.9.5

3 3

[U-Boot] [PATCH v3 0/2] Add usb ethernet support for Arndale
by Inderpal Singh 13 Jan '14

13 Jan '14

Arndale board has AX88760, which is USB 2.0 Hub & USB 2.0 Ethernet Combo controller, connected to HSIC Phy of USB host controller via USB3503 hub. This patchset adds support for this usb ethernet controllor. Changes in v2: - removed setting preboot environment in patch 2 Changes in v3: - used generic board_usb_init Inderpal Singh (2): usb: ehci: exynos: set/reset hsic phys usb: exynos5: arndale: Add network support arch/arm/include/asm/arch-exynos/ehci.h | 14 +++++++++++ board/samsung/arndale/arndale.c | 21 ++++++++++++++++ drivers/usb/host/ehci-exynos.c | 41 +++++++++++++++++++++++++++++++ include/configs/arndale.h | 4 +++ 4 files changed, 80 insertions(+) -- 1.7.9.5

2 3

[U-Boot] [PATCH v5 1/3] mx6sabresd: Add eMMC specific environment to allow U-Boot update
by Otavio Salvador 13 Jan '14

13 Jan '14

A new 'update_emmc_firmware' target is added to allow for easy U-Boot update in the eMMC as it has secury boot partition and this needs specific handling on how to program the specific partition. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v5: None Changes in v4: - Fix compilation error (Stefano) Changes in v3: None Changes in v2: None include/configs/mx6sabre_common.h | 23 +++++++++++++++++++++++ include/configs/mx6sabresd.h | 2 ++ 2 files changed, 25 insertions(+) diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 21c848f..5ee7fa5 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -95,6 +95,28 @@ #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 +#ifdef CONFIG_SUPPORT_EMMC_BOOT +#define EMMC_ENV \ + "emmcdev=2\0" \ + "update_emmc_firmware=" \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "if ${get_cmd} ${update_sd_firmware_filename}; then " \ + "if mmc dev ${emmcdev} && " \ + "mmc open ${emmcdev} 1; then " \ + "setexpr fw_sz ${filesize} / 0x200; " \ + "setexpr fw_sz ${fw_sz} + 1; " \ + "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ + "mmc close ${emmcdev} 1; " \ + "fi; " \ + "fi\0" +#else +#define EMMC_ENV "" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "uimage=uImage\0" \ @@ -121,6 +143,7 @@ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ "fi; " \ "fi\0" \ + EMMC_ENV \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 3229bc7..4919f53 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -23,6 +23,8 @@ #endif #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) +#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ + #include "mx6sabre_common.h" #define CONFIG_SYS_FSL_USDHC_NUM 3 -- 1.8.5.2

3 6

[U-Boot] [PATCH v7 00/17] sf: Add support for quad and dual_flash
by Jagannadha Sutradharudu Teki 13 Jan '14

13 Jan '14

This series is a combo of quad cmds and dual_flash support Refer [1] and [2] for more functional description about this changes. [1] http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-sf-Add-Extended-read-and-q… [2] http://u-boot.10912.n7.nabble.com/PATCH-v3-0-4-sf-Add-support-to-access-dua… Tested on sst, stmicro and spansion flash. Testing branch: $ git clone git://git.denx.de/u-boot-spi.git $ cd u-boot-spi $ git checkout -b master-quad origin/master-quad REQUEST FOR ALL SPI CODE CONTRIBUTORS/USERS, PLEASE TEST THESE CHANGES W.R.T YOUR HW IF POSSIBLE. Please let me know for any issues/concerns/questions. -- Thanks, Jagan. Changes for v7: - cmdsz on read_ops - sf param flags are placed spi_flash.h - code cleanup - updated dual_flash with BAR support Changes for v6: - Divided flash reg ops code - sf_ops.c clean Changes for v5: - Re-implemented write command log - not trying to discover the fastest write - Added SPI RX/TX operation modes - SPI flash parts are moved into sf_params.c file - Added QUAD_IO_FAST read support - Discovred the read dummy_cycles based on configured read cmd - Added set QEB support for macronix flash - Enabled quad read/write cmd support for macronix flash Changes for v4: Changes for v3: Changes for v2: - none Jagannadha Sutradharudu Teki (17): sf: Add extended read commands support sf: Add quad read/write commands support sf: ops: Add configuration register writing support sf: Set quad enable bit support sf: probe: Enable RD_FULL and WR_QPP sf: Separate the flash params table sf: Add QUAD_IO_FAST read support sf: Discover read dummy_byte sf: Add macronix set QEB support sf: probe: Enable macronix quad read/write cmds support sf: Divide flash register ops from QEB code sf: Code cleanups sf: ops: Unify read_ops bank configuration sf: Add dual memories support - DUAL_STACKED sf: Add dual memories support - DUAL_PARALLEL sf: Add CONFIG_SF_DUAL_FLASH doc: SPI: Update status.txt README | 6 + doc/SPI/README.dual-flash | 92 ++++++++++++++ doc/SPI/status.txt | 11 +- drivers/mtd/spi/Makefile | 4 +- drivers/mtd/spi/sf.c | 4 + drivers/mtd/spi/sf_internal.h | 34 ++++-- drivers/mtd/spi/sf_ops.c | 157 +++++++++++++++++++----- drivers/mtd/spi/sf_params.c | 130 ++++++++++++++++++++ drivers/mtd/spi/sf_probe.c | 274 +++++++++++++++++++++--------------------- include/spi.h | 26 ++++ include/spi_flash.h | 57 +++++++++ 11 files changed, 610 insertions(+), 185 deletions(-) create mode 100644 doc/SPI/README.dual-flash create mode 100644 drivers/mtd/spi/sf_params.c -- 1.8.3

3 2

[U-Boot] [PATCH v2 1/6] wandboard: Return from cpu_eth_init() directly
by Fabio Estevam 13 Jan '14

13 Jan '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> There is no need to print an error message when cpu_eth_init() fails because net/eth.c already prints it. In order to simplify the code, just return the value from cpu_eth_init(bis) directly. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - None board/wandboard/wandboard.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 0043bc6..72e9bb2 100644e --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -257,15 +257,9 @@ static void setup_display(void) int board_eth_init(bd_t *bis) { - int ret; - setup_iomux_enet(); - ret = cpu_eth_init(bis); - if (ret) - printf("FEC MXC: %s:failed\n", __func__); - - return ret; + return cpu_eth_init(bis); } int board_early_init_f(void) -- 1.8.1.2

3 7

[U-Boot] [PATCH v3] mx6slevk: Include "mx6_common.h"
by Fabio Estevam 13 Jan '14

13 Jan '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> Include "mx6_common.h" so that some ARM errata are applied and also the vddsoc regulator can be changed. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v2: - Discarded 1/2 and now all 3 errata are also applied to mx6solo-lite. Changes since v1: - None include/configs/mx6slevk.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 7abad08..b29f78c 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -11,6 +11,7 @@ #include <asm/arch/imx-regs.h> #include <asm/sizes.h> +#include "mx6_common.h" #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO -- 1.8.1.2

2 2

[U-Boot] [PATCH REPOST3 1/2] ARM: rpi_b: power on SDHCI and USB HW modules
by Stephen Warren 13 Jan '14

13 Jan '14

Send RPC commands to the VideoCore to turn on the SDHCI and USB modules. For SDHCI this isn't needed in practice, since the firmware already turned on the power in order to load U-Boot. However, it's best to be explicit. For USB, this is necessary, since the module isn't powered otherwise. This will allow the kernel USB driver to work. Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- arch/arm/include/asm/arch-bcm2835/mbox.h | 48 ++++++++++++++++++++++++++++++ board/raspberrypi/rpi_b/rpi_b.c | 34 ++++++++++++++++++++- 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-bcm2835/mbox.h b/arch/arm/include/asm/arch-bcm2835/mbox.h index 6b806ec..38cb42a 100644 --- a/arch/arm/include/asm/arch-bcm2835/mbox.h +++ b/arch/arm/include/asm/arch-bcm2835/mbox.h @@ -133,6 +133,54 @@ struct bcm2835_mbox_tag_get_arm_mem { } body; }; +#define BCM2835_MBOX_POWER_DEVID_SDHCI 0 +#define BCM2835_MBOX_POWER_DEVID_UART0 1 +#define BCM2835_MBOX_POWER_DEVID_UART1 2 +#define BCM2835_MBOX_POWER_DEVID_USB_HCD 3 +#define BCM2835_MBOX_POWER_DEVID_I2C0 4 +#define BCM2835_MBOX_POWER_DEVID_I2C1 5 +#define BCM2835_MBOX_POWER_DEVID_I2C2 6 +#define BCM2835_MBOX_POWER_DEVID_SPI 7 +#define BCM2835_MBOX_POWER_DEVID_CCP2TX 8 + +#define BCM2835_MBOX_POWER_STATE_RESP_ON (1 << 1) +/* Device doesn't exist */ +#define BCM2835_MBOX_POWER_STATE_RESP_NODEV (1 << 1) + +#define BCM2835_MBOX_TAG_GET_POWER_STATE 0x00020001 + +struct bcm2835_mbox_tag_get_power_state { + struct bcm2835_mbox_tag_hdr tag_hdr; + union { + struct { + u32 device_id; + } req; + struct { + u32 device_id; + u32 state; + } resp; + } body; +}; + +#define BCM2835_MBOX_TAG_SET_POWER_STATE 0x00028001 + +#define BCM2835_MBOX_SET_POWER_STATE_REQ_ON (1 << 0) +#define BCM2835_MBOX_SET_POWER_STATE_REQ_WAIT (1 << 1) + +struct bcm2835_mbox_tag_set_power_state { + struct bcm2835_mbox_tag_hdr tag_hdr; + union { + struct { + u32 device_id; + u32 state; + } req; + struct { + u32 device_id; + u32 state; + } resp; + } body; +}; + #define BCM2835_MBOX_TAG_GET_CLOCK_RATE 0x00030002 #define BCM2835_MBOX_CLOCK_ID_EMMC 1 diff --git a/board/raspberrypi/rpi_b/rpi_b.c b/board/raspberrypi/rpi_b/rpi_b.c index 16d442a..f33fae9 100644 --- a/board/raspberrypi/rpi_b/rpi_b.c +++ b/board/raspberrypi/rpi_b/rpi_b.c @@ -29,6 +29,12 @@ struct msg_get_arm_mem { u32 end_tag; }; +struct msg_set_power_state { + struct bcm2835_mbox_hdr hdr; + struct bcm2835_mbox_tag_set_power_state set_power_state; + u32 end_tag; +}; + struct msg_get_clock_rate { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_get_clock_rate get_clock_rate; @@ -54,11 +60,35 @@ int dram_init(void) return 0; } +static int power_on_module(u32 module) +{ + ALLOC_ALIGN_BUFFER(struct msg_set_power_state, msg_pwr, 1, 16); + int ret; + + BCM2835_MBOX_INIT_HDR(msg_pwr); + BCM2835_MBOX_INIT_TAG(&msg_pwr->set_power_state, + SET_POWER_STATE); + msg_pwr->set_power_state.body.req.device_id = module; + msg_pwr->set_power_state.body.req.state = + BCM2835_MBOX_SET_POWER_STATE_REQ_ON | + BCM2835_MBOX_SET_POWER_STATE_REQ_WAIT; + + ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, + &msg_pwr->hdr); + if (ret) { + printf("bcm2835: Could not set module %u power state\n", + module); + return -1; + } + + return 0; +} + int board_init(void) { gd->bd->bi_boot_params = 0x100; - return 0; + return power_on_module(BCM2835_MBOX_POWER_DEVID_USB_HCD); } int board_mmc_init(void) @@ -66,6 +96,8 @@ int board_mmc_init(void) ALLOC_ALIGN_BUFFER(struct msg_get_clock_rate, msg_clk, 1, 16); int ret; + power_on_module(BCM2835_MBOX_POWER_DEVID_SDHCI); + BCM2835_MBOX_INIT_HDR(msg_clk); BCM2835_MBOX_INIT_TAG(&msg_clk->get_clock_rate, GET_CLOCK_RATE); msg_clk->get_clock_rate.body.req.clock_id = BCM2835_MBOX_CLOCK_ID_EMMC; -- 1.7.10.4

2 2