summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-11 21:18:52 -0400
committerTom Rini <trini@konsulko.com>2015-06-11 21:18:52 -0400
commitb9130d88fa9e251123e2282184e8c1f3ae428a8a (patch)
tree87368904cfad98a19ee097d8ce2c61e77ccdb9c0 /scripts
parent7bb7d672aa50ed92a10ee268d0fed39aaa97a7c8 (diff)
parent257bfd2e215ff02aacce23e14bf17b61524a723f (diff)
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.uncmd_spl2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl
index 343c3fc199..4f056525bb 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=