January 2018 - U-Boot

[U-Boot] [PATCH] arm: zynq: Mark cc108 uart to be initialized before relocation
by Michal Simek 17 Jan '18

17 Jan '18

The same change is done for others zynq boards to get uart as early as possible. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/dts/zynq-cc108.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts index a55e82b2102c..4804da5235dd 100644 --- a/arch/arm/dts/zynq-cc108.dts +++ b/arch/arm/dts/zynq-cc108.dts @@ -100,6 +100,7 @@ }; &uart0 { + u-boot,dm-pre-reloc; status = "okay"; }; -- 1.9.1

1 0

[U-Boot] [PATCH v2] mmc: sdhci-cadence: add HS200 support
by Masahiro Yamada 17 Jan '18

17 Jan '18

Add HS200 timing setting and the MMC tuning callback. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v2: - Surround .execute_tuning hook with #ifdef MMC_SUPPORTS_TUNING drivers/mmc/sdhci-cadence.c | 90 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c index 921095b..8960f6f 100644 --- a/drivers/mmc/sdhci-cadence.c +++ b/drivers/mmc/sdhci-cadence.c @@ -52,6 +52,13 @@ #define SDHCI_CDNS_PHY_DLY_HSMMC 0x0c #define SDHCI_CDNS_PHY_DLY_STROBE 0x0d +/* + * The tuned val register is 6 bit-wide, but not the whole of the range is + * available. The range 0-42 seems to be available (then 43 wraps around to 0) + * but I am not quite sure if it is official. Use only 0 to 39 for safety. + */ +#define SDHCI_CDNS_MAX_TUNING_LOOP 40 + struct sdhci_cdns_plat { struct mmc_config cfg; struct mmc mmc; @@ -135,20 +142,18 @@ static void sdhci_cdns_set_control_reg(struct sdhci_host *host) * The mode should be decided by MMC_TIMING_* like Linux, but * U-Boot does not support timing. Use the clock frequency instead. */ - if (clock <= 26000000) + if (clock <= 26000000) { mode = SDHCI_CDNS_HRS06_MODE_SD; /* use this for Legacy */ - else if (clock <= 52000000) { + } else if (clock <= 52000000) { if (mmc->ddr_mode) mode = SDHCI_CDNS_HRS06_MODE_MMC_DDR; else mode = SDHCI_CDNS_HRS06_MODE_MMC_SDR; } else { - /* - * REVISIT: - * The IP supports HS200/HS400, revisit once U-Boot support it - */ - printf("unsupported frequency %d\n", clock); - return; + if (mmc->ddr_mode) + mode = SDHCI_CDNS_HRS06_MODE_MMC_HS400; + else + mode = SDHCI_CDNS_HRS06_MODE_MMC_HS200; } tmp = readl(plat->hrs_addr + SDHCI_CDNS_HRS06); @@ -161,6 +166,69 @@ static const struct sdhci_ops sdhci_cdns_ops = { .set_control_reg = sdhci_cdns_set_control_reg, }; +static int sdhci_cdns_set_tune_val(struct sdhci_cdns_plat *plat, + unsigned int val) +{ + void __iomem *reg = plat->hrs_addr + SDHCI_CDNS_HRS06; + u32 tmp; + + if (WARN_ON(!FIELD_FIT(SDHCI_CDNS_HRS06_TUNE, val))) + return -EINVAL; + + tmp = readl(reg); + tmp &= ~SDHCI_CDNS_HRS06_TUNE; + tmp |= FIELD_PREP(SDHCI_CDNS_HRS06_TUNE, val); + tmp |= SDHCI_CDNS_HRS06_TUNE_UP; + writel(tmp, reg); + + return readl_poll_timeout(reg, tmp, !(tmp & SDHCI_CDNS_HRS06_TUNE_UP), + 1); +} + +static int __maybe_unused sdhci_cdns_execute_tuning(struct udevice *dev, + unsigned int opcode) +{ + struct sdhci_cdns_plat *plat = dev_get_platdata(dev); + struct mmc *mmc = &plat->mmc; + int cur_streak = 0; + int max_streak = 0; + int end_of_streak = 0; + int i; + + /* + * This handler only implements the eMMC tuning that is specific to + * this controller. The tuning for SD timing should be handled by the + * SDHCI core. + */ + if (!IS_MMC(mmc)) + return -ENOSYS; + + if (WARN_ON(opcode != MMC_CMD_SEND_TUNING_BLOCK_HS200)) + return -EINVAL; + + for (i = 0; i < SDHCI_CDNS_MAX_TUNING_LOOP; i++) { + if (sdhci_cdns_set_tune_val(plat, i) || + mmc_send_tuning(mmc, opcode, NULL)) { /* bad */ + cur_streak = 0; + } else { /* good */ + cur_streak++; + if (cur_streak > max_streak) { + max_streak = cur_streak; + end_of_streak = i; + } + } + } + + if (!max_streak) { + dev_err(dev, "no tuning point found\n"); + return -EIO; + } + + return sdhci_cdns_set_tune_val(plat, end_of_streak - max_streak / 2); +} + +static struct dm_mmc_ops sdhci_cdns_mmc_ops; + static int sdhci_cdns_bind(struct udevice *dev) { struct sdhci_cdns_plat *plat = dev_get_platdata(dev); @@ -189,6 +257,10 @@ static int sdhci_cdns_probe(struct udevice *dev) host->ioaddr = plat->hrs_addr + SDHCI_CDNS_SRS_BASE; host->ops = &sdhci_cdns_ops; host->quirks |= SDHCI_QUIRK_WAIT_SEND_CMD; + sdhci_cdns_mmc_ops = sdhci_ops; +#ifdef MMC_SUPPORTS_TUNING + sdhci_cdns_mmc_ops.execute_tuning = sdhci_cdns_execute_tuning; +#endif ret = mmc_of_parse(dev, &plat->cfg); if (ret) @@ -223,5 +295,5 @@ U_BOOT_DRIVER(sdhci_cdns) = { .probe = sdhci_cdns_probe, .priv_auto_alloc_size = sizeof(struct sdhci_host), .platdata_auto_alloc_size = sizeof(struct sdhci_cdns_plat), - .ops = &sdhci_ops, + .ops = &sdhci_cdns_mmc_ops, }; -- 2.7.4

