oweals/u-boot.git
6 years agoarm: sunxi: Move spl spi sunxi code to mach-sunxi
Jagan Teki [Tue, 6 Feb 2018 17:12:56 +0000 (22:42 +0530)]
arm: sunxi: Move spl spi sunxi code to mach-sunxi

This SUNXI variant SPL SPI code doesn't use either SPI or
SPL_FLASG subsystems due to size constraints and also placing
this code in drivers/mtd/spi will unnecessary build SPI_FLASH
code(if defined) which never required, hence moved to arch area.

And also renamed the file according to kconfig which resembles
proper name.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
6 years agospi: omap3: Skip set_mode, set_speed from claim
Jagan Teki [Wed, 7 Mar 2018 05:00:45 +0000 (10:30 +0530)]
spi: omap3: Skip set_mode, set_speed from claim

set_mode, set_seed functions has separate function pointers
in dm_spi_ops, so use them in relevent one instead of
calling from claim_bus.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
6 years agospi: atcspi200: Drop non-dm code
Jagan Teki [Wed, 7 Mar 2018 05:03:33 +0000 (10:33 +0530)]
spi: atcspi200: Drop non-dm code

Boards adp-ae3xx_defconfig, nx25-ae250_defconfig
already enabled DM_SPI, so non-dm code make no use
of it hence droped.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
6 years agoPrepare v2018.03 v2018.03
Tom Rini [Tue, 13 Mar 2018 12:02:19 +0000 (08:02 -0400)]
Prepare v2018.03

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoimx: hab: Convert DCD non-NULL error to warning
Bryan O'Donoghue [Fri, 9 Mar 2018 13:07:21 +0000 (13:07 +0000)]
imx: hab: Convert DCD non-NULL error to warning

