]> git.ipfire.org Git - people/ms/u-boot.git/commit - arch/arm/mach-imx/spl.c
arm: imx: make bmode command work with SPL/U-Boot combo
authorNikita Kiryanov <nikita@compulab.co.il>
Wed, 29 Oct 2014 17:28:33 +0000 (19:28 +0200)
committerStefano Babic <sbabic@denx.de>
Wed, 12 Nov 2014 08:03:54 +0000 (09:03 +0100)
commitf2863ff3f47c99c4b5ba00be572e3a2c4213c5a2
tree24fbac07b3737bf73e53e3eb6fb7093676a5a188
parent63f7af9a4cfb4a3b9136674c6612c6d13957c2cd
arm: imx: make bmode command work with SPL/U-Boot combo

The bmode command forces the SoC to use a specific boot device
by writing its boot mode into SRC_GPR9, and notifying the SoC of
the change using SRC_GPR10[28] bit: if the bit is on, bootROM
uses the value in SRC_GPR9 instead of SRC_SMBR1 to determine
the boot device.

SPL on the other hand is oblivious to this distinction, so once
the bootROM loads SPL from the device configured in SRC_GPR10,
SPL will attempt to load U-Boot from the device configured in
SRC_SMBR1, which is not updated by the bootROM to the value in
SRC_GPR9.

The result is that the selected boot device is not used across all
the boot stages.

Update spl_boot_device() to look at gpr9 when necessary.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Troy Kisky <troy.kisky@boundarydevices.com>
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Eric Nelson <eric.nelson@boundarydevices.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Heiko Schocher <hs@denx.de>
arch/arm/cpu/armv7/mx6/soc.c
arch/arm/imx-common/spl.c