April 2015 - U-Boot

Re: [U-Boot] "Writing to MMC(%d)... failed"
by Przemyslaw Marczak 28 Apr '15

28 Apr '15

Hello Nathan, Sorry, I didn't reply last time, becouse I'm quite busy. On 04/28/2015 07:39 AM, Nathan wrote: > Still not sure where the problem lies. I thought I found an issue, but > it didn't fix anything and caused a different issue. > > At first, after plugging in a bunch of printfs, I thought it was a > simple issue in the dts (it appears not to be the issue): > ***** > Getting a little back into it, I find an issue in: > "./lib/libfdt/fdt_ro.c" > "fdt_path_offset()" where "-FDT_ERR_BADPATH" is returned for "path" > = "sdhci@12530000" > when: > "./lib/fdtdec.c" > "fdtdec_add_aliases_for_id()" is examining "mmc2" > > "fdt_path_offset()" > "_fdt_nodename_eq()" finds "aliases" > > But the issue comes from > "./lib/libfdt/fdt_ro.c" > "_fdt_string_eq()" > where > "p" = "mmc2" <> "s" = "sdhci@12530000" > > What I'm noticing different in the "exynos4412-odroid.dts" (odroid u2) > and "exynos54xx.dtsi" is the "/" for the alias paths "mmc2" and > "mmc4". > ***** If I good remember, Exynos 54xx doesn't support sdhci, it has only dw mmc. > > The problem with that "finding" was: > "fdtdec_add_aliases_for_id: warning: alias 'mmc2' points to a node > 'sdhci@12530000' that is missing or is not compatible with > 'samsung,exynos-dwmmc'" > Not sure why it would even mention dwmmc for mmc2 when it is specified > "exynos-mmc" in "exynos4.dtsi" > > A common issue with or without the slash is: > "_gpio_request_by_name_nodev: Node 'sdhci@12530000', property > 'pwr-gpios', failed to request GPIO index 0: -2" > The "pwr-gpio" is okay - the pin is not defined and not required here. For this board's config, there are two mmc drivers: - exynos dwmmc(mmc/exynos_dw_mmc.c) - channel 0 - for eMMC card slot - s5p sdhci(mmc/s5p_sdhci.c) - channel 2 - for SD card slot Each driver has it's own compatible id, which you can see in the array: lib/fdtdec.c - > compat_names[COMPAT_COUNT] Note: This is quite different like for the drivers, which support the driver model. We don't bind those drivers with the driver model yet. So now we init those drivers, by call the board_mmc_init() in board/samsung/common/board.c - as you probably know - most of samsung boards in U-Boot uses this common file, beside it's own board file. If you not sure where to find the function, you can check, which common files are compiled for your config: cd board/samsung find -name "*.o" >> I think the kicker is "No match for node 'sdhci@12530000'". >> I even manually set/forced the "status=okay" in the dts, but it still >> says it's disabled. >> >> I shall continue to pursue this, working my way back from >> "lists_bind_fdt()" in "lists.c" > And now, back to the issue with the warning, which you mentioned. This is okay. I'm sure, that sdhci driver init is fine. You can study the function: fdtdec_add_aliases_for_id() from lib/fdtdec.c Remember, that this is the first introduced method for init the drivers with the FDT support. But we are going to move all subsystems into the driver model. Let's look at the fdtdec_add_aliases_for_id(): - first we find all compatible nodes, - next we have an array "nodes[maxcount]" with the compatible nodes only - and next we look for the "path" for our "mmc*" aliases, but only for the compatible we can meet the condition: if (nodes[j] == node). This is way you get the warning when init DWMMC driver. This is ok. Which compiler are you using? We often use this U-Boot with SD cards and no one have such issue before. What about your power supply? Do you have eMMC card? Any other accessory is connected? Can you send me your binary (u-boot-dtb.bin)? Best regards, -- Przemyslaw Marczak Samsung R&D Institute Poland Samsung Electronics p.marczak(a)samsung.com

1 0

[U-Boot] [PATCH v3] sf: Fix to compute proper sector_size
by Jagannadha Sutradharudu Teki 28 Apr '15

