project/bcm63xx/u-boot.git
5 years agoARM: dts: stm32: Remove useless u-boot, dm-pre-reloc in stm32f746-disco-u-boot.dtsi
Patrice Chotard [Tue, 25 Jun 2019 08:06:06 +0000 (10:06 +0200)]
ARM: dts: stm32: Remove useless u-boot, dm-pre-reloc in stm32f746-disco-u-boot.dtsi

As in stm32f7-u-boot.dtsi these nodes already have "u-bootdm-pre-reloc"
property, no need to add them again in stm32f746-disco-u-boot.dtsi.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
5 years agoARM: dts: stm32: Add u-boot, dm-pre-reloc for usart1_pins_a for stm32f769-disco
Patrice Chotard [Tue, 25 Jun 2019 08:06:05 +0000 (10:06 +0200)]
ARM: dts: stm32: Add u-boot, dm-pre-reloc for usart1_pins_a for stm32f769-disco

This allow to get console output in SPL for stm32f769-disco.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
5 years agoMerge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
Tom Rini [Sat, 22 Jun 2019 16:09:33 +0000 (12:09 -0400)]
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86

- boot failure fix for Intel edison
- tangier wdt conversion to driver model

5 years agowatchdog: tangier: Convert to use WDT class
Andy Shevchenko [Fri, 21 Jun 2019 10:28:08 +0000 (13:28 +0300)]
watchdog: tangier: Convert to use WDT class

Convert legacy driver to use watchdog class.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Stefan Roese <sr@denx.de>
5 years agowatchdog: tangier: Replace unused constant with a comment
Andy Shevchenko [Fri, 21 Jun 2019 10:28:07 +0000 (13:28 +0300)]
watchdog: tangier: Replace unused constant with a comment

The default timeout value had been left in order to leave some traces
about default setup of watchdog done by firmware.

For better understanding and compiler burden, replace it with a comment.

Suggested-by: Stefan Roese <sr@denx.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
5 years agox86: Revert "Don't set up MTRRs in SPL"
Andy Shevchenko [Tue, 18 Jun 2019 16:06:34 +0000 (19:06 +0300)]
x86: Revert "Don't set up MTRRs in SPL"

This breaks Intel Edison to work. It gets laggish and unable to boot kernel.

Reverts commit 665cb18ea64aabbeb03d27a4c92ddec1baccb87a for now
till better solution will be proposed.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Bin Meng <bmeng.cn@gmail.com>
5 years agoMerge tag 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Tom Rini [Fri, 21 Jun 2019 18:12:28 +0000 (14:12 -0400)]
Merge tag 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

Pull request for UEFI sub-system for v2019.07-rc5 (3)

This pull request provides error fixes for the graphical output protocol,
the text output protocol, and the extended text input protocol.

Setting the boot device for the bootefi command is now not only supported
by the 'load' command but also for the file system specific commands like
'fatload'.

5 years agoMerge branch '2019-06-21-master-imports'
Tom Rini [Fri, 21 Jun 2019 18:11:11 +0000 (14:11 -0400)]
Merge branch '2019-06-21-master-imports'

- Assorted small fixes
- Bugfix RSA handling code to reject images with unknown padding.
- Some boards disabled unused features to turn off DM warnings.

5 years agoconfigs: Resync with savedefconfig
Tom Rini [Fri, 21 Jun 2019 14:11:23 +0000 (10:11 -0400)]
configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>
5 years agoarm: am335x-pdu001: Remove watchdog support
Felix Brack [Tue, 11 Jun 2019 08:39:52 +0000 (10:39 +0200)]
arm: am335x-pdu001: Remove watchdog support

This board does not require watchdog support.

Signed-off-by: Felix Brack <fb@ltec.ch>
5 years agolib: Makefile: build fdtdec_common.c when OF_LIBFDT selected
Peng Fan [Thu, 6 Jun 2019 07:59:16 +0000 (07:59 +0000)]
lib: Makefile: build fdtdec_common.c when OF_LIBFDT selected

When build SPL_OF_PLATDATA on i.MX6, meet issue the fdtdec_get_int
not defined, however fdtdec.c will use fdtdec_get_int, so let's
compile fdtdec_common.c when OF_LIBFDT selected.

Since there is also SPL_OF_LIBFDT, so need to use
CONFIG_$(SPL_TPL_)OF_LIBFDT.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
5 years agopci: Avoid assigning PCI resources that are below 0x1000
Bin Meng [Wed, 5 Jun 2019 14:26:44 +0000 (07:26 -0700)]
pci: Avoid assigning PCI resources that are below 0x1000