2 2

[U-Boot] [PATCH 0/7] RPi: Properly handle dynamic serial configuration
by Alexander Graf 17 Jan '18

17 Jan '18

The RPi has proprietary firmware that can be configured (using config.txt) to expose either the PL11, Mini-UART or no serial device to the UART pins on the GPIO pin bar of the RPi. So far we've only half-heartedly dealt with that, with lost of heuristics that ended up falling apart at times. For example the RPi3 CM uses PL011 when serial is enabled in config.txt, but we disabled PL11 support for BCM2837 because the RPi3 uses the Mini-UART with enable_uart=1 is set in config.txt. This patch set always enables both serial outputs and determines at probe time whether a serial device is actually muxed to the UART pins on the board. Only in that case, it will be probed and thus used for in- and output in U-Boot. With this patch set applied, I have successfully used the same U-Boot binary with CONFIG_OF_BOARD=y and a RPi firmware provided device tree with both enable_uart=1 and without on both a RPi3 and RPi3 CM. Alexander Graf (7): serial: Use next serial device if probing fails serial: Allow boards to determine whether a serial device is usable rpi: Remove runtime disabling support for serial serial: bcm283x_mu: Remove support for post-init disabling rpi: Properly detect which serial device is active rpi: Determine PL011/Mini-UART availability at runtime rpi: Force skip_init on serial devices arch/arm/mach-bcm283x/include/mach/gpio.h | 1 - board/raspberrypi/rpi/rpi.c | 91 +++++++++++++++++++--------- drivers/gpio/bcm2835_gpio.c | 2 +- drivers/serial/serial-uclass.c | 34 +++++++++-- drivers/serial/serial_bcm283x_mu.c | 20 +----- drivers/serial/serial_pl01x.c | 2 +- include/configs/rpi.h | 5 +- include/dm/platform_data/serial_bcm283x_mu.h | 1 - include/serial.h | 11 ++++ 9 files changed, 108 insertions(+), 59 deletions(-) -- 2.12.3

