summaryrefslogtreecommitdiff
path: root/spl
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-04 14:06:56 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-04 14:06:56 +0200
commite62d5fb0da76ef168e90cae9bbbda80349aaf137 (patch)
treeb5c338d17f0633b7ec2e27d4d8b82dcf153a5281 /spl
parent4eef93da262048eb1118e726b3ec5b8ebd3c6c91 (diff)
parent901ce27c6f018992b7dd6c08d3c98cf217cc4c96 (diff)
downloadu-boot-imx-e62d5fb0da76ef168e90cae9bbbda80349aaf137.zip
u-boot-imx-e62d5fb0da76ef168e90cae9bbbda80349aaf137.tar.gz
u-boot-imx-e62d5fb0da76ef168e90cae9bbbda80349aaf137.tar.bz2
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'spl')
-rw-r--r--spl/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/spl/Makefile b/spl/Makefile
index 339e5e8..174d0a7 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -98,6 +98,7 @@ LIBS-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/phy/libphy.o
LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/net/phy/libphy.o
LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/libusb_musb-new.o
LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/libusb_gadget.o
+LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/libwatchdog.o
ifneq ($(CONFIG_OMAP_COMMON),)
LIBS-y += $(CPUDIR)/omap-common/libomap-common.o