Browse Source

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 <york.sun@nxp.com>
York Sun 7 years ago
parent
commit
7267fbf734
1 changed files with 4 additions and 1 deletions
  1. 4 1
      common/spl/spl_mmc.c

+ 4 - 1
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,
 static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
 				 struct mmc *mmc)
 				 struct mmc *mmc)
 {
 {
-	unsigned long count;
 	int ret;
 	int ret;
 
 
+#if defined(CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR)
+	unsigned long count;
+
 	count = blk_dread(mmc_get_blk_desc(mmc),
 	count = blk_dread(mmc_get_blk_desc(mmc),
 		CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR,
 		CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR,
 		CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS,
 		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
 #endif
 		return -1;
 		return -1;
 	}
 	}
+#endif	/* CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR */
 
 
 	ret = mmc_load_image_raw_sector(spl_image, mmc,
 	ret = mmc_load_image_raw_sector(spl_image, mmc,
 		CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR);
 		CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR);