firmware: small makefile reorg

1 files changed, 15 insertions, 12 deletions

diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile
index ea691070..c2ca9f95 100644
--- a/src/target/firmware/Makefile
+++ b/src/target/firmware/Makefile
@@ -1,16 +1,12 @@
 
-# Global include path
-INCLUDES=-Iinclude/ -I../../../include -I../../shared/libosmocore/include
-
-# Various objects that are currently linked into all applications
-FLASH_OBJS=flash/cfi_flash.o
-DISPLAY_OBJS=display/font_r8x8.o display/font_r8x8_horiz.o display/st7558.o display/ssd1783.o display/display.o
-ABB_OBJS=abb/twl3025.o
-RF_OBJS=rf/trf6151.o
 
-# List of all supported boards
+# List of all supported boards (meant to be overridden on command line)
 BOARDS?=compal_e88 compal_e99 gta0x
 
+# List of all applications (meant to be overridden on command line)
+APPLICATIONS?=hello_world compal_dsp_dump layer1 loader simtest
+
+
 # TI Calypso
 
 calypso_COMMON_OBJS=board/common/calypso_uart.o board/common/calypso_pwl.o
@@ -54,13 +50,20 @@ e99loader_OBJS=board/compal/header.o
 e99flash_LDS=board/compal_e99/flash.lds
 
 
-# List of all applications (add yours here!)
-APPLICATIONS=hello_world compal_dsp_dump layer1 loader simtest
+# Global include path
+INCLUDES=-Iinclude/ -I../../../include -I../../shared/libosmocore/include
 
-# Things that go in all applications
+# Various objects that are currently linked into all applications
+FLASH_OBJS=flash/cfi_flash.o
+DISPLAY_OBJS=display/font_r8x8.o display/font_r8x8_horiz.o display/st7558.o display/ssd1783.o display/display.o
+ABB_OBJS=abb/twl3025.o
+RF_OBJS=rf/trf6151.o
+
+# Objects that go in all applications
 ANY_APP_OBJS+=$(ABB_OBJS) $(RF_OBJS) $(DISPLAY_OBJS) $(FLASH_OBJS)
 ANY_APP_LIBS+=calypso/libcalypso.a layer1/liblayer1.a lib/libmini.a comm/libcomm.a ../../shared/libosmocore/build-target/src/.libs/libosmocore.a
 
+
 # Libraries are defined in subdirectories
 -include calypso/Makefile
 -include layer1/Makefile