+ Needs GNU make for Windows, a new release of the Windows development environment will follow
 + Is based on the Windows Makefile, so will build everything in Thumb mode, doesn't have flash commands (yet)
This commit is contained in:
henryk@ploetzli.ch 2009-08-26 11:17:05 +00:00
parent 5435eb0ca2
commit 7e931bbd32
5 changed files with 103 additions and 250 deletions

View file

@ -1,19 +1,11 @@
PATH=..\..\devkitARM\bin;%PATH%
CC = arm-elf-gcc
AS = arm-elf-as
LD = arm-elf-ld
OBJCOPY = arm-elf-objcopy
# Makefile for armsrc, see ../common/Makefile.common for common settings
include ../common/Makefile.common
OBJDIR = obj
APP_INCLUDES = apps.h
INCLUDE = -I../include
INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h apps.h
LIB = "..\..\devkitARM\lib\gcc\arm-elf\4.1.0\interwork"
# Add the "-DWITH_LCD" flag in CLFAGS to add support for LCD
# Add the "-DWITH_LCD" flag in APP_CLFAGS to add support for LCD
# and add OBJLCD to OBJ too
CFLAGS = -O6 -c $(INCLUDE) -Wall
APP_CFLAGS = -O6
OBJLCD = $(OBJDIR)/fonts.o \
$(OBJDIR)/LCD.o
@ -25,42 +17,37 @@ OBJ = $(OBJDIR)/start.o \
$(OBJDIR)/iso14443.o \
$(OBJDIR)/iso14443a.o \
$(OBJDIR)/iso15693.o \
$(OBJDIR)/util.o
$(OBJDIR)/util.o \
$(OBJDIR)/usb.o
OBJFPGA = \
$(OBJDIR)/fpgaimg.o
OBJCOMMON = \
$(OBJDIR)/usb.o
all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19
all: osimage.s19
$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fpgaimg.o
$(LD) -g -Tldscript-fpga -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
$(OBJDIR)/fpgaimage.s19: $(OBJDIR)/fpgaimg.o
@echo obj/fpgaimage.s19
@$(LD) -g -Tldscript-fpga -o $(OBJDIR)\fpgaimage.elf -Map=obj/fpgaimage.map $(OBJDIR)/fpgaimg.o
@$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\fpgaimage.elf $(OBJDIR)\fpgaimage.s19
$(OBJDIR)/osimage.elf: $(OBJ) $(OBJCOMMON) $(ARMLIB)/libgcc.a
$(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
$(OBJDIR)/osimage.s19: $(OBJ) $(OBJCOMMON)
@echo obj/osimage.s19
@$(LD) -g -Tldscript -o $(OBJDIR)\osimage.elf $(OBJ) $(OBJCOMMON) -Map=obj/osimage.map $(LIB)\libgcc.a
@$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\osimage.elf $(OBJDIR)\osimage.s19
$(OBJDIR)/%.s19: $(OBJDIR)/%.elf
$(OBJCOPY) -Osrec --srec-forceS3 $^ $@
osimage.s19: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19
@echo osimage.s19
$(OBJ): $(@B).c $(INCLUDES)
@echo $(@B).c
@$(CC) $(CFLAGS) -mthumb -mthumb-interwork $(@B).c -o $(OBJDIR)/$(@B).o
$(OBJCOMMON): ../common/$(@B).c $(INCLUDES)
@echo $(@B).c
@$(CC) $(CFLAGS) -mthumb -mthumb-interwork ../common/$(@B).c -o $(OBJDIR)/$(@B).o
$(OBJFPGA): $(@B).c $(INCLUDES)
@echo $(@B).c
@$(CC) $(CFLAGS) -mthumb -mthumb-interwork $(@B).c -o $(OBJDIR)/$(@B).o
$(OBJ) $(OBJFPGA): $(OBJDIR)/%.o: %.c $(INCLUDES)
$(CC) $(CFLAGS) -mthumb -mthumb-interwork $< -o $@
clean:
del /q obj\*.o
del /q obj\*.elf
del /q obj\*.s19
$(DELETE) $(OBJDIR)$(PATHSEP)*.o
$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
$(DELETE) $(OBJDIR)$(PATHSEP)*.map
.PHONY: all clean help
help:
@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
@echo Possible targets:
@echo + all - Make both:
@echo + osimage.s19 - The OS image
@echo + fpgaimage.s19 - The FPGA image
@echo + clean - Clean $(OBJDIR)

View file

@ -1,99 +0,0 @@
# This makefile needs to be edited to reflect the location
# of your own arm-elf-gcc toolchain (ARMLIB variable)
CC = arm-elf-gcc
AS = arm-elf-as
LD = arm-elf-ld
OBJCOPY = arm-elf-objcopy
# Indicate where your gnuarm toolchain libgcc.a interworking library is located
# or set $ARMLIB in your environment:
#ARMLIB = /usr/local/lib/gcc/arm-elf/4.3.3/interwork
# Add -DWITH_LCD to EXTRA_CFLAGS if you want support for LCD
# in your firmware (add OBJLCD to OBJ too!)
#EXTRA_CFLAGS = -DWITH_LCD
EXTRA_CFLAGS =
### You should not need to edit below this line
INCLUDE = -I../include
INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h apps.h
CFLAGS_COMMON = -O6 -c $(INCLUDE) -Wall -mthumb-interwork
CFLAGS = $(CFLAGS_COMMON) $(EXTRA_CFLAGS) -mthumb
OBJDIR = obj
OBJLCD = $(OBJDIR)/LCD.o\
$(OBJDIR)/fonts.o
OBJ = $(OBJDIR)/start.o \
$(OBJDIR)/appmain.o \
$(OBJDIR)/fpga.o \
$(OBJDIR)/lfops.o \
$(OBJDIR)/iso15693.o \
$(OBJDIR)/util.o
# To be compiled in ARM mode, not thumb mode: larger but faster
# Alleviates the 'blew circular buffer' issues somehow...
OBJFAST = $(OBJDIR)/iso14443.o \
$(OBJDIR)/iso14443a.o
OBJFPGA = $(OBJDIR)/fpgaimg.o
OBJCOMMON = $(OBJDIR)/usb.o
all: osimage.s19 fpgaimage.s19 fullimage.s19
fpgaimage.s19: $(OBJFPGA)
@echo fpgaimage.s19
$(LD) -g -Tldscript-fpga -o $(OBJDIR)/fpgaimage.elf $^
$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/fpgaimage.elf fpgaimage.s19
osimage.s19: $(OBJ) $(OBJFAST) $(OBJCOMMON)
@echo osimage.s19
$(LD) -g -Tldscript -o $(OBJDIR)/osimage.elf -Map=osimage.map $^ $(ARMLIB)/libgcc.a
$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/osimage.elf osimage.s19
fullimage.s19: $(OBJ) $(OBJFAST) $(OBJCOMMON) $(OBJFAST) $(OBJFPGA)
@echo fullimage.s19
$(LD) -g -Tldscript-full -o $(OBJDIR)/fullimage.elf $^ $(ARMLIB)/libgcc.a
$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/fullimage.elf fullimage.s19
# Directives to put the *.o in the OBJDIR directory:
$(OBJ): $(OBJDIR)/%.o : %.c
$(CC) $(CFLAGS) $< -o $@
$(OBJFPGA): $(OBJDIR)/%.o : %.c
$(CC) $(CFLAGS) $< -o $@
$(OBJFAST): $(OBJDIR)/%.o : %.c
$(CC) $(CFLAGS_COMMON) $< -o $@
$(OBJCOMMON): $(OBJDIR)/%.o : ../common/%.c
$(CC) $(CFLAGS) $< -o $@
flash-both: flash flash-fpga
flash-fpga: fpgaimage.s19
../linux/flasher fpga fpgaimage.s19
flash: osimage.s19
../linux/flasher os osimage.s19
# Those do not work on the current firmware !
jtag-flash-full: fullimage.s19
../../OpenOCD/openocd -c "halt; flash write_image fullimage.s19 0x00100000; halt; reset; resume; poll; exit"
jtag-flash-fpga: fpgaimage.s19
../../OpenOCD/openocd -c "halt; flash write_image fpgaimage.s19 0x00100000; halt; reset; resume; poll; exit"
jtag-flash: osimage.s19
../../OpenOCD/openocd -c "halt; flash write_image osimage.s19 0x00100000; halt; reset; resume; poll; exit"
clean:
rm -f $(OBJDIR)/*.o $(OBJDIR)/*.elf *.s19 osimage.map
.PHONY: all clean

View file

@ -1,58 +1,45 @@
CC = arm-elf-gcc
AS = arm-elf-as
LD = arm-elf-ld
OBJCOPY = arm-elf-objcopy
OBJDIR = obj
INCLUDE = -I../include
INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h
CFLAGS = -g -c $(INCLUDE) -Wall
# Makefile for bootrom, see ../common/Makefile.common for common settings
include ../common/Makefile.common
OBJJTAG = $(OBJDIR)/bootrom.o $(OBJDIR)/ram-reset.o $(OBJDIR)/usb.o
OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o
all: bootrom.s19
THUMBSRC = usb.c fromflash.c bootrom.c
ASMSRC = ram-reset.s flash-reset.s
bootrom.s19: $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19
@echo bootrom.s19
@perl ..\tools\merge-srec.pl $(OBJDIR)\bootrom.s19 $(OBJDIR)\bootrom-forjtag.s19 > $(OBJDIR)\bootrom-merged.s19
@perl ..\tools\srecswap.pl $(OBJDIR)\bootrom-forjtag.s19 > $(OBJDIR)\bootrom-forjtag-swapped.s19
THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
ASMOBJ = $(patsubst %.s,$(OBJDIR)/%.o,$(ASMSRC))
$(OBJDIR)/bootrom.s19: $(OBJFLASH)
@echo obj/bootrom.s19
@$(LD) -g -Tldscript-flash --oformat elf32-littlearm -Map=obj/bootrom.map -o $(OBJDIR)/bootrom.elf $(OBJFLASH)
@$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom.elf $(OBJDIR)/bootrom.s19
all: bootrom-merged.s19
$(OBJDIR)/bootrom-forjtag.s19: $(OBJJTAG)
@echo obj/bootrom-forjtag.s19
@$(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -Map=obj/bootrom-forjtag.map -o $(OBJDIR)/bootrom-forjtag.elf $(OBJJTAG)
@$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom-forjtag.elf $(OBJDIR)/bootrom-forjtag.s19
bootrom-merged.s19: $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19
perl ../tools/merge-srec.pl $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19 > bootrom-merged.s19
$(OBJDIR)/bootrom.o: bootrom.c $(INCLUDES)
@echo $(@B).c
@$(CC) $(CFLAGS) -mthumb -mthumb-interwork bootrom.c -o $(OBJDIR)/bootrom.o
$(OBJDIR)/bootrom.elf: $(OBJFLASH)
$(LD) -g -Tldscript-flash --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
$(OBJDIR)/fromflash.o: fromflash.c $(INCLUDES)
@echo $(@B).c
@$(CC) $(CFLAGS) -mthumb -mthumb-interwork fromflash.c -o $(OBJDIR)/fromflash.o
$(OBJDIR)/bootrom-forjtag.elf: $(OBJJTAG)
$(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
$(OBJDIR)/usb.o: ../common/usb.c $(INCLUDES)
@echo $(@B).c
@$(CC) $(CFLAGS) -mthumb -mthumb-interwork ../common/usb.c -o $(OBJDIR)/usb.o
$(OBJDIR)/%.s19: $(OBJDIR)/%.elf
$(OBJCOPY) -Osrec --srec-forceS3 $^ $@
$(OBJDIR)/ram-reset.o: ram-reset.s
@echo $(@B).s
@$(CC) $(CFLAGS) -mthumb-interwork -o $(OBJDIR)/ram-reset.o ram-reset.s
$(THUMBOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
$(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $<
$(OBJDIR)/flash-reset.o: flash-reset.s
@echo $(@B).s
@$(CC) $(CFLAGS) -mthumb-interwork -o $(OBJDIR)/flash-reset.o flash-reset.s
$(ASMOBJ): $(OBJDIR)/%.o: %.s
$(CC) $(CFLAGS) -mthumb-interwork -o $@ $<
clean:
del /q obj\*.o
del /q obj\*.elf
del /q obj\*.s19
$(DELETE) $(OBJDIR)$(PATHSEP)*.o
$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
$(DELETE) $(OBJDIR)$(PATHSEP)*.map
$(DELETE) bootrom-merged.s19
.PHONY: all clean help
help:
@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
@echo Possible targets:
@echo + all - Make bootrom-merged.s19, the main bootrom
@echo + clean - Clean $(OBJDIR)

View file

@ -1,65 +0,0 @@
CC = arm-elf-gcc
AS = arm-elf-as
LD = arm-elf-ld
OBJCOPY = arm-elf-objcopy
OBJDIR = obj
INCLUDE = -I../include
INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h
CFLAGS = -g -c $(INCLUDE) -Wall
OBJJTAG = $(OBJDIR)/bootrom.o $(OBJDIR)/ram-reset.o $(OBJDIR)/usb.o
OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o
all: bootrom.s19 bootrom-forjtag-swapped.s19
bootrom-merged.s19: bootrom.s19 bootrom-forjtag.s19
perl ../tools/merge-srec.pl bootrom.s19 bootrom-forjtag.s19 > bootrom-merged.s19
bootrom-forjtag-swapped.s19: bootrom-merged.s19
perl ../tools/srecswap.pl bootrom-forjtag.s19 > bootrom-forjtag-swapped.s19
bootrom.s19: $(OBJFLASH)
@echo bootrom.s19
$(LD) -g -Tldscript-flash --oformat elf32-littlearm -o $(OBJDIR)/bootrom.elf $(OBJFLASH)
$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom.elf bootrom.s19
bootrom-forjtag.s19: $(OBJJTAG)
@echo bootrom-forjtag.s19
$(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -o $(OBJDIR)/bootrom-forjtag.elf $(OBJJTAG)
$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom-forjtag.elf bootrom-forjtag.s19
$(OBJDIR)/bootrom.o: bootrom.c $(INCLUDES)
@echo $@
$(CC) $(CFLAGS) -mthumb -mthumb-interwork $< -o $@
$(OBJDIR)/fromflash.o: fromflash.c $(INCLUDES)
@echo $@
$(CC) $(CFLAGS) -mthumb -mthumb-interwork $< -o $@
$(OBJDIR)/usb.o: ../common/usb.c $(INCLUDES)
@echo $@
$(CC) $(CFLAGS) -mthumb -mthumb-interwork $< -o $@
$(OBJDIR)/ram-reset.o: ram-reset.s
@echo $@
$(CC) $(CFLAGS) -mthumb-interwork -o $@ $<
$(OBJDIR)/flash-reset.o: flash-reset.s
@echo $@
$(CC) $(CFLAGS) -mthumb-interwork -o $@ $<
# Those do not work in this Firmware distribution!
flash: bootrom-merged.s19
../linux/flasher bootrom bootrom-merged.s19
jtag-flash: bootrom-merged.s19
../../OpenOCD/openocd -c "halt; flash write_image bootrom-merged.s19 0x00100000; halt; reset; resume; poll; exit"
clean:
rm -f $(OBJDIR)/*.o $(OBJDIR)/*.elf *.s19

43
common/Makefile.common Normal file
View file

@ -0,0 +1,43 @@
# This new makefile replaces the previous Makefile/Makefile.linux
# with as much common code for both environments as possible.
# Following is a short OS detection to set up variables, all the
# remaining Makefile should be portable and only depend on these
# variables
# Windows' echo echos its input verbatim, on Posix there is some
# amount of shell command line parsing going on. echo "" on
# Windows yields literal "", on Linux yields an empty line
ifeq ($(shell echo ""),)
# This is properly a proper system, so we can use uname
UNAME := $(shell uname)
ifeq ($(UNAME), Linux)
# Linux. (Todo: Add MacOS X if appropriate)
DELETE=rm -rf
PATHSEP=/
DETECTED_OS=Linux
# You may/should set this in your environment
ARMLIB ?= /usr/local/lib/gcc/arm-elf/4.3.3/interwork
endif
else
# Assume that we are running on Windows.
DELETE=del /q
PATHSEP=\\#
ARMLIB ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork
DETECTED_OS=Windows
endif
CC = arm-elf-gcc
AS = arm-elf-as
LD = arm-elf-ld
OBJCOPY = arm-elf-objcopy
OBJDIR = obj
INCLUDE = -I../include
# Also search prerequisites in the common directory (for usb.c)
VPATH = . ../common/
INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
CFLAGS = -c $(INCLUDE) -Wall $(APP_CFLAGS)