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> |
||
|---|---|---|
| .. | ||
| basic | ||
| kconfig | ||
| .gitignore | ||
| Kbuild.include | ||
| Lindent | ||
| Makefile | ||
| Makefile.autoconf | ||
| Makefile.build | ||
| Makefile.clean | ||
| Makefile.extrawarn | ||
| Makefile.host | ||
| Makefile.lib | ||
| Makefile.spl | ||
| Makefile.uncmd_spl | ||
| binutils-version.sh | ||
| checkpatch.pl | ||
| checkstack.pl | ||
| cleanpatch | ||
| docproc.c | ||
| dtc-version.sh | ||
| fill_scrapyard.py | ||
| gcc-stack-usage.sh | ||
| gcc-version.sh | ||
| get_maintainer.pl | ||
| kernel-doc | ||
| ld-version.sh | ||
| mailmapper | ||
| mkmakefile | ||
| objdiff | ||
| setlocalversion | ||
| show-gnu-make | ||