From 103d1aecb0b9e48955d4cd90aa3dbc0a22a1fab9 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 28 May 2022 17:21:03 -0400 Subject: Convert CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR et al to Kconfig This converts the following to Kconfig: CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS Signed-off-by: Tom Rini --- common/spl/Kconfig | 14 ++++++++++++++ common/spl/spl_mmc.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'common') diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 05049c1ffd7..d4f02b527d9 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1226,6 +1226,20 @@ config SYS_MMCSD_RAW_MODE_KERNEL_SECTOR Note that the Falcon mode image can also be a FIT, if FIT support is enabled. +config SYS_MMCSD_RAW_MODE_ARGS_SECTOR + hex "Falcon mode: Sector to load 'args' from MMC" + depends on SPL_FALCON_BOOT_MMCSD + help + When Falcon mode is used with an MMC or SD media, SPL needs to know + where to look for the OS 'args', typically a device tree. The + contents are expected to begin at the raw MMC specified in this config. + Note that if using a FIT image, this and the next option can be set to + 0x0. + +config SYS_MMCSD_RAW_MODE_ARGS_SECTORS + hex "Falcon mode: Number of sectors to load for 'args' from MMC" + depends on SPL_FALCON_BOOT_MMCSD && SYS_MMCSD_RAW_MODE_ARGS_SECTOR != 0x0 + config SPL_PAYLOAD string "SPL payload" default "tpl/u-boot-with-tpl.bin" if TPL diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 6116a68371a..f66147477e7 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -229,7 +229,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image, { int ret; -#if defined(CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR) +#if CONFIG_VAL(SYS_MMCSD_RAW_MODE_ARGS_SECTOR) unsigned long count; count = blk_dread(mmc_get_blk_desc(mmc), -- cgit v1.2.3