u-boot.git/common/spl, branch v2016.01-rc2

spl: mmc: Unify non/driver model spl_mmc_find_device()

2015-12-05T23:22:34+00:00

It is risky to have two different functions with much the same code. Future
authors may update one but not the other. It is hard to see which parts are
the same and which are different.

Unify the functions and drop the differences that are not really needed.

Note that one puts() becomes printf() as Tom mentioned that this does not
affect image size:

https://patchwork.ozlabs.org/patch/537276/

Note: It would be better to have an empty printf() and avoid the #ifdef for
CONFIG_SPL_LIBCOMMON_SUPPORT.

Signed-off-by: Simon Glass 
Tested-by: Michal Simek

spl: mmc: Rename 'mmc' variable to 'mmcp'

2015-12-05T23:22:33+00:00

The 'p' suffix makes it more obvious that we are dealing with a pointer
to a (pointer) value that will be returned to its caller.

Signed-off-by: Simon Glass 
Acked-by: Nikita Kiryanov 
Tested-by: Michal Simek

spl: mmc: Fix compiler warning with CONFIG_DM_MMC

2015-12-05T23:22:33+00:00

Since commit 4188ba3 we get the following warning on rockchip boards:

common/spl/spl_mmc.c:31:24: warning: ‘mmc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  count = mmc->block_dev.block_read(0, sector, 1, header);
                        ^
common/spl/spl_mmc.c:251:14: note: ‘mmc’ was declared here
  struct mmc *mmc;

Correct this by move the variable init earlier.

Signed-off-by: Simon Glass 
Tested-by: Michal Simek 
Acked-by: Nikita Kiryanov

spl: mmc: add support for BOOT_DEVICE_MMC2

2015-11-18T19:50:05+00:00

Currently the mmc device that SPL looks at is always mmc0, regardless
of the BOOT_DEVICE_MMCx value. This forces some boards to
implement hacks in order to boot from other mmc devices.

Make SPL take into account the correct mmc device.

Signed-off-by: Nikita Kiryanov 
Reviewed-by: Tom Rini

spl: announce boot devices

2015-11-18T19:50:04+00:00

Now that we support alternative boot devices, it can sometimes be
unclear which boot devices was actually used. Provide a function to
announce which boot devices are attempted during boot.

Signed-off-by: Nikita Kiryanov 
Cc: Igor Grinberg 
Cc: Tom Rini 
Cc: Simon Glass 
Reviewed-by: Tom Rini 
Reviewed-by: Simon Glass

spl: add support for alternative boot device

2015-11-18T19:50:03+00:00

Introduce spl_boot_list array, which defines a list of boot devices
that SPL will try before hanging. By default this list will consist
of only spl_boot_device(), but board_boot_order() can be overridden
by board code to populate the array with custom values.

Signed-off-by: Nikita Kiryanov 
Cc: Igor Grinberg 
Cc: Tom Rini 
Cc: Simon Glass 
Reviewed-by: Tom Rini 
Reviewed-by: Simon Glass

common: spl: move image load to its own function

2015-11-18T19:50:03+00:00

Refactor spl image load code out of board_init_r and into its own
function. This is a preparation for supporting alternative boot
devices.

Signed-off-by: Nikita Kiryanov 
Cc: Igor Grinberg 
Cc: Tom Rini 
Cc: Simon Glass 
Reviewed-by: Simon Glass 
Reviewed-by: Tom Rini

spl: change return values of spl_*_load_image()

2015-11-18T19:50:02+00:00

Make spl_*_load_image() functions return a value instead of
hanging if a problem is encountered. This enables main spl code
to make the decision whether to hang or not, thus preparing
it to support alternative boot devices.

Some boot devices (namely nand and spi) do not hang on error.
Instead, they return normally and SPL proceeds to boot the
contents of the load address. This is considered a bug and
is rectified by hanging on error for these devices as well.

Signed-off-by: Nikita Kiryanov 
Cc: Igor Grinberg 
Cc: Tom Rini 
Cc: Simon Glass 
Cc: Ian Campbell 
Cc: Hans De Goede 
Cc: Albert Aribaud 
Cc: Jagan Teki 
Reviewed-by: Tom Rini 
Reviewed-by: Simon Glass

spl: mmc: get rid of emmc boot code duplication

2015-11-18T19:50:02+00:00

Get rid of emmc boot code duplication in spl_mmc_load_image() using a switch
case fallthrough into MMCSD_MODE_RAW. Since the #ifdef CONFIG_SUPPORT_EMMC_BOOT
check is not really necessary, remove it in the process.

No functional changes.

Signed-off-by: Nikita Kiryanov 
Cc: Igor Grinberg 
Cc: Paul Kocialkowski 
Cc: Pantelis Antoniou 
Cc: Tom Rini 
Cc: Simon Glass 
Reviewed-by: Simon Glass 
Reviewed-by: Tom Rini

spl: mmc: move fs boot into its own function

2015-11-18T19:50:01+00:00

Move the code that handles fs boot out of spl_mmc_load_image() and into its
own function to reduce the #ifdef complexity of spl_mmc_load_image().

No functional changes.

Signed-off-by: Nikita Kiryanov 
Cc: Igor Grinberg 
Cc: Paul Kocialkowski 
Cc: Pantelis Antoniou 
Cc: Tom Rini 
Cc: Simon Glass 
Reviewed-by: Simon Glass 
Reviewed-by: Tom Rini