Assigning a parameter which is not used afterwards has not effect.
Signed-off-by: NHeinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: NSimon Glass <sjg@chromium.org>

trini: Update colibri-imx6ull to use Kconfig for mtdparts related
options.
Signed-off-by: NTom Rini <trini@konsulko.com>

There are already definitions for ramdisk_addr_r and fdt_addr_r, so
having a duplicate copy called ramdiskaddr and fdtaddr is confusing.
This patch converts any references to ramdisk_addr_r and fdt_addr_r
and removes the duplicates.
Signed-off-by: NAdam Ford <aford173@gmail.com>

The USBOH module on imx25 chips contains two USB controllers which are
called USB OTG Controller and USB Host Controller. Each one has its EHCI
root hub. The OTG Controller's EHCI registers start at offset 0, the Host
Controller's registers start at offset 0x400.

We set CONFIG_MXC_USB_PORT=0 to select the OTG Controller and 1 for the
Host Controller. Therefore, IMX_USB_PORT_OFFSET must be 0x400. Using
this setting, the Host Controller starts working on my imx25 board.

Please note that the imx25 reference manual claims that the Host
Controller's registers start at 0x200. This is not correct. The Linux
Kernel uses the correct offset 0x400 in imx25.dtsi.
Signed-off-by: NMartin Kaiser <martin@kaiser.cx>
Reviewed-by: NFabio Estevam <fabio.estevam@nxp.com>

Signing parts of a u-boot imximage for image verification in High
Assurance Boot (HAB) in a post-build process, requires some
information from the imximage header. Currently, this information is
only provided during the image build, which makes the transfer of this
information to the post-build process harder than necessary.

The i.MX HAB information (start and length) can be calculated either
by using information from the image-configuration file, or from the
information in the flash header of the imximage.
The advantage of using information from flash header is, that they are
not only available during image creation, but also available if
existing images are processed.

Example:
$ tools/mkimage -l u-boot.imx
Image Type:   Freescale IMX Boot Image
Image Ver:    2 (i.MX53/6/7 compatible)
Mode:         DCD
Data Size:    483328 Bytes = 472.00 KiB = 0.46 MiB
Load Address: 877ff420
Entry Point:  87800000
HAB Blocks:   0x877ff400 0x00000000 0x00071c00
DCD Blocks:   0x00910000 0x0000002c 0x00000208
Signed-off-by: NHolger Dengler <dengler@linutronix.de>
Tested-by: NBryan O'Donoghue <bryan.odonoghue@linaro.org>

In preparation for delivery bottlenecks, enable support for GigaDevice, Macronix, and Winbond nor flash chips.
Signed-off-by: NLudwig Zenz <lzenz@dh-electronics.de>

Since the vast majority of i.MX6 boards are migrating to SPL,
this patch converts im6q_logic to SPL and enables the SDP for
loading SPL and u-boot.img over USB.  The Falcon mode only
supports NAND flash as of now due to limited space/RAM, but
all i.MX6D/Q SOM's from Logic PD have internal NAND from which
to boot.
Signed-off-by: NAdam Ford <aford173@gmail.com>

Support 1GIB + 2GIB DDR3 with 64bit bus width and 512MIB + 1GIB with 32bit bus width
Signed-off-by: NLudwig Zenz <lzenz@dh-electronics.de>

Preperation for conditional DDR3 initialization based on GPIO codes.
Signed-off-by: NLudwig Zenz <lzenz@dh-electronics.de>

This reverts commit a637fe6f.

The DDR DRAM calibration was enhanced by write leveling correction code.
It can be used with T-topology now.
Signed-off-by: NLudwig Zenz <lzenz@dh-electronics.de>

The new config skips the boot menu which asks which board is in
use. This is useful to allow direct booting of image without user
iteration.
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

Our default config already has the secure mode supported, so the
manual step is not required anymore.
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

The DFU allows a more user friendly use as the details where the
bootloader is installed are abstracted.
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

This enables the "bootaux" command so a firmware can be loaded inside
the M4 MCU.
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

This allow the addition of extra default configurations for each
baseboard, removing the boot menu when user boots for the first time.
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

The addrmap5 value is the same for the 512MB and 1GB variants,
so there is no need to override it.
Signed-off-by: NFabio Estevam <festevam@gmail.com>
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

Currently the CAAM driver fails to be probed:

caam 30900000.caam: Entropy delay = 3200
caam 30900000.caam: failed to acquire DECO 0
caam 30900000.caam: failed to instantiate RNG

CAAM needs to be initialized in secure world, so enable
CONFIG_ARMV7_BOOT_SEC_DEFAULT to allow the driver to
probe successfully.

Tested with kernel mainline version 4.17.2.
Signed-off-by: NFabio Estevam <festevam@gmail.com>
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

Falcon mode boots the kernel directly from SPL, without loading
the full U-Boot.

As pico-imx7d does not have a GPIO for selecting Falcon versus
normal mode, enter in Falcon mode when the customer selects
the CONFIG_SPL_OS_BOOT option in menuconfig.
Signed-off-by: NFabio Estevam <festevam@gmail.com>
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

Currently the baseboards do not offer a way to autodetect which one is
in use, so we ask the user if no value has been set.
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

Add spl entry on dfu_alt_info to be able to update U-Boot with SPL
for pico imx7d board.
Signed-off-by: NFabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

Convert pico-imx7d to SPL support.

There are two variants of pico-imx7d SOMs:
- One with 512MB of RAM
- One with 1GB of RAM

The 512MB module contains two Hynix H5TC2G63GFR-PBA.
The 1GB module contains two Hynix H5TC4G63GFR-PBA.

The RAM size is determined in runtime by reading GPIO1_12.

While at it, also add USB Serial Download mode support as it
is very helpful for loading SPL and u-boot.img via imx_usb_loader.
Signed-off-by: NFabio Estevam <festevam@gmail.com>
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

fastboot tool is a convenient way to flash the eMMC, so
add support for it.

Examples of usages:

On the pico-imx7d U-Boot prompt:

=> fastboot 0

On the Linux PC connected via USB:

1. Retrieving the U-Boot version

$ sudo fastboot getvar bootloader-version -i 0x0525
bootloader-version: U-Boot 2018.07-rc1-03888-gde846f9
finished. total time: 0.000s

2. Resetting the board

$ sudo fastboot reboot -i 0x0525

(this causes the pico-imx7d to reboot)
Signed-off-by: NFabio Estevam <festevam@gmail.com>
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

This allow the use of:

> run setup_emmc

inside of the U-Boot prompt to do the partitioning of the disk.
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

This sets DISTRO_CONFIG and BOOTCOMMAND, as well as add a `finduuid`
environment helper to allow it to properly work with Yocto Project and
other distributions using extlinux autogenerated configuration files.
Signed-off-by: NOtavio Salvador <otavio@ossystems.com.br>

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>