diff options
| author | Simon Glass <sjg@chromium.org> | 2021-08-07 07:24:03 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-09-25 09:46:15 -0600 |
| commit | 414cc15144f69b66d12aa8881192e34862bc6042 (patch) | |
| tree | 07a154a1f32dca9f051e5809fa70d8a81b4b324f /common | |
| parent | eaad01a3d018a8a5b1003ab2d28e9e23e2b2db3f (diff) | |
| download | u-boot-414cc15144f69b66d12aa8881192e34862bc6042.zip u-boot-414cc15144f69b66d12aa8881192e34862bc6042.tar.gz u-boot-414cc15144f69b66d12aa8881192e34862bc6042.tar.bz2 | |
treewide: Simply conditions with the new OF_REAL
Use this new Kconfig to simplify the compilation conditions where
appropriate.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_spi.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 31516e1..ed94d51 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -489,7 +489,7 @@ static int spl_common_init(bool setup_malloc) return ret; } #endif - if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) { + if (CONFIG_IS_ENABLED(OF_REAL)) { ret = fdtdec_setup(); if (ret) { debug("fdtdec_setup() returned error %d\n", ret); diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index f92ce37..46ee405 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -102,10 +102,10 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, header = spl_get_load_buffer(-sizeof(*header), sizeof(*header)); -#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) - payload_offs = ofnode_conf_read_int("u-boot,spl-payload-offset", - payload_offs); -#endif + if (CONFIG_IS_ENABLED(OF_REAL)) { + payload_offs = ofnode_conf_read_int("u-boot,spl-payload-offset", + payload_offs); + } #ifdef CONFIG_SPL_OS_BOOT if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) |