From: Marek Vasut Date: Sat, 7 Apr 2018 15:03:28 +0000 (+0200) Subject: spl: ram: Convert to CONFIG_IS_ENABLED X-Git-Tag: v2018.05-rc2~22 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=49132610d1d7a7864b599b6adee988daf19ca2c4;p=oweals%2Fu-boot.git spl: ram: Convert to CONFIG_IS_ENABLED This patch is a preparation for adding TPL support for RAM loading. CONFIG_IS_ENABLED allows for proper handling of the U-Boot/SPL/TPL differences in config symbol names. Signed-off-by: Marek Vasut Cc: Tom Rini --- diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index d9db9f3a40..a15761e309 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -36,7 +36,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS; -#if defined(CONFIG_SPL_DFU_SUPPORT) +#if CONFIG_IS_ENABLED(DFU_SUPPORT) if (bootdev->boot_device == BOOT_DEVICE_DFU) spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0"); #endif @@ -74,10 +74,10 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, return 0; } -#if defined(CONFIG_SPL_RAM_DEVICE) +#if CONFIG_IS_ENABLED(RAM_DEVICE) SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image); #endif -#if defined(CONFIG_SPL_DFU_SUPPORT) +#if CONFIG_IS_ENABLED(DFU_SUPPORT) SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image); #endif