October 2016 - U-Boot

[U-Boot] [PATCH v5 0/7] LS2080ARDB: Enable EFI boot support
by Alexander Graf 19 Oct '16

19 Oct '16

We now have EFI support in U-Boot which worked out of the box on all systems that I tried it on so far. Except for the LS2080ARDB. With this patch set I can successfully boot grub2 and Linux from there on such a system - even using PXE. This patch set depends on the efi-next queue and the efi runtime rename patch. For easy pulling, you can find the fully applied tree here: https://github.com/agraf/u-boot.git ls2085-efi-support-v5 v3 -> v4: - Add CONFIG_CMD_FS_GENERIC to defconfig - Move code into generic quiesce weak function - Exit device for real when going to Linux - Only apply DPL if we have something to apply - New: armv8: ls2080a: Declare spin tables as reserved for efi loader - New: efi_loader: Allow boards to implement get_time and reset_system - New: armv8: fsl-layerscape: Add support for efi_loader RTS reset - New: efi_loader: Declare secure memory as reserved - New: efi_loader: Allow bouncing for network v4 -> v5: - Drop patches that are in the efi queue already - efi_loader: Allow boards to implement get_time and reset_system - efi_loader: Allow bouncing for network - Remove manual ttbr / tcr copy - Regenerate page tables in EL2, getting us non-secured page tables - Add qspi board - Don't overwrite ethact - Use __efi_runtime tags - Use gd->arch.secure_ram Alexander Graf (7): ls2080: Exit dpaa only right before exiting U-Boot efi_loader: AArch64: Run EFI payloads in EL2 if U-Boot runs in EL3 ls2080ardb: Reserve DP-DDR RAM ls2080ardb: Convert to distro boot armv8: ls2080a: Declare spin tables as reserved for efi loader armv8: fsl-layerscape: Add support for efi_loader RTS reset efi_loader: Declare secure memory as reserved arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 33 ++++++++++++++++++++++++++++++-- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 6 ++++++ arch/arm/include/asm/u-boot-arm.h | 1 + arch/arm/lib/bootm.c | 7 +++++++ board/freescale/ls2080a/ls2080a.c | 6 +++++- board/freescale/ls2080aqds/ls2080aqds.c | 11 +++++------ board/freescale/ls2080ardb/ls2080ardb.c | 20 +++++++++++++------ cmd/bootefi.c | 11 +++++++++++ configs/ls2080a_emu_defconfig | 1 + configs/ls2080a_simu_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080aqds_qspi_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + drivers/net/fsl-mc/mc.c | 24 +++++++++++++++++++++-- include/configs/ls2080ardb.h | 25 +++++++++++++++++++++++- lib/efi_loader/efi_boottime.c | 2 ++ lib/efi_loader/efi_memory.c | 15 +++++++++++++++ 21 files changed, 152 insertions(+), 18 deletions(-) -- 1.8.5.6

3 25

[U-Boot] NFS and timeouts?
by Tom Rini 19 Oct '16

19 Oct '16

Hey all, I've noticed now, but not dug into a problem that goes like this. On every platform that I have tried NFS on now (and I wasn't a user before the test came in) I see: # nfs 80000000 /tftpboot/1MiBtest.bin link up on port 0, speed 1000, full duplex ################################################################# ################################################################# ################################################################# ##########T T T T done Bytes transferred = 1048576 (100000 hex) for the same 1MiB file. The link line will vary from board to board but the end result is that I always see 4 T (for timeout) at the end of the transfer. On boards where I am doing this on gigabit the initial transfer is fast enough that the timeout doesn't cause failure. On the boards where I'm at 100Mbit instead however, I fail. -- Tom

4 6

[U-Boot] Multi boot selection scenarios
by Marcel Gielen [Celestia-STS] 19 Oct '16

19 Oct '16

