diff options
author | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
commit | 4b6e1fda107e5244e80ebc41865650ac2873dc88 (patch) | |
tree | f448089740af77c2987d12e2dd5b753b7659586f /cmd/Makefile | |
parent | 27bec5c12757c80f598b704477c1bc6c250bcb4c (diff) | |
parent | 341392dd115f1385c31bb0b034ec15f542730e30 (diff) | |
download | u-boot-imx-4b6e1fda107e5244e80ebc41865650ac2873dc88.zip u-boot-imx-4b6e1fda107e5244e80ebc41865650ac2873dc88.tar.gz u-boot-imx-4b6e1fda107e5244e80ebc41865650ac2873dc88.tar.bz2 |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'cmd/Makefile')
-rw-r--r-- | cmd/Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cmd/Makefile b/cmd/Makefile index f95759e..e3e0c74 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -112,7 +112,7 @@ obj-$(CONFIG_CMD_REMOTEPROC) += remoteproc.o obj-$(CONFIG_SANDBOX) += host.o obj-$(CONFIG_CMD_SATA) += sata.o obj-$(CONFIG_CMD_SF) += sf.o -obj-$(CONFIG_CMD_SCSI) += scsi.o +obj-$(CONFIG_SCSI) += scsi.o obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o obj-$(CONFIG_CMD_SOFTSWITCH) += softswitch.o @@ -155,12 +155,6 @@ obj-$(CONFIG_CMD_PMIC) += pmic.o obj-$(CONFIG_CMD_REGULATOR) += regulator.o endif # !CONFIG_SPL_BUILD -ifdef CONFIG_SPL_BUILD -ifdef CONFIG_SPL_SATA_SUPPORT -obj-$(CONFIG_CMD_SCSI) += scsi.o -endif -endif # CONFIG_SPL_BUILD - obj-$(CONFIG_CMD_BLOB) += blob.o # core command |