diff options
| author | Tom Rini <trini@ti.com> | 2012-12-22 05:55:19 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-22 05:55:19 -0700 |
| commit | da77a0e593c370c9ed79ea22c1df321d5f4e4bbf (patch) | |
| tree | d31ff68d217a80422845c82104098eef744f4cde /Makefile | |
| parent | ba6d4b64b33146740a15b3dd5a5f511a2bc8d6f6 (diff) | |
| parent | 96764df1b47ddebfb50fadf5af72530b07b5fc89 (diff) | |
| download | u-boot-imx-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.zip u-boot-imx-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.tar.gz u-boot-imx-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -316,6 +316,7 @@ LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif LIBS-y += drivers/rtc/librtc.o LIBS-y += drivers/serial/libserial.o +LIBS-y += drivers/sound/libsound.o LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o LIBS-y += drivers/twserial/libtws.o LIBS-y += drivers/usb/eth/libusb_eth.o @@ -510,7 +511,7 @@ $(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img ELFTOSB_TARGET-$(CONFIG_MX28) = imx28 $(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin - elftosb -zdf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \ + elftosb -zf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \ -o $(obj)u-boot.sb # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL. @@ -869,6 +870,7 @@ clobber: tidy @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.map} @rm -f $(obj)spl/{u-boot-spl.lds,u-boot.lst} @rm -f $(obj)MLO + @rm -f $(obj)SPL @rm -f $(obj)tools/xway-swap-bytes @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c @rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c |