]> git.sur5r.net Git - u-boot/log
u-boot
7 years agopowerpc: Partialy restore core of mpc8xx
Christophe Leroy [Thu, 6 Jul 2017 08:23:22 +0000 (10:23 +0200)]
powerpc: Partialy restore core of mpc8xx

CS Systemes d'Information (CSSI) manufactures 8xx boards for
critical communication systems. Those boards have been
running U-Boot since 2010 and will have to be maintained
until at least 2027.

commit 5b8e76c35ec312a3f73126bd1a2d2c0965b98a9f
("powerpc, 8xx: remove support for 8xx") orphaned those boards
by removing support for the mpc8xx CPU.

This commit partially restores support for the 8xx, with the
following limitations:
- Restores support for MPC866 and MPC885 only
- Does not restore IDE, PCMCIA, I2C, USB
- Does not restore examples
- Does not restore POST
- Does not restore Ethernet on SCC
- Does not restore console on SCC
- Does not restore bedbug and kgdb support

As the 866 and 885 do not support the following features,
they are not restored either:
- VIDEO / LCD
- RTC clock

The CPM uCODE patch is not restored either, because:
- 866 and 885 already have support for I2C and SPI relocation
without a uCODE patch
- relocation of SMC, I2C or SPI is only needed for using SCCs
for Ethernet or QMC

The dynamic setup/calculation of clocks is removed, we
expect the target being use with the clock and PLPRCR register
defined in the configuration.
All the clock settings for 8xx prior to 866 is removed as
well as we now only support 866 and 885.

This code is mature and addresses mature boards. Therefore
all code enclosed in '#if 0/#endif' and '#if XX_DEBUG/#endif'
is unneeded.

The following files are not restored by this patch:

- arch/powerpc/cpu/mpc8xx/bedbug_860.c
- arch/powerpc/cpu/mpc8xx/fec.h
- arch/powerpc/cpu/mpc8xx/kgdb.S
- arch/powerpc/cpu/mpc8xx/plprcr_write.S
- arch/powerpc/cpu/mpc8xx/scc.c
- arch/powerpc/cpu/mpc8xx/upatch.c
- arch/powerpc/cpu/mpc8xx/video.c
- arch/powerpc/include/asm/status_led.h
- arch/powerpc/lib/ide.c
- arch/powerpc/lib/ide.h
- doc/README.MPC866
- drivers/pcmcia/mpc8xx_pcmcia.c
- drivers/rtc/mpc8xx.c
- drivers/usb/gadget/mpc8xx_udc.c
- drivers/video/mpc8xx_lcd.c
- examples/standalone/test_burst.c
- examples/standalone/test_burst.h
- examples/standalone/test_burst_lib.S
- examples/standalone/timer.c
- include/mpc823_lcd.h
- include/usb/mpc8xx_udc.h
- post/cpu/mpc8xx/Makefile
- post/cpu/mpc8xx/cache.c
- post/cpu/mpc8xx/cache_8xx.S
- post/cpu/mpc8xx/ether.c
- post/cpu/mpc8xx/spr.c
- post/cpu/mpc8xx/uart.c
- post/cpu/mpc8xx/usb.c
- post/cpu/mpc8xx/watchdog.c

Some of the restored files are not located in a proper location.
In order to keep traceability of the changes, they will be
moved to their correct location and moved to Kconfig in a
followup patch.

This patch also declares CSSI as point of contact for the update
of the 8xx platform, as those boards are the only ones still
being maintained on the 8xx area. A later patch will add
those boards to the tree.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
7 years agoam335x: sl50: Enable CONFIG_AUTOBOOT_KEYED
Enric Balletbo i Serra [Thu, 6 Jul 2017 09:37:58 +0000 (11:37 +0200)]
am335x: sl50: Enable CONFIG_AUTOBOOT_KEYED

On startup the SL50 board halt at U-Boot prompt. Use CONFIG_AUTOBOOT_KEYED
to enable autoboot for this board and define the <SPACE> key to get the
U-Boot prompt.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
7 years agoboard/BuR/brppt1: fix MMC boot
Hannes Schmelzer [Thu, 6 Jul 2017 06:47:14 +0000 (08:47 +0200)]
board/BuR/brppt1: fix MMC boot

since commit
'd5abcf94c7123167725fc22ace342f0d455093c1' -
ti: boot: Register the MMC controllers in SPL in the same way as in u-boot

MMC boot on brppt1 board is broken, with this commit we make our board
    working again.

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
7 years agowdt: Unify option of timeout value
Andy Shevchenko [Wed, 5 Jul 2017 17:44:08 +0000 (20:44 +0300)]
wdt: Unify option of timeout value

There is no need to duplicate same option with different name.

Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
7 years agowdt: Fix spelling Resettting -> Resetting
Andy Shevchenko [Wed, 5 Jul 2017 17:44:06 +0000 (20:44 +0300)]
wdt: Fix spelling Resettting -> Resetting

Fix spelling Resettting -> Resetting.
No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
7 years agoavr32: Retire AVR32 for good
Andy Shevchenko [Wed, 5 Jul 2017 13:25:22 +0000 (16:25 +0300)]
avr32: Retire AVR32 for good

AVR32 is gone. It's already more than two years for no support in Buildroot,
even longer there is no support in GCC (last version is heavily patched 4.2.4).

