November 2016 - U-Boot

[U-Boot] [PATCH v5 0/7] toradex: config block handling
by Marcel Ziswiler 29 Nov '16

29 Nov '16

This series integrates Toradex factory configuration block handling. The config block is a data structure which gets stored to flash during production testing. The structure holds such information as board resp. hardware revision, product ID and serial number which is used as the NIC part of the Ethernet MAC address as well. The config block will be read upon boot by the show_board_info() function, displayed as part of the board information and passed to Linux via device tree or ATAGs. Changes in v5: - get rid of choice for config block location as it causes issues due to Kconfig multi sourcing (which BTW is not my invention as I simply copied TI's way of doing that for their common stuff) and anyway does not make much sense Changes in v4: - add various peoples acked- resp. reviewed-bys with which it now hopefully could be pulled in ASAP Changes in v3: - introduce new patch dropping unused CONFIG_CUSTOM_BOARDINFO by reverting commit a9ad18c9d5fe2554753b0f9a52adfd5ebce61147 - introduce new patch making show_board_info() a weak function which allows for custom board specific implementations thereof - fixup deactivation of CONFIG_DISPLAY_BOARDINFO in favour of CONFIG_DISPLAY_BOARDINFO_LATE which also displays on the LCD after recent move thereof to Kconfig - use custom show_board_info() rather than checkboard() and checkboard() rather than checkboard_fallback() - also reword commit message accordingly - use checkboard() rather than checkboard_fallback() - drop CUSTOM_BOARDINFO - drop patch 1 'colibri_imx7/vf: move to custom checkboard_fallback()' in favour of Stefan's proposed solution Changes in v2: - fixed common.h include mess in board/toradex/common by renaming common* to tdx-common - renamed TRDX to TDX and trdx to tdx as in common use internally - consolidated makefiles and changed copyright message - renamed configblock* to tdx-cfg-block* analogous to Kconfig symbols - moved board/toradex/common/Kconfig sourcing from arch/arm/Kconfig into our own board Kconfig files - use a named choice for the config block location for above to work without issuing any warnings (undocumented kbuild feature curtsey Arnaud Lacombe) - added CUSTOM_BOARDINFO into our common Kconfig to avoid recent no_new_adhoc_configs_check error - add Max' patch colibri_vf: usb gadget: toradex pid is now set generically Marcel Ziswiler (6): Revert "generic-board: allow showing custom board info" generic-board: make show_board_info a weak function apalis/colibri_t20/t30: deactivate displaying board info toradex: config block handling apalis/colibri_imx7/pxa270/t20/t30/vf: integrate config block handling apalis/colibri_t30: move environment location Max Krummenacher (1): colibri_vf: usb gadget: toradex pid is now set generically board/toradex/apalis_t30/Kconfig | 18 + board/toradex/apalis_t30/apalis_t30.c | 12 +- board/toradex/colibri_imx7/Kconfig | 16 + board/toradex/colibri_pxa270/Kconfig | 11 + board/toradex/colibri_pxa270/colibri_pxa270.c | 8 + board/toradex/colibri_t20/Kconfig | 11 + board/toradex/colibri_t20/colibri_t20.c | 13 + board/toradex/colibri_t30/Kconfig | 18 + board/toradex/colibri_t30/colibri_t30.c | 9 +- board/toradex/colibri_vf/Kconfig | 14 + board/toradex/colibri_vf/colibri_vf.c | 16 - board/toradex/common/Kconfig | 69 ++++ board/toradex/common/Makefile | 11 + board/toradex/common/tdx-cfg-block.c | 544 ++++++++++++++++++++++++++ board/toradex/common/tdx-cfg-block.h | 68 ++++ board/toradex/common/tdx-common.c | 168 ++++++++ board/toradex/common/tdx-common.h | 13 + common/board_info.c | 4 +- configs/apalis_t30_defconfig | 1 + configs/colibri_t20_defconfig | 1 + configs/colibri_t30_defconfig | 1 + configs/colibri_vf_defconfig | 1 + include/configs/apalis_t30.h | 11 +- include/configs/colibri_imx7.h | 6 +- include/configs/colibri_pxa270.h | 6 +- include/configs/colibri_t20.h | 2 +- include/configs/colibri_t30.h | 11 +- include/configs/colibri_vf.h | 13 +- scripts/config_whitelist.txt | 5 - 29 files changed, 1034 insertions(+), 47 deletions(-) create mode 100644 board/toradex/common/Kconfig create mode 100644 board/toradex/common/Makefile create mode 100644 board/toradex/common/tdx-cfg-block.c create mode 100644 board/toradex/common/tdx-cfg-block.h create mode 100644 board/toradex/common/tdx-common.c create mode 100644 board/toradex/common/tdx-common.h -- 2.5.5

2 14

[U-Boot] [PATCH] spl: remove redundant call to parse_image_header()
by Tomas Melin 29 Nov '16

29 Nov '16

Image header was checked twice. Signed-off-by: Tomas Melin <tomas.melin(a)vaisala.com> --- common/spl/spl_ymodem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index 13e8e51..957894d 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -109,7 +109,6 @@ static int spl_ymodem_load_image(struct spl_image_info *spl_image, while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0) size += res; } else { - spl_parse_image_header(spl_image, (struct image_header *)buf); ret = spl_parse_image_header(spl_image, (struct image_header *)buf); if (ret) -- 2.1.4

4 3

[U-Boot] [PATCH] spl: add check for FIT-header when loading image
by Tomas Melin 29 Nov '16

29 Nov '16

Add check for FDT_MAGIC, otherwise also legacy images will be loaded as a FIT. With this check in place, the loader works correct both with legacy and FIT images. Signed-off-by: Tomas Melin <tomas.melin(a)vaisala.com> --- common/spl/spl_spi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index a3caafb..78b8cd1 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -99,7 +99,8 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, if (err) return err; - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT)) { + if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && + image_get_magic(header) == FDT_MAGIC) { struct spl_load_info load; debug("Found FIT\n"); -- 2.1.4

4 3

[U-Boot] Pull request v3: u-boot-spi/sunxi
by Jagan Teki 29 Nov '16

29 Nov '16

Hi Tom, Please pull this sunxi PR. Changes for v3: - Dropped patches from 'Chen-Yu Tsai' - Added two new patches. Changes for v2: - Dropped 3 patches, which are still in review. thanks! Jagan. The following changes since commit 136179bec19f4bc84227cba138214ea392a723ea: colibri_pxa270: transition to driver model for serial (2016-11-23 13:53:20 +0100) are available in the git repository at: git://git.denx.de/u-boot-spi.git sunxi for you to fetch changes up to 707932b3e6507e47bb6b08be669fd39f140933b8: sun8i_emac: Fix mdio read sequence (2016-11-28 13:27:47 +0530) ---------------------------------------------------------------- Boris Brezillon (1): mtd: nand: add support for the TC58NVG2S0H chip Emmanuel Vadot (1): sunxi: mmc: Set CONFIG_SYS_MMC_MAX_DEVICE FUKAUMI Naoki (1): sunxi: add support for Nintendo NES Classic Edition Hans de Goede (1): sunxi: Mele_M5_defconfig: Drop non existing STATUSLED setting Jelle van der Waa (1): sunxi: Use the available Kconfig option for AHCI Philipp Tomsich (1): sun8i_emac: Fix mdio read sequence Yann E. MORIN (1): arm: sunxi: do not force USB for arch-sunxi arch/arm/Kconfig | 10 ++-- arch/arm/dts/Makefile | 1 + .../dts/sun8i-r16-nintendo-nes-classic-edition.dts | 63 ++++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 ++ configs/A10-OLinuXino-Lime_defconfig | 3 +- configs/A20-OLinuXino-Lime2_defconfig | 3 +- configs/A20-OLinuXino-Lime_defconfig | 3 +- configs/A20-OLinuXino_MICRO_defconfig | 3 +- configs/A20-Olimex-SOM-EVB_defconfig | 3 +- configs/Bananapi_defconfig | 3 +- configs/Bananapro_defconfig | 3 +- configs/Cubieboard2_defconfig | 3 +- configs/Cubieboard_defconfig | 3 +- configs/Cubietruck_defconfig | 3 +- configs/Itead_Ibox_A20_defconfig | 3 +- configs/Lamobo_R1_defconfig | 3 +- configs/Linksprite_pcDuino3_Nano_defconfig | 3 +- configs/Linksprite_pcDuino3_defconfig | 3 +- configs/Marsboard_A10_defconfig | 3 +- configs/Mele_A1000_defconfig | 3 +- configs/Mele_M5_defconfig | 3 +- configs/Nintendo_NES_Classic_Edition_defconfig | 24 +++++++++ configs/Orangepi_defconfig | 3 +- configs/Orangepi_mini_defconfig | 3 +- configs/Wits_Pro_A20_DKT_defconfig | 3 +- drivers/mtd/nand/nand_ids.c | 3 ++ drivers/net/sun8i_emac.c | 2 +- include/configs/sunxi-common.h | 1 + scripts/config_whitelist.txt | 1 - 29 files changed, 143 insertions(+), 27 deletions(-) create mode 100644 arch/arm/dts/sun8i-r16-nintendo-nes-classic-edition.dts create mode 100644 configs/Nintendo_NES_Classic_Edition_defconfig

2 1

[U-Boot] [PATCH v2] timer: Support clocks via phandle
by Vlad Zakharov 29 Nov '16

29 Nov '16

Earlier timer driver needed a clock-frequency property in compatible device-tree nodes. Another way is to reference a clock via a phandle. So now timer_pre_probe tries to get clock by reference through device tree. In case it is impossible to get clock device through the reference, clock-frequency property of the timer node is read to provide backward compatibility. Signed-off-by: Vlad Zakharov <vzakhar(a)synopsys.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes v1..v2: - Use temporary variable when getting clock rate drivers/timer/timer-uclass.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index f8ddf93..a891a58 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -8,6 +8,7 @@ #include <dm.h> #include <dm/lists.h> #include <dm/device-internal.h> +#include <clk.h> #include <errno.h> #include <timer.h> @@ -42,9 +43,19 @@ unsigned long notrace timer_get_rate(struct udevice *dev) static int timer_pre_probe(struct udevice *dev) { struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); - - uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset, - "clock-frequency", 0); + struct clk *timer_clk; + int err; + ulong ret; + + err = clk_get_by_index(dev, 0, timer_clk); + if (!err) { + ret = clk_get_rate(timer_clk); + if (IS_ERR_VALUE(ret)) + return ret; + uc_priv->clock_rate = ret; + } else + uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, + dev->of_offset, "clock-frequency", 0); return 0; } -- 2.7.4

2 4

[U-Boot] [PATCH 0/8] spl: Move image loader names into the linker list
by Simon Glass 28 Nov '16

28 Nov '16

At present we have a linker list for all the image-loader methods but announce_boot_device() uses its own switch() statement with the names of each method. We may as well combine the name into the linker list. The names are only needed if libcommon support is enabled, since printf() is used to display then. This series performs this adjustment, by adding the names and then converting the generic SPL code over to use them. This allows the board-specific spl_board_announce_boot_device() functions to be dropped as well. Simon Glass (8): spl: Use a single underscore in the SPL_LOAD_IMAGE_METHOD() macro spl: Add a name to the SPL load-image methods spl: Move the loading code into its own function spl: Pass the loader into spl_load_image() spl: Drop announce_boot_device() spl: sunxi: Drop spl_board_announce_boot_device() spl: uniphier: Drop spl_board_announce_boot_device() spl: sandbox: Drop spl_board_announce_boot_device() arch/arm/mach-sunxi/board.c | 11 +-- arch/arm/mach-uniphier/boot-mode/spl_board.c | 7 +- arch/sandbox/cpu/spl.c | 19 +--- common/spl/spl.c | 125 ++++++--------------------- common/spl/spl_mmc.c | 6 +- common/spl/spl_nand.c | 2 +- common/spl/spl_net.c | 5 +- common/spl/spl_nor.c | 2 +- common/spl/spl_onenand.c | 3 +- common/spl/spl_sata.c | 2 +- common/spl/spl_spi.c | 2 +- common/spl/spl_ubi.c | 4 +- common/spl/spl_usb.c | 2 +- common/spl/spl_ymodem.c | 2 +- drivers/mtd/spi/sunxi_spi_spl.c | 2 +- include/spl.h | 27 ++++-- 16 files changed, 70 insertions(+), 151 deletions(-) -- 2.8.0.rc3.226.g39d4020

3 11

[U-Boot] Macronix NOR_SPI and Quad I/O
by Champ, Andy 28 Nov '16

28 Nov '16

Hi all, in the table in drivers/mtd/spi/spi_flash_ids.c there is a flag WR_QPP set against Macronix devices (including the ones Dumitru is just adding). This is used when programming the devices on a 4-bit bus to select the command to use for programming - either CMD_QUAD_PAGE_PROGRAM (0x32) or CMD_PAGE_PROGRAM (0x2). The Macronix devices that I have a spec for do not mention command 0x32. Each of the devices that I have a spec for ( MX25L25635F MX25U51245G MX25V8035F and MX25V1635F ) use command 0x38 instead. This would suggest to me that devices that support quad I/O, and have Macronix NOR-SPI, won't be able to program them. Am I missing something, or is this a problem? I'm not able to check because we don't use Quad I/O. Regards Andy Champ Amazon Lab126 Cambridge, UK.

4 7

[U-Boot] [PATCH v2 0/4] davinci: omapl138_lcdk: fix a few bugs for SPL boot
by Fabien Parent 28 Nov '16

28 Nov '16

This patchset tries to fix the SPL on omapl138_lcdk. With this patchset, the SPL will be able to boot from EMMC/SPI. The NAND support is still broken so the default u-boot.ais image still has a SPL that is unable to load u-boot. Change v1 .. v2: * Don't add an AIS config file but instead configure the PLL and DDR in the SPL. This follow what other boards are doing. * Use new kconfig option to support EMMC boot.

2 9

[U-Boot] [PATCH] usb: xhci: Limit transfer length in a single TD
by Dongwoo Lee 28 Nov '16

28 Nov '16

The transfer request exceeding 4032KB (the maximum number of TRBs per TD * the maximum size of transfer buffer on TRB) fails on xhci host with timed out error or babble error state. This failure occurs when accessing large files on USB mass-storage. Currently with xhci as well as ehci host, the driver requests maximum 30MB (65536 blks * 512 byte) to storage at once. However, xhci cannot handle this request because of the reason mentioned above, even though ehci can handle this. Thus, transfer request larger than this size should be splitted in order to limit the length of data in a single TD. Even though the single request is splitted into multiple requests, the transfer speed has affected insignificantly in comparison with ehci host: 22.6 MB/s on ehci and 22.3 MB/s on xhci for 100MB tranfer. Reported-by: Jaehoon Chung <jh80.chung(a)samsung.com> Signed-off-by: Dongwoo Lee <dwoo08.lee(a)samsung.com> --- drivers/usb/host/xhci.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 3201177..594026e 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -907,12 +907,40 @@ static int _xhci_submit_int_msg(struct usb_device *udev, unsigned long pipe, static int _xhci_submit_bulk_msg(struct usb_device *udev, unsigned long pipe, void *buffer, int length) { + int ret; + int xfer_max_per_td, xfer_length, buf_pos; + if (usb_pipetype(pipe) != PIPE_BULK) { printf("non-bulk pipe (type=%lu)", usb_pipetype(pipe)); return -EINVAL; } - return xhci_bulk_tx(udev, pipe, length, buffer); + /* + * When transfering data exceeding the maximum number of TRBs per + * TD (default 64) is requested, the transfer fails with babble + * error or time out. + * + * Thus, huge data transfer should be splitted into multiple TDs. + */ + xfer_max_per_td = TRB_MAX_BUFF_SIZE * (TRBS_PER_SEGMENT - 1); + + buf_pos = 0; + do { + if (length > xfer_max_per_td) + xfer_length = xfer_max_per_td; + else + xfer_length = length; + + ret = xhci_bulk_tx(udev, pipe, xfer_length, buffer + buf_pos); + if (ret < 0) + return ret; + + buf_pos += xfer_length; + length -= xfer_length; + + } while (length > 0); + + return ret; } /** -- 1.9.1

3 6

[U-Boot] [PATCH RESEND] imx-common: hab: fix return value from hab_auth_img
by Eric Nelson 28 Nov '16

28 Nov '16

The authenticate_image routine returns a boolean to indicate a valid (1) or invalid (0) image. The hab_auth_img should return CMD_RET_SUCCESS to indicate success (a valid image), but currently doesn't. Before this patch, a valid image at addres 0x12000000 with an IVT offset of 0x7a8000 will produce the following: => if hab_auth_img 0x12000000 0x7a8000 ; then > echo worked > else > echo failed > fi Authenticate image from DDR location 0x12000000... Secure boot enabled HAB Configuration: 0xcc, HAB State: 0x99 failed Signed-off-by: Eric Nelson <eric(a)nelint.com> --- arch/arm/imx-common/hab.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/imx-common/hab.c b/arch/arm/imx-common/hab.c index 6731825..e2c04f9 100644 --- a/arch/arm/imx-common/hab.c +++ b/arch/arm/imx-common/hab.c @@ -486,7 +486,9 @@ static int do_authenticate_image(cmd_tbl_t *cmdtp, int flag, int argc, rcode = authenticate_image(addr, ivt_offset); - return rcode; + return (rcode != 0) + ? CMD_RET_SUCCESS + : CMD_RET_FAILURE; } U_BOOT_CMD( -- 2.7.4

1 1