I am looking into some multi boot options and I wonder what the most common ways are of selecting boot configurations. Suppose I have 2 Linux boot images consisting of kernel, device tree and root fs. What are the most common ways to set img2 as next active boot image from img1 ? - Change the u-boot environment from within the running image by using the userspace utilities. - Use some reserved RAM area (only works with warm boot) an read this from u-boot script. - Write something in e2prom or serial flash and read it from u-boot script. - Hardware based selection (e.g. switch to GPIO) Any other options I didn't think of ? Are there also already some provisions for "fallback options" in case of failed updates ? Any suggestions are welcome, Marcel

1 0

[U-Boot] [PATCH 0/4] dm: i2c: Add I2C support for i.CoreM6
by Jagan Teki 19 Oct '16

19 Oct '16

From: Jagan Teki <jagan(a)amarulasolutions.com> This series add I2C support for i.CoreM6 and it is on top of [1] with u-boot-imx/master branch. [1] [PATCH v7 00/21] imx6: Add Engicam i.CoreM6 QDL support Jagan Teki (4): i2c: Kconfig: Add SYS_I2C_MXC entry i2c: mxc: Print hex instead of decimal for bus address i2c: mxc: Make 'no gpio pinctrl state' print as debug imx6: icorem6: Add I2C support arch/arm/cpu/armv7/mx6/Kconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 2 ++ configs/imx6qdl_icore_nand_defconfig | 2 ++ drivers/i2c/Kconfig | 8 ++++++++ drivers/i2c/mxc_i2c.c | 2 +- 5 files changed, 14 insertions(+), 1 deletion(-) -- 2.7.4

1 4

[U-Boot] A33 tablet u-boot not boot (fel +sdbreakout).
by far5893 19 Oct '16

19 Oct '16

Hi, I'm trying to boot an A33 tablet , i buy sdcard breakout and enable sd card uart in .config using (UART0 on MicroSD breakout board). I used q8_a33_tablet_1024x600_defconfig as base. I read serial port output from BOOT0 and finally "eraly jump fel" message so i'm sure sdcard breakout work. and from my linux 16.04 command line u-boot-2016.09# sunxi-fel -v ver AWUSBFEX soc=00001667(A33) 00000001 ver=0001 44 08 scratchpad=00007e00 00000000 00000000 u-boot-2016.09# sunxi-fel -v uboot u-boot-sunxi-with-spl.bin Stack pointers: sp_irq=0x00002000, sp=0x00005E08 MMU is not enabled by BROM => Executing the SPL... done. libusb usb_bulk_send error -7 u-boot-2016.09# Nothing happen!! My tablet not boot direct from sdcard obviously(only installed android work), what can do for deeper debug ? I see that there is a early uart debug option in .config but ask parameters that i don't know. Thanks

1 0

[U-Boot] [PATCH v10] dm: at91: Add driver model support for the spi driver
by Wenyou Yang 19 Oct '16

19 Oct '16

