From dffb86e468c8e02ba77283989aefef214d904dc5 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 12 Aug 2015 07:31:54 +0900 Subject: of: flip CONFIG_SPL_DISABLE_OF_CONTROL into CONFIG_SPL_OF_CONTROL As we discussed a couple of times, negative CONFIG options make our life difficult; CONFIG_SYS_NO_FLASH, CONFIG_SYS_DCACHE_OFF, ... and here is another one. Now, there are three boards enabling OF_CONTROL on SPL: - socfpga_arria5_defconfig - socfpga_cyclone5_defconfig - socfpga_socrates_defconfig This commit adds CONFIG_SPL_OF_CONTROL for them and deletes CONFIG_SPL_DISABLE_OF_CONTROL from the other boards to invert the logic. Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini Reviewed-by: Simon Glass --- include/config_uncmd_spl.h | 2 +- include/fdtdec.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h index 86cc0c3c5d..2741fc8a8e 100644 --- a/include/config_uncmd_spl.h +++ b/include/config_uncmd_spl.h @@ -20,7 +20,7 @@ #undef CONFIG_CMD_SNTP #undef CONFIG_CMD_TFTPPUT #undef CONFIG_CMD_TFTPSRV -#ifdef CONFIG_SPL_DISABLE_OF_CONTROL +#ifndef CONFIG_SPL_OF_CONTROL #undef CONFIG_OF_CONTROL #endif diff --git a/include/fdtdec.h b/include/fdtdec.h index 2ef3f662cc..5796e272b2 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -46,7 +46,7 @@ struct fdt_memory { #endif #ifdef CONFIG_OF_CONTROL -# if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DISABLE_OF_CONTROL) +# if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_OF_CONTROL) # define OF_CONTROL 0 # else # define OF_CONTROL 1 -- cgit v1.2.1