smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct SPL uses of FASTBOOT_FLASH_MMC

Browse Source 
This converts 5 usages of this option to the non-SPL form, since there is
no SPL_FASTBOOT_FLASH_MMC defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Simon Glass
2023-02-05 17:54:12 -07:00
committed by Tom Rini
parent 41782a9c09
commit 7cb10e516b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/fastboot/fb_command.c
View File

@@ -295,7 +295,7 @@ void fastboot_data_complete(char *response)
*/
static void __maybe_unused flash(char *cmd_parameter, char *response)
{
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC))
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC))
fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr,
image_size, response);
@@ -315,7 +315,7 @@ static void __maybe_unused flash(char *cmd_parameter, char *response)
*/
static void __maybe_unused erase(char *cmd_parameter, char *response)
{
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC))
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC))
fastboot_mmc_erase(cmd_parameter, response);
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND))

2
drivers/fastboot/fb_common.c
View File

@@ -99,7 +99,7 @@ int __weak fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
const int mmc_dev = config_opt_enabled(CONFIG_FASTBOOT_FLASH_MMC,
CONFIG_FASTBOOT_FLASH_MMC_DEV, -1);
if (!CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC))
if (!IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC))
return -EINVAL;
if (reason >= FASTBOOT_REBOOT_REASONS_COUNT)

4
drivers/fastboot/fb_getvar.c
View File

@@ -62,7 +62,7 @@ static const struct {
.variable = "has-slot",
.dispatch = getvar_has_slot
#endif
#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)
#if IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)
}, {
.variable = "partition-type",
.dispatch = getvar_partition_type
@@ -99,7 +99,7 @@ static int getvar_get_part_info(const char *part_name, char *response,
struct disk_partition disk_part;
struct part_info *part_info;
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) {
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) {
r = fastboot_mmc_get_part_info(part_name, &dev_desc, &disk_part,
response);
if (r >= 0 && size)