Add driver model support while retaining the existing legacy code. This allows the driver to support boards that have converted to driver model as well as those that have not. Signed-off-by: Wenyou Yang <wenyou.yang(a)atmel.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> Acked-by: Stephen Warren <swarren(a)nvidia.com> --- Changes in v10: - Add Acked-by tag. Changes in v9: - Due to the peripheral clock driver improvement, remove the unneccessary clock calling. Changes in v8: - Fix compile error for AVR32. Changes in v7: - Move gpio_request_list_by_name() to _probe(), remove *_ofdata_to_platdata(). Changes in v6: - Remove the two flash related options. Changes in v5: - Change clk_client.h -> clk.h to adapt to clk API conversion. Changes in v4: - Collect Reviewed-by tag. - Update the clk API based on [PATCH] clk: convert API to match reset/mailbox fstyle (http://patchwork.ozlabs.org/patch/625342/). - Remove check on dev_get_parent() return. - Fixed the return value, -ENODEV->-EINVAL. - Retain #include <asm/arch/clk.h> line. Changes in v3: - Remove redundant log print. Changes in v2: - Add clock support. drivers/spi/Kconfig | 7 ++ drivers/spi/atmel_spi.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 290 insertions(+) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index aca385d..16ed231 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -32,6 +32,13 @@ config ATH79_SPI uses driver model and requires a device tree binding to operate. please refer to doc/device-tree-bindings/spi/spi-ath79.txt. +config ATMEL_SPI + bool "Atmel SPI driver" + depends on ARCH_AT91 + help + Enable the Atmel SPI driver. This driver can be used to access + the SPI Flash, such as AT25DF321. + config CADENCE_QSPI bool "Cadence QSPI driver" help diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index ed6278b..190f58b 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -4,6 +4,9 @@ * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> +#include <clk.h> +#include <dm.h> +#include <fdtdec.h> #include <spi.h> #include <malloc.h> @@ -11,9 +14,19 @@ #include <asm/arch/clk.h> #include <asm/arch/hardware.h> +#ifdef CONFIG_DM_SPI +#include <asm/arch/at91_spi.h> +#endif +#ifdef CONFIG_DM_GPIO +#include <asm/gpio.h> +#endif #include "atmel_spi.h" +DECLARE_GLOBAL_DATA_PTR; + +#ifndef CONFIG_DM_SPI + static int spi_has_wdrbt(struct atmel_spi_slave *slave) { unsigned int ver; @@ -209,3 +222,273 @@ out: return 0; } + +#else + +#define MAX_CS_COUNT 4 + +struct atmel_spi_platdata { + struct at91_spi *regs; +}; + +struct atmel_spi_priv { + unsigned int freq; /* Default frequency */ + unsigned int mode; + ulong bus_clk_rate; + struct gpio_desc cs_gpios[MAX_CS_COUNT]; +}; + +static int atmel_spi_claim_bus(struct udevice *dev) +{ + struct udevice *bus = dev_get_parent(dev); + struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); + struct atmel_spi_priv *priv = dev_get_priv(bus); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct at91_spi *reg_base = bus_plat->regs; + u32 cs = slave_plat->cs; + u32 freq = priv->freq; + u32 scbr, csrx, mode; + + scbr = (priv->bus_clk_rate + freq - 1) / freq; + if (scbr > ATMEL_SPI_CSRx_SCBR_MAX) + return -EINVAL; + + if (scbr < 1) + scbr = 1; + + csrx = ATMEL_SPI_CSRx_SCBR(scbr); + csrx |= ATMEL_SPI_CSRx_BITS(ATMEL_SPI_BITS_8); + + if (!(priv->mode & SPI_CPHA)) + csrx |= ATMEL_SPI_CSRx_NCPHA; + if (priv->mode & SPI_CPOL) + csrx |= ATMEL_SPI_CSRx_CPOL; + + writel(csrx, &reg_base->csr[cs]); + + mode = ATMEL_SPI_MR_MSTR | + ATMEL_SPI_MR_MODFDIS | + ATMEL_SPI_MR_WDRBT | + ATMEL_SPI_MR_PCS(~(1 << cs)); + + writel(mode, &reg_base->mr); + + writel(ATMEL_SPI_CR_SPIEN, &reg_base->cr); + + return 0; +} + +static int atmel_spi_release_bus(struct udevice *dev) +{ + struct udevice *bus = dev_get_parent(dev); + struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); + + writel(ATMEL_SPI_CR_SPIDIS, &bus_plat->regs->cr); + + return 0; +} + +static void atmel_spi_cs_activate(struct udevice *dev) +{ + struct udevice *bus = dev_get_parent(dev); + struct atmel_spi_priv *priv = dev_get_priv(bus); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + u32 cs = slave_plat->cs; + + dm_gpio_set_value(&priv->cs_gpios[cs], 0); +} + +static void atmel_spi_cs_deactivate(struct udevice *dev) +{ + struct udevice *bus = dev_get_parent(dev); + struct atmel_spi_priv *priv = dev_get_priv(bus); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + u32 cs = slave_plat->cs; + + dm_gpio_set_value(&priv->cs_gpios[cs], 1); +} + +static int atmel_spi_xfer(struct udevice *dev, unsigned int bitlen, + const void *dout, void *din, unsigned long flags) +{ + struct udevice *bus = dev_get_parent(dev); + struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); + struct at91_spi *reg_base = bus_plat->regs; + + u32 len_tx, len_rx, len; + u32 status; + const u8 *txp = dout; + u8 *rxp = din; + u8 value; + + if (bitlen == 0) + goto out; + + /* + * The controller can do non-multiple-of-8 bit + * transfers, but this driver currently doesn't support it. + * + * It's also not clear how such transfers are supposed to be + * represented as a stream of bytes...this is a limitation of + * the current SPI interface. + */ + if (bitlen % 8) { + /* Errors always terminate an ongoing transfer */ + flags |= SPI_XFER_END; + goto out; + } + + len = bitlen / 8; + + /* + * The controller can do automatic CS control, but it is + * somewhat quirky, and it doesn't really buy us much anyway + * in the context of U-Boot. + */ + if (flags & SPI_XFER_BEGIN) { + atmel_spi_cs_activate(dev); + + /* + * sometimes the RDR is not empty when we get here, + * in theory that should not happen, but it DOES happen. + * Read it here to be on the safe side. + * That also clears the OVRES flag. Required if the + * following loop exits due to OVRES! + */ + readl(&reg_base->rdr); + } + + for (len_tx = 0, len_rx = 0; len_rx < len; ) { + status = readl(&reg_base->sr); + + if (status & ATMEL_SPI_SR_OVRES) + return -1; + + if ((len_tx < len) && (status & ATMEL_SPI_SR_TDRE)) { + if (txp) + value = *txp++; + else + value = 0; + writel(value, &reg_base->tdr); + len_tx++; + } + + if (status & ATMEL_SPI_SR_RDRF) { + value = readl(&reg_base->rdr); + if (rxp) + *rxp++ = value; + len_rx++; + } + } + +out: + if (flags & SPI_XFER_END) { + /* + * Wait until the transfer is completely done before + * we deactivate CS. + */ + do { + status = readl(&reg_base->sr); + } while (!(status & ATMEL_SPI_SR_TXEMPTY)); + + atmel_spi_cs_deactivate(dev); + } + + return 0; +} + +static int atmel_spi_set_speed(struct udevice *bus, uint speed) +{ + struct atmel_spi_priv *priv = dev_get_priv(bus); + + priv->freq = speed; + + return 0; +} + +static int atmel_spi_set_mode(struct udevice *bus, uint mode) +{ + struct atmel_spi_priv *priv = dev_get_priv(bus); + + priv->mode = mode; + + return 0; +} + +static const struct dm_spi_ops atmel_spi_ops = { + .claim_bus = atmel_spi_claim_bus, + .release_bus = atmel_spi_release_bus, + .xfer = atmel_spi_xfer, + .set_speed = atmel_spi_set_speed, + .set_mode = atmel_spi_set_mode, + /* + * cs_info is not needed, since we require all chip selects to be + * in the device tree explicitly + */ +}; + +static int atmel_spi_enable_clk(struct udevice *bus) +{ + struct atmel_spi_priv *priv = dev_get_priv(bus); + struct clk clk; + ulong clk_rate; + int ret; + + ret = clk_get_by_index(bus, 0, &clk); + if (ret) + return -EINVAL; + + ret = clk_enable(&clk); + if (ret) + return ret; + + clk_rate = clk_get_rate(&clk); + if (!clk_rate) + return -EINVAL; + + priv->bus_clk_rate = clk_rate; + + clk_free(&clk); + + return 0; +} + +static int atmel_spi_probe(struct udevice *bus) +{ + struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); + struct atmel_spi_priv *priv = dev_get_priv(bus); + int ret; + + ret = atmel_spi_enable_clk(bus); + if (ret) + return ret; + + bus_plat->regs = (struct at91_spi *)dev_get_addr(bus); + + ret = gpio_request_list_by_name(bus, "cs-gpios", priv->cs_gpios, + ARRAY_SIZE(priv->cs_gpios), 0); + if (ret < 0) { + error("Can't get %s gpios! Error: %d", bus->name, ret); + return ret; + } + + writel(ATMEL_SPI_CR_SWRST, &bus_plat->regs->cr); + + return 0; +} + +static const struct udevice_id atmel_spi_ids[] = { + { .compatible = "atmel,at91rm9200-spi" }, + { } +}; + +U_BOOT_DRIVER(atmel_spi) = { + .name = "atmel_spi", + .id = UCLASS_SPI, + .of_match = atmel_spi_ids, + .ops = &atmel_spi_ops, + .platdata_auto_alloc_size = sizeof(struct atmel_spi_platdata), + .priv_auto_alloc_size = sizeof(struct atmel_spi_priv), + .probe = atmel_spi_probe, +}; +#endif -- 2.7.4

3 2

[U-Boot] [PATCH 1/2] tools: moveconfig: support wildcards in --defconfigs file
by Masahiro Yamada 19 Oct '16

19 Oct '16

Supporting shell-style wildcards for the --defconfigs option will be useful to run the moveconfig tool against a specific platform. For example, "uniphier*" in the file passed by --defconfigs option will be expanded to defconfig files that start with "uniphier". This is easier than listing out all the UniPhier defconfig files. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- tools/moveconfig.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index 87e2bb2..67cf5f0 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -127,7 +127,8 @@ Available options standard commit message is used which may need to be edited. -d, --defconfigs - Specify a file containing a list of defconfigs to move + Specify a file containing a list of defconfigs to move. The defconfig + files can be given with shell-style wildcards. -n, --dry-run Perform a trial run that does not make any changes. It is useful to @@ -180,6 +181,7 @@ import copy import difflib import filecmp import fnmatch +import glob import multiprocessing import optparse import os @@ -284,6 +286,17 @@ def get_make_cmd(): sys.exit('GNU Make not found') return ret[0].rstrip() +def get_matched_defconfigs(defconfigs_file): + """Get all the defconfig files that match the patterns in a file.""" + # use a set rather than a list in order to avoid double-counting + defconfigs = set() + for line in open(defconfigs_file): + line = os.path.join('configs', line.strip()) + defconfigs |= set(glob.glob(line)) + defconfigs |= set(glob.glob(line + '_defconfig')) + + return [ defconfig[len('configs') + 1:] for defconfig in defconfigs ] + def get_all_defconfigs(): """Get all the defconfig files under the configs/ directory.""" defconfigs = [] @@ -1204,13 +1217,7 @@ def move_config(configs, options): reference_src_dir = None if options.defconfigs: - defconfigs = [line.strip() for line in open(options.defconfigs)] - for i, defconfig in enumerate(defconfigs): - if not defconfig.endswith('_defconfig'): - defconfigs[i] = defconfig + '_defconfig' - if not os.path.exists(os.path.join('configs', defconfigs[i])): - sys.exit('%s - defconfig does not exist. Stopping.' % - defconfigs[i]) + defconfigs = get_matched_defconfigs(options.defconfigs) else: defconfigs = get_all_defconfigs() -- 1.9.1

3 9

[U-Boot] pull request: u-boot-uniphier/master
by Masahiro Yamada 19 Oct '16

19 Oct '16

Hi Tom. I was a bit late for -rc2, but please pull some more for UniPhier SoCs: * rework clk driver to re-use corresponding clk data from Linux * Re-sync DT with Linux * Reset migrate from ad-hoc code to the reset driver * some fixes The following changes since commit d5a815327d2c257fbba108ff46974b1c1d12fd2a: Prepare v2016.11-rc2 (2016-10-17 20:09:33 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 12a5ce72738a34eaa11b559778039f1051425dbd: ARM: uniphier: update doc/README.uniphier (2016-10-18 14:30:05 +0900) ---------------------------------------------------------------- Masahiro Yamada (7): pinctrl: uniphier: fix unused-const-variable warnings for GCC 6.x ARM: uniphier: fix addresses of Cortex-A72 gear setting macros ARM: uniphier: remove unneeded CONFIG_USB_MAX_CONTROLLER_COUNT define clk: uniphier: rework UniPhier clk driver ARM: dts: uniphier: sync DT with latest Linux ARM: uniphier: remove unnecessary EHCI reset deassertion ARM: uniphier: update doc/README.uniphier arch/arm/dts/Makefile | 24 ++-- arch/arm/dts/uniphier-common32.dtsi | 8 +- .../{uniphier-ph1-ld11-ref.dts => uniphier-ld11-ref.dts} | 9 +- .../dts/{uniphier-ph1-ld11.dtsi => uniphier-ld11.dtsi} | 16 ++- .../{uniphier-ph1-ld20-ref.dts => uniphier-ld20-ref.dts} | 11 +- .../dts/{uniphier-ph1-ld20.dtsi => uniphier-ld20.dtsi} | 9 +- .../{uniphier-ph1-ld4-ref.dts => uniphier-ld4-ref.dts} | 11 +- arch/arm/dts/{uniphier-ph1-ld4.dtsi => uniphier-ld4.dtsi} | 24 +++- .../{uniphier-ph1-ld6b-ref.dts => uniphier-ld6b-ref.dts} | 11 +- arch/arm/dts/uniphier-ld6b.dtsi | 32 +++++ arch/arm/dts/uniphier-ph1-ld6b.dtsi | 31 ----- .../{uniphier-ph1-pro4-ace.dts => uniphier-pro4-ace.dts} | 15 +- .../{uniphier-ph1-pro4-ref.dts => uniphier-pro4-ref.dts} | 11 +- ...niphier-ph1-pro4-sanji.dts => uniphier-pro4-sanji.dts} | 15 +- .../dts/{uniphier-ph1-pro4.dtsi => uniphier-pro4.dtsi} | 23 +++- ...niphier-ph1-pro5-4kbox.dts => uniphier-pro5-4kbox.dts} | 11 +- .../dts/{uniphier-ph1-pro5.dtsi => uniphier-pro5.dtsi} | 14 +- ...er-proxstream2-gentil.dts => uniphier-pxs2-gentil.dts} | 16 ++- ...hier-proxstream2-vodka.dts => uniphier-pxs2-vodka.dts} | 11 +- .../dts/{uniphier-proxstream2.dtsi => uniphier-pxs2.dtsi} | 16 ++- .../{uniphier-ph1-sld3-ref.dts => uniphier-sld3-ref.dts} | 11 +- .../dts/{uniphier-ph1-sld3.dtsi => uniphier-sld3.dtsi} | 48 +++++-- .../{uniphier-ph1-sld8-ref.dts => uniphier-sld8-ref.dts} | 11 +- .../dts/{uniphier-ph1-sld8.dtsi => uniphier-sld8.dtsi} | 24 +++- arch/arm/mach-uniphier/boards.c | 26 ++-- arch/arm/mach-uniphier/clk/clk-ld4.c | 7 +- arch/arm/mach-uniphier/clk/clk-pro4.c | 7 +- arch/arm/mach-uniphier/sc64-regs.h | 6 +- configs/uniphier_ld11_defconfig | 2 +- configs/uniphier_ld20_defconfig | 2 +- configs/uniphier_ld4_sld8_defconfig | 2 +- configs/uniphier_pro4_defconfig | 2 +- configs/uniphier_pxs2_ld6b_defconfig | 2 +- configs/uniphier_sld3_defconfig | 2 +- doc/README.uniphier | 78 +++++------ drivers/clk/uniphier/Kconfig | 15 +- drivers/clk/uniphier/Makefile | 5 +- drivers/clk/uniphier/clk-uniphier-core.c | 170 +++++++++++------------ drivers/clk/uniphier/clk-uniphier-mio.c | 183 +++++++++---------------- drivers/clk/uniphier/clk-uniphier.h | 46 ++++--- drivers/pinctrl/uniphier/pinctrl-uniphier.h | 7 +- include/configs/uniphier.h | 1 - 42 files changed, 511 insertions(+), 464 deletions(-) rename arch/arm/dts/{uniphier-ph1-ld11-ref.dts => uniphier-ld11-ref.dts} (78%) rename arch/arm/dts/{uniphier-ph1-ld11.dtsi => uniphier-ld11.dtsi} (93%) rename arch/arm/dts/{uniphier-ph1-ld20-ref.dts => uniphier-ld20-ref.dts} (70%) rename arch/arm/dts/{uniphier-ph1-ld20.dtsi => uniphier-ld20.dtsi} (96%) rename arch/arm/dts/{uniphier-ph1-ld4-ref.dts => uniphier-ld4-ref.dts} (72%) rename arch/arm/dts/{uniphier-ph1-ld4.dtsi => uniphier-ld4.dtsi} (89%) rename arch/arm/dts/{uniphier-ph1-ld6b-ref.dts => uniphier-ld6b-ref.dts} (73%) create mode 100644 arch/arm/dts/uniphier-ld6b.dtsi delete mode 100644 arch/arm/dts/uniphier-ph1-ld6b.dtsi rename arch/arm/dts/{uniphier-ph1-pro4-ace.dts => uniphier-pro4-ace.dts} (72%) rename arch/arm/dts/{uniphier-ph1-pro4-ref.dts => uniphier-pro4-ref.dts} (74%) rename arch/arm/dts/{uniphier-ph1-pro4-sanji.dts => uniphier-pro4-sanji.dts} (73%) rename arch/arm/dts/{uniphier-ph1-pro4.dtsi => uniphier-pro4.dtsi} (93%) rename arch/arm/dts/{uniphier-ph1-pro5-4kbox.dts => uniphier-pro5-4kbox.dts} (64%) rename arch/arm/dts/{uniphier-ph1-pro5.dtsi => uniphier-pro5.dtsi} (96%) rename arch/arm/dts/{uniphier-proxstream2-gentil.dts => uniphier-pxs2-gentil.dts} (69%) rename arch/arm/dts/{uniphier-proxstream2-vodka.dts => uniphier-pxs2-vodka.dts} (69%) rename arch/arm/dts/{uniphier-proxstream2.dtsi => uniphier-pxs2.dtsi} (95%) rename arch/arm/dts/{uniphier-ph1-sld3-ref.dts => uniphier-sld3-ref.dts} (76%) rename arch/arm/dts/{uniphier-ph1-sld3.dtsi => uniphier-sld3.dtsi} (87%) rename arch/arm/dts/{uniphier-ph1-sld8-ref.dts => uniphier-sld8-ref.dts} (73%) rename arch/arm/dts/{uniphier-ph1-sld8.dtsi => uniphier-sld8.dtsi} (89%) -- Best Regards Masahiro Yamada

