From 13a6b9086ec52cd7ec98fc2871162ac0758074f6 Mon Sep 17 00:00:00 2001 From: TitanMKD Date: Sun, 10 Feb 2013 18:33:01 +0100 Subject: [PATCH] Fixed some makefile and set default BOARD to JAWBREAKER (instead of JELLYBEAN). --- firmware/blinky_rom_to_ram/Makefile | 3 ++- firmware/common/Makefile_inc.mk | 3 ++- firmware/common/max2837.h | 1 + firmware/sgpio_passthrough_rom_to_ram/Makefile | 3 ++- firmware/startup_systick_perfo_rom_to_ram/Makefile | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/firmware/blinky_rom_to_ram/Makefile b/firmware/blinky_rom_to_ram/Makefile index b93e84e6..26e1f889 100644 --- a/firmware/blinky_rom_to_ram/Makefile +++ b/firmware/blinky_rom_to_ram/Makefile @@ -25,7 +25,8 @@ BINARY = blinky SRC = $(BINARY).c \ ../common/hackrf_core.c \ - ../common/si5351c.c + ../common/si5351c.c \ + ../common/max2837.c LDSCRIPT = ../common/LPC4330_M4_rom_to_ram.ld include ../common/Makefile_inc.mk diff --git a/firmware/common/Makefile_inc.mk b/firmware/common/Makefile_inc.mk index 2145fabd..a903515d 100644 --- a/firmware/common/Makefile_inc.mk +++ b/firmware/common/Makefile_inc.mk @@ -26,7 +26,8 @@ # derived primarily from Makefiles in libopencm3 -BOARD ?= JELLYBEAN +#BOARD ?= JELLYBEAN +BOARD ?= JAWBREAKER HACKRF_OPTS = -D$(BOARD) diff --git a/firmware/common/max2837.h b/firmware/common/max2837.h index 4983ca7e..acfc59be 100644 --- a/firmware/common/max2837.h +++ b/firmware/common/max2837.h @@ -8,6 +8,7 @@ /* 32 registers, each containing 10 bits of data. */ #define MAX2837_NUM_REGS 32 +#define MAX2837_DATA_REGS_MAX_VALUE 1024 /* TODO - these externs will be local to max2837.c ... don't define here? */ extern uint16_t max2837_regs[MAX2837_NUM_REGS]; diff --git a/firmware/sgpio_passthrough_rom_to_ram/Makefile b/firmware/sgpio_passthrough_rom_to_ram/Makefile index 073a583b..004c19a8 100644 --- a/firmware/sgpio_passthrough_rom_to_ram/Makefile +++ b/firmware/sgpio_passthrough_rom_to_ram/Makefile @@ -25,7 +25,8 @@ BINARY = sgpio_passthrough SRC = $(BINARY).c \ ../common/hackrf_core.c \ - ../common/si5351c.c + ../common/si5351c.c \ + ../common/max2837.c LDSCRIPT = ../common/LPC4330_M4_rom_to_ram.ld include ../common/Makefile_inc.mk diff --git a/firmware/startup_systick_perfo_rom_to_ram/Makefile b/firmware/startup_systick_perfo_rom_to_ram/Makefile index a52531e6..18d40799 100644 --- a/firmware/startup_systick_perfo_rom_to_ram/Makefile +++ b/firmware/startup_systick_perfo_rom_to_ram/Makefile @@ -5,7 +5,8 @@ BINARY = startup_systick_perfo_rom_to_ram SRC = startup_systick.c \ perf_mips.c \ ../common/hackrf_core.c \ - ../common/si5351c.c + ../common/si5351c.c \ + ../common/max2837.c LDSCRIPT = ../common/LPC4330_M4_rom_to_ram.ld include ../common/Makefile_inc.mk