2 9

[U-Boot] [PATCH 1/2] zynq: board: Remove checkboard()
by Ezequiel Garcia 17 Jan '18

17 Jan '18

Currently we are showing silicon version as board info, which should be part of the CPU info display. This commit removes the current checkboard implementation, and lets the generic show_board_info() show the DT 'model' property. CPU and silicon information will be added in a follow-up patch. Signed-off-by: Ezequiel Garcia <ezequiel(a)vanguardiasur.com.ar> --- board/xilinx/zynq/board.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index e59038106aa6..5785ad369fa0 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -109,22 +109,6 @@ int board_late_init(void) return 0; } -#ifdef CONFIG_DISPLAY_BOARDINFO -int checkboard(void) -{ - u32 version = zynq_get_silicon_version(); - - version <<= 1; - if (version > (PCW_SILICON_VERSION_3 << 1)) - version += 1; - - puts("Board: Xilinx Zynq\n"); - printf("Silicon: v%d.%d\n", version >> 1, version & 1); - - return 0; -} -#endif - int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) { #if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR) && \ -- 2.15.1

2 5

[U-Boot] [PATCH] arm: zynq: Update years in copyright to reflect latest changes
by Michal Simek 17 Jan '18

17 Jan '18

Updating year in zynq files. Also add missing Copyright to board.c. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/mach-zynq/ddrc.c | 2 +- arch/arm/mach-zynq/lowlevel_init.S | 2 +- arch/arm/mach-zynq/slcr.c | 2 +- arch/arm/mach-zynq/spl.c | 2 +- arch/arm/mach-zynq/timer.c | 2 +- board/xilinx/zynq/board.c | 1 + include/configs/zynq-common.h | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c index bde52d656203..047a7b4d9c2f 100644 --- a/arch/arm/mach-zynq/ddrc.c +++ b/arch/arm/mach-zynq/ddrc.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2012 - 2013 Michal Simek <monstr(a)monstr.eu> - * Copyright (C) 2012 - 2013 Xilinx, Inc. All rights reserved. + * Copyright (C) 2012 - 2017 Xilinx, Inc. All rights reserved. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/mach-zynq/lowlevel_init.S b/arch/arm/mach-zynq/lowlevel_init.S index 6d714b711cbe..e5ec9bea55cb 100644 --- a/arch/arm/mach-zynq/lowlevel_init.S +++ b/arch/arm/mach-zynq/lowlevel_init.S @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Xilinx, Inc. All rights reserved. + * Copyright (C) 2013 - 2015 Xilinx, Inc. All rights reserved. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index ba453a70248d..0b263fac589b 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Xilinx Inc. + * Copyright (c) 2013 - 2017 Xilinx Inc. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index 1672fa05c26a..b7e6d98f0858 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2014 Xilinx, Inc. Michal Simek + * (C) Copyright 2014 - 2017 Xilinx, Inc. Michal Simek * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c index b1bb3b80e1ce..493d608a5bb1 100644 --- a/arch/arm/mach-zynq/timer.c +++ b/arch/arm/mach-zynq/timer.c @@ -3,7 +3,7 @@ * Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> * * Copyright (C) 2012 Michal Simek <monstr(a)monstr.eu> - * Copyright (C) 2011-2012 Xilinx, Inc. All rights reserved. + * Copyright (C) 2011-2017 Xilinx, Inc. All rights reserved. * * (C) Copyright 2008 * Guennadi Liakhovetki, DENX Software Engineering, <lg(a)denx.de> diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index e59038106aa6..fb8eab07d768 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -1,5 +1,6 @@ /* * (C) Copyright 2012 Michal Simek <monstr(a)monstr.eu> + * (C) Copyright 2013 - 2018 Xilinx, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index f24aeda5c9fc..82690132732e 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2012 Michal Simek <monstr(a)monstr.eu> - * (C) Copyright 2013 Xilinx, Inc. + * (C) Copyright 2013 - 2018 Xilinx, Inc. * * Common configuration options for all Zynq boards. * -- 1.9.1

1 0

[U-Boot] [PATCH] i2c: imx: bus arbitration fix when reading block data
by Jim Brennan 17 Jan '18

17 Jan '18

From e643f91ccfa544b7e3153a7721fba66e0e494759 Mon Sep 17 00:00:00 2001 From: Jim Brennan <jbrennan(a)impinj.com> Date: Wed, 13 Dec 2017 13:44:02 -0800 Subject: [PATCH] i2c: imx: bus arbitration fix when reading block data Fixes arbitration failure on imx platform due to incorrect chip address use when reading a block of data. Add support for both reading or writing a block of data or any combination. Signed-off-by: Jim Brennan <jbrennan(a)impinj.com> --- drivers/i2c/mxc_i2c.c | 65 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 205274e947..bd2a39ebe6 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -25,6 +25,7 @@ #include <dm.h> #include <dm/pinctrl.h> #include <fdtdec.h> +#include <stdbool.h> DECLARE_GLOBAL_DATA_PTR; @@ -275,7 +276,7 @@ static void i2c_imx_stop(struct mxc_i2c_bus *i2c_bus) * write register address */ static int i2c_init_transfer_(struct mxc_i2c_bus *i2c_bus, u8 chip, - u32 addr, int alen) + u32 addr, int alen, bool read) { unsigned int temp; int ret; @@ -317,9 +318,17 @@ static int i2c_init_transfer_(struct mxc_i2c_bus *i2c_bus, u8 chip, temp |= I2CR_MTX | I2CR_TX_NO_AK; writeb(temp, base + (I2CR << reg_shift)); - if (alen >= 0) { - /* write slave address */ - ret = tx_byte(i2c_bus, chip << 1); + /* write slave address */ + u8 slave_address = (chip << 1); + + if (read) + slave_address |= 1; + ret = tx_byte(i2c_bus, slave_address); + if (ret < 0) + return ret; + + while (alen--) { + ret = tx_byte(i2c_bus, (addr >> (alen * 8)) & 0xff); if (ret < 0) return ret; @@ -413,7 +422,7 @@ exit: #endif static int i2c_init_transfer(struct mxc_i2c_bus *i2c_bus, u8 chip, - u32 addr, int alen) + u32 addr, int alen, bool read) { int retry; int ret; @@ -424,7 +433,7 @@ static int i2c_init_transfer(struct mxc_i2c_bus *i2c_bus, u8 chip, return -EINVAL; for (retry = 0; retry < 3; retry++) { - ret = i2c_init_transfer_(i2c_bus, chip, addr, alen); + ret = i2c_init_transfer_(i2c_bus, chip, addr, alen, read); if (ret >= 0) return 0; i2c_imx_stop(i2c_bus); @@ -536,7 +545,7 @@ static int bus_i2c_read(struct mxc_i2c_bus *i2c_bus, u8 chip, u32 addr, VF610_I2C_REGSHIFT : IMX_I2C_REGSHIFT; ulong base = i2c_bus->base; - ret = i2c_init_transfer(i2c_bus, chip, addr, alen); + ret = i2c_init_transfer(i2c_bus, chip, addr, alen, false); if (ret < 0) return ret; @@ -566,7 +575,7 @@ static int bus_i2c_write(struct mxc_i2c_bus *i2c_bus, u8 chip, u32 addr, { int ret = 0; - ret = i2c_init_transfer(i2c_bus, chip, addr, alen); + ret = i2c_init_transfer(i2c_bus, chip, addr, alen, false); if (ret < 0) return ret; @@ -817,7 +826,7 @@ static int mxc_i2c_probe_chip(struct udevice *bus, u32 chip_addr, int ret; struct mxc_i2c_bus *i2c_bus = dev_get_priv(bus); - ret = i2c_init_transfer(i2c_bus, chip_addr, 0, 0); + ret = i2c_init_transfer(i2c_bus, chip_addr, 0, 0, false); if (ret < 0) { debug("%s failed, ret = %d\n", __func__, ret); return ret; @@ -841,35 +850,43 @@ static int mxc_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) * because here we only want to send out chip address. The register * address is wrapped in msg. */ - ret = i2c_init_transfer(i2c_bus, msg->addr, 0, 0); + + bool read = (msg->flags & I2C_M_RD) ? true : false; + + ret = i2c_init_transfer(i2c_bus, msg->addr, 0, 0, read); if (ret < 0) { debug("i2c_init_transfer error: %d\n", ret); return ret; } for (; nmsgs > 0; nmsgs--, msg++) { + bool current_is_read = (msg->flags & I2C_M_RD) ? true : false; bool next_is_read = nmsgs > 1 && (msg[1].flags & I2C_M_RD); debug("i2c_xfer: chip=0x%x, len=0x%x\n", msg->addr, msg->len); - if (msg->flags & I2C_M_RD) + if (current_is_read) ret = i2c_read_data(i2c_bus, msg->addr, msg->buf, msg->len); else { ret = i2c_write_data(i2c_bus, msg->addr, msg->buf, msg->len); - if (ret) + } + if (ret) + break; + + if (nmsgs > 1 && (current_is_read ^ next_is_read)) { + u8 addr = msg->addr << 1; + + /* Reuse ret */ + ret = readb(base + (I2CR << reg_shift)); + ret |= I2CR_RSTA; + writeb(ret, base + (I2CR << reg_shift)); + + if (next_is_read) + addr |= 1; + + ret = tx_byte(i2c_bus, addr); + if (ret < 0) break; - if (next_is_read) { - /* Reuse ret */ - ret = readb(base + (I2CR << reg_shift)); - ret |= I2CR_RSTA; - writeb(ret, base + (I2CR << reg_shift)); - - ret = tx_byte(i2c_bus, (msg->addr << 1) | 1); - if (ret < 0) { - i2c_imx_stop(i2c_bus); - break; - } - } } } -- 2.13.6

4 6

[U-Boot] [PATCH 1/2] spl: atf: add SPL_ATF_NO_PLATFORM_PARAM option
by Philipp Tomsich 17 Jan '18

17 Jan '18

While we expect to call a pointer to a valid FDT (or NULL) as the platform parameter to an ATF, some ATF versions are not U-Boot aware and have an insufficiently robust (or an overzealour) parameter validation: either way, this may cause a hard-stop with uncooperative ATF versions. This change adds the option to suppress passing a platform parameter and will always pass NULL. Debug output from ATF w/ this option disabled (i.e. default): INFO: plat_param_from_bl2: 0x291450 Debug output from ATF w/ this option enabled: INFO: plat_param_from_bl2: 0 Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> Tested-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- common/spl/Kconfig | 18 ++++++++++++++++-- common/spl/spl_atf.c | 12 +++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index aef0034..9d35f41 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -721,10 +721,24 @@ config SPL_ATF bool "Support ARM Trusted Firmware" depends on ARM64 help - ATF(ARM Trusted Firmware) is a component for ARM arch64 which - is loaded by SPL(which is considered as BL2 in ATF terminology). + ATF(ARM Trusted Firmware) is a component for ARM AArch64 which + is loaded by SPL (which is considered as BL2 in ATF terminology). More detail at: https://github.com/ARM-software/arm-trusted-firmware +config SPL_ATF_NO_PLATFORM_PARAM + bool "Pass no platform parameter" + depends on SPL_ATF + help + While we expect to call a pointer to a valid FDT (or NULL) + as the platform parameter to an ATF, some ATF versions are + not U-Boot aware and have an insufficiently robust parameter + validation to gracefully reject a FDT being passed. + + If this option is enabled, the spl_atf os-type handler will + always pass NULL for the platform parameter. + + If your ATF is affected, say Y. + config TPL bool depends on SUPPORT_TPL diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 63557c0..a942de9 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -144,6 +144,7 @@ void spl_invoke_atf(struct spl_image_info *spl_image) { uintptr_t bl33_entry = CONFIG_SYS_TEXT_BASE; void *blob = spl_image->fdt_addr; + uintptr_t platform_param = (uintptr_t)blob; int node; /* @@ -158,8 +159,17 @@ void spl_invoke_atf(struct spl_image_info *spl_image) bl33_entry = spl_fit_images_get_entry(blob, node); /* + * If ATF_NO_PLATFORM_PARAM is set, we override the platform + * parameter and always pass 0. This is a workaround for + * older ATF versions that have insufficiently robust (or + * overzealous) argument validation. + */ + if (CONFIG_IS_ENABLED(ATF_NO_PLATFORM_PARAM)) + platform_param = 0; + + /* * We don't provide a BL3-2 entry yet, but this will be possible * using similar logic. */ - bl31_entry(spl_image->entry_point, bl33_entry, (uintptr_t)blob); + bl31_entry(spl_image->entry_point, bl33_entry, platform_param); } -- 2.1.4

4 9

[U-Boot] Please pull u-boot-dm
by Simon Glass 17 Jan '18

17 Jan '18

Hi Tom, Here are the patches left over from last time, along with the two to fix the 'old dtc' problem you identified. Let me know if there are any problems. I'm still a bit conflicted about the move from fdt@1, kernel@1 to fdt-1 and kernel-1 in the FIT format. I've been thinking whether we should just disable the DT warning. But I gather that everyone else is happy about it, so I suppose we should go ahead. The following changes since commit 8e9801c283c0e5a7ccd5c04f5ba09003d01f1591: Merge git://git.denx.de/u-boot-imx (2018-01-15 16:44:18 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to ed772fe79bf4419320e997de94b3f93dbbe0838a: test: Set the DTC environment variable (2018-01-15 18:29:21 -0700) ---------------------------------------------------------------- Andre Przywara (7): doc: FIT image: fix incorrect description of DT node unit address doc: FIT image: fix incorrect examples of DT node unit address doc: fix incorrect usage of DT node unit address fix incorrect usage of DT node unit address in comments sunxi: arm64: correct usage of DT node address in FIT generation tools: fix incorrect usage of DT node unit address armv8: secure firmware: fix incorrect unit address in node name Simon Glass (8): test: Run binman tests test: Run patman tests test: Run buildman tests test: Run dtoc tests travis.yml: Run tests for tools binman: Run code coverage tests dtoc: Allow DTC environment variable to provide path to dtc test: Set the DTC environment variable .travis.yml | 15 ++++ .../arm/cpu/armv8/fsl-layerscape/doc/README.falcon | 16 ++-- arch/arm/cpu/armv8/sec_firmware.c | 2 +- board/sunxi/mksunxi_fit_atf.sh | 16 ++-- common/image-fit.c | 16 ++-- common/image-sig.c | 2 +- doc/README.uniphier | 36 ++++---- doc/chromium/chromebook_jerry.its | 16 ++-- doc/chromium/nyan-big.its | 16 ++-- doc/uImage.FIT/beaglebone_vboot.txt | 84 ++++++++--------- doc/uImage.FIT/command_syntax_extensions.txt | 42 ++++----- doc/uImage.FIT/howto.txt | 52 +++++------ doc/uImage.FIT/kernel.its | 28 +++--- doc/uImage.FIT/kernel_fdt.its | 20 ++--- doc/uImage.FIT/multi-with-fpga.its | 28 +++--- doc/uImage.FIT/multi-with-loadables.its | 40 ++++----- doc/uImage.FIT/multi.its | 54 +++++------ doc/uImage.FIT/multi_spl.its | 14 +-- doc/uImage.FIT/overlay-fdt-boot.txt | 78 ++++++++-------- doc/uImage.FIT/sign-configs.its | 18 ++-- doc/uImage.FIT/sign-images.its | 16 ++-- doc/uImage.FIT/signature.txt | 100 ++++++++++----------- doc/uImage.FIT/source_file_format.txt | 26 +++--- doc/uImage.FIT/update3.its | 12 +-- doc/uImage.FIT/update_uboot.its | 4 +- doc/uImage.FIT/x86-fit-boot.txt | 10 +-- include/image.h | 26 +++--- test/run | 15 ++++ tools/binman/README | 4 + tools/dtoc/fdt_util.py | 3 +- tools/fit_image.c | 24 ++--- tools/image-host.c | 10 +-- 32 files changed, 439 insertions(+), 404 deletions(-) Regards, Simon

2 1

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 17 Jan '18

17 Jan '18

Hello Tom, please pull from u-boot-i2c.git master The following changes since commit fdb6c3232f66bc9c07c30de87928506477ac4e63: Merge git://git.denx.de/u-boot-net (2018-01-15 19:01:23 -0500) are available in the Git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to fb0128736b7bfb83b43a35211f603c74f8627eff: i2c: mxc_i2c: Use or operation (2018-01-16 06:59:39 +0100) ---------------------------------------------------------------- Peng Fan (3): i2c: lpi2c: do not add 4 for bus seq imx: mx7ulp: modify lpi2c seq number i2c: mxc_i2c: Use or operation arch/arm/dts/imx7ulp.dtsi | 8 ++++---- drivers/i2c/imx_lpi2c.c | 8 ++++---- drivers/i2c/mxc_i2c.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) No errors on travis: https://travis-ci.org/hsdenx/u-boot-i2c/builds/329335171 Thanks! bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

[U-Boot] [PATCH] tools: Update python "help" tests to cope with "more" oddities
by Tom Rini 16 Jan '18

16 Jan '18

In some cases when "more" is told to page a given file it will prepend the output with: :::::::::::::: /PATH/TO/THE/FILE :::::::::::::: And when this happens the output will not match the expected length. Further, if we use a different pager we will instead fail the coverage tests as we will not have 100% coverage. Update the help test to remove the string in question. Cc: Simon Glass <sjg(a)chromium.org> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- I see this behavior when running the tests via Jenkins in my container, but not when run manually in my container. As implied above, I tried switching to less via the env, which causes these tests to pass but then the coverage tests fail as we will not have coverage of the line about "if not pager" and thus not have 100% coverage. --- tools/binman/ftest.py | 5 ++++- tools/buildman/func_test.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 5812ab397cf3..b0832da08a42 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -290,7 +290,10 @@ class TestFunctional(unittest.TestCase): """Test that the full help is displayed with -H""" result = self._RunBinman('-H') help_file = os.path.join(self._binman_dir, 'README') - self.assertEqual(len(result.stdout), os.path.getsize(help_file)) + # Remove possible extraneous strings + extra = '::::::::::::::\n' + help_file + '\n::::::::::::::\n' + gothelp = result.stdout.replace(extra, '') + self.assertEqual(len(gothelp), os.path.getsize(help_file)) self.assertEqual(0, len(result.stderr)) self.assertEqual(0, result.return_code) diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index bc32f61733a8..eec0f9bd3730 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -231,7 +231,10 @@ class TestFunctional(unittest.TestCase): command.test_result = None result = self._RunBuildman('-H') help_file = os.path.join(self._buildman_dir, 'README') - self.assertEqual(len(result.stdout), os.path.getsize(help_file)) + # Remove possible extraneous strings + extra = '::::::::::::::\n' + help_file + '\n::::::::::::::\n' + gothelp = result.stdout.replace(extra, '') + self.assertEqual(len(gothelp), os.path.getsize(help_file)) self.assertEqual(0, len(result.stderr)) self.assertEqual(0, result.return_code) -- 2.7.4

2 1