2 1

[U-Boot] Please pull u-boot-x86
by Bin Meng 19 Oct '16

19 Oct '16

Hi Tom, The following changes since commit d5a815327d2c257fbba108ff46974b1c1d12fd2a: Prepare v2016.11-rc2 (2016-10-17 20:09:33 -0400) are available in the git repository at: git://git.denx.de/u-boot-x86.git for you to fetch changes up to f822403f0164be74a5161b65698d0f01f4556234: x86: Add implementations of setjmp() and longjmp() (2016-10-18 15:58:50 +0800) ---------------------------------------------------------------- Alexander Graf (1): x86: Move table csum into separate header Simon Glass (1): x86: Add implementations of setjmp() and longjmp() arch/x86/cpu/Makefile | 2 +- arch/x86/cpu/setjmp.S | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/include/asm/setjmp.h | 24 ++++++++++++++++++++++++ arch/x86/include/asm/tables.h | 2 ++ arch/x86/lib/tables.c | 12 ------------ include/tables_csum.h | 22 ++++++++++++++++++++++ 6 files changed, 110 insertions(+), 13 deletions(-) create mode 100644 arch/x86/cpu/setjmp.S create mode 100644 arch/x86/include/asm/setjmp.h create mode 100644 include/tables_csum.h Regards, Bin

