diff options
author | Stefano Babic <sbabic@denx.de> | 2015-06-15 12:08:11 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2015-06-15 12:08:11 +0200 |
commit | 212b66016120fa4cd3b8f7edbe4c9f106032884e (patch) | |
tree | f956cd9195952c7890493897a9c2108a8ee852d7 /scripts/Makefile.uncmd_spl | |
parent | b31fb4b97b4d9c9fcf5a50c39d5d2c277f7008c9 (diff) | |
parent | 64d16706a052553c85d2f8f4c741879a4e3e6116 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'scripts/Makefile.uncmd_spl')
-rw-r--r-- | scripts/Makefile.uncmd_spl | 2 |
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= |