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> |
||
|---|---|---|
| .. | ||
| bzip2 | ||
| dhry | ||
| efi | ||
| libfdt | ||
| lzma | ||
| lzo | ||
| rsa | ||
| tizen | ||
| zlib | ||
| Kconfig | ||
| Makefile | ||
| addr_map.c | ||
| aes.c | ||
| asm-offsets.c | ||
| bch.c | ||
| bitrev.c | ||
| circbuf.c | ||
| crc7.c | ||
| crc8.c | ||
| crc16.c | ||
| crc32.c | ||
| ctype.c | ||
| display_options.c | ||
| div64.c | ||
| errno.c | ||
| errno_str.c | ||
| fdtdec.c | ||
| fdtdec_common.c | ||
| fdtdec_test.c | ||
| gunzip.c | ||
| gzip.c | ||
| hang.c | ||
| hashtable.c | ||
| initcall.c | ||
| ldiv.c | ||
| linux_compat.c | ||
| linux_string.c | ||
| list_sort.c | ||
| lmb.c | ||
| md5.c | ||
| net_utils.c | ||
| physmem.c | ||
| qsort.c | ||
| rand.c | ||
| rbtree.c | ||
| rc4.c | ||
| sha1.c | ||
| sha256.c | ||
| slre.c | ||
| string.c | ||
| strmhz.c | ||
| time.c | ||
| tpm.c | ||
| trace.c | ||
| uuid.c | ||
| vsprintf.c | ||