28 Apr '15

Upto now flash sector_size is assigned from params which isn't necessarily a sector size from vendor, so based on the SECT_* flags from flash_params the erase_size will compute and it will become the sector_size finally. Bug report (from Bin Meng): => sf probe SF: Detected SST25VF016B with page size 256 Bytes, erase size 4 KiB, total 2 MiB, mapped at ffe00000 => sf erase 0 +100 SF: 65536 bytes @ 0x0 Erased: OK Signed-off-by: Jagannadha Sutradharudu Teki <jagannadh.teki(a)gmail.com> Reported-by: Bin Meng <bmeng.cn(a)gmail.com> Tested-by: Bin Meng <bmeng.cn(a)gmail.com> --- Changes for v3: - Updated comments Changes for v2: - Minimize the code logic drivers/mtd/spi/sf_internal.h | 3 ++- drivers/mtd/spi/sf_probe.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index bd834dc..4158e13 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -119,7 +119,8 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len, * @name: Device name ([MANUFLETTER][DEVTYPE][DENSITY][EXTRAINFO]) * @jedec: Device jedec ID (0x[1byte_manuf_id][2byte_dev_id]) * @ext_jedec: Device ext_jedec ID - * @sector_size: Sector size of this device + * @sector_size: Isn't necessarily a sector size from vendor, + * the size listed here is what works with CMD_ERASE_64K * @nr_sectors: No.of sectors on this device * @e_rd_cmd: Enum list for read commands * @flags: Important param, for flash specific behaviour diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index de8d0b7..3f6b882 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -184,6 +184,9 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, flash->erase_size = flash->sector_size; } + /* Now erase size becomes valid sector size */ + flash->sector_size = flash->erase_size; + /* Look for the fastest read cmd */ cmd = fls(params->e_rd_cmd & flash->spi->op_mode_rx); if (cmd) { -- 1.9.1

2 1

[U-Boot] [PATCH v2 1/2] dm: sf: Save flash flags to struct spi_flash
by Bin Meng 28 Apr '15

28 Apr '15

Add a new member 'flags' in struct spi_flash to store the flash flags during spi_flash_validate_params(). Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- Changes in v2: - New patch to save flash flags to struct spi_flash drivers/mtd/spi/sf_probe.c | 3 +++ include/spi_flash.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index d19138d..ac93114 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -132,6 +132,9 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, flash->name = params->name; flash->memory_map = spi->memory_map; flash->dual_flash = flash->spi->option; +#ifdef CONFIG_DM_SPI_FLASH + flash->flags = params->flags; +#endif /* Assign spi_flash ops */ #ifndef CONFIG_DM_SPI_FLASH diff --git a/include/spi_flash.h b/include/spi_flash.h index 218283f..ddce22a 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -65,6 +65,7 @@ struct spi_flash { #ifdef CONFIG_DM_SPI_FLASH struct spi_slave *spi; struct udevice *dev; + u16 flags; #else struct spi_slave *spi; #endif -- 1.8.2.1

2 1

Re: [U-Boot] "Writing to MMC(%d)... failed"
by Nathan 28 Apr '15

28 Apr '15

Still not sure where the problem lies. I thought I found an issue, but it didn't fix anything and caused a different issue. At first, after plugging in a bunch of printfs, I thought it was a simple issue in the dts (it appears not to be the issue): ***** Getting a little back into it, I find an issue in: "./lib/libfdt/fdt_ro.c" "fdt_path_offset()" where "-FDT_ERR_BADPATH" is returned for "path" = "sdhci@12530000" when: "./lib/fdtdec.c" "fdtdec_add_aliases_for_id()" is examining "mmc2" "fdt_path_offset()" "_fdt_nodename_eq()" finds "aliases" But the issue comes from "./lib/libfdt/fdt_ro.c" "_fdt_string_eq()" where "p" = "mmc2" <> "s" = "sdhci@12530000" What I'm noticing different in the "exynos4412-odroid.dts" (odroid u2) and "exynos54xx.dtsi" is the "/" for the alias paths "mmc2" and "mmc4". ***** The problem with that "finding" was: "fdtdec_add_aliases_for_id: warning: alias 'mmc2' points to a node 'sdhci@12530000' that is missing or is not compatible with 'samsung,exynos-dwmmc'" Not sure why it would even mention dwmmc for mmc2 when it is specified "exynos-mmc" in "exynos4.dtsi" A common issue with or without the slash is: "_gpio_request_by_name_nodev: Node 'sdhci@12530000', property 'pwr-gpios', failed to request GPIO index 0: -2" > I think the kicker is "No match for node 'sdhci@12530000'". > I even manually set/forced the "status=okay" in the dts, but it still > says it's disabled. > > I shall continue to pursue this, working my way back from > "lists_bind_fdt()" in "lists.c"

1 0

[U-Boot] [PATCH 0/29] dm: Introduce device tree support in SPL (for Rockchip)
by Simon Glass 28 Apr '15

28 Apr '15

With driver model SPL support in place the remaining driver difference between U-Boot proper and SPL is that SPL does not support device tree. This series adds this support, using a Rockchip board as an example. One problem with device tree is that U-Boot has no way of dropping features it does not need or use. For SPL this problem needs to be solved and this series uses the preprocessor for this. The 45KB Firefly device tree reduces to 693 bytes when unused material is removed. A better solution might involve the 'fdtgrep' tool but this has not made it into the device tree compiler as yet. This series includes some changes aimed at reduce code size in SPL, including: - dropping alias sequence support (the aliases node) since many boards just use a single UART in SPL - adding a smaller panic() function that does not support printf()-format strings - removing device unbind code which will never be used in SPL Overall the resulting SPL binary is 8829 bytes with my Linaro 4.8.2 compiler, including the device tree, using Thumb-2. Of this: 1768 bytes is driver model core code 1556 bytes is device tree code 693 bytes is the device tree itself 4756 is other code, including serial drivers, rodata and data The last figure includes rodata incorrectly added by the tool chain [1]. With a bug-fixed gcc 4.9.2 the total size is 6893 bytes including device tree. Approximately 750 bytes is used for strings and driver data (root device and serial) associated with driver model and device tree. This adds up an overhead of around 4750 bytes for driver model and device tree, including the code, rodata and device tree itself. It should therefore be possible to use driver model and device tree in SPL for board that have enough SRAM. Clearly 4KB is impossible without further work (perhaps removing some error strings). I suspect 8KB would be tricky, allowing only 3KB for stack and other code. But 16KB should work OK. SRAM sizes for recent SoCs I am aware of are: Rockchip RK3288: 96KB Tegra 124: 128KB Samsung Exynos 5420: 384KB The Rockchip Firefly was chosen for this work since it is a fairly recent board and is readily available. Rockchip engineers have been actively upstreaming code to Linux in the past year and there is a very full-featured U-Boot available. But it is invisible to most U-Boot people - mainline Rockchip support seems well overdue. This series does not make a serious start on that, since it only prints a message in SPL and then hangs, but additional work should get it booting to a prompt. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54303 Simon Glass (29): serial: ns16550: Add an option to specify the debug UART register shift dm: ns16550: Support non-byte register spacing with driver model dm: ns16550: Support CONFIG_SYS_NS16550_MEM32 with driver model serial: ns16550: Remove unnecessary init on UART setup fdt: arm: Drop device tree padding dm: core: Allow sequence alias support to be removed for SPL dm: core: Remove unbind operations when not required dm: Add a panic_str() function to reduce code size dm: core: Drop device removal error path when not supported fdt: sandbox: Move setup code from board_f to fdtdec fdt: Rename setup_fdt() and make it prepare also Move initf_malloc() to a common place Correct malloc_limit value for pre-relocation malloc() fdt: Add an option to disable device tree in SPL dts: Disable device tree for SPL on all boards fdt: Allow FDT functions to be built for SPL dm: core: Select device tree control correctly for SPL dm: Init device tree as well as driver model in SPL dm: serial: Don't support CONFIG_CONS_INDEX with device tree Remove SPL undefine of CONFIG_OF_CONTROL fdt: arm: Build device tree in SPL dm: rockchip: Add serial support rockchip: Bring in RK3288 device tree file includes and bindings rockchip: dts: Adjust device tree files for U-Boot SPL rockchip: Add base SoC files rockchip: Add basic support for firefly-rk3288 mkimage: Display a better list of available image types rockchip: Add the beginnings of an image tool rockchip: Add a simple README arch/arm/Kconfig | 11 + arch/arm/Makefile | 1 + arch/arm/cpu/armv7/exynos/Kconfig | 8 + arch/arm/cpu/armv7/s5pc1xx/Kconfig | 2 + arch/arm/cpu/u-boot-spl.lds | 2 +- arch/arm/dts/Makefile | 6 +- arch/arm/dts/rk3288-firefly.dts | 82 ++ arch/arm/dts/rk3288-firefly.dtsi | 496 +++++++ arch/arm/dts/rk3288-thermal.dtsi | 90 ++ arch/arm/dts/rk3288.dtsi | 1480 ++++++++++++++++++++ arch/arm/include/asm/arch-rockchip/clock.h | 12 + arch/arm/include/asm/arch-rockchip/gpio.h | 5 + arch/arm/include/asm/arch-rockchip/grf.h | 181 +++ arch/arm/mach-rockchip/Kconfig | 44 + arch/arm/mach-rockchip/Makefile | 12 + arch/arm/mach-rockchip/board-spl.c | 54 + arch/arm/mach-rockchip/board.c | 17 + arch/arm/mach-rockchip/common.c | 11 + arch/arm/mach-rockchip/rk3288/Kconfig | 16 + arch/arm/mach-tegra/Kconfig | 3 + arch/sandbox/cpu/cpu.c | 41 + arch/sandbox/include/asm/u-boot-sandbox.h | 8 + board/firefly/firefly-rk3288/Kconfig | 15 + board/firefly/firefly-rk3288/MAINTAINERS | 6 + board/firefly/firefly-rk3288/Makefile | 7 + board/firefly/firefly-rk3288/firefly-rk3288.c | 7 + common/board_f.c | 84 +- common/dlmalloc.c | 11 + common/image.c | 55 +- common/spl/spl.c | 22 +- configs/Linksprite_pcDuino3_fdt_defconfig | 1 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/arches_defconfig | 1 + configs/canyonlands_defconfig | 1 + configs/firefly-rk3288_defconfig | 11 + configs/galileo_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_zc70x_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + doc/README.rockchip | 83 ++ .../clock/rockchip,rk3288-cru.txt | 61 + doc/device-tree-bindings/clock/rockchip.txt | 77 + .../pinctrl/rockchip,pinctrl.txt | 157 +++ .../thermal/rockchip-thermal.txt | 68 + drivers/core/Kconfig | 9 + drivers/core/Makefile | 2 + drivers/core/device.c | 54 +- drivers/core/root.c | 14 +- drivers/core/uclass.c | 4 + drivers/serial/Kconfig | 19 + drivers/serial/Makefile | 1 + drivers/serial/ns16550.c | 44 +- drivers/serial/serial-uclass.c | 69 +- drivers/serial/serial_rockchip.c | 41 + dts/Kconfig | 11 +- dts/Makefile | 9 +- include/config_uncmd_spl.h | 3 + include/configs/firefly-rk3288.h | 50 + include/dm/uclass-internal.h | 8 + include/dt-bindings/clock/rk3288-cru.h | 378 +++++ include/dt-bindings/clock/rockchip,rk808.h | 11 + include/dt-bindings/pinctrl/rockchip.h | 34 + include/dt-bindings/power-domain/rk3288.h | 11 + include/dt-bindings/thermal/thermal.h | 17 + include/fdtdec.h | 16 + include/image.h | 12 + include/malloc.h | 3 + include/vsprintf.h | 23 + lib/Makefile | 6 + lib/fdtdec.c | 39 +- lib/vsprintf.c | 23 +- scripts/Makefile.lib | 12 +- scripts/Makefile.spl | 35 + scripts/Makefile.uncmd_spl | 2 + tools/Makefile | 1 + tools/mkimage.c | 59 +- tools/rkimage.c | 63 + 88 files changed, 4136 insertions(+), 212 deletions(-) create mode 100644 arch/arm/dts/rk3288-firefly.dts create mode 100644 arch/arm/dts/rk3288-firefly.dtsi create mode 100644 arch/arm/dts/rk3288-thermal.dtsi create mode 100644 arch/arm/dts/rk3288.dtsi create mode 100644 arch/arm/include/asm/arch-rockchip/clock.h create mode 100644 arch/arm/include/asm/arch-rockchip/gpio.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf.h create mode 100644 arch/arm/mach-rockchip/Kconfig create mode 100644 arch/arm/mach-rockchip/Makefile create mode 100644 arch/arm/mach-rockchip/board-spl.c create mode 100644 arch/arm/mach-rockchip/board.c create mode 100644 arch/arm/mach-rockchip/common.c create mode 100644 arch/arm/mach-rockchip/rk3288/Kconfig create mode 100644 board/firefly/firefly-rk3288/Kconfig create mode 100644 board/firefly/firefly-rk3288/MAINTAINERS create mode 100644 board/firefly/firefly-rk3288/Makefile create mode 100644 board/firefly/firefly-rk3288/firefly-rk3288.c create mode 100644 configs/firefly-rk3288_defconfig create mode 100644 doc/README.rockchip create mode 100644 doc/device-tree-bindings/clock/rockchip,rk3288-cru.txt create mode 100644 doc/device-tree-bindings/clock/rockchip.txt create mode 100644 doc/device-tree-bindings/pinctrl/rockchip,pinctrl.txt create mode 100644 doc/device-tree-bindings/thermal/rockchip-thermal.txt create mode 100644 drivers/serial/serial_rockchip.c create mode 100644 include/configs/firefly-rk3288.h create mode 100644 include/dt-bindings/clock/rk3288-cru.h create mode 100644 include/dt-bindings/clock/rockchip,rk808.h create mode 100644 include/dt-bindings/pinctrl/rockchip.h create mode 100644 include/dt-bindings/power-domain/rk3288.h create mode 100644 include/dt-bindings/thermal/thermal.h create mode 100644 tools/rkimage.c -- 2.2.0.rc0.207.ga3a616c

3 35

[U-Boot] [PATCH v3 0/7] Add support for Colibri Vybrid Modules
by Sanchayan Maity 27 Apr '15

27 Apr '15

Hello, This is the third version of the patchset which adds support for the Toradex Colibri Vybrid VF50 and VF61 modules. Boot up has been tested using the serial loader over UART. Compile tested for vf610twr_defconfig and vf610twr_nand_defconfig as well. First patch in the series refactors the DDR related code for use by both the tower board and colibri modules. It also introduces a DDR3 based JEDEC timing structure. Second third and fourth patch in this series are improvement patches related to RTC, SoC/CPU detection and caches. Fifth patch introduces USB support for Vybrid modules. Much of the code is similar to the ehci-mx6 driver. Both host and client modes are working and DFU has also been tested with client. Currently, we restrict the ports to be in one of host and client mode. Sixth patch adds the actual support for the Colibri modules. Comments and feedback are most welcome. Thanks for the feedback till now. The patchset is based and tested on the latest master branch as of this writing. Discussion on the version 2 of the patchset can be found at the below link: https://www.mail-archive.com/u-boot@lists.denx.de/msg168727.html Discussion on the version 1 of the patchset can be found at the below link: https://www.mail-archive.com/u-boot@lists.denx.de/msg168136.html Changes since v2: - Rework the USB driver to use register + offset method in light of discussion which Fabio Estevam pointed out instead of the regular struct{} method which v2 used. The discussion is at the below link: https://www.marc.info/?l=u-boot&m=142609602127309&w=2 - Reorder the patchset, putting the USB support in the end and add an additional patch for adding USB support to Colibri modules. By chance if more discussions happen on the USB support, this allows picking up of atleast the first patches on which no issues have been reported so far. - The register definitions have been moved under arch/arm/include/asm/ imx-common in the regs-usbphy.h file. This was agreed on after discussion with Marek and some input from Peter Chen. Since it is not clear if SoC's other than Freescale's use the Sigmatel Phy's which seem to be use in iMX/VF/MXS, put the USH PHY register definitions in imx-common rather than include/usb in a chipidea specific file. - Remove setting of a PLL divisor select which was added for USB but is actually not required considering default value. It also seems to break USB after my latest rebase. The file in question concerning the change is colibri_vf.c. PLL divisor selects the PLL Multiplication factor which by default is 0, setting Fout = Fref * 20 giving 480MHz. The earlier patch set this to 1 giving Fout = Fref * 22 where Fref = 24MHz. - Rebased on the latest master branch. Changes since v1: - Rework the USB driver to use register offsets using the regular struct {} method - Some cleanups and fixes in the sixth patch for the colibri_vf.h file which takes care of environment variables in uboot - Purge some useless defines in the fifth and sixth patch which were related to USB. - Sanchayan. Sanchayan Maity (5): ARM: vf610: Move DDR3 initialization to imx-common ARM: vf610: Add SoC and CPU type detection ARM: vf610: Initial integration for Colibri VF50/VF61 usb: host: Add ehci-vf USB driver for ARM Vybrid SoC's colibri_vf: Enable USB support for Colibri Vybrid Stefan Agner (2): ARM: vf610: Enable external 32KHz oscillator ARM: vf610: Enable caches arch/arm/Kconfig | 5 + arch/arm/cpu/armv7/vf610/generic.c | 45 ++- arch/arm/imx-common/Makefile | 3 + arch/arm/imx-common/ddrmc-vf610.c | 278 +++++++++++++++++++ arch/arm/include/asm/arch-vf610/crm_regs.h | 11 + arch/arm/include/asm/arch-vf610/ddrmc-vf610.h | 72 +++++ arch/arm/include/asm/arch-vf610/imx-regs.h | 36 ++- arch/arm/include/asm/imx-common/regs-usbphy.h | 26 ++ board/freescale/vf610twr/vf610twr.c | 295 +++++--------------- board/toradex/colibri_vf/Kconfig | 18 ++ board/toradex/colibri_vf/MAINTAINERS | 6 + board/toradex/colibri_vf/Makefile | 7 + board/toradex/colibri_vf/colibri_vf.c | 382 ++++++++++++++++++++++++++ board/toradex/colibri_vf/imximage.cfg | 17 ++ configs/colibri_vf_defconfig | 3 + drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-vf.c | 164 +++++++++++ include/configs/colibri_vf.h | 271 ++++++++++++++++++ 18 files changed, 1405 insertions(+), 235 deletions(-) create mode 100644 arch/arm/imx-common/ddrmc-vf610.c create mode 100644 arch/arm/include/asm/arch-vf610/ddrmc-vf610.h create mode 100644 arch/arm/include/asm/imx-common/regs-usbphy.h create mode 100644 board/toradex/colibri_vf/Kconfig create mode 100644 board/toradex/colibri_vf/MAINTAINERS create mode 100644 board/toradex/colibri_vf/Makefile create mode 100644 board/toradex/colibri_vf/colibri_vf.c create mode 100644 board/toradex/colibri_vf/imximage.cfg create mode 100644 configs/colibri_vf_defconfig create mode 100644 drivers/usb/host/ehci-vf.c create mode 100644 include/configs/colibri_vf.h -- 2.3.5

7 28

[U-Boot] [PATCH] sandbox: Don't try distro_bootcmd by default
by Sjoerd Simons 27 Apr '15

27 Apr '15

For the distro_bootcmds to succeed on the sandbox a bit of setup is required (e.g. network configured or host image bound), so running them by default isn't that useful. Add a -b/--boot command to the sandbox binary, which triggers the distro_bootcmds to run after the other command-line commands. Signed-off-by: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> --- Patch is against the u-boot-x86/sandbox branch arch/sandbox/cpu/start.c | 20 +++++++++++++++++--- arch/sandbox/include/asm/state.h | 1 + include/configs/sandbox.h | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index ec01040..ed2c569 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -77,12 +77,18 @@ int sandbox_main_loop_init(void) struct sandbox_state *state = state_get_current(); /* Execute command if required */ - if (state->cmd) { - int retval; + if (state->cmd || state->boot) { + int retval = 0; cli_init(); - retval = run_command_list(state->cmd, -1, 0); + if (state->cmd) + retval = run_command_list(state->cmd, -1, 0); + + if (state->boot) + retval = cli_simple_run_command("run distro_bootcmd", + 0); + if (!state->interactive) os_exit(retval); } @@ -90,6 +96,14 @@ int sandbox_main_loop_init(void) return 0; } +static int sandbox_cmdline_cb_boot(struct sandbox_state *state, + const char *arg) +{ + state->boot = true; + return 0; +} +SANDBOX_CMDLINE_OPT_SHORT(boot, 'b', 0, "Run distro boot commands"); + static int sandbox_cmdline_cb_command(struct sandbox_state *state, const char *arg) { diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h index a0c24ba..02d9f0f 100644 --- a/arch/sandbox/include/asm/state.h +++ b/arch/sandbox/include/asm/state.h @@ -42,6 +42,7 @@ struct sandbox_spi_info { struct sandbox_state { const char *cmd; /* Command to execute */ bool interactive; /* Enable cmdline after execute */ + bool boot; /* Automatically run distro bootcommands */ const char *fdt_fname; /* Filename of FDT binary */ const char *parse_err; /* Error to report from parsing */ int argc; /* Program arguments */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 9394dd3..9d67afc 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -127,6 +127,8 @@ func(HOST, host, 1) \ func(HOST, host, 0) +#define CONFIG_BOOTCOMMAND "" + #include <config_distro_bootcmd.h> #define CONFIG_KEEP_SERVERADDR -- 2.1.4

2 1

[U-Boot] [PATCH] use CONFIG_CMD_HOST to enable the host command
by Sjoerd Simons 27 Apr '15

27 Apr '15

Rather then building the host command depending on the configured board (CONFIG_SANDBOX being defined), use the more common way of enabling it via the board configuration. Fixes building of the env target for sandbox as config_distro_bootcmd failed to sanity check the configuration but couldn't find the pre-conditions for the host command previously. Signed-off-by: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> --- Patch is against the u-boot-x86/sandbox branch common/Makefile | 2 +- include/config_distro_bootcmd.h | 6 +++--- include/configs/sandbox.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/Makefile b/common/Makefile index 978c33b..40a3ec7 100644 --- a/common/Makefile +++ b/common/Makefile @@ -152,7 +152,7 @@ obj-$(CONFIG_CMD_PXE) += cmd_pxe.o obj-$(CONFIG_CMD_READ) += cmd_read.o obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o obj-$(CONFIG_CMD_REISER) += cmd_reiser.o -obj-$(CONFIG_SANDBOX) += cmd_host.o +obj-$(CONFIG_CMD_HOST) += cmd_host.o obj-$(CONFIG_CMD_SATA) += cmd_sata.o obj-$(CONFIG_CMD_SF) += cmd_sf.o obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 3a360ca4..26ef4ca 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -48,16 +48,16 @@ #define BOOTENV_DEV_NAME_BLKDEV(devtypeu, devtypel, instance) \ #devtypel #instance " " -#ifdef CONFIG_SANDBOX +#ifdef CONFIG_CMD_HOST #define BOOTENV_SHARED_HOST BOOTENV_SHARED_BLKDEV(host) #define BOOTENV_DEV_HOST BOOTENV_DEV_BLKDEV #define BOOTENV_DEV_NAME_HOST BOOTENV_DEV_NAME_BLKDEV #else #define BOOTENV_SHARED_HOST #define BOOTENV_DEV_HOST \ - BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX + BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_CMD_HOST #define BOOTENV_DEV_NAME_HOST \ - BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX + BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_CMD_HOST #endif #ifdef CONFIG_CMD_MMC diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 3bf45a2..9394dd3 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -26,6 +26,8 @@ /* Number of bits in a C 'long' on this architecture */ #define CONFIG_SANDBOX_BITS_PER_LONG 64 +#define CONFIG_CMD_HOST + #define CONFIG_OF_LIBFDT #define CONFIG_LMB #define CONFIG_CMD_FDT -- 2.1.4

2 1

Re: [U-Boot] [PATCH] stm32f4: fix serial output
by Kamil Lulko 27 Apr '15

27 Apr '15

2015-04-24 21:27 GMT+02:00 kunhuahuang <huangkunhua(a)gmail.com>: > This patch fix the serial output. > The source is from Kamil Lulko's "stm32f429-discovery board support" > > Signed-off-by: kunhuahuang <huangkunhua(a)gmail.com> > --- > drivers/serial/serial_stm32.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c > index 3c80096..693a7fa 100644 > --- a/drivers/serial/serial_stm32.c > +++ b/drivers/serial/serial_stm32.c > @@ -81,6 +81,10 @@ static int stm32_serial_getc(void) > static void stm32_serial_putc(const char c) > { > struct stm32_serial *usart = (struct stm32_serial *)USART_BASE; > + > + if(c == '\n') > + stm32_serial_putc('\r'); > + > while ((readl(&usart->sr) & USART_SR_FLAG_TXE) == 0) > ; > writel(c, &usart->dr); > -- > 1.9.1 > > Please fix checkpatch.pl error: ERROR: space required before the open parenthesis '(' #26: FILE: drivers/serial/serial_stm32.c:85: + if(c == '\n') total: 1 errors, 0 warnings, 0 checks, 10 lines checked Other than that looks good!

1 0

[U-Boot] socfpga: socdk and socrates share SPI flash config, move it to shared place
by Pavel Machek 27 Apr '15

27 Apr '15

Both Socrates and SocDK share same QSPI and SPI flash configuration. Move the common configuration into common place. Signed-off-by: Pavel Machek <pavel(a)denx.de> diff --git a/arch/arm/dts/socfpga_cyclone5.dtsi b/arch/arm/dts/socfpga_cyclone5.dtsi index 234a901..c40ade5 100644 --- a/arch/arm/dts/socfpga_cyclone5.dtsi +++ b/arch/arm/dts/socfpga_cyclone5.dtsi @@ -37,4 +37,30 @@ cpu1-start-addr = <0xffd080c4>; }; }; + + aliases { + spi0 = "/spi@ff705000"; /* QSPI */ + spi1 = "/spi@fff00000"; + spi2 = "/spi@fff01000"; + }; +}; + +&qspi { + status = "okay"; + + flash0: n25q00@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "n25q00"; + reg = <0>; /* chip select */ + spi-max-frequency = <50000000>; + m25p,fast-read; + page-size = <256>; + block-size = <16>; /* 2^16, 64KB */ + read-delay = <4>; /* delay value in read data capture register */ + tshsl-ns = <50>; + tsd2d-ns = <50>; + tchsh-ns = <4>; + tslch-ns = <4>; + }; }; diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts index ea30483..2a64b3c 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts @@ -14,12 +14,6 @@ bootargs = "console=ttyS0,115200"; }; - aliases { - spi0 = "/spi@ff705000"; /* QSPI */ - spi1 = "/spi@fff00000"; - spi2 = "/spi@fff01000"; - }; - memory { name = "memory"; device_type = "memory"; @@ -44,22 +38,3 @@ status = "okay"; }; -&qspi { - status = "okay"; - - flash0: n25q00@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "n25q00"; - reg = <0>; /* chip select */ - spi-max-frequency = <50000000>; - m25p,fast-read; - page-size = <256>; - block-size = <16>; /* 2^16, 64KB */ - read-delay = <4>; /* delay value in read data capture register */ - tshsl-ns = <50>; - tsd2d-ns = <50>; - tchsh-ns = <4>; - tslch-ns = <4>; - }; -}; -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

3 10