U-Boot proper is using DM_MMC so, enable CONFIG_BLK otherwise
find_mmc_device failed to detect MMC device.
Signed-off-by: NJagan Teki <jagan@amarulasolutions.com>
Reviewed-by: NStefano Babic <sbabic@denx.de>

The soc_boot_modes array is only used by bmode command
and not needed in SPL. Don't include it into SPL.
Signed-off-by: NAnatolij Gustschin <agust@denx.de>
Reviewed-by: NStefano Babic <sbabic@denx.de>

The GPT timer was already initialised in board_init_f() as
it is needed in dram init. Do not repeat timer init in
board_init_r().
Signed-off-by: NAnatolij Gustschin <agust@denx.de>
Acked-by: NStefano Babic <sbabic@denx.de>

There is no need to clear the control register 100 times in a
loop, a single zero write clears the register. I didn't find any
justification why clearing this register in a loop is needed
(no info in i.MX6 errata or GPT timer linux driver, linux driver
uses single write to clear this control register).
Signed-off-by: NAnatolij Gustschin <agust@denx.de>
Acked-by: NStefano Babic <sbabic@denx.de>

In case of 2 banks, the address space of the first CS must be defined
and not let to the higher value.

Add support for SOM with a single bank of RAM. It was tested with i.MX6Q
modules in the following configurations:

- 2 Banks, 4 GB
- 2 Banks, 1 GB
- 1 Bank,  1 GB
Signed-off-by: NStefano Babic <sbabic@denx.de>

Since the gpr_init() function is common for boards using MX6S, MX6DL, MX6D,
MX6Q and MX6QP processors move it to the soc.c file.
Signed-off-by: NBreno Lima <breno.lima@nxp.com>
Acked-by: NStefano Babic <sbabic@denx.de>
Reviewed-by: NLukasz Majewski <lukma@denx.de>
Reviewed-by: NFabio Estevam <fabio.estevam@nxp.com>

i.MX 6 serial downloader is not necessarily booting via UART but can
also boot from USB. In fact only some i.MX chips have serial
downloader support via UART (e.g. 6UL/ULL and Vybrid) but all of
them have serial downloader support via USB. Use the more appropriate
BOOT_DEVICE_BOARD define which is used for ROM provided recovery
mechanisms in general.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