commit 8c4037a09a5c ("imx: hab: Ensure the IVT DCD pointer is Null prior
to calling HAB authenticate function.") makes the DCD field being NULL a
dependency.

This change though will break loading and executing of existing pre-signed
binaries on a u-boot update i.e. if this change is deployed on a board you
will be forced to redo all images on that board to NULL out the DCD.

There is no prior guidance from NXP that the DCD must be NULL similarly
public guidance on usage of the HAB doesn't call out this NULL dependency
(see boundary devices link).

Since later SoCs will reject a non-NULL DCD there's no reason to make a
NULL DCD a requirement, however if there is an actual dependency for later
SoCs the appropriate fix would be to do SoC version checking.

Earlier SoCs are capable (and happy) to authenticate images with non-NULL
DCDs, we should not be forcing this change on downstream users -
particularly if it means those users now must rewrite their build systems
and/or redeploy signed images in the field.

Fixes: 8c4037a09a5c ("imx: hab: Ensure the IVT DCD pointer is Null prior
to calling HAB authenticate function.")

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Utkarsh Gupta <utkarsh.gupta@nxp.com>
Cc: Breno Lima <breno.lima@nxp.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Link: https://boundarydevices.com/high-assurance-boot-hab-dummies
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
6 years agodoc: mxc_hab: Update i.MX HAB documentation
Breno Lima [Thu, 22 Feb 2018 00:42:56 +0000 (00:42 +0000)]
doc: mxc_hab: Update i.MX HAB documentation

The README.mxc_hab is outdated and need improvements, add the following
modifications:

- Reorganize document and remove duplicate content
- Add CST download link
- Update CST package name
- Align command lines with CST v2.3.3
- Update U-Boot binary name
- Remove CSF padding since is not documented in AN4581

Signed-off-by: Breno Lima <breno.lima@nxp.com>
6 years agodoc: mxc_hab: Move HAB related info to the appropriate doc
Breno Lima [Thu, 22 Feb 2018 00:42:55 +0000 (00:42 +0000)]
doc: mxc_hab: Move HAB related info to the appropriate doc

Currently the High Assurance Boot procedure is documented in two
places:

- doc/README.imx6
- doc/README.mxc_hab

It is better to consolidate all HAB related information into
README.mxc_hab file, so move the content from README.imx6 to
README.mxc_hab.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
6 years agoimx: hab: Make usage of packed attribute consistent
Bryan O'Donoghue [Fri, 9 Mar 2018 13:07:20 +0000 (13:07 +0000)]
imx: hab: Make usage of packed attribute consistent

commit cd2d46003ce1 ("arm: imx: hab: Add IVT header definitions") declares
struct ivt_header as "__attribute__((packed))".

commit ed286bc80e9d ("imx: hab: Check if CSF is valid before
authenticating image") declares struct hab_hdr with __packed.

This patch makes the __packed convention consistent.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Utkarsh Gupta <utkarsh.gupta@nxp.com>
Cc: Breno Lima <breno.lima@nxp.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
6 years agoimx: hab: Fix usage of packed attribute
Bryan O'Donoghue [Fri, 9 Mar 2018 13:07:19 +0000 (13:07 +0000)]
imx: hab: Fix usage of packed attribute

commit ed286bc80e9d ("imx: hab: Check if CSF is valid before authenticating
image") makes use of "__packed" as a prefix to the "struct hab_hdr"
declaration.

With my compiler "gcc version 7.2.1 20171011 (Linaro GCC 7.2-2017.11)" we
get:

./arch/arm/include/asm/mach-imx/hab.h:42:25: error: expected ‘=’, ‘,’, ‘;’,
‘asm’ or ‘__attribute__’ before ‘{’ token
 struct __packed hab_hdr {

Fix this problem by including <linux/compiler.h>

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Utkarsh Gupta <utkarsh.gupta@nxp.com>
Cc: Breno Lima <breno.lima@nxp.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
6 years agoARM: dts: imx6dl-icore-rqs: Fix to include correct dtsi
Jagan Teki [Tue, 6 Mar 2018 11:45:59 +0000 (17:15 +0530)]
ARM: dts: imx6dl-icore-rqs: Fix to include correct dtsi

This patch fixes the wrongly included dtsi file which was
breaking mainline support for Engicam i.CoreM6 DualLite/Solo RQS.

Linux commit details for the same change as
"ARM: dts: imx6dl: Include correct dtsi file for Engicam i.CoreM6
DualLite/Solo RQS"
(sha1: c0c6bb2322964bd264b4ddedaa5776f40c709f0c)

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
6 years agoARM: dts: imx6qdl-icore-rqs: Sync usdhc4 node from Linux
Jagan Teki [Tue, 6 Mar 2018 11:45:58 +0000 (17:15 +0530)]
ARM: dts: imx6qdl-icore-rqs: Sync usdhc4 node from Linux

usdhc4 node need to update pinctrl, bus-width and non-removable
properties, sync the same from Linux.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
6 years agoMerge git://git.denx.de/u-boot-imx
Tom Rini [Fri, 9 Mar 2018 18:29:58 +0000 (13:29 -0500)]
Merge git://git.denx.de/u-boot-imx

6 years agoconfigs: Resync with savedefconfig
Tom Rini [Fri, 9 Mar 2018 14:27:23 +0000 (09:27 -0500)]
configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agotools/mkimage: Use proper output parameter in dtc-system call
Stefan Theil [Thu, 8 Mar 2018 08:00:13 +0000 (09:00 +0100)]
tools/mkimage: Use proper output parameter in dtc-system call

The system call used by mkimage to run dtc redirects stdout to a
temporary file. This can cause problems on Windows (with a MinGW
cross-compiled version). Using the "-o" dtc parameter avoids
this problem.

Signed-off-by: Stefan Theil <stefan.theil@mixed-mode.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agofs: ext4: Do not print mount fail message when not ext4 filesystem
Marek Behún [Wed, 7 Mar 2018 23:26:08 +0000 (00:26 +0100)]
fs: ext4: Do not print mount fail message when not ext4 filesystem

Other filesystem drivers don't do this.

Signed-off-by: Marek Behun <marek.behun@nic.cz>
6 years agoMAINTAINERS: bring sections into alphabetic order
Heinrich Schuchardt [Wed, 7 Mar 2018 03:04:29 +0000 (04:04 +0100)]
MAINTAINERS: bring sections into alphabetic order

NETWORK should be after NAND_FLASH.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agoscripts/coccinelle: add some more coccinelle tests
Heinrich Schuchardt [Thu, 8 Mar 2018 19:56:17 +0000 (20:56 +0100)]
scripts/coccinelle: add some more coccinelle tests

kmerr: verify that malloc and calloc are followed by a check to verify
that we are not out of memory.

badzero: Compare pointer-typed values to NULL rather than 0

Both checks are copied from the Linux kernel archive.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agoyaffs2: iterator variable cannot be NULL
Heinrich Schuchardt [Thu, 8 Mar 2018 21:52:29 +0000 (22:52 +0100)]
yaffs2: iterator variable cannot be NULL

The iterator of list_for_each() is never NULL.

Identified with coccinelle.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agobcm283x_pl011: Flush RX queue after setting baud rate
Alexander Graf [Wed, 7 Mar 2018 21:08:25 +0000 (22:08 +0100)]
bcm283x_pl011: Flush RX queue after setting baud rate

After the UART was initialized, we may still have bogus data in the
RX queue if it was enabled with incorrect pin muxing before.

So let's flush the RX queue whenever we initialize baud rates.

This fixes a regression with the dynamic pinmuxing code when enable_uart=1
is not set in config.txt on Raspberry Pis that use pl011 for serial.

Fixes: caf2233b28 ("bcm283x: Add pinctrl driver")
Reported-by: Göran Lundberg <goran@lundberg.email>
Reported-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Tested-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agoserial_bcm283x_mu: Flush RX queue after setting baud rate
Alexander Graf [Wed, 7 Mar 2018 21:08:24 +0000 (22:08 +0100)]
serial_bcm283x_mu: Flush RX queue after setting baud rate

After the UART was initialized, we may still have bogus data in the
RX queue if it was enabled with incorrect pin muxing before.

So let's flush the RX queue whenever we initialize baud rates.

This fixes a regression with the dynamic pinmuxing code when enable_uart=1
is not set in config.txt.

Fixes: caf2233b28 ("bcm283x: Add pinctrl driver")
Reported-by: Göran Lundberg <goran@lundberg.email>
Reported-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Tested-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agoARM: Drop unreferenced CONFIG_* defines named after boards
Tuomas Tynkkynen [Mon, 5 Mar 2018 23:46:39 +0000 (01:46 +0200)]
ARM: Drop unreferenced CONFIG_* defines named after boards

The following config symbols are only defined once and never referenced
anywhere else:

CONFIG_AT91SAM9263EK
CONFIG_AT91SAM9RLEK
CONFIG_BARIX_IPAM390
CONFIG_BOARD_H2200
CONFIG_EP9301
CONFIG_KZM_A9_GT
CONFIG_PICOSAM
CONFIG_PLATINUM_PICON
CONFIG_PLATINUM_TITANIUM
CONFIG_PM9261
CONFIG_PM9263
CONFIG_PM9G45
CONFIG_SIEMENS_DRACO
CONFIG_SIEMENS_PXM2
CONFIG_SIEMENS_RUT
CONFIG_SMDKC100
CONFIG_SMDKV310
CONFIG_STM32F4DISCOVERY

Most of them are config symbols named after the respective boards which
seems to have been a standard practice at some point.

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agoARM: Drop unreferenced CONFIG_* defines named after SoCs
Tuomas Tynkkynen [Mon, 5 Mar 2018 23:46:38 +0000 (01:46 +0200)]
ARM: Drop unreferenced CONFIG_* defines named after SoCs

The following config symbols are only defined once and never referenced
anywhere else:

CONFIG_ARM926EJS
CONFIG_CPUAT91
CONFIG_EXYNOS5800
CONFIG_SYS_CORTEX_R4

Most of them are config symbols named after the respective SoCs which
seems to have been a standard practice at some point.

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agoMIPS: Drop unreferenced CONFIG_* defines
Tuomas Tynkkynen [Mon, 5 Mar 2018 23:46:37 +0000 (01:46 +0200)]
MIPS: Drop unreferenced CONFIG_* defines

The following config symbols are only defined once and never referenced
anywhere else:

CONFIG_DBAU1X00
CONFIG_PB1X00

Most of them are config symbols named after the respective boards which
seems to have been a standard practice at some point.

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years agotreewide: Fix gdsys mail addresses
Mario Six [Tue, 6 Mar 2018 07:04:58 +0000 (08:04 +0100)]
treewide: Fix gdsys mail addresses

The @gdsys.cc addresses are supposed to be used for mailing lists.
Switch all occurrences of @gdsys.de mail addresses to their @gdsys.cc
equivalent.

Also, Dirk's address was wrong in one place; fix that as well.

Signed-off-by: Mario Six <six@gdsys.cc>
6 years agoARM: qemu-arm: Increase CONFIG_SYS_CBSIZE
Tuomas Tynkkynen [Mon, 5 Mar 2018 21:20:41 +0000 (23:20 +0200)]
ARM: qemu-arm: Increase CONFIG_SYS_CBSIZE

CONFIG_SYS_CBSIZE determines the maximum length of the kernel command
line, and the default value of 256 is too small for booting some Linux
images in the wild.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
6 years agoimx: syscounter: make sure asm is volatile
Yasushi SHOJI [Thu, 8 Mar 2018 04:21:10 +0000 (13:21 +0900)]
imx: syscounter: make sure asm is volatile

Without the volatile attribute, compilers are entitled to optimize out
the same asm().  In the case of __udelay() in syscounter.c, it calls
`get_ticks()` twice, one for the starting time and the second in the
loop to check the current time.  When compilers inline `get_ticks()`
they see the same `mrrc` instructions and optimize out the second one.
This leads to infinite loop since we don't get updated value from the
system counter.

Here is a portion of the disassembly of __udelay:

  88: 428b       cmp r3, r1
  8a: f8ce 20a4  str.w r2, [lr, #164] ; 0xa4
  8e: bf08       it eq
  90: 4282       cmpeq r2, r0
  92: f8ce 30a0  str.w r3, [lr, #160] ; 0xa0
  96: d3f7       bcc.n 88 <__udelay+0x88>
  98: e8bd 8cf0  ldmia.w sp!, {r4, r5, r6, r7, sl, fp, pc}

Note that final jump / loop at 96 to 88, we don't have any `mrrc`.

With a volatile attribute, the above changes to this:

  8a: ec53 2f0e  mrrc 15, 0, r2, r3, cr14
  8e: 42ab       cmp r3, r5
  90: f8c1 20a4  str.w r2, [r1, #164] ; 0xa4
  94: bf08       it eq
  96: 42a2       cmpeq r2, r4
  98: f8c1 30a0  str.w r3, [r1, #160] ; 0xa0
  9c: d3f5       bcc.n 8a <__udelay+0x8a>
  9e: e8bd 8cf0  ldmia.w sp!, {r4, r5, r6, r7, sl, fp, pc}
  a2: bf00       nop

I'm advised[1] to put volatile on all asm(), so this commit also adds it
to the asm() in timer_init().

[1]: https://lists.denx.de/pipermail/u-boot/2018-March/322062.html

Signed-off-by: Yasushi SHOJI <yasushi.shoji@gmail.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
6 years agoimximage: Remove failure when no IVT offset is found
Fabio Estevam [Fri, 9 Mar 2018 11:25:00 +0000 (08:25 -0300)]
imximage: Remove failure when no IVT offset is found

Sometimes imximage throws the following error:

  CFGS    board/freescale/vf610twr/imximage.cfg.cfgtmp
  CFGS    board/freescale/vf610twr/imximage.cfg.cfgtmp
  MKIMAGE u-boot-dtb.imx
Error: No BOOT_FROM tag in board/freescale/vf610twr/imximage.cfg.cfgtmp
arch/arm/mach-imx/Makefile:100: recipe for target 'u-boot-dtb.imx' failed

Later on, when running mkimage for the u-boot.imx it will succeed in
finding the IVT offset.

Looks like some race condition happening during parallel build when
processing mkimage for u-boot-dtb.imx and u-boot.imx.

A proper fix still needs to be implemented, but as a workaround let's
remove the error when the IVT offset is not found.

It is useful to have such message, especially during bring-up phase,
but the build error that it causes is severe, so better avoid the
build error for now.

The error checking can be re-implemented later when we have a proper
fix.

Reported-by: Breno Lima <breno.lima@nxp.com>
Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
6 years agoPrepare v2018.03-rc4 v2018.03-rc4
Tom Rini [Tue, 6 Mar 2018 01:27:08 +0000 (20:27 -0500)]
Prepare v2018.03-rc4

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoMerge git://git.denx.de/u-boot-sh
Tom Rini [Tue, 6 Mar 2018 01:24:17 +0000 (20:24 -0500)]
Merge git://git.denx.de/u-boot-sh

6 years agoDevboards.de DBM-SoC1 BOARD: Add S line
Tom Rini [Mon, 5 Mar 2018 15:20:46 +0000 (10:20 -0500)]
Devboards.de DBM-SoC1 BOARD: Add S line

This was missing the 'S' line causing a warning from genboardscfg.py

Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoARM: DTS: Re-sync logicpd-som-lv with Linux 4.16-rc3
Adam Ford [Mon, 5 Mar 2018 10:16:33 +0000 (04:16 -0600)]
ARM: DTS: Re-sync logicpd-som-lv with Linux 4.16-rc3

This should clean up a warning about a missing phy-cells

Signed-off-by: Adam Ford <aford173@gmail.com>
6 years agoMAINTAINERS: bring sections into alphabetic order
Heinrich Schuchardt [Mon, 5 Mar 2018 07:15:51 +0000 (08:15 +0100)]
MAINTAINERS: bring sections into alphabetic order

POWER should be after ONENAND

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agoscripts/spelling.txt: Sync script with kernel 4.16-rc4
Fabio Estevam [Mon, 5 Mar 2018 01:55:19 +0000 (22:55 -0300)]
scripts/spelling.txt: Sync script with kernel 4.16-rc4

Keep spelling.txt in sync with the version from kernel 4.16-rc4.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agoomap3_logic: Remove unnecessary undefs
Adam Ford [Sun, 4 Mar 2018 21:05:38 +0000 (15:05 -0600)]
omap3_logic: Remove unnecessary undefs

Due to evolution of the MMC driver and better support, let's
remove unnecessary undefs.

Signed-off-by: Adam Ford <aford173@gmail.com>
6 years agoti_armv7_omap: Remove comment remnant
Adam Ford [Sun, 4 Mar 2018 20:54:15 +0000 (14:54 -0600)]
ti_armv7_omap: Remove comment remnant

With the migration to Kconfig, the I2C block no longer exists in here.
Let's clean up the comment.

Signed-off-by: Adam Ford <aford173@gmail.com>
6 years agoMPC8315ERDB: Enable DHCP support
Ed Bartosh [Sun, 4 Mar 2018 18:17:52 +0000 (19:17 +0100)]
MPC8315ERDB: Enable DHCP support

Enable DHCP support for this board.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agolibfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>
Masahiro Yamada [Sun, 4 Mar 2018 16:20:11 +0000 (01:20 +0900)]
libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>

Thomas reported U-Boot failed to build host tools if libfdt-devel
package is installed because tools include libfdt headers from
/usr/include/ instead of using internal ones.

This commit moves the header code:
  include/libfdt.h         -> include/linux/libfdt.h
  include/libfdt_env.h     -> include/linux/libfdt_env.h

and replaces include directives:
  #include <libfdt.h>      -> #include <linux/libfdt.h>
  #include <libfdt_env.h>  -> #include <linux/libfdt_env.h>

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
6 years agotools: Include U-Boot libfdt headers from their actual path
Paul Kocialkowski [Fri, 2 Mar 2018 22:13:42 +0000 (23:13 +0100)]
tools: Include U-Boot libfdt headers from their actual path

There are no headers for libfdt in lib/libfdt, as they are instead
located in scripts/dtc/libfdt. Specifying lib/libfdt for headers
inclusion in host tools results in using the system libfdt headers,
which is not what we want. Change this to the proper path.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
6 years agoinput: indicate that code page 437 is used
Heinrich Schuchardt [Fri, 2 Mar 2018 20:11:35 +0000 (21:11 +0100)]
input: indicate that code page 437 is used

Add a comment indicating that the German key map assumes code page 437.

Add support for character ² (square sign) in the German key map.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
6 years agopinctrl: Kconfig: Fix typo
Marek Behún [Fri, 2 Mar 2018 08:56:00 +0000 (09:56 +0100)]
pinctrl: Kconfig: Fix typo

Signed-off-by: Marek Behun <marek.behun@nic.cz>
6 years agogpio: pca953x_gpio: Support label setting from DT
Mario Six [Thu, 1 Mar 2018 13:45:04 +0000 (14:45 +0100)]
gpio: pca953x_gpio: Support label setting from DT

The PCA953x driver uses "gpio@%x_" as the GPIO bank name, where "%x" is
instantiated with the I2C address of the chip. While this works, it
becomes very confusing if a board has multiple PCAs with the same
address on different I2C busses, and it also becomes an issue when a
GPIO's value is to be set via the 'gpio' command, because this command
only ever sets the value of the first device it encounters, leaving the
other devices inaccessible to the command.

As to not break boards that rely on this naming scheme, we introduce a
new device tree string property "label" for the driver. If it exists, it
is used to build a bank name of the form "%s@%x_" (where %x is still
instantiated with the I2C address). If it does not exist, the legacy
labeling scheme is used.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
6 years agospl: Kconfig: Rename SPL_USBETH_SUPPORT to SPL_USB_ETHER to match with the U-boot...
Faiz Abbas [Fri, 16 Feb 2018 15:47:44 +0000 (21:17 +0530)]
spl: Kconfig: Rename SPL_USBETH_SUPPORT to SPL_USB_ETHER to match with the U-boot CONFIG

Rename CONFIG_SPL_USBETH_SUPPORT to CONFIG_SPL_USB_ETHER.

This enables users to block text using CONFIG_IS_ENABLED() instead
of resorting to #if ladders with SPL and non-SPL cases.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
6 years agotools/env: allow equal sign as key value separation
Stefan Agner [Thu, 1 Mar 2018 13:06:32 +0000 (14:06 +0100)]
tools/env: allow equal sign as key value separation

Treat the first equal sign as a key/value separation too. This makes
the script files compatible with mkenvimage input file format. It
won't support variables with equal signs anymore, but this seems not
really like a loss.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
6 years agoAtmel TPM: Fix potential buffer overruns
Jeremy Boone [Mon, 12 Feb 2018 22:56:37 +0000 (17:56 -0500)]
Atmel TPM: Fix potential buffer overruns

Ensure that the Atmel TPM driver performs sufficient
validation of the length returned in the TPM response header.
This patch prevents memory corruption if the header contains a
length value that is larger than the destination buffer.

Signed-off-by: Jeremy Boone <jeremy.boone@nccgroup.trust>
6 years agoInfineon TPM: Fix potential buffer overruns
Jeremy Boone [Mon, 12 Feb 2018 22:56:36 +0000 (17:56 -0500)]
Infineon TPM: Fix potential buffer overruns

Ensure that the Infineon I2C and SPI TPM driver performs adequate
validation of the length extracted from the TPM response header.
This patch prevents integer underflow when the length was too small,
which could lead to memory corruption.

Signed-off-by: Jeremy Boone <jeremy.boone@nccgroup.trust>
6 years agoSTMicro TPM: Fix potential buffer overruns
Jeremy Boone [Mon, 12 Feb 2018 22:56:35 +0000 (17:56 -0500)]
STMicro TPM: Fix potential buffer overruns

This patch prevents integer underflow when the length was too small,
which could lead to memory corruption.

Signed-off-by: Jeremy Boone <jeremy.boone@nccgroup.trust>
6 years agoARM: dts: rmobile: Add PHY reset GPIO
Marek Vasut [Fri, 15 Sep 2017 19:11:40 +0000 (21:11 +0200)]
ARM: dts: rmobile: Add PHY reset GPIO

This patch got dropped during the update of DTs to 4.14, re-add it
back. This adds reset GPIOs to the ethernet PHYs.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoARM: dts: rmobile: Make PFC and RST available early on Gen2 only
Marek Vasut [Mon, 5 Mar 2018 09:57:40 +0000 (10:57 +0100)]
ARM: dts: rmobile: Make PFC and RST available early on Gen2 only

These do not need to be available early on Gen3 , so move them to
the respective DT files.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoARM: rmobile: Add R8A77965 Salvator-XS board support
Marek Vasut [Mon, 26 Feb 2018 09:35:15 +0000 (10:35 +0100)]
ARM: rmobile: Add R8A77965 Salvator-XS board support

Add R8A77965 M3N Salvator-XS development kit support. This kit is
similar to the other Salvator-X(S) ones, except is has M3N SoC on
it.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoARM: dts: rmobile: Add SDHI nodes to R8A77965 M3N DT
Marek Vasut [Thu, 1 Mar 2018 20:52:19 +0000 (21:52 +0100)]
ARM: dts: rmobile: Add SDHI nodes to R8A77965 M3N DT

Add SDHI nodes to r8a77965.dtsi to get eMMC and SD slots operational.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoARM: dts: rmobile: Add xHCI node to R8A77965 M3N DT
Marek Vasut [Thu, 1 Mar 2018 20:51:11 +0000 (21:51 +0100)]
ARM: dts: rmobile: Add xHCI node to R8A77965 M3N DT

Add xHCI node to r8a77965.dtsi to get xHCI USB operational.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoARM: dts: rmobile: Add EHCI nodes to R8A77965 M3N DT
Marek Vasut [Thu, 1 Mar 2018 20:51:05 +0000 (21:51 +0100)]
ARM: dts: rmobile: Add EHCI nodes to R8A77965 M3N DT

Add generic EHCI nodes to r8a77965.dtsi to get EHCI USB operational.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoARM: dts: rmobile: Add RAVB node to R8A77965 M3N DT
Marek Vasut [Thu, 1 Mar 2018 20:50:56 +0000 (21:50 +0100)]
ARM: dts: rmobile: Add RAVB node to R8A77965 M3N DT

Add RAVB node to r8a77965.dtsi to get ethernet operational.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoARM: dts: rmobile: Import R8A77965 M3N DT files from Linux
Marek Vasut [Mon, 26 Feb 2018 09:35:15 +0000 (10:35 +0100)]
ARM: dts: rmobile: Import R8A77965 M3N DT files from Linux

Import the R8A77965 M3N DT from Linux 4.16-rc1 .

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agousb: xhci-rcar: Add R8A77965 M3N entries
Marek Vasut [Mon, 26 Feb 2018 09:35:15 +0000 (10:35 +0100)]
usb: xhci-rcar: Add R8A77965 M3N entries

Add entries for the R8A77965 M3N SoC.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agopinctrl: rmobile: Add R8A77965 M3N entries
Marek Vasut [Mon, 26 Feb 2018 09:35:15 +0000 (10:35 +0100)]
pinctrl: rmobile: Add R8A77965 M3N entries

Add entries for the R8A77965 M3N SoC.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agonet: ravb: Add R8A77965 M3N entries
Marek Vasut [Mon, 26 Feb 2018 09:35:15 +0000 (10:35 +0100)]
net: ravb: Add R8A77965 M3N entries

Add entries for the R8A77965 M3N SoC.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Joe Hershberger <joe.hershberger@ni.com>
6 years agommc: uniphier-sd: Add R8A77965 M3N entries
Marek Vasut [Mon, 26 Feb 2018 09:35:15 +0000 (10:35 +0100)]
mmc: uniphier-sd: Add R8A77965 M3N entries

Add entries for the R8A77965 M3N SoC.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
6 years agogpio: rcar: Add R8A77965 M3N entries
Marek Vasut [Mon, 26 Feb 2018 09:35:15 +0000 (10:35 +0100)]
gpio: rcar: Add R8A77965 M3N entries

Add entries for the R8A77965 M3N SoC.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoclk: renesas: Add R8A77965 M3N entries
Marek Vasut [Mon, 26 Feb 2018 09:35:15 +0000 (10:35 +0100)]
clk: renesas: Add R8A77965 M3N entries

Add entries for the R8A77965 M3N SoC.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoARM: rmobile: Add R8A77965 M3N IDs
Marek Vasut [Mon, 26 Feb 2018 09:35:15 +0000 (10:35 +0100)]
ARM: rmobile: Add R8A77965 M3N IDs

Add CPU and PRR IDs for R8A77965 M3N SoC.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoMerge branch 'master' of git://git.denx.de/u-boot-socfpga
Tom Rini [Thu, 1 Mar 2018 20:50:52 +0000 (15:50 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-socfpga

6 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Tom Rini [Thu, 1 Mar 2018 20:50:43 +0000 (15:50 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

6 years agoMerge tag 'xilinx-kconfig-for-v2018.03' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Thu, 1 Mar 2018 17:41:21 +0000 (12:41 -0500)]
Merge tag 'xilinx-kconfig-for-v2018.03' of git://denx.de/git/u-boot-microblaze

Xilinx Kconfig changes for v2018.03

- Moving some macros to Kconfig

# gpg: Signature made Thu 01 Mar 2018 10:45:58 AM EST using DSA key ID 294A0C21
# gpg: Good signature from "Michal Simek <monstr@monstr.eu>"
# gpg:                 aka "Michal Simek (Xilinx) <michals@xilinx.com>"
# gpg:                 aka "Michal Simek (Xilinx) <michal.simek@xilinx.com>"

6 years agommc: Added Kconfig support for CONFIG_ZYNQ_SDHCI_MIN_FREQ
Vipul Kumar [Wed, 28 Feb 2018 10:23:29 +0000 (15:53 +0530)]
mmc: Added Kconfig support for CONFIG_ZYNQ_SDHCI_MIN_FREQ

This patch added Kconfig support for CONFIG_ZYNQ_SDHCI_MIN_FREQ
and enabled it in respective defconfig.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agommc: Added Kconfig support for CONFIG_ZYNQ_SDHCI_MAX_FREQ
Vipul Kumar [Wed, 28 Feb 2018 10:23:28 +0000 (15:53 +0530)]
mmc: Added Kconfig support for CONFIG_ZYNQ_SDHCI_MAX_FREQ

This patch added Kconfig support for CONFIG_ZYNQ_SDHCI_MAX_FREQ
and enabled it in respective defconfig.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agomicroblaze: Added Kconfig support for CONFIG_XILINX_GPIO
Vipul Kumar [Wed, 28 Feb 2018 06:02:22 +0000 (11:32 +0530)]
microblaze: Added Kconfig support for CONFIG_XILINX_GPIO

This patch added Kconfig support for CONFIG_XILINX_GPIO
and enabled it in respective defconfig.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agoi2c: Added kconfig support for CONFIG_ZYNQ_I2C0 and CONFIG_ZYNQ_I2C1
Vipul Kumar [Fri, 16 Feb 2018 13:37:22 +0000 (19:07 +0530)]
i2c: Added kconfig support for CONFIG_ZYNQ_I2C0 and CONFIG_ZYNQ_I2C1

This patch added Kconfig support for CONFIG_ZYNQ_I2C0 and
CONFIG_ZYNQ_I2C1 and enabled it in respective defconfig.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agoi2c: Added Kconfig support for CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET
Vipul Kumar [Fri, 16 Feb 2018 13:37:21 +0000 (19:07 +0530)]
i2c: Added Kconfig support for CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET

This patch added Kconfig support for CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET
and enabled it in respective defconfig.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agoi2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SPEED
Vipul Kumar [Fri, 16 Feb 2018 13:37:20 +0000 (19:07 +0530)]
i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SPEED

This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SPEED
and set it to default value 100000.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agoi2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SLAVE
Vipul Kumar [Fri, 16 Feb 2018 13:37:19 +0000 (19:07 +0530)]
i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SLAVE

This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SLAVE
and set it default to 0.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agoi2c: Enabled CONFIG_SYS_I2C_ZYNQ in the respective defconfig
Vipul Kumar [Fri, 16 Feb 2018 13:37:18 +0000 (19:07 +0530)]
i2c: Enabled CONFIG_SYS_I2C_ZYNQ in the respective defconfig

This patch enabled CONFIG_SYS_I2C_ZYNQ in the respective
defconfig.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agoi2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ
Vipul Kumar [Fri, 16 Feb 2018 13:37:17 +0000 (19:07 +0530)]
i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ

This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
6 years agoarm: zynq: fpga: Added Kconfig support for CONFIG_FPGA_ZYNQPL
Vipul Kumar [Fri, 16 Feb 2018 12:32:51 +0000 (18:02 +0530)]
arm: zynq: fpga: Added Kconfig support for CONFIG_FPGA_ZYNQPL

This patch added Kconfig support for CONFIG_FPGA_ZYNQPL and migrates the
values over to the defconfigs.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
6 years agofpga: Added Kconfig support for FPGA_SPARTAN3
Vipul Kumar [Fri, 16 Feb 2018 12:32:49 +0000 (18:02 +0530)]
fpga: Added Kconfig support for FPGA_SPARTAN3

This patch added Kconfig support for FPGA_SPARTAN3 and migrates the
values over to the defconfigs.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
6 years agoMerge git://git.denx.de/u-boot-net
Tom Rini [Wed, 28 Feb 2018 01:10:28 +0000 (20:10 -0500)]
Merge git://git.denx.de/u-boot-net

6 years agoKconfig: cmd: Make networking command dependent on NET
Michal Simek [Mon, 26 Feb 2018 15:01:02 +0000 (16:01 +0100)]
Kconfig: cmd: Make networking command dependent on NET

Enable networking command only when NET is enabled.
And remove selecting NET for CMD_NET

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
6 years agoARM: rmobile: Build u-boot-spl.srec on Gen2
Marek Vasut [Mon, 26 Feb 2018 19:19:08 +0000 (20:19 +0100)]
ARM: rmobile: Build u-boot-spl.srec on Gen2

The u-boot-spl.srec is needed for the minimon update on Gen2 SoCs,
conveniently generate this file if SPL is enabled.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Tom Rini <trini@konsulko.com>
6 years agoMakefile: add u-boot-spl.srec target
Marek Vasut [Mon, 26 Feb 2018 19:14:02 +0000 (20:14 +0100)]
Makefile: add u-boot-spl.srec target

The u-boot-spl.srec is needed for some platforms, add target to generate this file.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Tom Rini <trini@konsulko.com>
6 years agoARM: rmobile: Build u-boot-elf.srec on Gen3
Masaru Nagai [Fri, 28 Aug 2015 03:12:45 +0000 (12:12 +0900)]
ARM: rmobile: Build u-boot-elf.srec on Gen3

The u-boot-elf.srec is needed for the minimon update on Gen3 SoCs,
conveniently generate this file.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoMakefile: add u-boot-elf.srec target
Masaru Nagai [Fri, 28 Aug 2015 03:12:45 +0000 (12:12 +0900)]
Makefile: add u-boot-elf.srec target

The u-boot-elf.srec is needed for some platforms, add target to generate this file.

Signed-off-by: Masaru Nagai <masaru.nagai.vx@renesas.com>
Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoarm: socfpga: cyclone5: Enable Macronix flash support
Chin Liang See [Tue, 27 Feb 2018 09:25:02 +0000 (17:25 +0800)]
arm: socfpga: cyclone5: Enable Macronix flash support

Enable Macronix flash support for Cyclone5 SoC

Signed-off-by: Chin Liang See <chin.liang.see@intel.com>
6 years agonet: phy: smsc: Add SMSC LAN8741 support
Arno Steffens [Thu, 25 Jan 2018 12:08:35 +0000 (13:08 +0100)]
net: phy: smsc: Add SMSC LAN8741 support

Signed-off-by: Arno Steffens <star@gmx.li>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
6 years agonet: e1000: Fix e1000_igb semaphore handling
Bernhard Messerklinger [Thu, 15 Feb 2018 07:55:49 +0000 (08:55 +0100)]
net: e1000: Fix e1000_igb semaphore handling

Fix commit f1bcad22dd19 ("net: e1000: add support for writing to
EEPROM").

Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
6 years agoNET: designware: fix clock enable
Eugeniy Paltsev [Tue, 6 Feb 2018 14:12:09 +0000 (17:12 +0300)]
NET: designware: fix clock enable

After commit ba1f966725223 ("net: designware: add clock support")
we got NET broken on axs101 and axs103 platforms.

Some clock don't support gating so their clock drivers don't
implement .enable/.disable callbacks. In such case clk_enable
returns -ENOSYS.
Also some clock drivers implement .enable/.disable callbacks not for all
clock IDs and return -ENOSYS (or -ENOTSUPP) for others.

If we have such clock in 'clocks' list of designware ethernet controller
node we fail to probe designware ethernet.

Fix it.

Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
6 years agophy: Fix style violations
Mario Six [Mon, 15 Jan 2018 10:08:27 +0000 (11:08 +0100)]
phy: Fix style violations

Fix some style violations in the generic PHY management code.

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Mario Six <mario.six@gdsys.cc>
6 years agocmd: mdio: Fix style violations
Mario Six [Mon, 15 Jan 2018 10:08:26 +0000 (11:08 +0100)]
cmd: mdio: Fix style violations

Fix some style violations in the MDIO command.

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Mario Six <mario.six@gdsys.cc>
6 years agonet: phy: marvell 88e151x: Fix handling of bare RGMII interface type
Mario Six [Mon, 15 Jan 2018 10:08:25 +0000 (11:08 +0100)]
net: phy: marvell 88e151x: Fix handling of bare RGMII interface type

Commit 68e6ecadc551 ("net: phy: marvell 88e151x: Fix handling of RGMII
interface types") fixed the initialization of 88e151x phys, but made it
so that interfaces of type PHY_INTERFACE_MODE_RGMII had both RX and TX
delay bits cleared. The default (like in m88e1111s_config) is to have
both bits set.

Hence, this patch changes the behavior in the PHY_INTERFACE_MODE_RGMII
case so that both bits are set.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
6 years agonet: phy: marvell: Fix style violations
Mario Six [Mon, 15 Jan 2018 10:08:24 +0000 (11:08 +0100)]
net: phy: marvell: Fix style violations

Fix some style violations (mostly wrong indentions) in the Marvell PHY
driver.

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Mario Six <mario.six@gdsys.cc>
6 years agonet: tsec: Make live-tree compatible
Mario Six [Mon, 15 Jan 2018 10:08:23 +0000 (11:08 +0100)]
net: tsec: Make live-tree compatible

Make the tsec ethernet driver compatible with a live device tree.

Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Mario Six <mario.six@gdsys.cc>
6 years agonet: tsec: Fix memory leak in error path
Mario Six [Mon, 15 Jan 2018 10:08:22 +0000 (11:08 +0100)]
net: tsec: Fix memory leak in error path

tsec_initialize allocates a private driver structure using malloc.
Should the memory allocation of this private structure fail, the
function execution is aborted with a return 0, but the previously
allocated device structure is never freed, hence leaked.

Free the device structure in the error case.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
6 years agonet: tsec: Fix style violations
Mario Six [Mon, 15 Jan 2018 10:08:21 +0000 (11:08 +0100)]
net: tsec: Fix style violations

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
6 years agoARM: dts: rmobile: Import proper DTS for H2 Stout
Marek Vasut [Mon, 26 Feb 2018 18:55:37 +0000 (19:55 +0100)]
ARM: dts: rmobile: Import proper DTS for H2 Stout

Replace the placeholder DTS for R8A7790 H2 Stout with a proper
DTS from Linux next .

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years agoARM: socfpga: Add new CycloneV SoC Devboards DBM-SoC1 board
Marek Vasut [Sat, 24 Feb 2018 22:34:00 +0000 (23:34 +0100)]
ARM: socfpga: Add new CycloneV SoC Devboards DBM-SoC1 board

Add support for a new boards from devboards.de , the DBM-SoC1 .
This board has one ethernet port, one USB OTG port and USB UART.

Signed-off-by: Marek Vasut <marex@denx.de>
6 years agoMerge git://git.denx.de/u-boot-mmc
Tom Rini [Mon, 26 Feb 2018 03:28:59 +0000 (22:28 -0500)]
Merge git://git.denx.de/u-boot-mmc

6 years agommc: omap_hsmmc: use a default 52MHz max clock rate if none is specified
Jean-Jacques Hiblot [Fri, 23 Feb 2018 09:40:19 +0000 (10:40 +0100)]
mmc: omap_hsmmc: use a default 52MHz max clock rate if none is specified

mmc_of_parse() doesn't set a default value if none is available in DT.
In that case, use a default 52MHz clock rate.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Tested-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agommc: omap_hsmmc: make it possible to compile out ADMA support
Jean-Jacques Hiblot [Fri, 23 Feb 2018 09:40:18 +0000 (10:40 +0100)]
mmc: omap_hsmmc: make it possible to compile out ADMA support

Some platforms don't have ADMA controllers. For those platforms, compiling
it out reduces the size of the binary by about 600 bytes.
Leaving the support in doesn't break things as the driver checks at runtime
if the ADMA2 controller is present.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Tested-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agommc: omap_hsmmc: compile out write support if not needed
Jean-Jacques Hiblot [Fri, 23 Feb 2018 09:40:17 +0000 (10:40 +0100)]
mmc: omap_hsmmc: compile out write support if not needed

This reduces the size of the binary by about 196 bytes.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Tested-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agommc: omap_hsmmc: do not embed struct mmc in struct omap_hsmmc_plat
Jean-Jacques Hiblot [Fri, 23 Feb 2018 09:40:16 +0000 (10:40 +0100)]
mmc: omap_hsmmc: do not embed struct mmc in struct omap_hsmmc_plat

The area for struct mmc can be allocated dynamically. It greatly reduces
the size of struct omap_hsmmc_plat. This is useful in cases where the board
level code declares one or two struct omap_hsmmc_plat because it doesn't
use the Driver Model.

This saves around 740 bytes for the am335x_evm SPL.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Tested-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
6 years agoMerge git://git.denx.de/u-boot-rockchip
Tom Rini [Sun, 25 Feb 2018 20:39:10 +0000 (15:39 -0500)]
Merge git://git.denx.de/u-boot-rockchip