summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Albrecht <prom@berlin.ccc.de>2010-07-19 09:09:24 +0200
committerIngo Albrecht <prom@berlin.ccc.de>2010-07-20 14:41:21 +0200
commit05863eef93dd02a751ad2b0008a353084288db14 (patch)
tree5f5af41e70cb0fd305a8a3c0ec4d9afc9b4f1122
parentbc65d6905dd9182c66c36f6a57d9533f9dd84aed (diff)
firmware: moved dead-brain-flags to primary makefile
-rw-r--r--src/target/firmware/Makefile9
-rw-r--r--src/target/firmware/Makefile.inc9
2 files changed, 9 insertions, 9 deletions
diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile
index 4d22943d..ea691070 100644
--- a/src/target/firmware/Makefile
+++ b/src/target/firmware/Makefile
@@ -69,3 +69,12 @@ ANY_APP_LIBS+=calypso/libcalypso.a layer1/liblayer1.a lib/libmini.a comm/libcomm
# Include rules
-include Makefile.inc
+
+# Uncomment this line if you want to enable Tx (Transmit) Support.
+#CFLAGS += -DCONFIG_TX_ENABLE
+
+# Uncomment this line if you want to write to flash.
+#CFLAGS += -DCONFIG_FLASH_WRITE
+
+# Uncomment this line if you want to write to flash, including the bootloader.
+#CFLAGS += -DCONFIG_FLASH_WRITE_LOADER
diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc
index 30240343..1c9ced2d 100644
--- a/src/target/firmware/Makefile.inc
+++ b/src/target/firmware/Makefile.inc
@@ -19,15 +19,6 @@ CFLAGS += -Wa,-adhlns=$(subst $(suffix $<),.lst,$<)
CFLAGS += -Os -ffunction-sections
CFLAGS += -g$(DEBUGF)
-# Uncomment this line if you want to enable Tx (Transmit) Support.
-#CFLAGS += -DCONFIG_TX_ENABLE
-
-# Uncomment this line if you want to write to flash.
-#CFLAGS += -DCONFIG_FLASH_WRITE
-
-# Uncomment this line if you want to write to flash, including the bootloader.
-#CFLAGS += -DCONFIG_FLASH_WRITE_LOADER
-
# some older toolchains don't support this, ignore it for now
#ASFLAGS=-Wa,-adhlns=$(<:.S=.lst),--g$(DEBUGF) $(INCLUDES) -D__ASSEMBLY__
ASFLAGS=-Wa,-adhlns=$(<:.S=.lst) $(INCLUDES) -D__ASSEMBLY__