project/bcm63xx/u-boot.git
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 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>
7 years agox86: Remove CONFIG_USB_MAX_CONTROLLER_COUNT
Bin Meng [Thu, 22 Jun 2017 06:42:40 +0000 (14:42 +0800)]
x86: Remove CONFIG_USB_MAX_CONTROLLER_COUNT

As all x86 boards have been switched over to use DM USB, remove
CONFIG_USB_MAX_CONTROLLER_COUNT which is not used by DM USB.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>
7 years agox86: minnowmax: Configure GPIO pins to turn on USB ports VBUS
Bin Meng [Fri, 16 Jun 2017 13:31:46 +0000 (06:31 -0700)]
x86: minnowmax: Configure GPIO pins to turn on USB ports VBUS

GPIO bank E pin 8 & 9 are used to control the on-board two USB ports
VBUS on/off. Let's configure them in the misc_init_r().

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot-samsung
Tom Rini [Wed, 21 Jun 2017 12:01:07 +0000 (08:01 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-samsung

7 years agoMerge branch 'master' of git://git.denx.de/u-boot-tegra
Tom Rini [Wed, 21 Jun 2017 12:00:04 +0000 (08:00 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-tegra

7 years agoMerge tag 'xilinx-for-v2017.07' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Wed, 21 Jun 2017 11:57:37 +0000 (07:57 -0400)]
Merge tag 'xilinx-for-v2017.07' of git://denx.de/git/u-boot-microblaze

Xilinx changes for v2017.07

ZynqMP:
- config cleanup
- SD LS mode support
- psu_init* cleanup
- unmap OCM
- Support for SMC

Zynq:
- add ddrc to Kconfig
- add topic-miamilite board support

7 years agoMAINTAINERS: Add myself as i.MX co-maintainer
Fabio Estevam [Tue, 6 Jun 2017 12:18:43 +0000 (09:18 -0300)]
MAINTAINERS: Add myself as i.MX co-maintainer

I would like to help Stefano Babic as a co-maintainer of
U-Boot i.MX.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Acked-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agosunxi: Correct select's of SPL_STACK_R and SPL_SYS_MALLOC_SIMPLE
Tom Rini [Wed, 21 Jun 2017 11:54:46 +0000 (07:54 -0400)]
sunxi: Correct select's of SPL_STACK_R and SPL_SYS_MALLOC_SIMPLE

On ARCH_SUNXI we've been selecting these targets for a long time if
SUPPORT_SPL is set.  However, Lichee Pi Zero is the first platform we've
added that does support SPL but does not build SPL and has exposed a
latent bug.  Both of these symbols depend on SPL not SUPPORT_SPL, so we
need to update our select here otherwise we get a Kconfig warning.

Fixes: f02abb0608fe ("sunxi: add support for Lichee Pi Zero")
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoARM: rmobile: Add missing config bits
Marek Vasut [Tue, 20 Jun 2017 13:17:19 +0000 (15:17 +0200)]
ARM: rmobile: Add missing config bits

The commit "fb82fe385173 configs: Resync defconfigs" resynced all config
files.  This exposed two latent issues with the Gen3 boards in that we
had not been setting CONFIG_DEFAULT_FDT_FILE correctly and had not been
setting CONFIG_CMD_MMC.  Fix both of these.

Fixes: fb82fe385173 ("configs: Resync defconfigs")
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoARM: dts: omap3: Fix dts->dtb typo
Marek Vasut [Tue, 20 Jun 2017 12:39:31 +0000 (14:39 +0200)]
ARM: dts: omap3: Fix dts->dtb typo

Trivial, fix typo.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@konsulko.com>
7 years agobch: Fix build on FreeBSD host
Emmanuel Vadot [Tue, 20 Jun 2017 07:02:29 +0000 (09:02 +0200)]
bch: Fix build on FreeBSD host

endian.h on FreeBSD system exist in sys/ subdirectory.
FreeBSD already have a fls function defined in strings.h which is included
in string.h if __BSD_VISIBLE is defined, as a check for this.

Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com>
7 years agotegra: mmc: Set the bus width correctly
Simon Glass [Thu, 8 Jun 2017 03:11:48 +0000 (21:11 -0600)]
tegra: mmc: Set the bus width correctly

The driver currently does not reset bit 5 of the hostctl register even if
the MMC stack requests it. Then means that once a bus width of 8 is
selected it is not possible to change it back to 1. This breaks
'mmc rescan' which needs to start off with a bus width of 1.

The problem was surfaced by enabling CONFIG_DM_MMC_OPS on tegra. Without
this option the MMC stack fully reinits the driver on a 'mmc rescan'.
But with this option driver model does not re-probe a driver once it has
been probed once.

Fix the driver to honour the request.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Peter Chubb <peter.chubb@data61.csiro.au>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
7 years agoarm: zynq: Add support for the topic-miamilite system-on-module
Mike Looijmans [Wed, 7 Jun 2017 05:42:38 +0000 (07:42 +0200)]
arm: zynq: Add support for the topic-miamilite system-on-module

The topic-miamilite SoM contains a Zynq xc7z010 SoC, 1GB DDR3L RAM,
64MB dual-parallel QSPI NOR flash and clock sources.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm: zynq: Move CONFIG_SF_DUAL_FLASH to defconfig
Mike Looijmans [Wed, 7 Jun 2017 05:42:37 +0000 (07:42 +0200)]
arm: zynq: Move CONFIG_SF_DUAL_FLASH to defconfig

Move the only use of CONFIG_SF_DUAL_FLASH to defconfig. This makes the
associated topic_miamiplus.h header obsolete, so remove that as well.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: Check pmufw version
Michal Simek [Tue, 7 Feb 2017 13:32:26 +0000 (14:32 +0100)]
arm64: zynqmp: Check pmufw version

If PMUFW version is not v0.3 then panic.
ZynqMP switch to CCF based clock driver which requires
PMUFW to be present at certain version.
This patch ensure that you use correct and tested PMUFW
binary.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agofpga: zynqmppl: Reuse invoke_smc routine
Siva Durga Prasad Paladugu [Fri, 17 Feb 2017 10:46:01 +0000 (16:16 +0530)]
fpga: zynqmppl: Reuse invoke_smc routine

Reuse invoke_smc() routine which is already defined
instead of duplicating same at multiple places.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: Define routines for mmio write and read
Siva Durga Prasad Paladugu [Wed, 1 Feb 2017 19:40:46 +0000 (01:10 +0530)]
arm64: zynqmp: Define routines for mmio write and read

Define routines of mmio write and read functionalities
for zynqmp platform.

Also do not call SMC from SPL because SPL is running before ATF in EL3
that's why SMCs can't be called because there is nothing to call.
zynqmp_mmio*() are doing direct read/write accesses and this patch does
the same. PMUFW is up and running at this time and there is a way to talk
to pmufw via IPI but there is no reason to implement IPI stuff in SPL if
we need just simple read for getting clock driver to work.

Also make invoke_smc as global so that it can be reused in
multile places where ever possible.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm: zynq: Add Kconfig option for any DDR specific initialization
Siva Durga Prasad Paladugu [Fri, 12 May 2017 09:34:11 +0000 (15:04 +0530)]
arm: zynq: Add Kconfig option for any DDR specific initialization

Add Kconfig option for ddr init as this might be required
in cases like ddr less systems where we want to skip ddrc
init and this option is useful for it.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: Do not map unused OCM/TCM region
Michal Simek [Sat, 25 Feb 2017 17:17:11 +0000 (18:17 +0100)]
arm64: zynqmp: Do not map unused OCM/TCM region

When OCM or TCM is protected this mapping still exist and it is causing access
violation.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: Add comment about level shifter mode v1
Michal Simek [Thu, 2 Mar 2017 10:02:55 +0000 (11:02 +0100)]
arm64: zynqmp: Add comment about level shifter mode v1

Silicon v1 didn't support SD boot mode with level shifter.
Because system can't boot any error message is not shown
that's why comment is just a record if someone tries to debug it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: Add empty sleep.h file for psu_init* compilation
Michal Simek [Thu, 25 May 2017 14:08:43 +0000 (16:08 +0200)]
arm64: zynqmp: Add empty sleep.h file for psu_init* compilation

psu_init* contain sleep.h header which is not present in u-boot.
Instead of keep comment sleep.h in psu_init* it is easier to add empty
file which is included.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoblock: sata: ceva: drop extraneous netdev.h include
Peter Robinson [Sun, 14 May 2017 20:47:02 +0000 (21:47 +0100)]
block: sata: ceva: drop extraneous netdev.h include

Drop include of netdev.h as it's a SATA driver not a network driver.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: Decrease MALLOC size for SPL
Michal Simek [Fri, 14 Oct 2016 12:06:28 +0000 (14:06 +0200)]
arm64: zynqmp: Decrease MALLOC size for SPL

Decrease malloc size to 1MB from 256MB. Huge malloc
space is adding huge delay in mem_malloc_init() because
we are enabling CONFIG_SYS_MALLOC_CLEAR_ON_INIT
which clear the whole malloc space.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoPrepare v2017.07--rc2
Tom Rini [Tue, 20 Jun 2017 00:41:27 +0000 (20:41 -0400)]
Prepare v2017.07--rc2

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoarm64: zynqmp: Fix psu_init* external functions
Michal Simek [Wed, 15 Feb 2017 09:13:22 +0000 (10:13 +0100)]
arm64: zynqmp: Fix psu_init* external functions

In older vivado version some psu_init* files didn't contain
mask*() which were missing.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: spl: use given boot_device instead of fetching it again
Jean-Francois Dagenais [Mon, 3 Apr 2017 01:44:35 +0000 (21:44 -0400)]
arm64: zynqmp: spl: use given boot_device instead of fetching it again

The boot_device argument to spl_boot_mode was massively added without
actually modifying the existing functions.

This commit actually makes use of the handed value, which is the same.

Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: spl: fix dual SD controller support
Jean-Francois Dagenais [Mon, 3 Apr 2017 01:44:34 +0000 (21:44 -0400)]
arm64: zynqmp: spl: fix dual SD controller support

When enabling both SDHCI controllers, spl_mmc.c would actually choose
device sdhci0 even if booted from sdhci1 (boot_device). This is because
spl_mmc_get_device_index(boot_device) expects BOOT_DEVICE_MMC2[_2] in
order to return index 1 instead of 0.

The #if defined(...) statement is copied from board/xilinx/zynqmp/zynqmp.c

So the key to properly enabling both controllers as boot sources is
defining both CONFIG_ZYNQ_SDHCI0 and CONFIG_ZYNQ_SDHCI1 in your board's
include/configs/*.h.

Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: Wire SD1 level shifter mode to SPL
Michal Simek [Wed, 15 Feb 2017 08:10:16 +0000 (09:10 +0100)]
arm64: zynqmp: Wire SD1 level shifter mode to SPL

Add missing SD boot mode to SPL. zcu102-rev1.0 is supporting
this boot mode.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agomicroblaze: Build only DTBs for selected target
Michal Simek [Wed, 15 Feb 2017 07:22:04 +0000 (08:22 +0100)]
microblaze: Build only DTBs for selected target

Adding more targets to repository requires some additional
changes not simply just adding config file, defconfig and dts.
This patch makes this process easier by building only
particular DTB which is selected via defconfig
that Makefile doesn't need to contain all dts files in the repository.

Reported-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoarm64: zynqmp: Remove CPU_RELEASE_ADDR macro
Michal Simek [Wed, 3 May 2017 14:22:30 +0000 (16:22 +0200)]
arm64: zynqmp: Remove CPU_RELEASE_ADDR macro

CPU_RELEASE_ADDR is used only when CONFIG_ARMV8_MULTIENTRY
is enabled. ZynqMP is running ATF which takes care about this
that's why no need to have this macro.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
7 years agoconfigs: Resync defconfigs
Tom Rini [Mon, 19 Jun 2017 13:47:40 +0000 (09:47 -0400)]
configs: Resync defconfigs

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoMerge git://git.denx.de/u-boot-usb
Tom Rini [Mon, 19 Jun 2017 12:08:57 +0000 (08:08 -0400)]
Merge git://git.denx.de/u-boot-usb

7 years agoMerge branch 'master' of git://git.denx.de/u-boot-sunxi
Tom Rini [Mon, 19 Jun 2017 12:08:40 +0000 (08:08 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-sunxi

7 years agoodroid: remove CONFIG_DM_I2C_COMPAT config
Jaehoon Chung [Wed, 7 Jun 2017 03:08:40 +0000 (12:08 +0900)]
odroid: remove CONFIG_DM_I2C_COMPAT config

Remove the CONFIG_DM_I2C_COMPAT config.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
7 years agocmd: usb_mass_storage: Staticize do_usb_mass_storage()
Fabio Estevam [Sat, 28 May 2016 01:37:11 +0000 (22:37 -0300)]
cmd: usb_mass_storage: Staticize do_usb_mass_storage()

Make do_usb_mass_storage() static to fix the following sparse
warning:

cmd/usb_mass_storage.c:136:5: warning: symbol 'do_usb_mass_storage' was not declared. Should it be static?

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agocmd: usb_mass_storage: Use NULL for pointer
Fabio Estevam [Sat, 28 May 2016 01:37:10 +0000 (22:37 -0300)]
cmd: usb_mass_storage: Use NULL for pointer

Use NULL for pointer to fix the following sparse warning:
cmd/usb_mass_storage.c:47:15: warning: Using plain integer as NULL pointer

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoat91_udc.c: Fix unused variable warning
Tom Rini [Wed, 19 Apr 2017 02:23:51 +0000 (22:23 -0400)]
at91_udc.c: Fix unused variable warning

With gcc-6 and later we see warnings that at91sam9263_udc_caps and
at91rm9200_udc_caps are unused.

Fixes: 620197670a69 ("usb: gadget: at91_udc: add at91_udc into U-Boot")
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agodrivers/usb/ehci: Use platform-specific accessors
Alexey Brodkin [Mon, 5 Jun 2017 19:31:51 +0000 (22:31 +0300)]
drivers/usb/ehci: Use platform-specific accessors

Current implementation doesn't allow utilization of platform-specific
reads and writes.

But some arches or platforms may want to use their accessors that do
some extra work like adding barriers for data serialization etc.

Interesting enough OHCI accessors already do that so just aligning
EHCI to it now.

This is a resend of http://patchwork.ozlabs.org/patch/726714/
Back in the day this patch broke some PPC and Sandbox boards
as they we missing inclusion of "asm/io.h". Those missing items were
fixed with:
 1) http://patchwork.ozlabs.org/patch/751397/
 2) http://patchwork.ozlabs.org/patch/771099/

So now it should be safe to apply this patch.
FWIW TravisCI builds everything with all 3 patches in place,
see https://travis-ci.org/abrodkin/u-boot/builds/239563813

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>
7 years agousb: dwc2: force to host mode if not support HNP/SRP
Meng Dongyang [Thu, 8 Jun 2017 07:34:20 +0000 (15:34 +0800)]
usb: dwc2: force to host mode if not support HNP/SRP

In current code, after running the command of "usb start", the controller
will keep in otg mode and can't switch to host mode if not support
SNP/SRP capability. So add the property of "hnp-srp-disable" in the DTS
to config the contrller work in force mode of host.

Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
7 years agopowerpc, 5xx: remove some "5xx" remains
Heiko Schocher [Wed, 14 Jun 2017 03:49:42 +0000 (05:49 +0200)]
powerpc, 5xx: remove some "5xx" remains

we removed 5xx support. So delete some forgotten remains.

Signed-off-by: Heiko Schocher <hs@denx.de>
7 years agopowerpc, 82xx: remove some missed mpc82xx remains
Heiko Schocher [Wed, 14 Jun 2017 03:49:41 +0000 (05:49 +0200)]
powerpc, 82xx: remove some missed mpc82xx remains

we removed 82xx support. Missed some 82xx remains,
remove them now.

Signed-off-by: Heiko Schocher <hs@denx.de>
7 years agopowerpc, 5xxx, 512x: remove support for mpc5xxx and mpc512x
Heiko Schocher [Wed, 14 Jun 2017 03:49:40 +0000 (05:49 +0200)]
powerpc, 5xxx, 512x: remove support for mpc5xxx and mpc512x

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

Signed-off-by: Heiko Schocher <hs@denx.de>
7 years agoarm: mach-omap2: Generate MLO file from SD boot capable targets
Andrew F. Davis [Tue, 13 Jun 2017 20:04:59 +0000 (15:04 -0500)]
arm: mach-omap2: Generate MLO file from SD boot capable targets

Secure boot targets that can be loaded from an SD card FAT partition
need to be called "MLO" on the filesystem, make a copy with this name
to clarify the correct image for SD card booting.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
7 years agocmd: ethsw: Fix out-of-bounds error
York Sun [Tue, 13 Jun 2017 16:50:41 +0000 (09:50 -0700)]
cmd: ethsw: Fix out-of-bounds error

The for loop in cmd_keywords_opt_check() seems to use wrong array to
set boundary, reported by Coverity analysis.

Signed-off-by: York Sun <york.sun@nxp.com>
CC: Joe Hershberger <joe.hershberger@ni.com>
CC: Tom Rini <trini@konsulko.com>
CC: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Reported-by: Coverity (CID: 163251)
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
7 years agoarm: ti: Add missing guards to headers
Semen Protsenko [Tue, 13 Jun 2017 15:15:58 +0000 (18:15 +0300)]
arm: ti: Add missing guards to headers

To prevent possible double inclusions in future.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoboard/BuR/brxre1: refactor default environment
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:33 +0000 (14:11 +0200)]
board/BuR/brxre1: refactor default environment

For better readability and setup-handling we refactor the default
environment.

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoboard/BuR/brxre1: cosmetic cleanup of config-header
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:32 +0000 (14:11 +0200)]
board/BuR/brxre1: cosmetic cleanup of config-header

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoboard/BuR/brxre1: drop obsolete CONFIG_LCD_NOSTDOUT from config-header
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:31 +0000 (14:11 +0200)]
board/BuR/brxre1: drop obsolete CONFIG_LCD_NOSTDOUT from config-header

This define isn't used anymore in the u-boot source tree, so we drop it
from the config header.

We drop it also from the 'config_whitelist.txt'

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoboard/BuR/brxre1: drop bootlogo feature
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:30 +0000 (14:11 +0200)]
board/BuR/brxre1: drop bootlogo feature

the BMP logo loading has become obsolete and is not used any more. So we
drop the support for it.

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoboard/BuR/brxre1: fix MMC boot
Hannes Schmelzer [Tue, 13 Jun 2017 12:11:29 +0000 (14:11 +0200)]
board/BuR/brxre1: 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 brxre1 board is broken, with this commit we make our board
working again.

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
7 years agotreewide: remove unneeded semicolons
Masahiro Yamada [Tue, 13 Jun 2017 06:17:28 +0000 (15:17 +0900)]
treewide: remove unneeded semicolons

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agodefconfig: arm335x_evm_usbspl: Update MUSB Ethernet
Michael Welling [Mon, 12 Jun 2017 23:02:39 +0000 (18:02 -0500)]
defconfig: arm335x_evm_usbspl: Update MUSB Ethernet

Adds CONFIG_SPL_USB_GADGET_SUPPORT and CONFIG_SPL_USBETH_SUPPORT.

Removes CONFIG_SPL_NAND_SUPPORT, CONFIG_SPL_MTD_SUPPORT, and CONFIG_SPL_YMODEM_SUPPORT
to free up space to fit in RAM.

Signed-off-by: Michael Welling <mwelling@ieee.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Marek Vasut <marex@denx.de>
7 years agoinclude: nand: move endif to end of file
Mugunthan V N [Mon, 23 Jan 2017 22:04:34 +0000 (16:04 -0600)]
include: nand: move endif to end of file

The terminator endif of ifdef _NAND_H_ should be at the
end of file as a fail safe.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
7 years agoMerge git://git.denx.de/u-boot-mpc85xx
Tom Rini [Wed, 14 Jun 2017 22:53:03 +0000 (18:53 -0400)]
Merge git://git.denx.de/u-boot-mpc85xx

7 years agoMerge branch 'master' of git://git.denx.de/u-boot-tegra
Tom Rini [Wed, 14 Jun 2017 22:52:49 +0000 (18:52 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-tegra