Instead of keeping a custom environment, use a more generic approach
by switching to disto config.
Signed-off-by: NFabio Estevam <festevam@gmail.com>
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

Not all i.MX6 pads use the same drive strength table. So far only the
240 Ohm to 34 Ohm table was available. Because the constants used have
speaking names it can be confusing to use e.g. PAD_CTL_DSE_48ohm when
according to the reference manual 52 Ohm is the correct value. This
patch adds the 260 Ohm to 37 Ohm table.

For example, the IOMUXC_SW_PAD_CTL_PAD_SD2_CLK register (SD-card clock)
uses the added table.
Signed-off-by: NMark Jonas <mark.jonas@de.bosch.com>
Reviewed-by: NStefano Babic <sbabic@denx.de>

This makes sure that all Colibri iMX7 modules work with the
same timing. The changes are:
- Disable ODT on read (JEDEC standard JESD79-3F says in chapter
  5.2.3 ODT during Reads: "As the DDR3 SDRAM can not terminate
  and drive at the same time, RTT must be disabled at least half
  a clock cycle..." and also MX7D SABRESD is disabling it)
  This alone fixed memory issues for two Colibri iMX7 1GB modules
  which showed issues before
- Make sure tRFC(min) is at least 260ns
- Make sure tRC is >50.625ns
- tRP needs to be >13.125ns, we can lower from 18.75ns to 15ns
- tFAW is not relevant, leave at reset
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Acked-by: NMarcel Ziswiler <marcel.ziswiler@toradex.com>

Device trees from vanilla Linux do not specify a i.MX 7 specific
compatible string. Make sure to set partitions also when booting
upstream Linux.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

Previously we had stored the environment right after the
u-boot.img on the disk.  I never liked this because with dtbs
being included and such the image could grow in size.  Instead
we move the environment to be negatively offset from the 1MB
mark.  Almost all our images start at 4MB's, and most standard
images start at 1MB, and all our storage devices are a minimum
1MB.  Therefore we can store env there for all classes of devices
and have plenty of space in case u-boot.img needs to grow.
Signed-off-by: NJon Nettleton <jon@solid-run.com>
Signed-off-by: NBaruch Siach <baruch@tkos.co.il>
Reviewed-by: NFabio Estevam <fabio.estevam@nxp.com>

Implement MIGRATE_INFO_TYPE. This informs Linux that no migration
for the trusted operating system is necessary:
  [    0.000000] psci: Trusted OS migration not required
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

So far psci_cpu_(on|off) only worked for CPU1. Allow to control
CPU0 too. This allows to run the Linux PSCI checker successfully:
  [    2.213447] psci_checker: PSCI checker started using 2 CPUs
  [    2.219107] psci_checker: Starting hotplug tests
  [    2.223859] psci_checker: Trying to turn off and on again all CPUs
  [    2.267191] IRQ21 no longer affine to CPU0
  [    2.293266] Retrying again to check for CPU kill
  [    2.302269] CPU0 killed.
  [    2.311648] psci_checker: Trying to turn off and on again group 0 (CPUs 0-1)
  [    2.354354] IRQ21 no longer affine to CPU0
  [    2.383222] Retrying again to check for CPU kill
  [    2.392148] CPU0 killed.
  [    2.398063] psci_checker: Hotplug tests passed OK
  [    2.402910] psci_checker: Starting suspend tests (10 cycles per state)
  [    2.410019] psci_checker: cpuidle not available on CPU 0, ignoring
  [    2.416452] psci_checker: cpuidle not available on CPU 1, ignoring
  [    2.422757] psci_checker: Could not start suspend tests on any CPU
  [    2.429370] psci_checker: PSCI checker completed
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

PSCI 1.0 require PSCI_VERSION, PSCI_FEATURES, AFFINITY_INFO and
CPU_SUSPEND to be implemented. Commit 0ec3d98f ("mx7_common:
use psci 1.0 instead of 0.1") marked the i.MX 7 implementation to
be PSCI 1.0 compliant but failed to implement those functions.
Especially the missing PSCI version callback was noticeable when
booting Linux:

  [    0.000000] psci: probing for conduit method from DT.
  [    0.000000] psci: PSCIv65535.65535 detected in firmware.
  [    0.000000] psci: Using standard PSCI v0.2 function IDs
  [    0.000000] psci: MIGRATE_INFO_TYPE not supported.
  [    0.000000] psci: SMC Calling Convention v1.0

This patch provides a minimal implementation thereof. With this
patch applied Linux detects PSCI 1.0:

  [    0.000000] psci: probing for conduit method from DT.
  [    0.000000] psci: PSCIv1.0 detected in firmware.
  [    0.000000] psci: Using standard PSCI v0.2 function IDs
  [    0.000000] psci: MIGRATE_INFO_TYPE not supported.
  [    0.000000] psci: SMC Calling Convention v1.0

Fixes: 0ec3d98f ("mx7_common: use psci 1.0 instead of 0.1")
Suggested-by: NMark Rutland <mark.rutland@arm.com>
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

There is no need for assembly in the platform specific part of
the PSCI implementation.

Note that this does not make it a complete PSCI 1.0 implementation
yet but aids to do so in upcoming patches.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

A proper stack is required to safely use C code in psci_arch_cpu_entry.

Fixes: 486daaa6 ("arm: psci: add a weak function psci_arch_cpu_entry")
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Acked-by: NPatrick DELAUNAY <Patrick.delaunay@st.com>
Tested-by: NPatrick DELAUNAY <Patrick.delaunay@st.com>

Enable the support for all SPI flash types.
Signed-off-by: NUri Mashiach <uri.mashiach@compulab.co.il>
Signed-off-by: NYaniv Levinsky <yaniv.levinsky@compulab.co.il>

Fix an invalid usage of the gpr_init function for the imx6ul
architecture
Signed-off-by: NMichael Trimarchi <michael@amarulasolutions.com>
Acked-by: NJagan Teki <jagan@amarulasolutions.com>

This function can be used only for some of the nxp SoC. Make
it explicit in the comment. This adjust a bit commit
3aa4b703 ("imx: imx6: Move gpr_init() function to soc.c")
Signed-off-by: NMichael Trimarchi <michael@amarulasolutions.com>
Acked-by: NJagan Teki <jagan@amarulasolutions.com>

i.MX7 does not support BMODE due to the erratum e10574 ("Watchdog:
A watchdog timeout or software trigger will not reset the SOC"), so
remove its support.
Signed-off-by: NFabio Estevam <fabio.estevam@nxp.com>

lcdif_power_down should not be included in spl build to avoid build
failure introduced by commit eb111bb3Signed-off-by: NMichael Trimarchi <michael@amarulasolutions.com>
Reviewed-by: NPeng Fan <peng.fan@nxp.com>

Add the missing gpio phy reset binding to the gpio and
reset time configuration
Signed-off-by: NMichael Trimarchi <michael@amarulasolutions.com>
Acked-by: NJoe Hershberger <joe.hershberger@ni.com>

Mainline and now the SolidRun 4.9 nxp based tree use the new
reorganization of device-tree files that separate out the emmc
into its own dtb.  u-boot will now look for -emmc in the device
tree name if one is detected.
Signed-off-by: NJon Nettleton <jon@solid-run.com>
Signed-off-by: NBaruch Siach <baruch@tkos.co.il>

Previously we had just made broad assumptions with which of our
boards had an eMMC or not even though this is a manufacturing time
assembly option.  This takes the guessing away and actually checks for
the existence of an eMMC and sets up the has_emmc environment variable.
Signed-off-by: NJon Nettleton <jon@solid-run.com>
Signed-off-by: NBaruch Siach <baruch@tkos.co.il>

This macro is not used.
Signed-off-by: NBaruch Siach <baruch@tkos.co.il>

The HB2 boards as well as rev 1.5 soms support eMMC
booting as well as SDHC.  Add the infrastructure to support
booting these devices.
Signed-off-by: NJon Nettleton <jon@solid-run.com>
Signed-off-by: NBaruch Siach <baruch@tkos.co.il>

This code is useful for testing the existance of devices that
do not have card detect capabilities.  This breaks out the core
functionality and leaves the actual init logic and error reporting
in mmc_start_init().
Signed-off-by: NJon Nettleton <jon@solid-run.com>
Signed-off-by: NBaruch Siach <baruch@tkos.co.il>
Reviewed-by: NStefano Babic <sbabic@denx.de>

The IN_PROGRESS macro has been removed in commit bd47c135 (mmc: Fix
splitting device initialization). Remove it from the mmc_start_init()
function description.
Signed-off-by: NBaruch Siach <baruch@tkos.co.il>

Add support for the Colibri iMX6ULL module which comes with
on-board raw NAND.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

The GPMI NAND IP seems to be the same as used in i.MX 6Quad. Use
the fsl,imx6q-gpmi-nand compatible string like Linux devices trees
are.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

This macro allows to detect whether the boot ROM initialized USB
already (serial downloader). This is helpful to reliably detect
if the system has been recovered via USB serial downloader.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>
Acked-by: NMarcel Ziswiler <marcel.ziswiler@toradex.com>

Support i.MX 6 NAND GPMI driver data from device tree.
Signed-off-by: NStefan Agner <stefan.agner@toradex.com>

If the bootcounter address is in a cached memory,
a flush of dcache must occur after updateing the bootcounter.

Issue found on i.MX6 where bootcounter is put into the internal
(cached) IRAM.
Signed-off-by: NStefano Babic <sbabic@denx.de>

Add Kconfig options SPL_ENV_* and TPL_ENV_* and simplify Makefile.
This allows SPL/TPL image has different environment setting from
full feature U-Boot.
Signed-off-by: NYork Sun <york.sun@nxp.com>

%s/remove/remote/
Signed-off-by: NHeinrich Schuchardt <xypron.glpk@gmx.de>

Currently the fdtfile environment variable is set to
CONFIG_DEFAULT_DEVICE_TREE which is іnternally used as U-Boot devicetree
source. The OS can use a different filename and Kconfig gives us the
ability to select a default devicetree via CONFIG_DEFAULT_FDT_FILE.
This also gives user configuring U-Boot via menuconfig the behaviour
someone would expect.
Signed-off-by: NKlaus Goger <klaus.goger@theobroma-systems.com>
Tested-By: NVagrant Cascadian <vagrant@debian.org>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

On the veyron board the vcc33_sd regulator is used as vmmc-supply for
the SD card. This regulator is powered in the MMC core during power on
but its value is never actually set.

In the veyron platform the reset value for the LDO output is 1.8V while
the standard (min and max) value for this regulator defined in the DTS
is 3.3V. When the MMC core enable the regulator without setting its
value, the output is automatically set to 1.8V instead of 3.3V.

With this patch we preemptively set the value to 3.3V.
Signed-off-by: NCarlo Caione <carlo@endlessm.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

The GRF_SOC_CON0.grf_force_jtag bit is automatically set at boot and it
is preventing the SDMMC to work correctly. Disable the JTAG function on
the assumption that a working SD has higher priority over JTAG.
Signed-off-by: NCarlo Caione <carlo@endlessm.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

Use regulators_enable_boot_on() to init all the regulators with
regulator-boot-on property.
Signed-off-by: NCarlo Caione <carlo@endlessm.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

The first dhcp command consistently fails with a timeout when
the lion-rk3368 board is connected to a Zyxel GS1100-24E
Gigabit Ethernet switch:

  ethernet@ff290000 Waiting for PHY auto negotiation to complete......... TIMEOUT !

Increasing PHY_ANEG_TIMEOUT from the default 4000 to 8000 makes the
first dhcp command work reliably.
Signed-off-by: NJakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

Without the patch SPL (in case of an error) creates an output like:

	U-Boot SPL board initMissing DTB

The patch adds the missing line feed. So now we get:

	U-Boot SPL board init
	Missing DTB
Signed-off-by: NHeinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

Change the description relating to CONFIG_SPL_ROCKCHIP_BACK_TO_BROM to
clarify that both RK3288 and RK3036 use

	CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
Signed-off-by: NHeinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

%s/rkflashtool/rkdeveloptool/

We are using rkdeveloptool not rkflashtool.
Signed-off-by: NHeinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: NKever Yang <kever.yang@rock-chips.com>

The order distroboot searches for a boot.scr is fixed at compile time.
To make BIOS_DISABLE work as expected and boot from mmc1 instead of
mmc0 if enabled, we need to change the environment at runtime.
Especially as commit: 482cf223 ("rockchip: rk3399-puma: add boot-on
regulator to override BIOS_DISABLE") enables the eMMC in U-Boot even
if BIOS_DISABLE is active.
Signed-off-by: NKlaus Goger <klaus.goger@theobroma-systems.com>
Signed-off-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>