2 3

[U-Boot] [PATCH PATCH v1] watchdog: Fix Watchdog Reset while in U-Boot Prompt
by Andreas J. Reichel 19 Oct '16

19 Oct '16

Hardware: CM-FX6 Module from Compulab This patch fixes unwanted watchdog resets while the user enters a command at the U-Boot prompt. As found on the CM-FX6 board from Compulab, when having enabled the watchdog, a missing WATCHDOG_RESET call in common/console.c causes this and alike boards to reset when the watchdog's timeout has elapsed while waiting at the U-Boot prompt. Despite the user could press several keys within the watchdog timeout limit, the while loop in cli_readline.c, line 261, does only call WATCHDOG_RESET if first == 1, which gets set to 0 in the 1st loop iteration. This leads to a watchdog timeout no matter if the user presses keys or not. Although, this affects other boards as well as it touches common/console.c, the macro WATCHDOG_RESET expands to {} if watchdog support isn't configured. Hence, there's no harm caused and no need to surround it by #ifdef in this case. * Symptom: U-Boot resets after watchdog times out when in commandline prompt and watchdog is enabled. * Reasoning: When U-Boot shows the commandline prompt, the following function call stack is executed while waiting for a keypress: common/main.c: main_loop => common/cli.c: cli_loop() => common/cli_hush.c: parse_file_outer => parse_stream_outer => parse_stream => b_getch(i) => i->get(i) => file_get => get_user_input => cmdedit_read_input => uboot_cli_readline => common/cli_readline.c: cli_readline => cli_readline_into_buffer => cread_line => getcmd_getch (== getc) => common/console.c: fgetc => console_tstc common/console.c: (with CONFIG_CONSOLE_MUX is set) - in console_tstc line 181: If dev->tstc(dev) returns 0, the global tstcdev variable doesn't get set. This is the case if no character is in the serial buffer. - in fgetc(int file), line 297: Program flow keeps looping because tstcdev does not get set. Therefore WATCHDOG_RESET is not called, as mx_serial_tstc from drivers/serial/serial_mxc.c does not call it. * Solution: Add WATCHDOG_RESET into the loop of console_tstc. Note: Macro expands to {} if not configured, so no #ifdef is needed. * Comment: Signed-off-by: Christian Storm <christian.storm(a)tngtech.com> Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> Signed-off-by: Andreas J. Reichel <Andreas.Reichel(a)tngtech.com> --- common/console.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/console.c b/common/console.c index 12293f3..054b6cd 100644 --- a/common/console.c +++ b/common/console.c @@ -16,6 +16,7 @@ #include <stdio_dev.h> #include <exports.h> #include <environment.h> +#include <watchdog.h> DECLARE_GLOBAL_DATA_PTR; @@ -294,6 +295,7 @@ int fgetc(int file) * Effectively poll for input wherever it may be available. */ for (;;) { + WATCHDOG_RESET(); /* * Upper layer may have already called tstc() so * check for that first. -- 2.8.2

4 7