diff options
| author | Simon Glass <sjg@chromium.org> | 2015-05-12 14:55:07 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-06-10 19:26:55 -0600 |
| commit | a59abd10498fed8c2bb5718748ba27310aac4ba2 (patch) | |
| tree | 95eb6a3b3e19b2803e952f7bd8da1bd4ac0cd7c0 | |
| parent | b6bfb6ff9a2173d5e0e5506b95631aa49396c468 (diff) | |
| download | u-boot-imx-a59abd10498fed8c2bb5718748ba27310aac4ba2.zip u-boot-imx-a59abd10498fed8c2bb5718748ba27310aac4ba2.tar.gz u-boot-imx-a59abd10498fed8c2bb5718748ba27310aac4ba2.tar.bz2 | |
Remove SPL undefine of CONFIG_OF_CONTROL
Allow SPL to be built with this option so that we can support device tree
control. Disable the simple bus for now in SPL. It may be needed later.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/core/Makefile | 2 | ||||
| -rw-r--r-- | include/config_uncmd_spl.h | 2 | ||||
| -rw-r--r-- | scripts/Makefile.uncmd_spl | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/core/Makefile b/drivers/core/Makefile index f14695b..a3fec38 100644 --- a/drivers/core/Makefile +++ b/drivers/core/Makefile @@ -5,5 +5,7 @@ # obj-$(CONFIG_DM) += device.o lists.o root.o uclass.o util.o +ifndef CONFIG_SPL_BUILD obj-$(CONFIG_OF_CONTROL) += simple-bus.o +endif obj-$(CONFIG_DM_DEVICE_REMOVE) += device-remove.o diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h index 38cb0e8..c191f56 100644 --- a/include/config_uncmd_spl.h +++ b/include/config_uncmd_spl.h @@ -20,7 +20,9 @@ #undef CONFIG_CMD_SNTP #undef CONFIG_CMD_TFTPPUT #undef CONFIG_CMD_TFTPSRV +#ifdef CONFIG_SPL_DISABLE_OF_CONTROL #undef CONFIG_OF_CONTROL +#endif #ifndef CONFIG_SPL_DM #undef CONFIG_DM_SERIAL diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl index 343c3fc..4f05652 100644 --- a/scripts/Makefile.uncmd_spl +++ b/scripts/Makefile.uncmd_spl @@ -3,7 +3,9 @@ # TODO: Invent a better way ifdef CONFIG_SPL_BUILD +ifdef CONFIG_SPL_DISABLE_OF_CONTROL CONFIG_OF_CONTROL= +endif ifndef CONFIG_SPL_DM CONFIG_DM_SERIAL= |