oweals/u-boot.git
7 years agotools: use files from scripts/dtc/libfdt where possible
Masahiro Yamada [Tue, 17 Oct 2017 13:30:18 +0000 (22:30 +0900)]
tools: use files from scripts/dtc/libfdt where possible

Prior to this commit, tools/Makefile pulls all libfdt files from
lib/libfdt.

lib/libfdt/ and scripts/dtc/libfdt have the same copies for the
followings 6 files:
  fdt.c fdt_addresses.c fdt_empty_tree.c fdt_overlay.c fdt_strerr.c
  fdt_sw.c

This commit changes them to #include ones from scripts/dtc/libfdt.

Unfortunately, U-Boot locally modified the following 3 files:
  fdt_ro.c fdt_wip.c fdt_rw.c

I did not touch them in order to avoid unpredictable impact.

The fdt_region.c is U-Boot own file.  This is also borrowed from
lib/libfdt/.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agolibfdt: change libfdt_internal.h to a wrapper of scripts/dtc/libfdt/*
Masahiro Yamada [Tue, 17 Oct 2017 13:30:17 +0000 (22:30 +0900)]
libfdt: change libfdt_internal.h to a wrapper of scripts/dtc/libfdt/*

Fortunately, U-Boot did not modify libfdt_internal.h locally.

Change it to a wrapper of scripts/dtc/libfdt/fdt.h, which will be
periodically synced with the upstream DTC (or kernel).

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agolibfdt: change fdt.h to a wrapper of scripts/dtc/libfdt/*
Masahiro Yamada [Tue, 17 Oct 2017 13:30:16 +0000 (22:30 +0900)]
libfdt: change fdt.h to a wrapper of scripts/dtc/libfdt/*

Fortunately, U-Boot did not modify fdt.h locally.

Change it to a wrapper of scripts/dtc/libfdt/fdt.h, which will be
periodically synced with the upstream DTC (or kernel).

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agopylibfdt: compile pylibfdt only when dtoc/binman is necessary
Masahiro Yamada [Tue, 17 Oct 2017 04:42:44 +0000 (13:42 +0900)]
pylibfdt: compile pylibfdt only when dtoc/binman is necessary

Currently, pylibfdt is always compiled if swig is installed on your
machine.  It is really annoying because most of targets (excepts
x86, sunxi, rockchip) do not use dtoc or binman.

"checkbinman" and "checkdtoc" are wrong.  It is odd that the final
build stage checks if we have built necessary tools.  If your platform
depends on dtoc/binman, you must be able to build pylibfdt.  If swig
is not installed, it should fail immediately.

I added PYLIBFDT, DTOC, BINMAN entries to Kconfig.  They should be
property select:ed by platforms that need them.  Kbuild will descend
into scripts/dtc/pylibfdt/ only when CONFIG_PYLIBFDT is enabled.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agopylibfdt: move pylibfdt to scripts/dtc/pylibfdt and refactor makefile
Masahiro Yamada [Tue, 17 Oct 2017 04:42:43 +0000 (13:42 +0900)]
pylibfdt: move pylibfdt to scripts/dtc/pylibfdt and refactor makefile

The pylibfdt is used by dtoc (and, indirectly by binman), but there
is no reason why it must be generated in the tools/ directory.

Recently, U-Boot switched over to the bundled DTC, and the directory
structure under scripts/dtc/ now mirrors the upstream DTC project.
So, scripts/dtc/pylibfdt is the best location.

I also rewrote the Makefile in a cleaner Kbuild style.

The scripts from the upstream have been moved as follows:

  lib/libfdt/pylibfdt/setup.py -> scripts/dtc/pylibfdt/setup.py
  lib/libfdt/pylibfdt/libfdt.i -> scripts/dtc/pylibfdt/libfdt.i_shipped

The .i_shipped is coped to .i during building because the .i must be
located in the objtree when we build it out of tree.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoscripts/dtc: Update to upstream version v1.4.5-3-gb1a60033c110
Masahiro Yamada [Tue, 17 Oct 2017 04:42:42 +0000 (13:42 +0900)]
scripts/dtc: Update to upstream version v1.4.5-3-gb1a60033c110

This adds the following commits from upstream:

b1a6003 tests: Add a test for overlays syntactic sugar
737b2df overlay: Add syntactic sugar version of overlays
497432f checks: Use proper format modifier for size_t
22a65c5 dtc: Bump version to v1.4.5
c575d80 Add fdtoverlay to .gitignore
b6a6f94 fdtoverlay: Sanity check blob size
8c1eb15 pylibfdt: Use Python2 explicitly
ee3d26f checks: add interrupts property check
c1e7738 checks: add gpio binding properties check
b3bbac0 checks: add phandle with arg property checks

[ sync with Linux commit: 4201d057ea91c3d6efd2db65219bc91fae413bc2 ]

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoscripts/dtc: add fdt_overlay.c and fdt_addresses.c to sync script
Rob Herring [Tue, 17 Oct 2017 04:42:41 +0000 (13:42 +0900)]
scripts/dtc: add fdt_overlay.c and fdt_addresses.c to sync script

libfdt has gained some new files. We need to include them in the
kernel's copy.

Reported-by: Kyle Yan <kyan@codeaurora.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
[ Linux commit: 4322323058f010274564006d61945187a15b6361 ]

7 years agoarm: add initial support for Amlogic P212 based on Meson GXL family
Neil Armstrong [Thu, 12 Oct 2017 13:50:32 +0000 (15:50 +0200)]
arm: add initial support for Amlogic P212 based on Meson GXL family

This adds platform code for the Amlogic P212 reference board based on a
Meson GXL (S905X) SoC with the Meson GXL configuration.

This initial submission only supports UART and MMC/SDCard, support for the
internal Ethernet PHY in Work In Progress.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Beniamino Galvani <b.galvani@gmail.com>
7 years agopinctrl: meson: Add GXL Support
Neil Armstrong [Thu, 12 Oct 2017 13:50:31 +0000 (15:50 +0200)]
pinctrl: meson: Add GXL Support

Add the Amlogic Meson GXL pinctrl support based on the GXBB driver and
the synchronized DTS from Linux 4.13.5

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Beniamino Galvani <b.galvani@gmail.com>
7 years agoARM: dts: Synchronize Amlogic from Linux Mainline 4.13.5
Neil Armstrong [Thu, 12 Oct 2017 13:50:30 +0000 (15:50 +0200)]
ARM: dts: Synchronize Amlogic from Linux Mainline 4.13.5

Synchronize the Amlogic ARM64 dts from mainline Linux 4.13.5

In the preparation of the support of the Amlogic P212 board,
import the corresponding meson-gxl-s905x-p212.dts file.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Beniamino Galvani <b.galvani@gmail.com>
7 years agoboard: ti: dra71x-evm: Hook LDO1 of LP8733 to EN_PIN
Keerthy [Thu, 12 Oct 2017 04:48:45 +0000 (10:18 +0530)]
board: ti: dra71x-evm: Hook LDO1 of LP8733 to EN_PIN

All regulators are hooked to EN_Pin at reset so that EN Pin controls
their state. Hook the LDO1 regulator to EN pin which at reset is not
hooked. This applies only to LP8733.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoam33xx: Add a function to query MPU voltage in uV
Felix Brack [Wed, 11 Oct 2017 16:42:23 +0000 (18:42 +0200)]
am33xx: Add a function to query MPU voltage in uV

For the DM TPS65910 driver I'm working on, querying the MPU voltage
should return a value in uV. This value can then be used by the
regulator's standard function set_value to set the MPU voltage.

Signed-off-by: Felix Brack <fb@ltec.ch>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
7 years agoMerge git://www.denx.de/git/u-boot-marvell
Tom Rini [Thu, 16 Nov 2017 14:32:04 +0000 (09:32 -0500)]
Merge git://www.denx.de/git/u-boot-marvell

7 years agoarm: mvebu: clearfog: update SPI flash DT description
Baruch Siach [Mon, 13 Nov 2017 05:04:31 +0000 (07:04 +0200)]
arm: mvebu: clearfog: update SPI flash DT description

All current ClearFog SOMs have the SPI flash populated. Enable SPI flash in
the device tree.

Add an alias to the SPI bus so that the 'sf' command can probe the flash on
bus 1.

Add the "spi-flash" compatible string to make the standard SPI flash driver
probe the device.

Reviewed-by: Jagan Teki <jagan@openedev.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm: mvebu: clearfog: Fix SPI-NOR flash access
Jon Nettleton [Mon, 13 Nov 2017 05:04:30 +0000 (07:04 +0200)]
arm: mvebu: clearfog: Fix SPI-NOR flash access

The production variant of the SPI flash used by the clearfog
devices are based on winbond chips.  Additionally enable
SPI_FLASH_BAR since some variants will have 16MB of flash
that requires this to be enabled.

Remove the default speed and mode; these values are taken from the
device tree when CONFIG_DM_SPI_FLASH is enabled.

Add default bus, so that 'sf' detects the SPI flash by default.

Signed-off-by: Jon Nettleton <jon@solid-run.com>
[baruch: remove speed/mode; add bus; move winbond to defconfig]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm: mvebu: clearfog: enable XHCI USB
Jon Nettleton [Mon, 6 Nov 2017 08:33:21 +0000 (10:33 +0200)]
arm: mvebu: clearfog: enable XHCI USB

Enable the driver by default for the clearfog boards since the external
port is configured for XHCI.

Signed-off-by: Jon Nettleton <jon@solid-run.com>
[baruch: split from the SoC setup patch]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm: mvebu: Add board_setup for xhci hardware
Jon Nettleton [Mon, 6 Nov 2017 08:33:20 +0000 (10:33 +0200)]
arm: mvebu: Add board_setup for xhci hardware

This fixes the USB 3.0 support for the a38x SOC.

Signed-off-by: Jon Nettleton <jon@solid-run.com>
[baruch: use fdt_addr_t]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agomvebu: usb: xhci: a38x support
Jon Nettleton [Mon, 6 Nov 2017 08:33:19 +0000 (10:33 +0200)]
mvebu: usb: xhci: a38x support

This makes the initial changes need to support the
a38x series of SOCs.  It adds the device-tree identifier
as well as changing the board_support function to take
the IO address designated by device-tree.

Signed-off-by: Jon Nettleton <jon@solid-run.com>
[baruch: use fdt_addr_t; update 37xx and 8K implementations]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm: mvebu: configs: Enable DISTRO_DEFAULTS for MACCHIATObin
Heinrich Schuchardt [Sun, 15 Oct 2017 05:03:40 +0000 (07:03 +0200)]
arm: mvebu: configs: Enable DISTRO_DEFAULTS for MACCHIATObin

Enable DISTRO_DEFAULTS for
mvebu_db_armada8k_defconfig
mvebu_mcbin-88f8040_defconfig

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm: mvebu: theadorable_debug_defconfig: Enable setexpr command
Stefan Roese [Fri, 6 Oct 2017 07:11:38 +0000 (09:11 +0200)]
arm: mvebu: theadorable_debug_defconfig: Enable setexpr command

The setexpr command is useful for scripting, lets enable it for this
platform.

Signed-off-by: Stefan Roese <sr@denx.de>
7 years agopci: mvebu: Increase size of PCIe default mapping
VlaoMao [Fri, 22 Sep 2017 15:49:02 +0000 (18:49 +0300)]
pci: mvebu: Increase size of PCIe default mapping

Increase size PCI memory mapping from 32MiB to 128MiB.

Signed-off-by: VlaoMao <vlaomao@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoMerge git://git.denx.de/u-boot-fsl-qoriq
Tom Rini [Wed, 15 Nov 2017 22:34:06 +0000 (17:34 -0500)]
Merge git://git.denx.de/u-boot-fsl-qoriq

7 years agoarmv8: ls2080ardb: Add sd_bootcmd for distro fallback in case of sdboot
Shengzhou Liu [Thu, 9 Nov 2017 09:57:58 +0000 (17:57 +0800)]
armv8: ls2080ardb: Add sd_bootcmd for distro fallback in case of sdboot

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv7: ls1021atwr: Add sd_bootcmd for distro fallback in case of sdboot
Shengzhou Liu [Thu, 9 Nov 2017 09:57:57 +0000 (17:57 +0800)]
armv7: ls1021atwr: Add sd_bootcmd for distro fallback in case of sdboot

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1046ardb: Add sd_bootcmd for distro fallback in case of sdboot
Shengzhou Liu [Thu, 9 Nov 2017 09:57:56 +0000 (17:57 +0800)]
armv8: ls1046ardb: Add sd_bootcmd for distro fallback in case of sdboot

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1043ardb: Add sd_bootcmd for distro fallback in case of sdboot
Shengzhou Liu [Thu, 9 Nov 2017 09:57:55 +0000 (17:57 +0800)]
armv8: ls1043ardb: Add sd_bootcmd for distro fallback in case of sdboot

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agocmd: mac: Update description of help
Prabhakar Kushwaha [Thu, 9 Nov 2017 10:29:21 +0000 (15:59 +0530)]
cmd: mac: Update description of help

Update help message for "mac" command to reflect correct descriptions
and parameters.

Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agodriver: net: fsl-mc: Use base 16 in simple_strtoul
Prabhakar Kushwaha [Thu, 9 Nov 2017 09:15:41 +0000 (14:45 +0530)]
driver: net: fsl-mc: Use base 16 in simple_strtoul

Value provided in MC_MEM_SIZE_ENV_VAR is in hex. Use 16 as base
in simple_strtoul.

Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1088ardb: Add distro boot support
Ashish Kumar [Mon, 6 Nov 2017 07:49:28 +0000 (13:19 +0530)]
armv8: ls1088ardb: Add distro boot support

Distro boot support gives flexibility to run distro RFS like Ubuntu
being deployed from SD card or SATA drive. If it fails to detect
external storage, fall back to qspi/sd boot.

Enable this by default in RDB's defconfig by selecting
CONFIG_DISTRO_DEFAULTS

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Zhang Ying <zhangying@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1088aqds: Add SD boot support for ls1088qds
Ashish Kumar [Mon, 6 Nov 2017 07:48:44 +0000 (13:18 +0530)]
armv8: ls1088aqds: Add SD boot support for ls1088qds

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Signed-off-by: Raghav Dogra <raghav.dogra@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1088ardb: Add SD boot support for ls1088
Ashish Kumar [Mon, 6 Nov 2017 07:48:43 +0000 (13:18 +0530)]
armv8: ls1088ardb: Add SD boot support for ls1088

Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Raghav Dogra <raghav.dogra@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1088: Enable SATA for ls1088
Ashish Kumar [Thu, 2 Nov 2017 04:20:47 +0000 (09:50 +0530)]
armv8: ls1088: Enable SATA for ls1088

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Amrita Kumari <amrita.kumari@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agomtd: nand: fsl-ifc: fix support of multiple NAND devices
Kurt Kanzenbach [Fri, 20 Oct 2017 09:44:25 +0000 (11:44 +0200)]
mtd: nand: fsl-ifc: fix support of multiple NAND devices

Currently the chipselect used to identify the corresponding NAND chip
is stored at the controller and only set during fsl_ifc_chip_init().
This way, only the last NAND chip is working, as the previous value
of cs_nand gets overwritten.

In order to solve this issue the chipselect is computed on demand by
evaluating the bank variable. Thus, the correct chipselect for each
NAND chip operation is used.

Tested on hardware with two NAND chips connected to the IFC
controller.

Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
Acked-by: Scott Wood <oss@buserror.net>
[YS: reformatted commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoarmv8: ls1088a: Move CONFIG_SPI_FLASH_SPANSION to defconfig
Ashish Kumar [Mon, 30 Oct 2017 06:24:52 +0000 (11:54 +0530)]
armv8: ls1088a: Move CONFIG_SPI_FLASH_SPANSION to defconfig

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agodrivers: net: ldpaa_eth: Correct error handler for qbman_swp_acquire()
Ashish Kumar [Thu, 26 Oct 2017 10:33:22 +0000 (16:03 +0530)]
drivers: net: ldpaa_eth: Correct error handler for qbman_swp_acquire()

The zero value returned from qbman_swp_acquire() is an error
condition meaning no free buffer for allocation.

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Kushwaha Prabhakar <prabhakar@freescale.com>
[YS: revised commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
7 years agoPrepare v2017.11 v2017.11
Tom Rini [Tue, 14 Nov 2017 01:08:06 +0000 (20:08 -0500)]
Prepare v2017.11

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoRevert "console: simplify puts()"
Soeren Moch [Sat, 4 Nov 2017 15:14:09 +0000 (16:14 +0100)]
Revert "console: simplify puts()"

This reverts commit c61d0009feb966e0e93254a8c435a1889085e6b8.

A tbs2910 board user reported a very slow console frambuffer as
regression in current u-boot. I could bisect this down to the
above mentioned commit.

This revert brings back the fast framebuffer console (one
cache flush per string in puts(), not after each char).

Reported-by: Uwe Scheffler <scheffler.u@web.de>
Signed-off-by: Soeren Moch <smoch@web.de>
Tested-by: Uwe Scheffler <scheffler.u@web.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoboard: sysam: stmark2: add missing environment location
Angelo Dureghello [Thu, 2 Nov 2017 19:54:59 +0000 (20:54 +0100)]
board: sysam: stmark2: add missing environment location

Signed-off-by: Angelo Dureghello <angelo@sysam.it>
7 years agoARM: rmobile: Fix eMMC signal voltage on Salvator-X/XS
Marek Vasut [Thu, 9 Nov 2017 18:58:40 +0000 (19:58 +0100)]
ARM: rmobile: Fix eMMC signal voltage on Salvator-X/XS

The eMMC is 1V8 device only and the signaling is always 1V8,
fix the DT for Salvator-X/XS to describe the hardware correctly.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
7 years agoMerge git://git.denx.de/u-boot-sunxi
Tom Rini [Fri, 10 Nov 2017 15:04:21 +0000 (10:04 -0500)]
Merge git://git.denx.de/u-boot-sunxi

7 years agosunxi: SATA link timeout fix
Werner Böllmann [Fri, 10 Nov 2017 13:44:20 +0000 (19:14 +0530)]
sunxi: SATA link timeout fix

After updating u-boot from v2016.01 to 2017.09, issue with
"SATA link 0 timeout." on my Cubietruck board.

mdelay milled after moving satapwr code to board.
"sunxi: Turn satapwr on from board_init"
(sha1: 9fbb0c3aa49f4604b0342cb527a6bd099f92eaeb)

After adding the "mdelay(500);"
line that was lost in the path the error is gone.

Signed-off-by: Werner Böllmann <Werner.Boellmann@fh-dortmund.de>
[Rebased and updated change and commit message]
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agonet: sun8i_emac: Fix build for non-H3/H5 SoCs
Chen-Yu Tsai [Fri, 22 Sep 2017 07:26:33 +0000 (15:26 +0800)]
net: sun8i_emac: Fix build for non-H3/H5 SoCs

Only the H3/H5 SoCs have an internal PHY and its related clock and
reset controls.

Use an #ifdef to guard the internal PHY control code block so it
can be built for other SoCs, such as the A83T or A64.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agoMerge git://git.denx.de/u-boot-rockchip
Tom Rini [Fri, 10 Nov 2017 13:19:01 +0000 (08:19 -0500)]
Merge git://git.denx.de/u-boot-rockchip

7 years agorockchip: configs: vyasa: Update falcon offsets
Jagan Teki [Fri, 10 Nov 2017 11:48:44 +0000 (17:18 +0530)]
rockchip: configs: vyasa: Update falcon offsets

Update the falcon offsets for args to 16MB and kernel to 17MB
Since the below commit updated U-Boot proper location along
with rockchip boot image offsets
"spl: set SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR to 0x4000 for rockchip"
(sha1: 8f4d62b403db45dfa8b1cadb9da9096c79b7df47)

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: doc: Fix U-Boot proper location for falcon
Jagan Teki [Fri, 10 Nov 2017 11:48:43 +0000 (17:18 +0530)]
rockchip: doc: Fix U-Boot proper location for falcon

This patch fixed U-Boot proper location has been
missed to update in bewlo commit
"rockchip: doc: update U-Boot location info"
(sha1: 73e6dbe855f357a8330cfd53ff3033303611c1ad)

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: doc: update U-Boot location info
Goldschmidt Simon [Fri, 10 Nov 2017 11:38:32 +0000 (11:38 +0000)]
rockchip: doc: update U-Boot location info

The U-Boot location has been moved to block 16384.
This is 8MB, not 4MB.

Signed-off-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-sunxi
Tom Rini [Thu, 9 Nov 2017 13:11:40 +0000 (08:11 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-sunxi

7 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Thu, 9 Nov 2017 13:11:30 +0000 (08:11 -0500)]
Merge branch 'master' of git://denx.de/git/u-boot-imx

7 years agoimx7: Add include guards for include/asm/arch-mx7/sys_proto.h file
Lukasz Majewski [Tue, 7 Nov 2017 10:34:17 +0000 (11:34 +0100)]
imx7: Add include guards for include/asm/arch-mx7/sys_proto.h file

Signed-off-by: Lukasz Majewski <lukma@denx.de>
7 years agoimx5: Add include guards for include/asm/arch-mx5/sys_proto.h file
Lukasz Majewski [Tue, 7 Nov 2017 10:34:16 +0000 (11:34 +0100)]
imx5: Add include guards for include/asm/arch-mx5/sys_proto.h file

Signed-off-by: Lukasz Majewski <lukma@denx.de>
7 years agoimx6: Add include guards for include/asm/arch-mx6/sys_proto.h file
Lukasz Majewski [Tue, 7 Nov 2017 10:34:15 +0000 (11:34 +0100)]
imx6: Add include guards for include/asm/arch-mx6/sys_proto.h file

Signed-off-by: Lukasz Majewski <lukma@denx.de>
7 years agoimx:display5: Add support for LWN's DISPLAY5 board
Lukasz Majewski [Tue, 31 Oct 2017 16:58:05 +0000 (17:58 +0100)]
imx:display5: Add support for LWN's DISPLAY5 board

This commit provides support for LWN's IMX6Q based DISPLAY5 board.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
7 years agoimx6: iomux: Add generic function to set RGMII IO voltage on IMX6 SoCs
Lukasz Majewski [Tue, 31 Oct 2017 12:26:24 +0000 (13:26 +0100)]
imx6: iomux: Add generic function to set RGMII IO voltage on IMX6 SoCs

This commit provides generic function to set the RGMII/HSIC IO voltage
level on iMX6 devices.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
7 years agoboard: imx6: marsboard: Remove doubled #include <asm/arch/sys_proto.h>
Lukasz Majewski [Tue, 7 Nov 2017 10:10:29 +0000 (11:10 +0100)]
board: imx6: marsboard: Remove doubled #include <asm/arch/sys_proto.h>

The sys_proto.h file has been included earlier in this file.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
7 years agosunxi: restore PHYLIB for CONFIG_SUN4I_EMAC users
Artturi Alm [Wed, 8 Nov 2017 03:08:58 +0000 (05:08 +0200)]
sunxi: restore PHYLIB for CONFIG_SUN4I_EMAC users

due misnaming of CONFIG_SUN4I_EMAC in include/configs/sunxi-common.h,
likely missed in:
commit 3146f0c017df ("Move PHYLIB to Kconfig")

Signed-off-by: Artturi Alm <artturi.alm@gmail.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agosunxi: fix CONFIG_SUNXI_EMAC references
Artturi Alm [Wed, 8 Nov 2017 03:08:57 +0000 (05:08 +0200)]
sunxi: fix CONFIG_SUNXI_EMAC references

fixes CONFIG_SUNXI_EMAC references from drivers/net/Makefile and
include/configs/sunxi-common.h likely forgotten in:
commit abc3e4df59f5 ("sunxi: Convert SUNXI_EMAC to Kconfig")

Signed-off-by: Artturi Alm <artturi.alm@gmail.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agommc: fsl_esdhc: Fix PIO timeout
Benoît Thébaudeau [Sun, 29 Oct 2017 21:08:58 +0000 (22:08 +0100)]
mmc: fsl_esdhc: Fix PIO timeout

The following error has been observed on i.MX25 with a high-speed SDSC
card:
    Data Write Failed in PIO Mode.

It was caused by the timeout set on PRSSTAT.BWEN, which was triggered
because this bit takes 15 ms to be set after writing the first block to
DATPORT with this card. Without this timeout, all the blocks are
properly written.

This timeout was implemented by decrementing a variable, so it was
depending on the CPU frequency. Fix this issue by setting this timeout
to a long enough absolute duration (500 ms).

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
7 years agoi.MX6: engicam: Fix MAINTAINERS/README
Jagan Teki [Mon, 30 Oct 2017 09:57:09 +0000 (15:27 +0530)]
i.MX6: engicam: Fix MAINTAINERS/README

- Update newly added include/configs file in MAINTAINERS
- Update newly added defconfig file in README

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agomx51: Select the ESDHC_A001 erratum
Fabio Estevam [Fri, 3 Nov 2017 15:40:10 +0000 (13:40 -0200)]
mx51: Select the ESDHC_A001 erratum

When a high speed card is connected to mx51evk the following error is seen:

U-Boot 2017.11-rc2 (Oct 18 2017 - 13:49:26 -0200)

CPU:   Freescale i.MX51 rev3.0 at 800 MHz
Reset cause: POR
Board: MX51EVK
DRAM:  512 MiB
MMC:   FSL_SDHC: 0, FSL_SDHC: 1
*** Warning - read failed, using default environment

In:    serial
Out:   serial
Err:   serial
Net:   FEC
Hit any key to stop autoboot:  0
=> saveenv
Saving Environment to MMC...
Writing to MMC(0)... failed

The root cause for the failure is the eSDHC-A001 erratum:

"eSDHC-A001 : Data timeout counter (SYSCTL[DTOCV]) is not reliable for
values of 0x4,0x8, and 0xC" that is listed
on some PowerArchitecture chips:
https://www.nxp.com/files-static/32bit/doc/errata/MPC8379ECE.pdf

Even though eSDHC-A001 is not documented on the i.MX51 errata document,
I have confirmed with the NXP design team that this erratum does affect
i.MX51, so fix the problem by selecting SYS_FSL_ERRATUM_ESDHC_A001
at SoC level.

The i.MX51 ts4800 board already selects this option, but it is better
to move this selection to the i.MX51 SoC level instead.

Successfully tested with a high speed SD card on a mx51evk board.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
7 years agomx25: Select the ESDHC_A001 erratum
Fabio Estevam [Fri, 3 Nov 2017 15:40:09 +0000 (13:40 -0200)]
mx25: Select the ESDHC_A001 erratum

When a high speed card is connected to mx25 the following error is seen:

U-Boot 2017.11-rc2-00104-gb79372a (Oct 31 2017 - 11:02:22 -0200)

CPU:   Freescale i.MX25 rev1.2 at 399 MHz
Reset cause: POR
Board: MX25PDK
I2C:   ready
DRAM:  64 MiB
No arch specific invalidate_icache_all available!
MMC:   FSL_SDHC: 0
*** Warning - read failed, using default environment
In:    serial
Out:   serial
Err:   serial
Net:   FEC
Hit any key to stop autoboot:  0
=> saveenv
Saving Environment to MMC...
Writing to MMC(0)... failed

, which prevents any usage of the SD card.

The root cause for the failure is the eSDHC-A001 erratum:

"eSDHC-A001 : Data timeout counter (SYSCTL[DTOCV]) is not reliable for
values of 0x4,0x8, and 0xC" that is listed
on some PowerArchitecture chips:
https://www.nxp.com/files-static/32bit/doc/errata/MPC8379ECE.pdf

Even though eSDHC-A001 is not documented on the i.MX25 errata document,
I have confirmed with the NXP design team that this erratum does affect
i.MX25, so fix the problem by selecting SYS_FSL_ERRATUM_ESDHC_A001
at SoC level.

Successfully tested with a high speed SD card on a mx25pdk board.

Suggested-by: Benoît Thébaudeau <benoit@wsystem.com>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Otavio Salvador <otavio@ossystems.com.br> # mx25pdk
7 years agomx25: Move MX25 selection to Kconfig
Fabio Estevam [Fri, 3 Nov 2017 15:40:08 +0000 (13:40 -0200)]
mx25: Move MX25 selection to Kconfig

The motivation for moving MX25 selection to Kconfig is to be
able to better handle MX25 specific errata, so that an errata option
can be selected at SoC level instead of board level.

This selection method also aligns with the way other i.MX SoCs are
selected in U-Boot.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
7 years agorockchip: remove SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR from defconfig
Kever Yang [Thu, 2 Nov 2017 07:16:36 +0000 (15:16 +0800)]
rockchip: remove SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR from defconfig

Use default value 0x4000 for SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR instead
of define a new one.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: doc: update U-Boot location info
Kever Yang [Thu, 2 Nov 2017 07:16:35 +0000 (15:16 +0800)]
rockchip: doc: update U-Boot location info

Update rockchip U-Boot location to 0x4000/16384.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agospl: set SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR to 0x4000 for rockchip
Kever Yang [Thu, 2 Nov 2017 07:16:34 +0000 (15:16 +0800)]
spl: set SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR to 0x4000 for rockchip

Rockchip use a 'loader2' partition for U-Boot, so u-boot.bin or
u-boot.itb load by SPL need to locate at0x4000. Detail here:
http://opensource.rock-chips.com/wiki_Boot_option

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: board: puma_rk3399: make env location selectable via Kconfig
Klaus Goger [Mon, 6 Nov 2017 22:02:56 +0000 (23:02 +0100)]
rockchip: board: puma_rk3399: make env location selectable via Kconfig

The environment storage location is selectable via Kconfig. We support
eMMC, SD and SPI-NOR as location for U-Boot. This adds support to store
the environment in the SPI-NOR additional to the default eMMC location.

Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: dts: rk3399: change sd-card io voltage to 3.0V
Klaus Goger [Mon, 6 Nov 2017 22:02:55 +0000 (23:02 +0100)]
rockchip: dts: rk3399: change sd-card io voltage to 3.0V

The VCC_SD and VCC_SDIO rail should only be powered up to 3.0V on RK3399
platforms.

Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: dts: Use defines for pin names in rk3399-puma.dtsi and rk3368-lion.dts
Klaus Goger [Mon, 6 Nov 2017 22:02:54 +0000 (23:02 +0100)]
rockchip: dts: Use defines for pin names in rk3399-puma.dtsi and rk3368-lion.dts

pinctrl/rockchip.h provides defines that map pin numbers to pin names.
Use them to make the dts more human readable.

Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: dts: rk3399-puma: update USB configuration
Philipp Tomsich [Mon, 6 Nov 2017 22:02:53 +0000 (23:02 +0100)]
rockchip: dts: rk3399-puma: update USB configuration

This change updates the USB configuration for the RK3399-Q7 in the DTS:
 * fixes the OTG board configuration by enabling it ('okay')
 * improves the speed of 'usb start' by disabling the unused EHCI/OHCI
   controllers

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Tested-by: Klaus Goger <klaus.goger@theobroma-systems.com>
7 years agorockchip: dts: rk3399-puma: update usbhub_enable regulator
Philipp Tomsich [Mon, 6 Nov 2017 22:02:52 +0000 (23:02 +0100)]
rockchip: dts: rk3399-puma: update usbhub_enable regulator

To correctly model the usbhub_enable regulator for U-Boot, we need
to change the settings to:
 * the GPIO polarity is GPIO_ACTIVE_LOW
 * should be set to inactive (enable-active-low) when boot-on settings
   are applied
 * it can be changed at runtime (i.e. remove the always-on)

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Tested-by: Klaus Goger <klaus.goger@theobroma-systems.com>
7 years agorockchip: dts: rk3399-puma: fix the modelling of BIOS_DISABLE
Philipp Tomsich [Mon, 6 Nov 2017 22:02:51 +0000 (23:02 +0100)]
rockchip: dts: rk3399-puma: fix the modelling of BIOS_DISABLE

The fixed regulator for overriding BIOS_DISABLE had been modelling
backwards (i.e. the GPIO polarity and the enable-active-low/high
property had both been inverted), causing the 'regulator' command
to always print/expect 'disabled'/'enabled' backwards.

This fixes the mix-up and models it correctly:
 * the GPIO is low-active
 * the regulator should be enabled (enable-active-high) during
   boot-on initialisation

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Tested-by: Klaus Goger <klaus.goger@theobroma-systems.com>
7 years agorockchip: config: use common CONFIG_ENV_SIZE for all SoCs
Kever Yang [Tue, 31 Oct 2017 07:52:20 +0000 (15:52 +0800)]
rockchip: config: use common CONFIG_ENV_SIZE for all SoCs

All Rockchip SoCs use 32KB as CONFIG_ENV_SIZE.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: config: sync the ENV offset from rockchip legacy U-Boot
Kever Yang [Tue, 31 Oct 2017 07:52:19 +0000 (15:52 +0800)]
rockchip: config: sync the ENV offset from rockchip legacy U-Boot

Using the ENV offset from rockchip legacy U-Boot for all SoCs,
the offset is 4MB-32KB

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: rock: remove CONFIG_ENV_OFFSET
Kever Yang [Fri, 3 Nov 2017 08:11:04 +0000 (16:11 +0800)]
rockchip: rock: remove CONFIG_ENV_OFFSET

We use the same default ENV setting in rockchip_common.h for all SoC.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agoPrepare v2017.11-rc4 v2017.11-rc4
Tom Rini [Mon, 6 Nov 2017 23:25:37 +0000 (18:25 -0500)]
Prepare v2017.11-rc4

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agocosmetic: rmobile: renesas spelled wrong
Chris Brandt [Fri, 3 Nov 2017 15:36:12 +0000 (10:36 -0500)]
cosmetic: rmobile: renesas spelled wrong

Renesas was spelled wrong.

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
7 years agoDo not attempt to use the systemwide libfdt
Jan Kundrát [Fri, 3 Nov 2017 02:06:35 +0000 (03:06 +0100)]
Do not attempt to use the systemwide libfdt

U-Boot bundles a patched copy of libfdt, so it's wrong to attempt to
include it <like/this>. This breaks the build for me when I have dtc
fully installed in my host -- as happened earlier tonight with
Buildroot, for example.

There are several other occurrences throughout the code where '<libfdt'
matches. I'm not modifying these because I have no clue why the
<systemwide> include style is being used -- IMHO wrongly.

Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
7 years agom68k: doc: update outdated documentation
Angelo Dureghello [Fri, 3 Nov 2017 00:35:34 +0000 (01:35 +0100)]
m68k: doc: update outdated documentation

Update m68k documentation to reflect the current ColdFire
architecture support status.

Signed-off-by: Angelo Dureghello <angelo@sysam.it>
7 years agodisk: part_dos: fix part_get_info_extended() function
Shawn Guo [Thu, 2 Nov 2017 08:46:34 +0000 (16:46 +0800)]
disk: part_dos: fix part_get_info_extended() function

The check in part_get_info_extended() for a successful partition
searching misses a condition for extended partition. In case of
(ext_part_sector == 0), we should anyway mark the partition as found,
even if it's an extended partition, i.e. (is_extended(pt->sys_ind) == 0).
Otherwise, the extended partition (type 0x0f) will never be identified,
and the following recursive call to part_get_info_extended() will get a
wrong 'part_num' and 'which_part' parameter.  In the end, all those
partitions in extended table will not be identified.

Let's add the missing OR condition of (ext_part_sector == 0) for
is_extended() check to fix the problem.

The issue is discovered by running fastboot flash to an extended
partition on eMMC.

  $ fastboot flash mmcsda5 cache.img
  target reported max download size of 536870912 bytes
  sending 'mmcsda5' (18796 KB)...
  OKAY [  2.144s]
  writing 'mmcsda5'...
  FAILED (remote: cannot find partition)
  finished. total time: 2.261s

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
7 years agogpt: Use cache aligned buffers for gpt_h and gpt_e
Lukasz Majewski [Fri, 27 Oct 2017 10:28:10 +0000 (12:28 +0200)]
gpt: Use cache aligned buffers for gpt_h and gpt_e

Before this patch one could receive following errors when executing
"gpt write" command on machine with cache enabled:

display5 factory > gpt write mmc ${mmcdev} ${partitions}
Writing GPT:
CACHE: Misaligned operation at range [4ef8f7f04ef8f9f0]
CACHE: Misaligned operation at range [4ef8f9f84ef939f8]
CACHE: Misaligned operation at range [4ef8f9f84ef939f8]
CACHE: Misaligned operation at range [4ef8f7f04ef8f9f0]
success!

To alleviate this problem - the calloc()s have been replaced with
malloc_cache_aligned() and memset().

After those changes the buffers are properly aligned (with both start
address and size) to SoC cache line.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
7 years agotools: image: fix message when fail to add verification data for config
Masahiro Yamada [Fri, 27 Oct 2017 06:04:21 +0000 (15:04 +0900)]
tools: image: fix message when fail to add verification data for config

This function is called when signing configuration nodes.  Adjust
the error message.

I do not know why we do not need to show the error message in case of
ENOSPC.  Remove the if-conditional that seems unnecessary.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agotools: image: allow to sign image nodes without -K option
Masahiro Yamada [Fri, 27 Oct 2017 06:04:20 +0000 (15:04 +0900)]
tools: image: allow to sign image nodes without -K option

If -K option is missing when you sign image nodes, it fails with
an unclear error message:

  tools/mkimage Can't add hashes to FIT blob: -1

It is hard to figure out the cause of the failure.

In contrast, when you sign configuration nodes, -K is optional because
fit_config_process_sig() returns successfully if keydest is unset.
Probably this is a preferred behavior when you want to update FIT with
the same key; you do not have to update the public key in this case.

So, this commit changes fit_image_process_sig() to continue signing
without keydest.  If ->add_verify_data() fails, show a clearer error
message, which has been borrowed from fit_config_process_sig().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agotools: image: fix "algo" property of public key for verified boot
Masahiro Yamada [Fri, 27 Oct 2017 04:25:21 +0000 (13:25 +0900)]
tools: image: fix "algo" property of public key for verified boot

The "algo_name" points to a property in a blob being edited.  The
pointer becomes stale when fit_image_write_sig() inserts signatures.
Then crypto->add_verify_data() writes wrong data to the public key
destination.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agotest/py: regenerate persistent GPT image if code changes
Stephen Warren [Fri, 27 Oct 2017 00:23:35 +0000 (18:23 -0600)]
test/py: regenerate persistent GPT image if code changes

test_gpt generates a persistent disk image which can be re-used across
multiple test runs. Currently, if the Python code that generates the disk
image change, the image is not regenerated, which could cause test
failures e.g. if a test was updated to expect some new partition name or
size, yet the persistent disk image contained the old name or size. This
change introduces functionality to regenerate the disk image if the
instructions to generate the image have changed.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
7 years agotools: env: allow to print U-Boot version
Stefan Agner [Thu, 26 Oct 2017 12:57:53 +0000 (14:57 +0200)]
tools: env: allow to print U-Boot version

The fw_env utility family has a default environment compiled in
which ties it quite strongly to the U-Boot source/config it has
been built with. Allow to display the U-Boot version it has been
built with using the -v/--version argument.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
7 years agoimage-sig: use designated initializers for algorithm
Masahiro Yamada [Mon, 23 Oct 2017 01:03:40 +0000 (10:03 +0900)]
image-sig: use designated initializers for algorithm

Designated initializers are more readable because we do not
have to check the order in the struct definitions.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoMAINTAINERS: Add missing boards and config entries
Tom Rini [Sat, 21 Oct 2017 16:54:02 +0000 (12:54 -0400)]
MAINTAINERS: Add missing boards and config entries

As part of my usual round of build testing, output about missing
MAINTAINERS information was not logged, and thus often overlooked.
Correct that mistake by ensuring that I log the output of
genboardscfg.py every time.  As part of that, address a number of
missing MAINTAINERS entires.  In the case of a missing file, I have put
the original submitter down.  In the rest of the cases I have added the
config (and sometimes relevant header file) to the existing set of file
globs.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agotpm: st33zp24: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:54:01 +0000 (09:54 +0200)]
tpm: st33zp24: fix STMicroelectronics copyright

Uniformize STMicroelectronics copyrights header

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agospear: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:54:00 +0000 (09:54 +0200)]
spear: fix STMicroelectronics copyright

Uniformize STMicroelectronics copyrights headers for SPEAR
related code.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agostv0991: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:53:59 +0000 (09:53 +0200)]
stv0991: fix STMicroelectronics copyright

Uniformize STMicroelectronics copyrights headers for STV0991
related code.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agostm32: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:53:58 +0000 (09:53 +0200)]
stm32: fix STMicroelectronics copyright

Uniformize STMicroelectronics copyrights headers for STM32
related code.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agosti: fix STMicroelectronics copyright
Patrice Chotard [Mon, 23 Oct 2017 07:53:57 +0000 (09:53 +0200)]
sti: fix STMicroelectronics copyright

Uniformize all STMicroelectronics copyrights headers for STi
related code.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
7 years agoMerge git://git.denx.de/u-boot-samsung
Tom Rini [Mon, 6 Nov 2017 14:24:55 +0000 (09:24 -0500)]
Merge git://git.denx.de/u-boot-samsung

7 years agovideo: sunxi: de2: fix SimpleFB node creation when HDMI not initialized
Icenowy Zheng [Wed, 1 Nov 2017 14:18:06 +0000 (22:18 +0800)]
video: sunxi: de2: fix SimpleFB node creation when HDMI not initialized

When HDMI is not initialized (e.g. no monitor is plugged), the current
SimpleFB code will still create a broken SimpleFB node.

Detect whether HDMI is initialized when creating SimpleFB node.

Fixes: be5b96f0e411 ("sunxi: setup simplefb for Allwinner DE2")
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 years agoARM: dts: exynos: fix property values of LDO15/17 for ODROID-XU3/4
Dongjin Kim [Sun, 29 Oct 2017 16:39:59 +0000 (12:39 -0400)]
ARM: dts: exynos: fix property values of LDO15/17 for ODROID-XU3/4

Looking at the schematic, LDO15 and LDO17 are tied as a power source of a
builtin network chipset. The voltage on LDO15 is corrected to 3.3V and the
name of LDO17 is corrected to "vdd_ldo17".

Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
7 years agoKconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT
Tom Rini [Sun, 22 Oct 2017 21:55:07 +0000 (17:55 -0400)]
Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT

We move all instances of CONFIG_MTDIDS_DEFAULT and
CONFIG_MTDPARTS_DEFAULT from the header files to the defconfig files.
There's a few cases here where we need to expand upon what was in the
header file.

Tested-by: Adam Ford <aford173@gmail.com> #omap3_logic
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge tag 'xilinx-fixes-for-v2017.11' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Fri, 3 Nov 2017 14:02:29 +0000 (10:02 -0400)]
Merge tag 'xilinx-fixes-for-v2017.11' of git://denx.de/git/u-boot-microblaze

Xilinx fix for v2017.11

- Fix ceva sata initialization

7 years agoscsi: ceva: Start port in probe
Michal Simek [Thu, 2 Nov 2017 14:45:34 +0000 (15:45 +0100)]
scsi: ceva: Start port in probe

The patch:
"dm: ahci: Unwind the confusing init code"
(sha1: 7cf1afce7fa3fe64189020fe14b93f7326dd0758)
introduce bug for ceva sata because port didn't start.
On the other hand the dwc_ahci.c was fixed correctly.
Do the same change for ceva too.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
7 years agoMerge git://git.denx.de/u-boot-rockchip
Tom Rini [Wed, 1 Nov 2017 13:32:14 +0000 (09:32 -0400)]
Merge git://git.denx.de/u-boot-rockchip

7 years agorockchip: lion-rk3368: defconfig: select PHY_MICREL_KSZ90X1
Philipp Tomsich [Mon, 30 Oct 2017 13:44:54 +0000 (14:44 +0100)]
rockchip: lion-rk3368: defconfig: select PHY_MICREL_KSZ90X1

The RK3368-uQ7 uses a KSZ9031 PHY on-module.  Enable PHY_MICREL_KSZ90X1
in the associated defconfig.

References: da3b9e7f ("Move PHY_MICREL and PHY_MICREL_KSZ90X1 to Kconfig")
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: puma-rk3399: defconfig: select PHY_MICREL_KSZ90X1
Philipp Tomsich [Mon, 30 Oct 2017 13:44:55 +0000 (14:44 +0100)]
rockchip: puma-rk3399: defconfig: select PHY_MICREL_KSZ90X1

The RK3368-uQ7 uses a KSZ9031 PHY on-module.  Enable PHY_MICREL_KSZ90X1
in the associated defconfig (this somehow got lost with da3b9e7f).

References: da3b9e7f ("Move PHY_MICREL and PHY_MICREL_KSZ90X1 to Kconfig")
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>