From 1174eddcd31eb77afb36da12a71a781ef9be3d35 Mon Sep 17 00:00:00 2001 From: Dominik Meyer Date: Sat, 8 Feb 2014 21:56:14 +0100 Subject: [PATCH] FIX: regeneration auf Make.sources if .config changes --- Makefiles/Kconfig.boards | 2 -- Makefiles/Makefile | 15 ++++++++------- Makefiles/kconfig/lxdialog/inputbox.o | Bin 6728 -> 0 bytes 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 Makefiles/kconfig/lxdialog/inputbox.o diff --git a/Makefiles/Kconfig.boards b/Makefiles/Kconfig.boards index 729eb4d..dacad64 100644 --- a/Makefiles/Kconfig.boards +++ b/Makefiles/Kconfig.boards @@ -1,5 +1,3 @@ - - choice prompt "board type" default BOARD_ML505 diff --git a/Makefiles/Makefile b/Makefiles/Makefile index deb8551..274a283 100644 --- a/Makefiles/Makefile +++ b/Makefiles/Makefile @@ -13,6 +13,7 @@ DEVICE_NR=$(subst ", , $(CONFIG_IMPACT_TARGET)) endif TOP=top +BIT=soc.bit ifndef UCF UCF=$(subst ", , $(CONFIG_UCF_NAME)) @@ -84,7 +85,7 @@ endif .PHONY: clean all real_clean -all: +all: soc.bit real_clean: git clean -x -f @@ -93,7 +94,7 @@ clean: kconfig_clean -@rm -rf Make.sources ${CLEAN_FILES} $(OBJ) -Make.sources: Makefile.files Makefile.modules +Make.sources: .config Makefile.files Makefile.modules @clear @echo "****************************************************************************************" @echo "**** XILINX Synthesis, Map, Place, Route and Modelsim Makefile Version " $(VERSION) @@ -115,11 +116,11 @@ impact.script: @echo "quit" >> $@ program: impact.script - echo "**** Programming FPGA ****" - [ -n "$(BIT)" ] || ( echo "**** Please give Bitfile on commandline with BIT=" && exit 1) - cp $(BIT) flash.bit - $(XILINX_PATH)/impact -batch impact.script 1>/dev/null - rm impact.script + @echo "**** Programming FPGA ****" + @[ -n "$(BIT)" ] || ( echo "**** Please give Bitfile on commandline with BIT=" && exit 1) + @cp $(BIT) flash.bit + @$(XILINX_PATH)/impact -batch impact.script 1>/dev/null + @rm impact.script include $(MAKEFILES_PATH)/Makefile.configure diff --git a/Makefiles/kconfig/lxdialog/inputbox.o b/Makefiles/kconfig/lxdialog/inputbox.o deleted file mode 100644 index e47ff3340e3e932862219f64d613d45763ac28c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6728 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