summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-07-07 09:58:41 -0400
committerTom Rini <trini@konsulko.com>2016-07-07 09:58:41 -0400
commitabbaa23f652e18f3df7594b943835c82f8f78c3a (patch)
treebcdfd55e6ed3dd5242d9a4995a0c4e854185e8a5 /arch
parent99b8275797b9f4155ee65ec272629ae857d6a8bb (diff)
parenteb364c3dc28d59d33e823470d07746b22a8e6fee (diff)
downloadtalos-obmc-uboot-abbaa23f652e18f3df7594b943835c82f8f78c3a.tar.gz
talos-obmc-uboot-abbaa23f652e18f3df7594b943835c82f8f78c3a.zip
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/cpu/mpc85xx/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile
index 65c26c093c..f4c4fe2602 100644
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -26,7 +26,9 @@ else
obj-$(CONFIG_MP) += release.o
+ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_CMD_ERRATA) += cmd_errata.o
+endif
obj-$(CONFIG_CPM2) += commproc.o
obj-$(CONFIG_CPM2) += ether_fcc.o
OpenPOWER on IntegriCloud