Add the reserved boot mode used in the bmode command for i.MX 6UL
and 6ULL as introduced in commit 3fd95790 ("imx: mx6ull: fix USB
bmode for i.MX 6UL and 6ULL").

Also replace BMODE_UART with BMODE_RESERVED, which is more appropriate.
Commit 96aac843 ("imx: Use IMX6_BMODE_* macros instead of numericals")
added macros for boot modes, in the process the reserved boot mode got
named BMODE_UART. We use the reserved boot mode in the bmode command to
let the boot ROM enter serial downloader recovery mode. But this is only
a side effect, the actual boot mode is reserved...
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

To i.MX7ULP, we need to create two info instances for
iomux0 and iomux1 respectively, otherwise iomuxc0/1 will
share one info instance and use one base, because imx_pinctrl_probe
will use info to store base address and etc. But iomuxc0/1
actually have different base address.
Signed-off-by: NPeng Fan <peng.fan@nxp.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefano Babic <sbabic@denx.de>

when using SHARE_MUX_CONF_REG, wrong mask is used for
writing config value, which causes mux value is cleared.
Signed-off-by: NPeng Fan <peng.fan@nxp.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefano Babic <sbabic@denx.de>

Some files for i.MX do not yet have the SPDX ID to reference the correct
license.
Signed-off-by: NStefano Babic <sbabic@denx.de>
Reviewed-by: NWolfgang Denk <wd@denx.de>

Add copyright and license header.
Signed-off-by: NPeng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>

Enable Serial Download Protocol (SDP) in SPL and U-Boot. This is
useful to make use of imx_usb to download the complete U-Boot
(u-boot.img) after SPL has been downloaded. The U-Boot command
sdp allows to enumerate as SDP capable device again, e.g. to
download a Linux kernel and/or U-Boot script.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Acked-by: NMax Krummenacher <max.krummenacher@toradex.com>

Use a completely independent USB Product ID for SPL. This allows
to differentiate a SDP running in SPL and SDP running in a U-Boot
which could not read the config block successfully.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Acked-by: NMax Krummenacher <max.krummenacher@toradex.com>
Reviewed-by: NŁukasz Majewski <lukma@denx.de>

Document the U-Boot Serial Download Protocol implementation and
some typical use cases.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Reviewed-by: NŁukasz Majewski <lukma@denx.de>

Add USB serial download protocol support to SPL. If the SoC started
in recovery mode the SPL will immediately switch to SDP and wait for
further downloads/commands from the host side.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Reviewed-by: NStefano Babic <sbabic@denx.de>
Reviewed-by: NŁukasz Majewski <lukma@denx.de>

Add a new command to start USB Serial Download Protocol (SDP)
state machine.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Reviewed-by: NŁukasz Majewski <lukma@denx.de>
Reviewed-by: NStefano Babic <sbabic@denx.de>

Support U-Boot images in SPL so that u-boot.img files can be
directly downloaded and executed. Furthermore support U-Boot
scripts download and execution in full U-Boot so that custom
recovery actions can be downloaded from the host in a third
step.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Reviewed-by: NŁukasz Majewski <lukma@denx.de>
Reviewed-by: NStefano Babic <sbabic@denx.de>

Add SDP (Serial Downloader Protocol) implementation for U-Boot. The
protocol is used in NXP SoC's boot ROM and allows to download program
images. Beside that, it can also be used to read/write registers and
download complete Device Configuration Data (DCD) sets. This basic
implementation supports downloading images with the imx header format
reading and writing registers.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Reviewed-by: NŁukasz Majewski <lukma@denx.de>

Move the imximage.h header file to a common location so we can make
use of it from U-Boot too.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Reviewed-by: NŁukasz Majewski <lukma@denx.de>

Otherwise:
drivers/usb/gadget/f_fastboot.c:564:32: warning: format "%lx" expects
argument of type "long unsigned int", but argument 3 has type "unsigned
int" [-Wformat=]
Signed-off-by: NTom Rini <trini@konsulko.com>

 - Fix unmet direct dependencies warning
 - Remove old sLD3 SoC support
 - Update reset data
 - Add dr_mode DT property to avoid warning

The db-88f6820-amc has four chips with 2Gb density giving a total of 1GB
DRAM. Update the board_topology_map to reflect the correct
configuration.
Signed-off-by: NChris Packham <judge.packham@gmail.com>
Reviewed-by: NStefan Roese <sr@denx.de>
Signed-off-by: NStefan Roese <sr@denx.de>

Signed-off-by: NLukasz Majewski <lukma@denx.de>

The function blk_dread will return -ENOSYS on failure or on success the
number of blocks read, which must be the number asked to read (otherwise
it failed somewhere).  Correct this check.

Cc: Lukasz Majewski <lukma@denx.de>
Signed-off-by: NTom Rini <trini@konsulko.com>

When building the flash zImage code on aarch64 we see warnings about
pointer size casts.  Use uintptr_t instead to correct these.

Cc: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: NTom Rini <trini@konsulko.com>
Reviewed-By: NSam Protsenko <semen.protsenko@linaro.org>

There is no guarantee that commands are null-terminated in the USB
request buffer, so limit the length of data that is printed.
Signed-off-by: NJohn Keeping <john@metanate.com>
Tested-by: NSteve Rae <steve.rae@raedomain.com>

Fastboot loads an image at CONFIG_FASTBOOT_BUF_ADDR, but currently
tells do_bootm() to look for an image at $loadaddr.  This breaks if
CONFIG_FASTBOOT_BUF_ADDR is different from the current user-set
loadaddr.

Instead, tell do_bootm() to pick up the image where it was laoded.
Signed-off-by: NPeter Chubb <peter.chubb@data61.csiro.au>
Reviewed-by: NTom Rini <trini@konsulko.com>
Acked-by: NSteve Rae <steve.rae@raedomain.com>

This converts CONFIG_USB_EHCI_PCI to a Kconfig option, and updates
all boards that use it.
Signed-off-by: NBin Meng <bmeng.cn@gmail.com>

Some of these were missed in the conversion.
Signed-off-by: NSimon Glass <sjg@chromium.org>

Now that we have errors available in the environment driver's load()
method, check the return valid.
Signed-off-by: NSimon Glass <sjg@chromium.org>

With the change to the environment code to remove the common init stage
of pointing to the default environment and setting it as valid, combined
with the change to switch gd->env_valid from 0/1/2 to an enum we now
must set env_valid to one of the enum values rather than an int.  And in
this case, not only was setting it to an int wrong, it was now the wrong
value.  Finally, in the case of ENV_IS_NOWHERE we must still say that
our envionrment is invalid after init for things to continue to
function.

Fixes: 7938822a ("env: Drop common init() functions")
Tested-by: NMarek Vasut <marek.vasut@gmail.com>
Reported-by: NMarek Vasut <marek.vasut@gmail.com>
Reported-by: NAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: NTom Rini <trini@konsulko.com>
---
Changes in v3:
- Actually include changes for env/nowhere.c

Since commit 576e3cc7 ("usb: host: xhci-dwc3: Add dual role mode
support from DT"), warning is displayed if dr_mode is not specified.
Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>

  - Merge sys_reset data of LD4, Pro4, sLD8 and Pro5

  - Merge sys_reset data of LD11 and LD20

  - Use primitive UNIPHIER_RESETX() macro because bit assignments for
    system reset will be changed for every SoC in the future

  - Add NAND and eMMC resets
Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>

This reverts commit 82d075e7.

Commit 82d075e7 ("ARM: uniphier: fix ROM boot mode for PH1-sLD3")
was a workaround for sLD3.  Now the sLD3 SoC support has been removed.

Revert it to allow to simplify the init code.
Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>

This reverts commit bcc51c15.

Commit bcc51c15 ("ARM: uniphier: move lowlevel debug init code
after page table switch") was intended to support lowlevel debug for
sLD3.  Now the sLD3 SoC support has been removed.

Revert it to allow to enable lowlevel debug earlier.
Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>

This SoC is too old.  It is difficult to maintain any longer.
Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>

Since commit f0776a55 ("spl: dm: Kconfig: SPL_CLK depends on
SPL_DM"), the following warning is displayed:

  $ make uniphier_v8_defconfig
  warning: (ARCH_ZYNQ && ARCH_ZYNQMP && STM32F7 && CLK_UNIPHIER) selects
  SPL_CLK which has unmet direct dependencies (CLK && SPL_DM)

While I am here, I am removing the prompt to make it user-unconfigurable
option so that "select CLK_UNIPHIER" can be omitted.
Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>