commit b7598a43f2b4 ("[PATCH] Avoid assigning PCI resources from
zero address") only moved the bus lower address to 0x1000 if the
given bus start address is zero. The comment said 0x1000 is a
reasonable starting value, hence we'd better apply the same
adjustment when the given bus start address is below 0x1000.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
5 years agoconfig_distro_bootcmd: Init IDE devices
Joshua Watt [Thu, 20 Jun 2019 21:31:35 +0000 (16:31 -0500)]
config_distro_bootcmd: Init IDE devices

IDE devices are no longer automatically probed by u-boot, so it should
be done by the distro boot command before attempting to boot from IDE
(just like scsi and nvme)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
5 years agoarm64: zynqmp: Cover ultra96 dts file by MAINTAINERS fragment
Michal Simek [Thu, 20 Jun 2019 06:02:46 +0000 (08:02 +0200)]
arm64: zynqmp: Cover ultra96 dts file by MAINTAINERS fragment

Avnet Ultra96 dts file should be also cover by MAINTAINERS fragment.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
5 years agotravis.yml: Add buildman support for NXP's LS1028 & LX2160
Prabhakar Kushwaha [Wed, 19 Jun 2019 12:17:12 +0000 (17:47 +0530)]
travis.yml: Add buildman support for NXP's LS1028 & LX2160

NXP's LS1028 and LX2160 platform build support added via buildman
in travis.yml.

Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agodisk: part: Don't skip partition init
Robert Hancock [Tue, 18 Jun 2019 15:53:04 +0000 (09:53 -0600)]
disk: part: Don't skip partition init

blk_get_device_by_str was skipping part_init when hw partition 0 was
selected because it is the default. However, this caused issues when
switching to a non-zero partition and then back to partition zero, as
stale data from the wrong partition was returned.

Remove this optimization and call part_init regardless of the selected
partition.

Signed-off-by: Robert Hancock <hancock@sedsystems.ca>
5 years agoam335x, guardian: update the maintainer list
Moses Christopher [Tue, 18 Jun 2019 13:54:02 +0000 (13:54 +0000)]
am335x, guardian: update the maintainer list

Signed-off-by: Moses Christopher <BollavarapuMoses.Christopher@in.bosch.com>
5 years agovexpress64: fix a typo of SPDX-License-Identifier
Masahiro Yamada [Tue, 18 Jun 2019 03:25:51 +0000 (12:25 +0900)]
vexpress64: fix a typo of SPDX-License-Identifier

Misspelling of SPDX-License-Identifier is rather fatal than other
general typos, so must be fixed.

This file spells SPDX-Licence-Identifier.
                           ^

I also moved it to the very top of the file with // comment style.

Detected by grepping the source tree:

$ git grep --not -e SPDX-License-Identifier --and -e SPDX-
board/armltd/vexpress64/pcie.c: * SPDX-Licence-Identifier:      GPL-2.0+

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Liviu Dudau <liviu.dudau@foss.arm.com>
5 years agoboard: Arcturus: DM: Disable drivers without DM support.
Oleksandr Zhadan [Mon, 17 Jun 2019 20:10:23 +0000 (16:10 -0400)]
board: Arcturus: DM: Disable drivers without DM support.

Extra "not DM" controllers support is disabled.
u-boot BSP still good enough to upgrade and run images.

Signed-off-by: Oleksandr Zhadan <oleks@arcturusnetworks.com>
Signed-off-by: Michael Durrant <mdurrant@arcturusnetworks.com>
5 years agocmd/led.c: fix typos in online help
Anatolij Gustschin [Mon, 17 Jun 2019 13:33:55 +0000 (15:33 +0200)]
cmd/led.c: fix typos in online help

Remove square brackets around label in state command description.

Fixes: ea41b15617fa ("cmd/led: check subcommand "list" instead "l"")
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Reviewed-by: Heiko Schocher <hs@denx.de>
5 years agorsa: reject images with unknown padding
Patrick Doyle [Fri, 14 Jun 2019 17:43:38 +0000 (13:43 -0400)]
rsa: reject images with unknown padding

Previously we would store NULL in info->padding and jump to an illegal
instruction if an unknown value for "padding" was specified in the
device tree.

Signed-off-by: Patrick Doyle <pdoyle@irobot.com>
5 years agoMerge branch '2019-06-20-master-imports'
Tom Rini [Fri, 21 Jun 2019 01:52:31 +0000 (21:52 -0400)]
Merge branch '2019-06-20-master-imports'

- Assorted minor fixes

5 years agoefi_loader: fix typo in efi_variable.c
Heinrich Schuchardt [Thu, 20 Jun 2019 10:03:53 +0000 (12:03 +0200)]
efi_loader: fix typo in efi_variable.c

%s/efi_efi_/efi_/

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: consistent error handling in efidebug.c
Heinrich Schuchardt [Thu, 20 Jun 2019 10:59:45 +0000 (12:59 +0200)]
efi_loader: consistent error handling in efidebug.c

If a variable cannot be set, always show an information message.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: consistent types in efidebug.c
Heinrich Schuchardt [Thu, 20 Jun 2019 10:48:04 +0000 (12:48 +0200)]
efi_loader: consistent types in efidebug.c

efi_status_t and int are of different size. Use separate variables for
return codes of different type.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agofs: do_load: pass device path for efi payload
Mian Yousaf Kaukab [Tue, 18 Jun 2019 13:03:44 +0000 (15:03 +0200)]
fs: do_load: pass device path for efi payload

fatload command can be used to load the EFI payload since EFI system
partition is always a FAT partition. Call into EFI code from do_load()
to set the device path from which the last binary was loaded. An EFI
application like grub2 can’t find its configuration file without the
device path set.

Since device path is now set in do_load() there is no need to set it
in do_load_wrapper() for the load command.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: Delete() return EFI_WARN_DELETE_FAILURE
Heinrich Schuchardt [Mon, 17 Jun 2019 20:00:13 +0000 (22:00 +0200)]
efi_loader: Delete() return EFI_WARN_DELETE_FAILURE

If EFI_FILE_PROTOCOL.Delete() fails, always close the handle and return
EFI_WARN_DELETE_FAILURE.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: ListPackageLists() return EFI_NOT_FOUND
Heinrich Schuchardt [Mon, 17 Jun 2019 18:46:29 +0000 (20:46 +0200)]
efi_loader: ListPackageLists() return EFI_NOT_FOUND

If no matching package list is found in ListPackageLists(), return
EFI_NOT_FOUND.

If we do not support a package type, we will not find a matching package
list. Remove the unreachable EFI_PRINTF() statements.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: console incorrectly advertised left logo key
Heinrich Schuchardt [Sun, 16 Jun 2019 20:33:20 +0000 (22:33 +0200)]
efi_loader: console incorrectly advertised left logo key

Avoid to signal that the left logo key is pressed, when it is not.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: alternative scan codes for F5, END, HOME
Heinrich Schuchardt [Sun, 16 Jun 2019 19:41:13 +0000 (21:41 +0200)]
efi_loader: alternative scan codes for F5, END, HOME

Depending on the key board alternative scan codes are used for F5, END, and
HOME.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: GOP: provide accurate mode information
Heinrich Schuchardt [Sat, 15 Jun 2019 12:52:53 +0000 (14:52 +0200)]
efi_loader: GOP: provide accurate mode information

For 5:6:5 modes provide correct frame buffer information.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: SetMode() must blank screen
Heinrich Schuchardt [Sat, 15 Jun 2019 12:52:53 +0000 (14:52 +0200)]
efi_loader: SetMode() must blank screen

EFI_GRAPHICS_OUTPUT_PROTOCOL.SetMode() must blank the screen.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: system table setup
Heinrich Schuchardt [Sat, 15 Jun 2019 12:51:06 +0000 (14:51 +0200)]
efi_loader: system table setup

When setting up the system table avoid superfluous void * conversions.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL definition
Heinrich Schuchardt [Sat, 15 Jun 2019 12:47:25 +0000 (14:47 +0200)]
efi_loader: EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL definition

EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.Reset() is a function and not a void *
pointer.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: QueryMode() must allocate buffer
Heinrich Schuchardt [Sat, 15 Jun 2019 12:07:40 +0000 (14:07 +0200)]
efi_loader: QueryMode() must allocate buffer

EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode() must allocate a buffer for the
mode information structure.

Adjust the unit test to free the buffer.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: SetMode() parameters check
Heinrich Schuchardt [Sat, 15 Jun 2019 10:58:30 +0000 (12:58 +0200)]
efi_loader: SetMode() parameters check

If EFI_GRAPHICS_OUTPUT_PROTOCOL.SetMode() is called with an invalid mode,
return EFI_UNSUPPORTED.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: QueryMode() check parameters
Heinrich Schuchardt [Sat, 15 Jun 2019 10:52:35 +0000 (12:52 +0200)]
efi_loader: QueryMode() check parameters

Check the parameters of EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode().

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoefi_loader: Blt() with incorrect BltOperation
Heinrich Schuchardt [Sat, 15 Jun 2019 10:42:46 +0000 (12:42 +0200)]
efi_loader: Blt() with incorrect BltOperation

If EFI_GRAPHICS_OUTPUT_PROTOCOL.Blt() is called with an invalid value of
BltOperation return EFI_INVALID_PARAMETER.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
5 years agoFix watchdog timeout setup for mt7623
Shannon Barber [Fri, 7 Jun 2019 20:48:19 +0000 (20:48 +0000)]
Fix watchdog timeout setup for mt7623

Signed-off-by: Shannon Barber <sbarber@dataspeedinc.com>
5 years agofw_env: Add missing write failure check
Alex Kiernan [Wed, 12 Jun 2019 14:27:55 +0000 (15:27 +0100)]
fw_env: Add missing write failure check

If flash_write fails, whilst we propagate this up to our caller, we need
to avoid swapping in the new file (if we're on a filesystem) in this
case.

Fixes: dbc34323796b ("tools: env: Implement atomic replace for filesystem")
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
5 years agodoc: Remove duplicated documentation directory
Breno Matheus Lima [Wed, 5 Jun 2019 18:18:30 +0000 (18:18 +0000)]
doc: Remove duplicated documentation directory

Commit ad7061ed742e ("doc: Move device tree bindings documentation to
 doc/device-tree-bindings") moved all device tree binding documentation
to doc/device-tree-bindings directory.

The current U-Boot project still have two documentation directories:

- doc/
- Documentation/

Move all documentation and sphinx files to doc directory so all content
can be in a common place.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
5 years agoaspeed/watchdog: Correct timeout value
Joel Stanley [Thu, 6 Jun 2019 07:38:45 +0000 (17:08 +0930)]
aspeed/watchdog: Correct timeout value

The driver was using milliseconds and programming it into a register
which takes ticks of the watchdog clock, which runs at 1MHz. This meant
we were off by 1000 with the desired value.

When 06985289d452 ("watchdog: Implement generic watchdog_reset()
version") was added the aspeed board would leave the watchdog running,
causing it to bite before u-boot was done.

Discovered by booting in qemu:

  $ qemu-system-arm -M ast2500-evb -drive file=test.img,format=raw,if=mtd -nographic -no-reboot -d cpu_reset

  U-Boot 2019.07-rc3-00091-g2253e40caef5 (Jun 06 2019 - 16:53:23 +0930)

  Model: Aspeed BMC
  DRAM:  496 MiB
  WDT:   Started with servicing (60s timeout)
  MMC:
  In:    serial@1e784000
  Out:   serial@1e784000
  Err:   serial@1e784000
  Watchdog timer expired.

Fixes: 06985289d452 ("watchdog: Implement generic watchdog_reset() version")
Signed-off-by: Joel Stanley <joel@jms.id.au>
5 years agoarmv8: fix typo in LINUX_KERNEL_IMAGE_HEADER check
Mian Yousaf Kaukab [Thu, 13 Jun 2019 12:46:44 +0000 (14:46 +0200)]
armv8: fix typo in LINUX_KERNEL_IMAGE_HEADER check

Fixes: 8163faf952 ARMv8: add optional Linux kernel image header
Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Andreas Färber <afaerber@suse.de>
5 years agoMAINTAINERS: Update git repo links
Bin Meng [Wed, 19 Jun 2019 03:40:54 +0000 (20:40 -0700)]
MAINTAINERS: Update git repo links

Update all git repo links with the new gitlab ones.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Wolfgang Denk <wd@denx.de>
5 years agosh: Add myself as SH maintainer
Marek Vasut [Thu, 16 May 2019 20:16:54 +0000 (22:16 +0200)]
sh: Add myself as SH maintainer

Add myself as an SH maintainer.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Tom Rini <trini@konsulko.com>
5 years agoMerge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
Tom Rini [Thu, 20 Jun 2019 13:14:35 +0000 (09:14 -0400)]
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx

- PCIe driver change to support DM model
- T2080QDS migrated to use PCIe DM model

5 years agoMerge tag 'u-boot-stm32-20190619' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
Tom Rini [Thu, 20 Jun 2019 13:14:03 +0000 (09:14 -0400)]
Merge tag 'u-boot-stm32-20190619' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm

- Update STM32MP entry in MAINTAINERS
- Handle correctly binding for g-tx-fifo-size for USB DWC2 driver
- Fix trusted STM32MP1 defconfig with correct ethernet driver

5 years agoMerge tag 'mmc-6-19' of https://github.com/MrVan/u-boot
Tom Rini [Thu, 20 Jun 2019 13:13:27 +0000 (09:13 -0400)]
Merge tag 'mmc-6-19' of https://github.com/MrVan/u-boot

- Avoid HS400 mode when accessing boot partitions

5 years agoconfigs: T2080QDS: Enable PCIe driver
Hou Zhiqiang [Sat, 27 Apr 2019 16:55:22 +0000 (00:55 +0800)]
configs: T2080QDS: Enable PCIe driver

Enable the DM PCIe driver in T2080QDS defconfig.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agopowerpc: T208xQDS: Disable legacy PCIe driver when DM_PCI is enabled
Hou Zhiqiang [Thu, 20 Jun 2019 03:20:47 +0000 (11:20 +0800)]
powerpc: T208xQDS: Disable legacy PCIe driver when DM_PCI is enabled

Disable legacy PCIe driver and unused PCIe macros when DM_PCI enabled.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agodm: pci: add Freescale PowerPC PCIe driver
Hou Zhiqiang [Wed, 24 Apr 2019 14:33:02 +0000 (22:33 +0800)]
dm: pci: add Freescale PowerPC PCIe driver

Add PCIe DM driver for Freescale PowerPC PCIe controllers.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agot2080: dts: Added PCIe DT nodes
Hou Zhiqiang [Wed, 24 Apr 2019 15:41:07 +0000 (23:41 +0800)]
t2080: dts: Added PCIe DT nodes

T2080 integrated 4 PCIe controllers, which is compatible with
the PCI Express™ Base Specification, Revision 3.0, and this
patch is to add DT node for each PCIe controller.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agopowerpc: T208xQDS: Compile the legacy PCIe routines conditionally
Hou Zhiqiang [Mon, 22 Apr 2019 13:58:13 +0000 (21:58 +0800)]
powerpc: T208xQDS: Compile the legacy PCIe routines conditionally

Compile the legacy PCIe initialization reoutines only when DM_PCI
is not enabled.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agopowerpc: mpc85xx: Update the condition to compile PCI routines
Hou Zhiqiang [Mon, 22 Apr 2019 13:50:34 +0000 (21:50 +0800)]
powerpc: mpc85xx: Update the condition to compile PCI routines

Compile the routines of mpc85xx/pci.c when both FSL_PCI_INIT
and DM_PCI are not enabled.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agopowerpc: mpc85xx: Move CONFIG_FSL_PCIE_RESET to Kconfig
Hou Zhiqiang [Thu, 23 May 2019 03:52:44 +0000 (11:52 +0800)]
powerpc: mpc85xx: Move CONFIG_FSL_PCIE_RESET to Kconfig

Use the Kconfig option to select the PCIe reset errata.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agopowerpc: mpc85xx: Move CONFIG_FSL_PCIE_DISABLE_ASPM to Kconfig
Hou Zhiqiang [Wed, 22 May 2019 14:46:03 +0000 (22:46 +0800)]
powerpc: mpc85xx: Move CONFIG_FSL_PCIE_DISABLE_ASPM to Kconfig

Use the Kconfig option to select the PCIe ASPM errata.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoMerge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
Tom Rini [Wed, 19 Jun 2019 18:01:11 +0000 (14:01 -0400)]
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

- LS1046AFRWY support
- USB errata fix and secure boot defconfig support for LS1028A
- Enabled SDHC and SATA for LX2160
- LS1046A serdes fixes
- other minor fixes

5 years agousb: dwc2: allow peripheral mode for OTG configuration
Patrick Delaunay [Tue, 18 Jun 2019 14:57:18 +0000 (16:57 +0200)]
usb: dwc2: allow peripheral mode for OTG configuration

Allow device mode in DWC2 driver when device tree select the dr_mode
"peripheral" or "otg".

The device mode is not allowed when dr_mode = "host" in device tree.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Marek Vasut <marex@denx.de>
5 years agoARM: dts: stm32mp1: remove override for g-tx-fifo-size
Patrick Delaunay [Tue, 18 Jun 2019 14:57:17 +0000 (16:57 +0200)]
ARM: dts: stm32mp1: remove override for g-tx-fifo-size

Remove the override for usbotg_hs on g-tx-fifo-size as the correct
binding, used in the kernel device tree, is now supported in dwc2
device driver.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
5 years agousb: dwc2: correctly handle binding for g-tx-fifo-size
Patrick Delaunay [Tue, 18 Jun 2019 14:57:16 +0000 (16:57 +0200)]
usb: dwc2: correctly handle binding for g-tx-fifo-size

Manage g-tx-fifo-size as a array as specify in the binding.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Marek Vasut <marex@denx.de>
5 years agoboard/freescale/common: secure_boot: Set bootdelay to -2.
Udit Agarwal [Tue, 11 Jun 2019 09:37:49 +0000 (09:37 +0000)]
board/freescale/common: secure_boot: Set bootdelay to -2.

Uboot prompt must not be available while running
secure boot. TO ensure this  bootdelay must be set
to -2.

Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: ls1046afrwy: Add support for LS1046AFRWY platform
Vabhav Sharma [Thu, 6 Jun 2019 12:35:28 +0000 (12:35 +0000)]
armv8: ls1046afrwy: Add support for LS1046AFRWY platform

LS1046AFRWY board supports LS1046A family SoCs. This patch
add base support for this board.
Board support's 4GB ddr memory, i2c, micro-click module,microSD card,
serial console,qspi nor flash,ifc nand flash,qsgmii network interface,
usb 3.0 and serdes interface to support two x1gen3 pcie interface.

Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com>
Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com>
Signed-off-by: Vabhav Sharma <vabhav.sharma@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: ls2088ardb: Fix MC firmware loading during SD boot
Wasim Khan [Mon, 10 Jun 2019 10:17:29 +0000 (10:17 +0000)]
armv8: ls2088ardb: Fix MC firmware loading during SD boot

During SD boot, MC firmware and DPC are copied from SD card to DDR.
Size reserved between MC and DPC firmware on DDR is 1MB.
If the size of MC firmware(load address 0x80000000) is more than 1 MB
then part of MC firmware will be overwritten by DPC firmware (load
address 0x80100000).

Fix: Update the MC/DPL/DPC firmware's DDR address as per their
respective addresses in SD card.

Signed-off-by: Wasim Khan <wasim.khan@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: ls2088aqds: Fix MC firmware loading during SD boot
Wasim Khan [Mon, 10 Jun 2019 10:17:27 +0000 (10:17 +0000)]
armv8: ls2088aqds: Fix MC firmware loading during SD boot

During SD boot, MC firmware and DPC are copied from SD card to DDR.
Size reserved between MC and DPC firmware on DDR is 1MB.
If the size of MC firmware(load address 0x80000000) is more than 1 MB
then part of MC firmware will be overwritten by DPC firmware (load
address 0x80100000).

Fix: Update the MC/DPL/DPC firmware's DDR address as per their
respective addresses in SD card.

Signed-off-by: Wasim Khan <wasim.khan@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: ls2088aqds: Add bootcmd for TFA boot
Wasim Khan [Mon, 10 Jun 2019 10:17:25 +0000 (10:17 +0000)]
armv8: ls2088aqds: Add bootcmd for TFA boot

Add bootcmd for IFC NOR boot and SD boot.

Signed-off-by: Wasim Khan <wasim.khan@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarm: ls1028a: define the integrated PCI bus (ECAM)
Alex Marginean [Fri, 7 Jun 2019 14:03:07 +0000 (17:03 +0300)]
arm: ls1028a: define the integrated PCI bus (ECAM)

LS1028A includes an integrated PCI bus with 11 PCI functions residing on
bus 0.  ECAM plus the device register space takes up 256MB of address
space.

Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: fsl-lsch2: add clock support for the second eSDHC
Yinbo Zhu [Mon, 3 Jun 2019 11:24:23 +0000 (19:24 +0800)]
armv8: fsl-lsch2: add clock support for the second eSDHC

Layerscape began to use two eSDHC controllers, for example,
LS1012A. They are same IP block with same reference clock.
This patch is to add clock support for the second eSDHC.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoconfigs/ls1046ardb_*: disable CONFIG_SPI_FLASH_USE_4K_SECTORS
Maciej Pijanowski [Fri, 31 May 2019 20:30:58 +0000 (22:30 +0200)]
configs/ls1046ardb_*: disable CONFIG_SPI_FLASH_USE_4K_SECTORS

With this setting enabled, the on-board QSPI cannot be
properly flashed. There are no error messages, but the simple
write / read / compare tests fail.

This is already disabled in the qspi and tfa defconfigs for the
LS1046ARDB platform.

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Cc: piotr.krol@3mdeb.com
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarm: fsl-layerscape: add 0x3040 serdes1 settings for LS1046A
Maciej Pijanowski [Fri, 31 May 2019 14:11:35 +0000 (16:11 +0200)]
arm: fsl-layerscape: add 0x3040 serdes1 settings for LS1046A

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Cc: piotr.krol@3mdeb.com
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarm: fsl-layerscape: fix 0x3363 serdes1 settings for ls1046a
Maciej Pijanowski [Fri, 31 May 2019 14:00:26 +0000 (16:00 +0200)]
arm: fsl-layerscape: fix 0x3363 serdes1 settings for ls1046a

As per LS1046A hardware manual, SGMII.9 and SGMII.10 present on
lane D and lane C respectively for 0x3363 protocol.

So fix serdes1 settings for ls1046a.

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoconfigs: Unset CONFIG_SPI_FLASH_BAR, move CONFIG_FSL_QSPI to defconfig
Ashish Kumar [Fri, 31 May 2019 10:33:28 +0000 (16:03 +0530)]
configs: Unset CONFIG_SPI_FLASH_BAR, move CONFIG_FSL_QSPI to defconfig

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: fsl-layerscape: fix config dependency for layerscape pci code
Alex Marginean [Thu, 30 May 2019 16:28:31 +0000 (19:28 +0300)]
armv8: fsl-layerscape: fix config dependency for layerscape pci code

Fixes a link error on layerscape platform, linking fails with CONFIG_PCI
set and CONFIG_PCI_LAYERSCAPE unset.

Signed-off-by: Alex Marginean <alexm.osslist@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: fsl-layerscape: Change bootcmd update logic
Pankit Garg [Thu, 30 May 2019 12:04:15 +0000 (12:04 +0000)]
armv8: fsl-layerscape: Change bootcmd update logic

Change bootcmd update logic when CONFIG_ENV_ADDR is not defined

Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agols1046ardb: Add CONFIG_ENV_ADDR to init env in qspi boot
Pankit Garg [Thu, 30 May 2019 12:04:14 +0000 (12:04 +0000)]
ls1046ardb: Add CONFIG_ENV_ADDR to init env in qspi boot

Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: fsl-layerscape: Update qspi clk cfg
Pankit Garg [Wed, 29 May 2019 12:12:36 +0000 (12:12 +0000)]
armv8: fsl-layerscape: Update qspi clk cfg

Update qspi clock configuration in TFABOOT in case
of all boot sources except qspi boot source.

Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoARM: dts: ls1021a: Fixed reg for sata node
Peng Ma [Wed, 29 May 2019 02:40:47 +0000 (02:40 +0000)]
ARM: dts: ls1021a: Fixed reg for sata node

This patch is to fixed the reg read to "0" for armv7
architecture.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8/fsl-layerscape: Add loop to check L3 dcache status
Meenakshi Aggarwal [Tue, 28 May 2019 16:07:58 +0000 (21:37 +0530)]
armv8/fsl-layerscape: Add loop to check L3 dcache status

Flushing L3 cache may need variable time depending upon cache line
allocation.

Coming up with a proper timeout value would be best handled by
simulations under multiple scenarios in your actual system.
>From the purely HN-F point of view, the flush would take ~15 cycles for
a clean line, and ~22 cycles for a dirty line.  For the dirty line case,
there are many variables outside the HN-F that will increase the
duration per line.  For example, a *DBIDResp from the SN-F/SBSX,
memory controller latency, SN-F/SBSX RetryAck responses, CCN ring
congestion, CCN ring hops, etc, etc.  The worst-case timeout would
have to factor in all of these variables plus the HN-F cycles for
every line in the L3, and assuming all lines are dirty

In case if L3 is not flushed properly, system behaviour will be
erratic, so remove timeout and add loop to check status of L3 cache.

System will stuck in while loop if there is some issue in L3 cache
flushing.

Signed-off-by: Udit Kumar <udit.kumar@nxp.com>
Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: lx2160aqds: Enable eSDHC controllers
Yinbo Zhu [Mon, 27 May 2019 04:17:18 +0000 (12:17 +0800)]
armv8: lx2160aqds: Enable eSDHC controllers

This patch is to enable esdhc controllers for lx2160aqds

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: ls1028a: Add secure boot defconfig
Yuantian Tang [Fri, 24 May 2019 06:36:27 +0000 (14:36 +0800)]
armv8: ls1028a: Add secure boot defconfig

Add secure boot defconfig for ls1028aqds and ls1028ardb boards.

Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoboard: lx2160a: use default scan_dev_for_boot
Mian Yousaf Kaukab [Thu, 23 May 2019 08:57:34 +0000 (10:57 +0200)]
board: lx2160a: use default scan_dev_for_boot

Default environment variable is more complete. Also scans for efi
binaries for example.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoboard: lx2160a: fix fsl-mc status in fdt with bootefi
Mian Yousaf Kaukab [Thu, 23 May 2019 08:57:33 +0000 (10:57 +0200)]
board: lx2160a: fix fsl-mc status in fdt with bootefi

fsl-mc lazyapply command applies dpl from efi_exit_boot_services().
Status of fsl-mc node in working fdt is updated at this stage.
However, an efi application like grub may already have copied the fdt.
So the updates to fdt done at efi_exit_boot_services() may not be
visible to the OS. Fix it by updating fdt earlier if fsl-mc lazyapply
command is used.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: ls1028a: Add ecc address node for sata.
Peng Ma [Thu, 23 May 2019 04:06:48 +0000 (04:06 +0000)]
armv8: ls1028a: Add ecc address node for sata.

Move the ecc addr from driver to dts

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agommc: fsl_esdhc: fix probe issue without CONFIG_BLK enabled
Yangbo Lu [Thu, 23 May 2019 03:05:46 +0000 (11:05 +0800)]
mmc: fsl_esdhc: fix probe issue without CONFIG_BLK enabled

u-boot is trying to make CONFIG_BLK as a hard requirement
for DM_MMC. But now it's still not.

config BLK
bool "Support block devices"
depends on DM
default y if DM_MMC

When fsl_esdhc driver was reworked for DM_MMC support, DM_MMC
without CONFIG_BLK enabled wasn't considered. This patch is to
fix probe issue without CONFIG_BLK enabled.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: fsl-lsch3: add clock support for the second eSDHC
Yangbo Lu [Thu, 23 May 2019 03:05:45 +0000 (11:05 +0800)]
armv8: fsl-lsch3: add clock support for the second eSDHC

Layerscape began to use two eSDHC controllers, for example,
LS1028A. They are same IP block with same reference clock.
This patch is to add clock support for the second eSDHC.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: lx2160aqds: Enable sata
Peng Ma [Wed, 22 May 2019 02:43:22 +0000 (02:43 +0000)]
armv8: lx2160aqds: Enable sata

Change sata node status to enable sata.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: ls1028a: Add other serdes protocal support
Xiaowei Bao [Tue, 21 May 2019 10:28:31 +0000 (18:28 +0800)]
armv8: ls1028a: Add other serdes protocal support

Add other serdes protocal support.

Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: ls1028a: enable workaround for USB errarum A-009007
Yinbo Zhu [Tue, 14 May 2019 09:34:57 +0000 (17:34 +0800)]
armv8: ls1028a: enable workaround for USB errarum A-009007

Rx Compliance tests may fail intermittently at high jitter
frequencies using default register values.

So program register USB_PHY_RX_OVRD_IN_HI in certain sequence
to make the Rx compliance test pass.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoarmv8: ls1028a: enable workaround for USB erratum A-008997
Ran Wang [Tue, 14 May 2019 09:34:56 +0000 (17:34 +0800)]
armv8: ls1028a: enable workaround for USB erratum A-008997

Enable workaround for USB erratum A-008997. Here PCSTXSWINGFULL
registers has been moved to DSCR as compared to other Layerscape SoCs
where it was in SCFG.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agoboard/fsl/layerscape: Modify the aliases names
Pankaj Bansal [Mon, 22 Apr 2019 06:31:42 +0000 (06:31 +0000)]
board/fsl/layerscape: Modify the aliases names

when compiling dts file using DTC_FLAG='-@', the device tree compiler
reports these warnings:

Warning (alias_paths): /aliases: aliases property name must include
only lowercase and '-'

Fixed the node aliases to silence these warnings.

Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
5 years agommc: Avoid HS400 mode when accessing boot partitions
Marek Vasut [Fri, 31 May 2019 13:22:44 +0000 (15:22 +0200)]
mmc: Avoid HS400 mode when accessing boot partitions

U-Boot code currently only applies this restriction to HS200 mode,
extend this to HS400 mode as well.

Currently U-Boot code not support accessing boot partition in HS200/400
mode. This needs more check.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Jean-Jacques Hiblot <jjhiblot@ti.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
5 years agoMAINTAINERS: Remove Christophe Kerello from STM32MP entry
Patrice Chotard [Tue, 18 Jun 2019 08:52:07 +0000 (10:52 +0200)]
MAINTAINERS: Remove Christophe Kerello from STM32MP entry

Christophe will not have maintainer activities, so remove its name.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Cc: Christophe Kerello <christophe.kerello@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
5 years agoconfigs: stm32mp15: Select correct Ethernet driver for trusted mode
Patrice Chotard [Tue, 11 Jun 2019 13:40:41 +0000 (15:40 +0200)]
configs: stm32mp15: Select correct Ethernet driver for trusted mode

Select the correct Ethernet driver from Synopsis.
Initially, "Synopsys Designware Ethernet MAC" driver was wrongly
selected instead of "Synopsys DWC Ethernet QOS device" driver.

Fixes: commit f90b3f5b68ed ("configs: stm32mp15: Enable Ethernet feature")
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
5 years agoMerge branch 'master' of git://git.denx.de/u-boot-spi
Tom Rini [Mon, 17 Jun 2019 15:32:22 +0000 (11:32 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-spi

- Drop zipitz2 board (Tom)
- Add DEPRECATED option (Tom)
- Mark legacy or non-dm drivers as DEPRECATED (Jagan)

5 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Mon, 17 Jun 2019 15:27:21 +0000 (11:27 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

- Assorted gadget fixes

5 years agoMerge tag 'efi-2019-07-rc5-2' of git://git.denx.de/u-boot-efi
Tom Rini [Sat, 15 Jun 2019 17:03:00 +0000 (13:03 -0400)]
Merge tag 'efi-2019-07-rc5-2' of git://git.denx.de/u-boot-efi

Pull request for UEFI sub-system for v2019.07-rc5 (2)

This pull request provides bug fixes for the UEFI sub-system. The most
relevant one concerns the allocation of memory at address 0. It is
needed for booting Linux on several boards via bootefi, e.g. the Asus
TinkerBoard.

An undefined reference bug in disk/part.c related to a division is
resolved.

5 years agoMerge branch 'master' of git://git.denx.de/u-boot-socfpga
Tom Rini [Sat, 15 Jun 2019 17:02:26 +0000 (13:02 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-socfpga

- SPL size check for Gen5, i2c enablement for S10

5 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Tom Rini [Sat, 15 Jun 2019 17:02:12 +0000 (13:02 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

- More board removal

5 years agoMerge branch '2019-06-14-master-imports'
Tom Rini [Sat, 15 Jun 2019 16:58:06 +0000 (12:58 -0400)]
Merge branch '2019-06-14-master-imports'

- Kconfig migrations of SPL_BOOT_xxx, SYS_LDSCRIPT, IP_DEFRAG,
  TFTP_BLOCKSIZE.
- Typo fixes, other minor corrections.

5 years agocmd: define CMD_DATA_SIZE when CONFIG_CMD_SETEXPR is selected
Bartosz Golaszewski [Mon, 20 May 2019 08:22:14 +0000 (10:22 +0200)]
cmd: define CMD_DATA_SIZE when CONFIG_CMD_SETEXPR is selected

The setexpr shell command calls cmd_get_data_size() which is only built
when CMD_DATA_SIZE is defined. We need to define CMD_DATA_SIZE if
CONFIG_CMD_SETEXPR is selected or the build will fail if no other
command selecting this option is enabled.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
5 years agoconfigs: Migrate CONFIG_SYS_LDSCRIPT to Kconfig
Tom Rini [Sun, 2 Jun 2019 12:57:32 +0000 (08:57 -0400)]
configs: Migrate CONFIG_SYS_LDSCRIPT to Kconfig

In order to migrate this symbol to Kconfig introduce a new symbol to
guard it, CONFIG_SYS_CUSTOM_LDSCRIPT.  When that is set we can then
provide the exact final location o the script.

Signed-off-by: Tom Rini <trini@konsulko.com>