diff options
| author | Masahiro Yamada <[email protected]> | 2015-08-12 07:31:54 +0900 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2015-08-18 13:46:04 -0400 |
| commit | dffb86e468c8e02ba77283989aefef214d904dc5 (patch) | |
| tree | 6a34789586f2e78de5974ded230f13255f6da143 /include | |
| parent | cc7aebe8198be062ae005448f78c7cdcbba825d4 (diff) | |
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 <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/config_uncmd_spl.h | 2 | ||||
| -rw-r--r-- | include/fdtdec.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h index 86cc0c3c5d7..2741fc8a8e1 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 2ef3f662cc8..5796e272b29 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 |