diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-11 07:59:27 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-11 07:59:27 (GMT) |
commit | 5480ac32171ab0e38c48c9f585fa650c7867f6a1 (patch) | |
tree | 6672a47e3675e7e79fd0fbf9b491045230b24eed /Makefile | |
parent | 68e1747f9c0506159e8ecc9a4feb58e9c65a7b39 (diff) | |
parent | 5c18a1cf3e56e0177388258696be4a17a672e9d0 (diff) | |
download | u-boot-fsl-qoriq-5480ac32171ab0e38c48c9f585fa650c7867f6a1.tar.xz |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts:
tools/Makefile
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -866,7 +866,7 @@ clean: $(obj)tools/gdb/{astest,gdbcont,gdbsend} \ $(obj)tools/gen_eth_addr $(obj)tools/img2srec \ $(obj)tools/mk{env,}image $(obj)tools/mpc86x_clk \ - $(obj)tools/mk{smdk5250,}spl \ + $(obj)tools/mk{$(BOARD),}spl \ $(obj)tools/mxsboot \ $(obj)tools/ncb $(obj)tools/ubsha1 \ $(obj)tools/kernel-doc/docproc \ |