Linux kernel v4.12 got rid of it (and v4.11 didn't build successfully).

There is no good point to keep this support in U-Boot either.

Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
7 years agostm32: Correct positioning of declaration
Simon Glass [Sat, 1 Jul 2017 17:06:09 +0000 (11:06 -0600)]
stm32: Correct positioning of declaration

The current code gives a warning:

arch/arm/mach-stm32/stm32f7/soc.c: In function 'arch_cpu_init':
arch/arm/mach-stm32/stm32f7/soc.c:38:2: error: 'for' loop initial
    declarations are only allowed in C99 or C11 mode
  for (int i = 0; i < ARRAY_SIZE(stm32_region_config); i++)
  ^
arch/arm/mach-stm32/stm32f7/soc.c:38:2: note: use option -std=c99,
    -std=gnu99, -std=c11 or -std=gnu11 to compile your code

Fix it by moving the declaration to the top of the function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Series-cc trini

7 years agokm/common: remove unused code
Holger Brunck [Fri, 30 Jun 2017 13:33:35 +0000 (15:33 +0200)]
km/common: remove unused code

The 82xx board mgcoge3ne was removed from the codebase, so this is dead
code.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Cc: Heiko Schocher <hs@denx.de>
Reviewed-by: Heiko Schocher <hs@denx.de>
7 years agoconfigs: Odroid C2: enable device tree overlays
xypron.glpk@gmx.de [Thu, 29 Jun 2017 19:29:55 +0000 (21:29 +0200)]
configs: Odroid C2: enable device tree overlays

The Odroid C2 comes with several expansion options such as an RTC module.
As these expansions are not considered in the Linux device tree they have
to be enabled via device tree overlays.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
7 years agomkimage: fix display of image types list
Baruch Siach [Thu, 29 Jun 2017 17:37:08 +0000 (20:37 +0300)]
mkimage: fix display of image types list

Since commit 5b9d44df2307f (mkimage: Display a better list of available image
types) mkimage usage text suggest to "use -T to see a list of available image
types". Unfortunately, commit 02221f29deb8 (mkimage: Convert to use getopt())
broke that feature, because getopt() fails when -T has no option argument.

Add a pseudo image type name 'list' that lists all image types. Update the
usage text accordingly.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
7 years agoCHIP: add device tree overlay support
Peter Robinson [Mon, 26 Jun 2017 13:25:06 +0000 (14:25 +0100)]
CHIP: add device tree overlay support

CHIP and CHIP Pro devices have options of DIP addon boards some of which need
overlays from the beginning so it makes sense to enable device tree overlays.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
7 years ago96boards: dragonboard/hikey: add device tree overlay support
Peter Robinson [Mon, 26 Jun 2017 13:25:05 +0000 (14:25 +0100)]
96boards: dragonboard/hikey: add device tree overlay support

96boards CE devices such as the DragonBoard and Hikey devices have numerous
mezzanine options some of which need overlays from the beginning so it makes
sense to enable device tree overlays.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
7 years agoam335x: beagle/evm: add device tree overlay support
Peter Robinson [Mon, 26 Jun 2017 13:25:04 +0000 (14:25 +0100)]
am335x: beagle/evm: add device tree overlay support

TI am33xx devices such as the BeagleBone devices have numerous cape options such
as screens some of which need overlays from the beginning so it makes sense to
enable evice tree overlays.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
7 years agoRaspberry Pi: add device tree overlay support
Peter Robinson [Mon, 26 Jun 2017 13:25:03 +0000 (14:25 +0100)]
Raspberry Pi: add device tree overlay support

Raspberry Pi has numerous HAT and other HW expansion options such as screens and
cameras some of which need overlays from the beginning so it makes sense to
enable evice tree overlays.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
7 years agoarm64: use psci reset on snapdragon
Rob Clark [Mon, 26 Jun 2017 13:22:23 +0000 (09:22 -0400)]
arm64: use psci reset on snapdragon

This actually works on snapdragon.. not sure why we weren't using it.
Fixes reboot/poweroff when using UEFI.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
7 years agoigep003x: Falcon mode
Ladislav Michl [Sun, 25 Jun 2017 08:30:47 +0000 (10:30 +0200)]
igep003x: Falcon mode

Implement spl_start_uboot to let Falcon mode work.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agoigep00x0: Enable UBI fastmap
Ladislav Michl [Sun, 25 Jun 2017 08:29:25 +0000 (10:29 +0200)]
igep00x0: Enable UBI fastmap

Fastmap significantly reduces flash scan time, enable it by default.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agospl: Make UBI fastmap support Kconfig selectable
Ladislav Michl [Sun, 25 Jun 2017 08:26:11 +0000 (10:26 +0200)]
spl: Make UBI fastmap support Kconfig selectable

Fastmap was always enabled in ubispl, make it selectable by
CONFIG_MTD_UBI_FASTMAP.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agoodroid-c2: Populate serial# environment variable from efuse
Martin Böh [Fri, 23 Jun 2017 13:40:00 +0000 (13:40 +0000)]
odroid-c2: Populate serial# environment variable from efuse

7 years agogpio: add static to get_function()
Masahiro Yamada [Thu, 22 Jun 2017 07:50:25 +0000 (16:50 +0900)]
gpio: add static to get_function()

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoserial: make serial_stub_* to static functions
Masahiro Yamada [Thu, 22 Jun 2017 07:48:49 +0000 (16:48 +0900)]
serial: make serial_stub_* to static functions

Add missing static to serial_stub_puts().

Unexport serial_stub_{getc,tstc} because they are used locally.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoMerge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Tom Rini [Tue, 4 Jul 2017 12:00:16 +0000 (08:00 -0400)]
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

Patch queue for efi - 2017-07-04

Highlights this time: bugfixes. With these changes, OpenBSD should
be more happy.

7 years agoefi_loader: abort on unsupported relocation type
xypron.glpk@gmx.de [Mon, 3 Jul 2017 22:12:58 +0000 (00:12 +0200)]
efi_loader: abort on unsupported relocation type

If a relocation type is not supported loading the EFI binary
should be aborted.

Writing a message only is insufficient.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
[agraf: use a() != b coding style]
Signed-off-by: Alexander Graf <agraf@suse.de>
7 years agoefi_loader: Add efi-next git tree to MAINTAINERS file
Alexander Graf [Mon, 3 Jul 2017 16:10:31 +0000 (18:10 +0200)]
efi_loader: Add efi-next git tree to MAINTAINERS file

The efi-next tree lives on github, not the usual denx git.
Reflect this in the MAINTAINERS file so that people can
find it.

Signed-off-by: Alexander Graf <agraf@suse.de>
7 years agoefi_loader: efi_handle_protocol set attributes
xypron.glpk@gmx.de [Thu, 29 Jun 2017 19:16:19 +0000 (21:16 +0200)]
efi_loader: efi_handle_protocol set attributes

UEFI spec 2.7 indicates that HandleProtocol can be implemented
by calling OpenProtocol with
attributes = EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL.

Currently we pass attributes = 0 to efi_open_protocol. 0 is not a
valid value when calling OpenProtocol. This does not cause any errors
yet because our implementation of OpenProtocol is incomplete.

We should pass the correct value to enable a fully compliant
implementation of OpenProtocol in the future.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
7 years agoPrepare v2017.07-rc3 v2017.07-rc3
Tom Rini [Mon, 3 Jul 2017 23:58:08 +0000 (19:58 -0400)]
Prepare v2017.07-rc3

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agopowerpc: remove 4xx support
Heiko Schocher [Tue, 27 Jun 2017 14:49:14 +0000 (16:49 +0200)]
powerpc: remove 4xx support

There was for long time no activity in the 4xx area.
We need to go further and convert to Kconfig, but it
turned out, nobody is interested anymore in 4xx,
so remove it.

Signed-off-by: Heiko Schocher <hs@denx.de>
7 years agodrivers, block: remove sil680 driver
Heiko Schocher [Tue, 27 Jun 2017 14:49:13 +0000 (16:49 +0200)]
drivers, block: remove sil680 driver

driver is not used anymore, so remove it.

Signed-off-by: Heiko Schocher <hs@denx.de>
7 years agoefi_loader: add static to local functions
Masahiro Yamada [Thu, 22 Jun 2017 08:49:03 +0000 (17:49 +0900)]
efi_loader: add static to local functions

These are locally used in lib/efi_loader/efi_boottime.c

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
7 years agoefi_loader: check CreateEvent() parameters
Jonathan Gray [Sun, 12 Mar 2017 08:26:07 +0000 (19:26 +1100)]
efi_loader: check CreateEvent() parameters

Add some of the invalid parameter checks described in the UEFI
specification for CreateEvent().  This does not include checking
the validity of the type and tpl parameters.

Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Acked-By: Heinrich Schuchardt <xypron.glpk@gmx.de>
[agraf: fix checkpatch.pl indent warning]
Signed-off-by: Alexander Graf <agraf@suse.de>
7 years agoefi_loader: run CreateEvent() notify function based on flags
Jonathan Gray [Sun, 12 Mar 2017 08:26:06 +0000 (19:26 +1100)]
efi_loader: run CreateEvent() notify function based on flags

The UEFI specification states that the tpl, function and context
arguments are to be ignored if neither EVT_NOTIFY_WAIT or
EVT_NOTIFY_SIGNAL are specified.  This matches observed behaviour with
an AMI EDK2 based UEFI implementation.

Skip calling the notify function if neither flag is present.

Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Acked-By: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
7 years agoefi_loader: Add check for fallback fdt memory reservation
Alexander Graf [Mon, 3 Jul 2017 11:32:35 +0000 (13:32 +0200)]
efi_loader: Add check for fallback fdt memory reservation

When running bootefi, we allocate new space but never check whether
the allocation succeeded. This patch adds a check so that in case
things go wrong, we at least know they did.

Signed-off-by: Alexander Graf <agraf@suse.de>
7 years agopico-imx7d: Remove bouncing email
Fabio Estevam [Thu, 29 Jun 2017 17:07:42 +0000 (14:07 -0300)]
pico-imx7d: Remove bouncing email

Wig Cheng's email bounces, so remove it from the maintainers list.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agodoc: restore doc/README.fsl-clk
Christophe Leroy [Tue, 27 Jun 2017 14:00:24 +0000 (16:00 +0200)]
doc: restore doc/README.fsl-clk

doc/README.fsl-clk was removed in commit
5b8e76c35ec31 ("powerpc, 8xx: remove support for 8xx")
allthought CONFIG_SYS_FSL_CLK is defined in
arch/arm/cpu/armv8/fsl-layerscape/Kconfig and still in use
in the following configs:

./include/configs/mx53loco.h:21:#define CONFIG_SYS_FSL_CLK
./include/configs/m53evk.h:16:#define CONFIG_SYS_FSL_CLK
./include/configs/mx25pdk.h:17:#define CONFIG_SYS_FSL_CLK
./include/configs/usbarmory.h:14:#define CONFIG_SYS_FSL_CLK
./include/configs/ls1021aqds.h:14:#define CONFIG_SYS_FSL_CLK
./include/configs/mx53cx9020.h:22:#define CONFIG_SYS_FSL_CLK
./include/configs/colibri_vf.h:17:#define CONFIG_SYS_FSL_CLK
./include/configs/mx35pdk.h:21:#define CONFIG_SYS_FSL_CLK
./include/configs/woodburn_common.h:19:#define CONFIG_SYS_FSL_CLK
./include/configs/mx7_common.h:25:#define CONFIG_SYS_FSL_CLK
./include/configs/ls1021aiot.h:12:#define CONFIG_SYS_FSL_CLK
./include/configs/ls1021atwr.h:14:#define CONFIG_SYS_FSL_CLK
./include/configs/mx53ard.h:21:#define CONFIG_SYS_FSL_CLK
./include/configs/mx53smd.h:21:#define CONFIG_SYS_FSL_CLK
./include/configs/mx51evk.h:16:#define CONFIG_SYS_FSL_CLK
./include/configs/mx6_common.h:31:#define CONFIG_SYS_FSL_CLK
./include/configs/vf610twr.h:14:#define CONFIG_SYS_FSL_CLK
./include/configs/mx53evk.h:21:#define CONFIG_SYS_FSL_CLK

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: Heiko Schocher <hs@denx.de>
7 years ago.travis.yml: All DENX boards are now under Aries
Tom Rini [Fri, 30 Jun 2017 01:24:16 +0000 (21:24 -0400)]
.travis.yml: All DENX boards are now under Aries

DENX hardware is now under Aries Embedded, update the job.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoRevert "armv7m: Disable D-cache when booting nommu(ARMv7M) Linux kernel"
Tom Rini [Fri, 30 Jun 2017 01:18:48 +0000 (21:18 -0400)]
Revert "armv7m: Disable D-cache when booting nommu(ARMv7M) Linux kernel"

The author of the commit discovered later on that this was already being
done in cleanup_before_linux() on arch/arm/cpu/armv7m/cpu.c.

This reverts commit 8f079cccb369995e46a2ab530d5d60b88c1e70bb.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge git://git.denx.de/u-boot-arc
Tom Rini [Thu, 29 Jun 2017 19:28:51 +0000 (15:28 -0400)]
Merge git://git.denx.de/u-boot-arc

7 years agoARM: at91: ma5d4: Support both SF and eMMC SoMs
Marek Vasut [Tue, 2 May 2017 18:27:50 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Support both SF and eMMC SoMs

Discern the SoMs based on the presence of SPI flash to support both
variants of the SoM, one booting from SPI NOR and one booting from
eMMC.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
7 years agoARM: at91: ma5d4: Enable random ethaddr
Marek Vasut [Tue, 2 May 2017 18:27:49 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Enable random ethaddr

Use random ethaddr by default in case no ethaddr is set.

Signed-off-by: Marek Vasut <marex@denx.de>
7 years agoARM: at91: ma5d4: Switch environment start to eMMC
Marek Vasut [Tue, 2 May 2017 18:27:48 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Switch environment start to eMMC

The redesigned version of the SoM which was released onto the market
does no longer contain SPI flash, but boots from the eMMC. Move the
environment storage to the eMMC.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
7 years agoARM: at91: ma5d4: Boot from MMC2 when using SAM-BA
Marek Vasut [Tue, 2 May 2017 18:27:47 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Boot from MMC2 when using SAM-BA

Continue loading U-Boot from MMC2 when the SPL was loaded using SAM-BA
loader. This allows the board to boot system from the removable media
instead of the eMMC, which is useful for commissioning purposes. When
booting from the eMMC, always boot from it as it is not possible to
boot from the SD interface directly.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
7 years agoARM: at91: ma5d4: Enable support for booting from eMMC
Marek Vasut [Tue, 2 May 2017 18:27:46 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Enable support for booting from eMMC

The SoM has been redesigned to work around bug in the SoC and is now
capable of booting from the eMMC. Add support for booting from eMMC.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
7 years agoARM: at91: ma5d4: Swap SD/MMC controller order
Marek Vasut [Tue, 2 May 2017 18:27:45 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Swap SD/MMC controller order

The SDHCI1 is the primary boot controller on rev. 2.1 SoM, which
is the version available on the market. Swap the controller order
to match this and future versions of the SoM.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
7 years agoARM: at91: ma5d4: Init SD/MMC controller in SPL
Marek Vasut [Tue, 2 May 2017 18:27:44 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Init SD/MMC controller in SPL

Init the controllers, otherwise the board cannot boot from SD/MMC.
This boot option is new on rev. 2.1 SoM .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
7 years agoARM: at91: ma5d4: Enable DFU and UMS
Marek Vasut [Tue, 2 May 2017 18:27:43 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Enable DFU and UMS

Enable DFU and USB mass storage support for the DENX MA5D4 SoM.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
7 years agoARM: at91: ma5d4: Reset CAN controllers late
Marek Vasut [Tue, 2 May 2017 18:27:42 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Reset CAN controllers late

The CAN controllers need slight delay between toggling of their reset
line. Move this action into board_init(), otherwise timer will not be
initialized and the board might hang.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
7 years agoARM: at91: ma5d4: Switch DDR2 controller to sequencial address decoding
Marek Vasut [Tue, 2 May 2017 18:27:41 +0000 (20:27 +0200)]
ARM: at91: ma5d4: Switch DDR2 controller to sequencial address decoding

According to the datasheet, sequential mapping is used for DDR
SDRAM, while interleaved mapping is used for regular SDRAM.
Incorrect configuration of this bit does indeed cause sporadic
memory instability.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Wenyou Yang <wenyou.yang@atmel.com>
7 years agoARM: atmel: Rename MA5D4EVK
Marek Vasut [Tue, 2 May 2017 18:27:40 +0000 (20:27 +0200)]
ARM: atmel: Rename MA5D4EVK

The board is now manufactured by Aries Embedded GmbH , rename it.

Signed-off-by: Marek Vasut <marex@denx.de>
7 years agoarc: Add support for HS Development Kit board
Alexey Brodkin [Fri, 25 Nov 2016 13:23:43 +0000 (16:23 +0300)]
arc: Add support for HS Development Kit board

ARC HS Development Kit board is a new low-cost
development platform sporting ARC HS38 in real silicon
with nice set of features such as:
 * Quad-core ARC HS38 with 512 kB L2 cache and running @1GHz
 * 4Gb of DDR (we use only lowest 1Gb out of it now)
 * Lots of DesigWare peripherals
 * Different connectivity modules:
     - Synopsys HAPS HT3
     - Arduino-compatible connector
     - MikroBUS

This initial commit supports the following peripherals:
 * UART (DW 8250)
 * Ethernet (DW GMAC)
 * SD/MMC (DW Mobile Storage)
 * USB 1.1 & 2.0

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
7 years agoarcv2: Set IOC aperture so it covers available DDR
Alexey Brodkin [Mon, 26 Jun 2017 08:46:47 +0000 (11:46 +0300)]
arcv2: Set IOC aperture so it covers available DDR

We used to use the same memory layout and size for a couple of
boards and thus we just hardcoding IOC aperture start and size.

Now when we're getting more boards with more memory on board we
need to have an ability to set IOC so it matches real DDR layout
and size.

Even though it is not really a must but for simplicity we assume
IOC covers all the DDR we have, that gives us a chance to not
bother where DMA buffers are allocated - any part of DDR is OK.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
7 years agoaxs10x: Move environment from I2C EEPROM to SD-card
Alexey Brodkin [Thu, 1 Jun 2017 14:09:38 +0000 (17:09 +0300)]
axs10x: Move environment from I2C EEPROM to SD-card

With deprecation of I2C EEPROM we we left without a permamnent
storage for U-Boot environment, but luckily we may simply use SD-card
with FAT partition for that.

Having environment on SD-card is much more convenient as it
allows us to preserve all the settings when moving from one board to
another. Moreover instead of 256 bytes of EEPROM we're now virtually
unlimited in stuff being placed in environment like complicated scripts
etc which are usually required in case of full-scale distros.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
7 years agoaxs10x: Get rid of both I2C and EEPROM who used to use I2C
Alexey Brodkin [Thu, 1 Jun 2017 13:27:27 +0000 (16:27 +0300)]
axs10x: Get rid of both I2C and EEPROM who used to use I2C

With eb5ba3aefdf0 "i2c: Drop use of CONFIG_I2C_HARD" in place we
cannot use I2C EEPROM any longer so we're dropping all references to
both EEPROM and I2C which was only used for EEPROM.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Simon Glass <sjg@chromium.org>
7 years agoboards: axs10x, nsim, tb100: Enable cmdline history
Alexey Brodkin [Fri, 21 Apr 2017 08:04:19 +0000 (11:04 +0300)]
boards: axs10x, nsim, tb100: Enable cmdline history

Enable shell commands history on ARC boards for
more convenience of users.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
7 years agoaxs10x: Add support of Ext2/4 FS
Alexey Brodkin [Tue, 18 Apr 2017 18:24:14 +0000 (21:24 +0300)]
axs10x: Add support of Ext2/4 FS

Those could be easily used on USB flash drives or on SD/MMC cards.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
7 years agoaxs101: Enable data cache
Alexey Brodkin [Tue, 18 Apr 2017 18:21:56 +0000 (21:21 +0300)]
axs101: Enable data cache

There's no reason to keep data cache disabled in axs101
board any longer, enabling it.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
7 years agoarc: arcv1: Disable master/slave check
Alexey Brodkin [Tue, 11 Apr 2017 15:24:25 +0000 (18:24 +0300)]
arc: arcv1: Disable master/slave check

ARCompact cores are not supposed to be used in SMP designs
(this doesn't stop people from creation of heterogeneous chips,
for an example keep reading) so there's no point in
checking ARCNUM and halting somebody if we build for ARC700.

Moreover on AXS101 board we have ARC770 in the ASIC together with
other ARC cores and ARC770 happens to be the last node in JTAG chain
with ARCNUM = 4. And existing check halts the one and only core we
want keep running.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
7 years agoatmel, at91: fix taurus board
Heiko Schocher [Wed, 28 Jun 2017 09:24:58 +0000 (11:24 +0200)]
atmel, at91: fix taurus board

since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support"

taurus board comes not up anymore. Fix it.

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Wenyou Yang <wenyou.yang@microchip.com>
7 years agoat91, dfu, smartweb: set serial number
Heiko Schocher [Mon, 26 Jun 2017 11:26:14 +0000 (13:26 +0200)]
at91, dfu, smartweb: set serial number

since commit 842778a09104 dfu-util shows serial="UNDEFINED".

to see here again a serial number, we have to call
g_dnl_set_serialnumber().

Signed-off-by: Heiko Schocher <hs@denx.de>
7 years agoatmel, at91: fix smartweb board
Heiko Schocher [Fri, 23 Jun 2017 18:13:59 +0000 (20:13 +0200)]
atmel, at91: fix smartweb board

since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support"

smartweb board comes not up anymore. Fix it.

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Wenyou Yang <wenyou.yang@microchip.com>
7 years agodrivers, usb, gadget: fix compiler warnings for at91_udc.c
Heiko Schocher [Fri, 23 Jun 2017 18:13:58 +0000 (20:13 +0200)]
drivers, usb, gadget: fix compiler warnings for at91_udc.c

fix warnings:
drivers/usb/gadget/at91_udc.c:1344:12: warning: 'at91rm9200_udc_init' defined but not used [-Wunused-function]
drivers/usb/gadget/at91_udc.c:1379:13: warning: 'at91rm9200_udc_pullup' defined but not used [-Wunused-function]
drivers/usb/gadget/at91_udc.c:1476:12: warning: 'at91sam9263_udc_init' defined but not used [-Wunused-function]

Signed-off-by: Heiko Schocher <hs@denx.de>
7 years agoGE Bx50v3 boards: fix fdt file variable
Peter Robinson [Thu, 29 Jun 2017 12:21:38 +0000 (13:21 +0100)]
GE Bx50v3 boards: fix fdt file variable

The CONFIG_DEFAULT_FDT_FILE expects just the file not a full path
as that might vary depending on the variant of Linux distro you
might be using.

Cc: Martin Donnelly <martin.donnelly@ge.com>
Cc: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Acked-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoscripts: config_whitelist: Handle lines with leading spaces/tabs
Bin Meng [Thu, 29 Jun 2017 03:36:25 +0000 (11:36 +0800)]
scripts: config_whitelist: Handle lines with leading spaces/tabs

Some Kconfig options are defined in a line with leading spaces/tabs.
Update build-whitelist/check-config scripts to handle such cases.
Generate a new config_whitelist.txt with new scripts.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
7 years agoARM: make memset and memcpy prompt message more clearly
Andy Yan [Wed, 28 Jun 2017 08:27:37 +0000 (16:27 +0800)]
ARM: make memset and memcpy prompt message more clearly

The origin SPL_USE_ARCH_MEMSET/MEMCPY use same prompt message
as USE_ARCH_MEMSET/MEMCPY, which makes it's hard to distinguish
them in menuconfig interface. This patch gives them different
prompt messages for spl and none-spl config.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
7 years agousb: gadget: Call g_dnl_bind_fixup() before testing g_dnl_serial length
Lukasz Majewski [Mon, 26 Jun 2017 11:04:58 +0000 (13:04 +0200)]
usb: gadget: Call g_dnl_bind_fixup() before testing g_dnl_serial length

After the commit SHA1: 842778a091 - the serial number descriptor is only
visible when we have non zero length of g_dnl_serial.

However, on some platforms (e.g. Siemens) the serial number is set at
g_dnl_bind_fixup(), so with the current code we will always omit the
serial (since it is not set).

This commit moves the g_dnl_bind_fixup() call before the g_dnl_serial
length test.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
7 years agoti816x: Enable ethernet support
Tom Rini [Wed, 10 May 2017 16:01:02 +0000 (12:01 -0400)]
ti816x: Enable ethernet support

The ti816x SoC revision of the ethernet IP block is handled by the
"davinci_emac" driver, rather than the "cpsw" driver as done by later
members of the family.  Enable the relevant plumbing.

Signed-off-by: Sriramakrishnan <srk@ti.com>
Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge git://git.denx.de/u-boot-x86
Tom Rini [Tue, 27 Jun 2017 13:33:10 +0000 (09:33 -0400)]
Merge git://git.denx.de/u-boot-x86

7 years agoMerge git://www.denx.de/git/u-boot-imx
Tom Rini [Tue, 27 Jun 2017 13:32:37 +0000 (09:32 -0400)]
Merge git://www.denx.de/git/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_geam.h
include/configs/imx6ul_isiot.h

7 years agoRevert "x86: Convert MMC to driver model"
Bin Meng [Mon, 26 Jun 2017 23:36:15 +0000 (16:36 -0700)]
Revert "x86: Convert MMC to driver model"

This reverts commit ddb3ac3c716f56cead695444e65a7ba7b0946555.

With MMC converted to driver model, SCSI driver is broken due to
zero address access at (ops->read) in block_dread() function.

The fix (SCSI driver converted to DM) is ready in u-boot-dm branch,
but it is too late for this relese to get that in.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agomx6: soc: Fix typo in temperature unit name
Fabio Estevam [Thu, 22 Jun 2017 13:50:05 +0000 (10:50 -0300)]
mx6: soc: Fix typo in temperature unit name

The correct name is 'Celsius', so fix it accordingly.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Tom Rini [Mon, 26 Jun 2017 19:48:05 +0000 (15:48 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

7 years agoi2c_eeprom: add static to i2c_eeprom_std_ops/probe
Masahiro Yamada [Thu, 22 Jun 2017 07:51:22 +0000 (16:51 +0900)]
i2c_eeprom: add static to i2c_eeprom_std_ops/probe

These are only used in drivers/mis/i2c_eeprom.c

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
7 years agoMerge git://git.denx.de/u-boot-uniphier
Tom Rini [Sat, 24 Jun 2017 22:18:41 +0000 (18:18 -0400)]
Merge git://git.denx.de/u-boot-uniphier

- fix sparse warnings
- sync DT with Linux
- add new board support (LD11/LD20 global)

7 years agoarm64: dts: uniphier: add support for LD20 Global board
Kunihiko Hayashi [Thu, 22 Jun 2017 09:43:52 +0000 (18:43 +0900)]
arm64: dts: uniphier: add support for LD20 Global board

Add initial device tree support for LD20 Global board.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoarm64: dts: uniphier: add support for LD11 Global board
Kunihiko Hayashi [Thu, 22 Jun 2017 09:43:51 +0000 (18:43 +0900)]
arm64: dts: uniphier: add support for LD11 Global board

Add initial device tree support for LD11 Global board.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: dts: uniphier: sync DT with Linux next-20170622
Masahiro Yamada [Thu, 22 Jun 2017 07:46:40 +0000 (16:46 +0900)]
ARM: dts: uniphier: sync DT with Linux next-20170622

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: fix various sparse warnings
Masahiro Yamada [Thu, 22 Jun 2017 07:42:04 +0000 (16:42 +0900)]
ARM: uniphier: fix various sparse warnings

Fix warnings reported by sparse:
 - ... was not declared. Should it be static?"
 - cast to restricted __be32

While fixing those, the type conflict of cci500_init() was found.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-rockchip
Tom Rini [Fri, 23 Jun 2017 15:02:21 +0000 (11:02 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-rockchip

7 years agorockchip: clk: rk3036: correct setting for pll integer mode
Kever Yang [Tue, 13 Jun 2017 02:03:11 +0000 (10:03 +0800)]
rockchip: clk: rk3036: correct setting for pll integer mode

According to rk3036 TRM, pll_con1[12] should be set to '1' for the pll
integer mode, while the '0' means the frac mode.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: mkimage: correct spl_size for rk3399
Kever Yang [Wed, 14 Jun 2017 06:54:20 +0000 (14:54 +0800)]
rockchip: mkimage: correct spl_size for rk3399

The maximum spl_size for rk3399 is the internal memory size minus
the size used in bootrom (which usually can get from SPL_TEXT_BASE).

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorockchip: rk3399: correct SPL_MAX_SIZE
Kever Yang [Wed, 14 Jun 2017 08:14:18 +0000 (16:14 +0800)]
rockchip: rk3399: correct SPL_MAX_SIZE

The SPL_MAX_SIZE is the internal memory size minux the space
used by bootrom.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agorkcommon.c: Remove unused rkcommon_spi_to_offset
Tom Rini [Fri, 9 Jun 2017 02:33:25 +0000 (22:33 -0400)]
rkcommon.c: Remove unused rkcommon_spi_to_offset

This function is unused, remove.  Reported by clang-3.8.

Fixes: a1c29d4b43dc ("rockchip: mkimage: set init_boot_size to avoid ...")
Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
7 years agoatmel, at91: fix corvus board
Heiko Schocher [Thu, 22 Jun 2017 05:42:50 +0000 (07:42 +0200)]
atmel, at91: fix corvus board

since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support"
corvus board comes not up anymore. Fix it.

Signed-off-by: Heiko Schocher <hs@denx.de>
7 years agoMAINTAINERS, git-mailrc: update the maintainer for rockchip
Philipp Tomsich [Wed, 21 Jun 2017 13:13:38 +0000 (15:13 +0200)]
MAINTAINERS, git-mailrc: update the maintainer for rockchip

Adding myself to MAINTAINERS and git-mailrc for the rockchip
sub-architecture.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Simon Glass <sjg@chromium.org>
7 years agoserial, kconfig: fix menutext
Heiko Schocher [Wed, 21 Jun 2017 04:23:10 +0000 (06:23 +0200)]
serial, kconfig: fix menutext

fix menutext for the options SPL_DM_SERIAL and TPL_DM_SERIAL.
Both have the same text as DM_SERIAL, which is
confusing.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Stefan Roese <sr@denx.de>
7 years agobdinfo: print fdt_blob
Heiko Schocher [Wed, 21 Jun 2017 04:22:41 +0000 (06:22 +0200)]
bdinfo: print fdt_blob

for debugging it is handy to know the fdt_blob
address. So print it in bdinfo.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
7 years agoboard/db410c: add missing linker map entries for efi
Rob Clark [Tue, 20 Jun 2017 21:55:24 +0000 (17:55 -0400)]
board/db410c: add missing linker map entries for efi

Otherwise the loaded image would miss the efi_runtime sections, and fall
over hard when grub (for example) tried to call runtime services located
in this section.

Signed-off-by: Rob Clark <robdclark@gmail.com>
7 years agomtd: OneNAND: Fix onenand_block_markbad
Ladislav Michl [Tue, 20 Jun 2017 15:17:45 +0000 (17:17 +0200)]
mtd: OneNAND: Fix onenand_block_markbad

commit dfe64e2c89731a3f9950d7acd8681b68df2bae03
    Author: Sergey Lapin <slapin@ossfans.org>
    Date:   Mon Jan 14 03:46:50 2013 +0000

        mtd: resync with Linux-3.7.1

modified onenand_block_markbad to call mtd_block_markbad,
but as _block_markbad function pointer used by mtd_block_markbad
to do actual job is by default pointing back to
onenand_block_markbad there is no way this function ever
finishes its job.
Fix it by changing function body according current (4.12-rc6)
linux implementation.
Tested on IGEPv2 board with Muxed OneNAND(DDP) 512MB containing
several unerasable blocks this function marked bad.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
7 years agoonenand_spl_simple: Add DDP OneNAND support
Ladislav Michl [Tue, 20 Jun 2017 09:44:29 +0000 (11:44 +0200)]
onenand_spl_simple: Add DDP OneNAND support

Current implementation is unable to access second half of
DDP OneNAND flash (reads first half mirrored). Use block
and bufferram address calculations from onenand_base to
fix this.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
7 years agoonenand_spl_simple: Call onenand_spl_get_geometry() only once
Ladislav Michl [Tue, 20 Jun 2017 09:43:22 +0000 (11:43 +0200)]
onenand_spl_simple: Call onenand_spl_get_geometry() only once

Do not call onenand_spl_get_geometry() for each block read.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
7 years agoapi: Define a default mmc max device
Emmanuel Vadot [Tue, 20 Jun 2017 06:09:40 +0000 (08:09 +0200)]
api: Define a default mmc max device

Define a default number of 1 for mmc max device if board config didn't
specify one.

Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoclk_rv1108.c: Fix unused variable warning
Tom Rini [Fri, 16 Jun 2017 17:06:28 +0000 (13:06 -0400)]
clk_rv1108.c: Fix unused variable warning

The variables gpll_init_cfg and apll_init_cfg are unused in this file,
remove them.

Cc: Simon Glass <sjg@chromium.org>
Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agopost: Fix unused variable warning on lwmon5
Tom Rini [Fri, 16 Jun 2017 17:06:27 +0000 (13:06 -0400)]
post: Fix unused variable warning on lwmon5

The variable syndrome_codes is only used when DEBUG is define, add #if
guards around it in the same style as the rest of the file.

Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Stefan Roese <sr@denx.de>
7 years agocontrolcenterd_36BIT_SDCARD: Fix unused variable warning
Tom Rini [Fri, 16 Jun 2017 17:06:26 +0000 (13:06 -0400)]
controlcenterd_36BIT_SDCARD: Fix unused variable warning

On the controlcenterd_36BIT_SDCARD config we get a warning about
prg_stage1_prepare being unused.  Move the declaration closer to usage
and hide under the existing #if tests.

Cc: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoARM: dts: OMAP5+: Update spl specific dts
Lokesh Vutla [Fri, 16 Jun 2017 08:42:58 +0000 (14:12 +0530)]
ARM: dts: OMAP5+: Update spl specific dts

Now that we can specify DT nodes that can be used in spl, mark
all necessary nodes as u-boot,dm-spl.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoARM: dts: am43xx: Update spl specific dts
Lokesh Vutla [Fri, 16 Jun 2017 08:42:57 +0000 (14:12 +0530)]
ARM: dts: am43xx: Update spl specific dts

Now that we can specify DT nodes that can be used in spl, mark
all necessary nodes as u-boot,dm-spl.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoti816x: Add additional boot device detection logic
Tom Rini [Thu, 15 Jun 2017 17:57:00 +0000 (13:57 -0400)]
ti816x: Add additional boot device detection logic

It has been observed that between PG1.0 and PG2.0/2.1 depending on
which device we boot from, we may see a different value here than is
documented in the TRM.  Update the values for NAND and MMC1 based on
real life usage on each revision.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoarm: omap: Extract OMAP5 boot environment to separate file
Semen Protsenko [Wed, 14 Jun 2017 18:34:23 +0000 (21:34 +0300)]
arm: omap: Extract OMAP5 boot environment to separate file

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoMerge git://www.denx.de/git/u-boot-marvell
Tom Rini [Fri, 23 Jun 2017 12:23:14 +0000 (08:23 -0400)]
Merge git://www.denx.de/git/u-boot-marvell

7 years agopinctrl: a3700: Fix the issue that gpio controller is registered with wrong node id
Ken Ma [Thu, 22 Jun 2017 09:13:36 +0000 (17:13 +0800)]
pinctrl: a3700: Fix the issue that gpio controller is registered with wrong node id

In armada_37xx_gpiochip_register, the return value of fdtdec_get_bool
should be true when gpio-controller is found; current codes makes a
wrong inverse return value judgement, this patch fixes it.

Signed-off-by: Ken Ma <make@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Kostya Porotchkin <kostap@marvell.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Wilson Ding <dingwei@marvell.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agopinctrl: a3700: Fix uart2 group selection register mask
Ken Ma [Thu, 22 Jun 2017 09:13:35 +0000 (17:13 +0800)]
pinctrl: a3700: Fix uart2 group selection register mask

If north bridge selection register bit1 is clear, pins [10:8] are for
SDIO0 Resetn, Wakeup, and PDN while if bit1 is set, pins [10:8]are for
GPIO; when bit1 is clear, pin 9 and pin 10 can be used for uart2 RTSn
and CTSn, so bit1 should be added to uart2 group and it must be set
for both "gpio" and "uart" functions of uart2 group.

Signed-off-by: Ken Ma <make@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Kostya Porotchkin <kostap@marvell.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Wilson Ding <dingwei@marvell.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>