diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-08-11 22:31:55 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-18 17:46:05 (GMT) |
commit | 0f9258228e2b2070368ffccf5c243218128770a8 (patch) | |
tree | cb0d5f4b6d223e2a20a4d3f300ea1f266a4e6a40 /include/configs | |
parent | dffb86e468c8e02ba77283989aefef214d904dc5 (diff) | |
download | u-boot-0f9258228e2b2070368ffccf5c243218128770a8.tar.xz |
of: clean up OF_CONTROL ifdef conditionals
We have flipped CONFIG_SPL_DISABLE_OF_CONTROL. We have cleansing
devices, $(SPL_) and CONFIG_IS_ENABLED(), so we are ready to clear
away the ugly logic in include/fdtdec.h:
#ifdef CONFIG_OF_CONTROL
# if defined(CONFIG_SPL_BUILD) && !defined(SPL_OF_CONTROL)
# define OF_CONTROL 0
# else
# define OF_CONTROL 1
# endif
#else
# define OF_CONTROL 0
#endif
Now CONFIG_IS_ENABLED(OF_CONTROL) is the substitute. It refers to
CONFIG_OF_CONTROL for U-boot proper and CONFIG_SPL_OF_CONTROL for
SPL.
Also, we no longer have to cancel CONFIG_OF_CONTROL in
include/config_uncmd_spl.h and scripts/Makefile.spl.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/microblaze-generic.h | 3 | ||||
-rw-r--r-- | include/configs/socfpga_common.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 626fa44..8ce1c49 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -106,7 +106,8 @@ # define CONFIG_XILINX_TB_WATCHDOG #endif -#ifndef CONFIG_OF_CONTROL +#if !defined(CONFIG_OF_CONTROL) || \ + (defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_OF_CONTROL)) /* ddr sdram - main memory */ # define CONFIG_SYS_SDRAM_BASE XILINX_RAM_START # define CONFIG_SYS_SDRAM_SIZE XILINX_RAM_SIZE diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 5ca45a9..c64c7ed 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -214,7 +214,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SPI_FLASH_BAR #endif -#ifdef CONFIG_OF_CONTROL /* DW SPI is controlled via DT */ +#if CONFIG_IS_ENABLED(OF_CONTROL) /* DW SPI is controlled via DT */ #define CONFIG_DESIGNWARE_SPI #define CONFIG_CMD_SPI #endif |