From 9b41a77ea45ec74b4268227f2a505832d172b5d2 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 12 May 2020 17:09:13 -0500 Subject: [PATCH] Moved clock speed definition (F_CPU) to arch header file --- firmware/asdf/src/Makefile | 2 +- firmware/asdf/src/Makefile.app | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/firmware/asdf/src/Makefile b/firmware/asdf/src/Makefile index fd4e999..fcdbbdb 100644 --- a/firmware/asdf/src/Makefile +++ b/firmware/asdf/src/Makefile @@ -9,7 +9,7 @@ BUILD_DIR = ../build all: app app: - make -f $(TARGET_MAKEFILE) ARCH=$(ARCH) KEYMAP=$(KEYMAP)y + make -f $(TARGET_MAKEFILE) ARCH=$(ARCH) KEYMAP=$(KEYMAP) test: make -f Makefile.test diff --git a/firmware/asdf/src/Makefile.app b/firmware/asdf/src/Makefile.app index 43055fe..eb79e0d 100644 --- a/firmware/asdf/src/Makefile.app +++ b/firmware/asdf/src/Makefile.app @@ -23,8 +23,6 @@ VERSION = RELEASE= SIZE_COMMAND = avr-size -CLOCK = 8000000L - CLEAN_FILES = CLEANALL_FILES = @@ -53,7 +51,6 @@ CFLAGS += -Wstrict-prototypes CFLAGS += -Wundef CFLAGS += -Wold-style-definition CFLAGS += -mmcu=$(ARCH) -CFLAGS += -DF_CPU=$(CLOCK) LDFLAGS = -Wl,-Map=$(TARGET_MAP) LDFLAGS += -Wl,--start-group