From fe9b6689d007a379fd0ebfc46aba1bc2feecd490 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Thu, 7 Jun 2012 16:26:58 -0700 Subject: [PATCH 1/6] Added Emacs-style file type declaration. --- firmware/common/Makefile_inc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/firmware/common/Makefile_inc.mk b/firmware/common/Makefile_inc.mk index 9b451b5f..2811fb78 100644 --- a/firmware/common/Makefile_inc.mk +++ b/firmware/common/Makefile_inc.mk @@ -1,3 +1,4 @@ +# Hey Emacs, this is a -*- makefile -*- # # Copyright 2009 Uwe Hermann # Copyright 2010 Piotr Esden-Tempski From b4346892504304b25ee4258779635cff5ce92034 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Thu, 7 Jun 2012 16:27:51 -0700 Subject: [PATCH 2/6] Fixed typo in declaration of OBJ variable. --- firmware/common/Makefile_inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/common/Makefile_inc.mk b/firmware/common/Makefile_inc.mk index 2811fb78..e8d36a3d 100644 --- a/firmware/common/Makefile_inc.mk +++ b/firmware/common/Makefile_inc.mk @@ -53,7 +53,7 @@ LDSCRIPT ?= $(BINARY).ld LDFLAGS += -L$(TOOLCHAIN_DIR)/lib/armv7e-m/fpu \ -L$(LIBOPENCM3)/lib -T$(LDSCRIPT) -nostartfiles \ -Wl,--gc-sections -Xlinker -Map=$(BINARY).map - OBJ = $(SRC:.c=.o) +OBJ = $(SRC:.c=.o) # Be silent per default, but 'make V=1' will show all compiler calls. ifneq ($(V),1) From 823f6e659591e78c789015404b3846c11676ab61 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Thu, 7 Jun 2012 16:30:47 -0700 Subject: [PATCH 3/6] Corrected path for libopencm3 LDFLAGS and %.elf dependency. --- firmware/common/Makefile_inc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/common/Makefile_inc.mk b/firmware/common/Makefile_inc.mk index e8d36a3d..96d6967a 100644 --- a/firmware/common/Makefile_inc.mk +++ b/firmware/common/Makefile_inc.mk @@ -51,7 +51,7 @@ CFLAGS += -O2 -g -Wall -Wextra -I$(LIBOPENCM3)/include -I../common \ $(HACKRF_OPTS) LDSCRIPT ?= $(BINARY).ld LDFLAGS += -L$(TOOLCHAIN_DIR)/lib/armv7e-m/fpu \ - -L$(LIBOPENCM3)/lib -T$(LDSCRIPT) -nostartfiles \ + -L$(LIBOPENCM3)/lib/lpc43xx -T$(LDSCRIPT) -nostartfiles \ -Wl,--gc-sections -Xlinker -Map=$(BINARY).map OBJ = $(SRC:.c=.o) @@ -91,7 +91,7 @@ flash: $(BINARY).flash @#printf " OBJDUMP $(*).list\n" $(Q)$(OBJDUMP) -S $(*).elf > $(*).list -%.elf: $(OBJ) $(LDSCRIPT) $(LIBOPENCM3)/lib/libopencm3_lpc43xx.a +%.elf: $(OBJ) $(LDSCRIPT) #$(LIBOPENCM3)/lib/lpc43xx/libopencm3_lpc43xx.a @#printf " LD $(subst $(shell pwd)/,,$(@))\n" $(Q)$(LD) $(LDFLAGS) -o $(*).elf $(OBJ) -lopencm3_lpc43xx From cea1a66d39fca43731435e3ebd52831ad58046dc Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Thu, 7 Jun 2012 16:34:36 -0700 Subject: [PATCH 4/6] Added hackrf_core.h #include for lpc43.h dependency. --- firmware/common/hackrf_core.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/firmware/common/hackrf_core.h b/firmware/common/hackrf_core.h index e0043389..35730f20 100644 --- a/firmware/common/hackrf_core.h +++ b/firmware/common/hackrf_core.h @@ -28,6 +28,8 @@ extern "C" { #endif +#include + /* hardware identification number */ #define BOARD_ID_JELLYBEAN 0 From b2d733921f79a175b0e2e797628f037b186ab599 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Thu, 7 Jun 2012 16:35:10 -0700 Subject: [PATCH 5/6] Added stdint.h #include for blinky's use of C standard integer types. --- firmware/blinky_SPIFI_SRAM/blinky.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/firmware/blinky_SPIFI_SRAM/blinky.c b/firmware/blinky_SPIFI_SRAM/blinky.c index 7fa09249..0b3f5887 100644 --- a/firmware/blinky_SPIFI_SRAM/blinky.c +++ b/firmware/blinky_SPIFI_SRAM/blinky.c @@ -19,6 +19,8 @@ * Boston, MA 02110-1301, USA. */ +#include + #include "hackrf_core.h" void wait(uint8_t duration) From 7501238ec2ba8e58ee4193585beee23bd363a0b8 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Thu, 7 Jun 2012 16:55:06 -0700 Subject: [PATCH 6/6] Change use of Makefile BINARY to TARGET. --- firmware/blinky/Makefile | 4 ++-- firmware/common/Makefile_inc.mk | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/blinky/Makefile b/firmware/blinky/Makefile index 96e5a9ba..63d3cce5 100644 --- a/firmware/blinky/Makefile +++ b/firmware/blinky/Makefile @@ -1,7 +1,7 @@ # Hey Emacs, this is a -*- makefile -*- -BINARY = blinky +TARGET = blinky -SRC = $(BINARY).c +SRC = $(TARGET).c include ../common/Makefile_inc.mk diff --git a/firmware/common/Makefile_inc.mk b/firmware/common/Makefile_inc.mk index 96d6967a..482fbe0b 100644 --- a/firmware/common/Makefile_inc.mk +++ b/firmware/common/Makefile_inc.mk @@ -49,10 +49,10 @@ CFLAGS += -O2 -g -Wall -Wextra -I$(LIBOPENCM3)/include -I../common \ -fno-common -mcpu=cortex-m4 -mthumb -MD \ -mfloat-abi=hard -mfpu=fpv4-sp-d16 \ $(HACKRF_OPTS) -LDSCRIPT ?= $(BINARY).ld +LDSCRIPT ?= $(TARGET).ld LDFLAGS += -L$(TOOLCHAIN_DIR)/lib/armv7e-m/fpu \ -L$(LIBOPENCM3)/lib/lpc43xx -T$(LDSCRIPT) -nostartfiles \ - -Wl,--gc-sections -Xlinker -Map=$(BINARY).map + -Wl,--gc-sections -Xlinker -Map=$(TARGET).map OBJ = $(SRC:.c=.o) # Be silent per default, but 'make V=1' will show all compiler calls. @@ -69,8 +69,8 @@ endif all: images -images: $(BINARY).images -flash: $(BINARY).flash +images: $(TARGET).images +flash: $(TARGET).flash %.images: %.bin %.hex %.srec %.list @#echo "*** $* images generated ***"