diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:27 +0200 |
| commit | 8b464dc6eec4d1fd58875451671456393181e980 (patch) | |
| tree | e97f998a24620c545711a3692be509768407b75d /Makefile | |
| parent | 90118343e46fecac78b6351ce25bb610b15fc077 (diff) | |
| parent | 8df8a3d7a9d3356183df0a45c97f32dac878b65b (diff) | |
| download | barebox-8b464dc6eec4d1fd58875451671456393181e980.tar.gz barebox-8b464dc6eec4d1fd58875451671456393181e980.tar.xz | |
Merge branch 'for-next/doc'
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -774,10 +774,6 @@ include/config/kernel.release: include/config/auto.conf FORCE $(Q)rm -f $@ $(Q)echo $(KERNELVERSION)$(localversion) > $@ -Doxyfile.version: include/config/auto.conf FORCE - $(Q)rm -f $@ - $(Q)echo "PROJECT_NUMBER = $(KERNELRELEASE)" > $@ - # Things we need to do before we recursively start building the kernel # or the modules are listed in "prepare". # A multi level approach is used. prepareN is processed before prepareN-1. @@ -996,7 +992,7 @@ CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \ .tmp_version .tmp_barebox* barebox.bin barebox.map barebox.S \ .tmp_kallsyms* common/barebox_default_env* barebox.ldr \ scripts/bareboxenv-target barebox-flash-image \ - Doxyfile.version barebox.srec barebox.s5p barebox.ubl \ + barebox.srec barebox.s5p barebox.ubl barebox.zynq \ barebox.uimage barebox.spi barebox.kwb barebox.kwbuart \ barebox.canon-a1100.bin |