diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-08-12 07:31:55 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-18 13:46:05 -0400 |
| commit | 0f9258228e2b2070368ffccf5c243218128770a8 (patch) | |
| tree | cb0d5f4b6d223e2a20a4d3f300ea1f266a4e6a40 /include/configs/microblaze-generic.h | |
| parent | dffb86e468c8e02ba77283989aefef214d904dc5 (diff) | |
| download | talos-obmc-uboot-0f9258228e2b2070368ffccf5c243218128770a8.tar.gz talos-obmc-uboot-0f9258228e2b2070368ffccf5c243218128770a8.zip | |
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/microblaze-generic.h')
| -rw-r--r-- | include/configs/microblaze-generic.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 626fa44927..8ce1c49707 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 |
