From 7267fbf734486e585243cf3142b4159b296bdd16 Mon Sep 17 00:00:00 2001 From: York Sun Date: Tue, 26 Jun 2018 09:44:39 -0700 Subject: [PATCH] spl: mmc: Skip RAW mode ARGS sectors if not defined RAW mode ARGS sector doesn't have to be used for all falcon boot. Skip loading ARGS sectors if not defined. Signed-off-by: York Sun --- common/spl/spl_mmc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index db5be3dfa5..0b2f059570 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -191,9 +191,11 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image, static int mmc_load_image_raw_os(struct spl_image_info *spl_image, struct mmc *mmc) { - unsigned long count; int ret; +#if defined(CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR) + unsigned long count; + count = blk_dread(mmc_get_blk_desc(mmc), CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR, CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS, @@ -204,6 +206,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image, #endif return -1; } +#endif /* CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR */ ret = mmc_load_image_raw_sector(spl_image, mmc, CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR); -- 2.39.5