modyfied build process
This commit is contained in:
parent
6bca96e560
commit
e048ac1e57
64
Makefile
64
Makefile
|
@ -10,15 +10,19 @@ PRNGS :=
|
||||||
# we use the gnu make standard library
|
# we use the gnu make standard library
|
||||||
include gmsl
|
include gmsl
|
||||||
include avr-makefile.inc
|
include avr-makefile.inc
|
||||||
include *.mk
|
include mkfiles/*.mk
|
||||||
|
|
||||||
ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
|
ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
|
||||||
ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
|
ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
|
||||||
ALGORITHMS_OBJ_IMM = $(foreach a, $(ALGORITHMS_OBJ), $($(a)))
|
define OBJinBINDIR_TEMPLATE
|
||||||
|
$(1) = $(2)
|
||||||
|
endef
|
||||||
|
$(foreach a, $(ALGORITHMS_OBJ), $(eval $(call OBJinBINDIR_TEMPLATE, $(a), $(patsubst %.o,$(BIN_DIR)%.o,$($(a))))))
|
||||||
ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
|
ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
|
||||||
|
$(foreach a, $(ALGORITHMS_TEST_BIN), $(eval $(call OBJinBINDIR_TEMPLATE, $(a), $(patsubst %.o,$(BIN_DIR)%.o,$($(a))))))
|
||||||
ALGORITHMS_TEST_BIN_MAIN = $(foreach a, $(ALGORITHMS_TEST_BIN), $(firstword $($(a))))
|
ALGORITHMS_TEST_BIN_MAIN = $(foreach a, $(ALGORITHMS_TEST_BIN), $(firstword $($(a))))
|
||||||
ALGORITHMS_TEST_BIN_MAIN_ELF = $(patsubst %.o, %.elf, $(ALGORITHMS_TEST_BIN_MAIN))
|
ALGORITHMS_TEST_BIN_MAIN_ELF = $(patsubst $(BIN_DIR)%.o, $(TESTBIN_DIR)%.elf, $(ALGORITHMS_TEST_BIN_MAIN))
|
||||||
ALGORITHMS_TEST_BIN_MAIN_HEX = $(patsubst %.o, %.hex, $(ALGORITHMS_TEST_BIN_MAIN))
|
ALGORITHMS_TEST_BIN_MAIN_HEX = $(patsubst $(BIN_DIR)%.o, $(TESTBIN_DIR)%.hex, $(ALGORITHMS_TEST_BIN_MAIN))
|
||||||
|
|
||||||
ALGORITHMS_TEST_BIN_IMM = $(foreach a, $(ALGORITHMS_TEST_BIN), $($(a)))
|
ALGORITHMS_TEST_BIN_IMM = $(foreach a, $(ALGORITHMS_TEST_BIN), $($(a)))
|
||||||
ALGORITHMS_NESSIE_TEST = $(patsubst %,%_NESSIE_TEST, $(ALGORITHMS))
|
ALGORITHMS_NESSIE_TEST = $(patsubst %,%_NESSIE_TEST, $(ALGORITHMS))
|
||||||
|
@ -26,7 +30,6 @@ ALGORITHMS_PERFORMANCE_TEST = $(patsubst %,%_PERORMANCE_TEST, $(ALGORITHMS))
|
||||||
|
|
||||||
ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
|
ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
|
||||||
|
|
||||||
PRG = remove_me
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -44,7 +47,7 @@ $(2): $(3)
|
||||||
$(LIBS)
|
$(LIBS)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst %.o,%.elf,$(firstword $($(algo)_TEST_BIN))), $($(algo)_TEST_BIN) )))
|
$(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst $(BIN_DIR)%.o,$(TESTBIN_DIR)%.elf,$(firstword $($(algo)_TEST_BIN))), $(patsubst %.o,%.o,$($(algo)_TEST_BIN)) )))
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -61,22 +64,18 @@ info:
|
||||||
@echo " $(MACS)"
|
@echo " $(MACS)"
|
||||||
@echo " PRNG functions:"
|
@echo " PRNG functions:"
|
||||||
@echo " $(PRNGS)"
|
@echo " $(PRNGS)"
|
||||||
# @echo " LC functions:"
|
|
||||||
# @echo " $(ALGORITHMS_LC)"
|
$(BIN_DIR)%.o: %.c
|
||||||
|
@echo "[gcc]: $@"
|
||||||
# echo $(ALGORITHMS_TEST_BIN_MAIN)
|
@$(CC) $(CFLAGS) -c -o $@ $<
|
||||||
# echo $(ALGORITHMS)
|
|
||||||
# echo $(firstword $(XTEA_TEST_BIN))
|
$(BIN_DIR)%.o: %.S
|
||||||
# echo $(patsubst %.o,%.elf,$(firstword $(XTEA_TEST_BIN)))
|
@echo "[as] : $@"
|
||||||
# echo $(ALGORITHMS_OBJ)
|
@$(CC) $(ASFLAGS) -c -o $@ $<
|
||||||
# echo $(ALGORITHMS_OBJ_IMM)
|
|
||||||
# echo $(ALGORITHMS_TEST_BIN)
|
|
||||||
# echo $(ALGORITHMS_NESSIE_TEST)
|
|
||||||
# echo $(ALGORITHMS_PERFORMANCE_TEST)
|
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
@echo "[gcc]: $@"
|
@echo "[gcc]: $@"
|
||||||
@$(CC) $(CFLAGS) -c -o $@ $<
|
@$(CC) $(CFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
%.o: %.S
|
%.o: %.S
|
||||||
@echo "[as] : $@"
|
@echo "[as] : $@"
|
||||||
|
@ -107,7 +106,6 @@ tests: $(ALGORITHMS_TEST_BIN) \
|
||||||
|
|
||||||
.PHONY: stats
|
.PHONY: stats
|
||||||
stats: $(SIZESTAT_FILE)
|
stats: $(SIZESTAT_FILE)
|
||||||
#$(patsubst %, %_size.txt, $(ALGORITHMS_LC))
|
|
||||||
|
|
||||||
|
|
||||||
$(SIZESTAT_FILE): $(patsubst %, %_size.txt, $(ALGORITHMS_LC))
|
$(SIZESTAT_FILE): $(patsubst %, %_size.txt, $(ALGORITHMS_LC))
|
||||||
|
@ -158,28 +156,20 @@ $(foreach algo, $(ALGORITHMS),$(eval $(call FLASH_TEMPLATE, $(algo), \
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
rm -rf *.o *.elf *.eps *.png *.pdf *.bak *_size.txt
|
rm -rf $(BIN_DIR)*.o *.o $(TESTBIN_DIR)*.elf $(TESTBIN_DIR)* *.elf *.eps *.png *.pdf *.bak *_size.txt
|
||||||
rm -rf *.lst *.map $(EXTRA_CLEAN_FILES) $(SIZESTAT_FILE)
|
rm -rf *.lst *.map $(EXTRA_CLEAN_FILES) $(SIZESTAT_FILE)
|
||||||
xclean: clean
|
xclean: clean
|
||||||
rm -rf *.d
|
rm -rf $(DEP_DIR)*.d
|
||||||
|
|
||||||
flash:
|
flash:
|
||||||
$(ERASECMD)
|
$(ERASECMD)
|
||||||
$(FLASHCMD)
|
$(FLASHCMD)
|
||||||
|
|
||||||
lst: $(PRG).lst
|
|
||||||
|
|
||||||
%.lst: %.elf
|
%.lst: %.elf
|
||||||
$(OBJDUMP) -h -S $< > $@
|
$(OBJDUMP) -h -S $< > $@
|
||||||
|
|
||||||
# Rules for building the .text rom images
|
# Rules for building the .text rom images
|
||||||
|
|
||||||
text: hex bin srec
|
|
||||||
|
|
||||||
hex: $(PRG).hex
|
|
||||||
bin: $(PRG).bin
|
|
||||||
srec: $(PRG).srec
|
|
||||||
|
|
||||||
%.hex: %.elf
|
%.hex: %.elf
|
||||||
$(OBJCOPY) -j .text -j .data -O ihex $< $@
|
$(OBJCOPY) -j .text -j .data -O ihex $< $@
|
||||||
|
|
||||||
|
@ -191,11 +181,6 @@ srec: $(PRG).srec
|
||||||
|
|
||||||
# Rules for building the .eeprom rom images
|
# Rules for building the .eeprom rom images
|
||||||
|
|
||||||
eeprom: ehex ebin esrec
|
|
||||||
|
|
||||||
ehex: $(PRG)_eeprom.hex
|
|
||||||
ebin: $(PRG)_eeprom.bin
|
|
||||||
esrec: $(PRG)_eeprom.srec
|
|
||||||
|
|
||||||
%_eeprom.hex: %.elf
|
%_eeprom.hex: %.elf
|
||||||
$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@
|
$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@
|
||||||
|
@ -213,12 +198,6 @@ esrec: $(PRG)_eeprom.srec
|
||||||
FIG2DEV = fig2dev
|
FIG2DEV = fig2dev
|
||||||
EXTRA_CLEAN_FILES = *.hex *.bin *.srec
|
EXTRA_CLEAN_FILES = *.hex *.bin *.srec
|
||||||
|
|
||||||
dox: eps png pdf
|
|
||||||
|
|
||||||
eps: $(PRG).eps
|
|
||||||
png: $(PRG).png
|
|
||||||
pdf: $(PRG).pdf
|
|
||||||
|
|
||||||
|
|
||||||
%.eps: %.fig
|
%.eps: %.fig
|
||||||
$(FIG2DEV) -L eps $< $@
|
$(FIG2DEV) -L eps $< $@
|
||||||
|
@ -230,7 +209,8 @@ pdf: $(PRG).pdf
|
||||||
$(FIG2DEV) -L png $< $@
|
$(FIG2DEV) -L png $< $@
|
||||||
|
|
||||||
|
|
||||||
DEPS := $(wildcard *.d)
|
DEPS := $(wildcard $(DEP_DIR)*.d)
|
||||||
|
|
||||||
ifneq ($(DEPS),)
|
ifneq ($(DEPS),)
|
||||||
include $(DEPS)
|
include $(DEPS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -4,13 +4,15 @@ MCU_TARGET = atmega644
|
||||||
OPTIMIZE = -Os
|
OPTIMIZE = -Os
|
||||||
DEFS = -D$(call uc, $(MCU_TARGET))
|
DEFS = -D$(call uc, $(MCU_TARGET))
|
||||||
FLASHCMD = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c avr911 -U flash:w:# no space at the end
|
FLASHCMD = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c avr911 -U flash:w:# no space at the end
|
||||||
|
DEP_DIR = deps/
|
||||||
|
BIN_DIR = bin/
|
||||||
|
TESTBIN_DIR = test_bin/
|
||||||
#uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
|
#uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
|
||||||
ERASECMD =
|
ERASECMD =
|
||||||
|
|
||||||
CC = avr-gcc
|
CC = avr-gcc
|
||||||
|
|
||||||
override CFLAGS = -MMD -pedantic -std=c99 -Wall -Wstrict-prototypes $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
|
override CFLAGS = -MMD -MF$(DEP_DIR)$(patsubst %.c,%.d,$^) -pedantic -std=c99 -Wall -Wstrict-prototypes $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
|
||||||
|
|
||||||
override LDFLAGS = -Wl,-Map,
|
override LDFLAGS = -Wl,-Map,
|
||||||
override ASFLAGS = -mmcu=$(MCU_TARGET)
|
override ASFLAGS = -mmcu=$(MCU_TARGET)
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
# Makefile for Mickey128
|
||||||
|
ALGO_NAME := MICKEY128
|
||||||
|
|
||||||
|
# comment out the following line for removement of Mickey128 from the build process
|
||||||
|
STREAM_CIPHERS += $(ALGO_NAME)
|
||||||
|
|
||||||
|
$(ALGO_NAME)_OBJ := mickey128.o
|
||||||
|
$(ALGO_NAME)_TEST_BIN := main-mickey128-test.o debug.o uart.o serial-tools.o \
|
||||||
|
nessie_stream_test.o nessie_common.o mickey128.o cli.o
|
||||||
|
$(ALGO_NAME)_NESSIE_TEST := "nessie"
|
||||||
|
$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
|
||||||
|
|
Loading…
Reference in New Issue