[project] rearrange project files

-For every base target, add a simple .mk file in target/ -More complex project files include from the target/ one
2015-01-15 16:45:14 -08:00
parent 5c9ebc5c05
commit a14ed28229
29 changed files with 20 additions and 65 deletions
--- a/project/adk2012-test.mk
+++ b/project/adk2012-test.mk
@@ -1,5 +1,3 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 TARGET := adk2012
 MODULES += \
 	app/tests \
--- a/project/beagle-test.mk
+++ b/project/beagle-test.mk
@@ -1,7 +1,5 @@
 # top level project rules for the armemu-test project
 #
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 TARGET := beagle

 MODULES += \
--- a/project/beaglebone-test.mk
+++ b/project/beaglebone-test.mk
@@ -1,7 +1,5 @@
 # top level project rules for the armemu-test project
 #
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 TARGET := beaglebone

 MODULES += \
--- a/project/helio-test.mk
+++ b/project/helio-test.mk
@@ -0,0 +1,8 @@
+MODULES += \
+	app/tests \
+	app/stringtests \
+	app/shell \
+	lib/debugcommands
+
+include project/target/helio.mk
+
--- a/project/helio.mk
+++ b/project/helio.mk
@@ -1,13 +0,0 @@
-# top level project rules for the armemu-test project
-#
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-TARGET := helio
-
-MODULES += \
-	app/tests \
-	app/stringtests \
-	app/shell \
-	lib/debugcommands
-
-
--- a/project/lpcexpresso1549-test.mk
+++ b/project/lpcexpresso1549-test.mk
@@ -1,8 +1,6 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 MODULES += \
 	app/shell \
 	app/tests \
 	lib/debugcommands

-include project/lpcexpresso1549.mk
+include project/target/lpcexpresso1549.mk
--- a/project/lpcexpresso1549.mk
+++ b/project/lpcexpresso1549.mk
@@ -1,4 +0,0 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-TARGET := lpcexpresso1549
-
--- a/project/pc-x86-64-test.mk
+++ b/project/pc-x86-64-test.mk
@@ -1,7 +1,5 @@
 # top level project rules for the pc-x86-test project
 #
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 ARCH := x86-64
 TARGET := pc-x86
 MODULES += \
--- a/project/sam3x-ek-test.mk
+++ b/project/sam3x-ek-test.mk
@@ -1,5 +1,3 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 TARGET := sam3x-ek
 MODULES += \
 	app/tests \
--- a/project/stellaris-launchpad-test.mk
+++ b/project/stellaris-launchpad-test.mk
@@ -1,5 +1,3 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 MODULES += \
 	app/shell \
 	app/tests \
--- a/project/stellaris-launchpad.mk
+++ b/project/stellaris-launchpad.mk
@@ -1,4 +1,2 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 TARGET := stellaris-launchpad

--- a/project/stm32-h103-test.mk
+++ b/project/stm32-h103-test.mk
@@ -1,8 +1,6 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 MODULES += \
 	app/tests \
 	app/shell \
 	lib/debugcommands \

-include project/stm32-h103.mk
+include project/target/stm32-h103.mk
--- a/project/stm32-p107-test.mk
+++ b/project/stm32-p107-test.mk
@@ -1,9 +1,7 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 MODULES += \
 	lib/debugcommands \
 	app/tests \
 	app/shell

-include project/stm32-p107.mk
+include project/target/stm32-p107.mk

--- a/project/stm32-p407-test.mk
+++ b/project/stm32-p407-test.mk
@@ -1,9 +1,7 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 MODULES += \
 	lib/debugcommands \
 	app/tests \
 	app/shell

-include project/stm32-p407.mk
+include project/target/stm32-p407.mk

--- a/project/stm3220g-eval.mk
+++ b/project/stm3220g-eval.mk
@@ -1,5 +1,3 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 MODULES += \
 	lib/debugcommands \
 	app/tests \
--- a/project/stm32f4-discovery-test.mk
+++ b/project/stm32f4-discovery-test.mk
@@ -1,8 +1,6 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 MODULES += \
 	lib/debugcommands \
 	app/tests \
 	app/shell

-include project/stm32f4-discovery.mk
+include project/target/stm32f4-discovery.mk
--- a/project/target/helio.mk
+++ b/project/target/helio.mk
@@ -0,0 +1 @@
+TARGET := helio
--- a/project/target/lpcexpresso1549.mk
+++ b/project/target/lpcexpresso1549.mk
@@ -0,0 +1,2 @@
+TARGET := lpcexpresso1549
+
--- a/project/target/stm32-h103.mk
+++ b/project/target/stm32-h103.mk
--- a/project/target/stm32-p107.mk
+++ b/project/target/stm32-p107.mk
--- a/project/target/stm32-p407.mk
+++ b/project/target/stm32-p407.mk
--- a/project/target/stm32f4-discovery.mk
+++ b/project/target/stm32f4-discovery.mk
--- a/project/target/uzed.mk
+++ b/project/target/uzed.mk
--- a/project/target/zybo.mk
+++ b/project/target/zybo.mk
--- a/project/uzed-dram-test.mk
+++ b/project/uzed-dram-test.mk
@@ -1,6 +1,4 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 ZYNQ_USE_SRAM := 0

-include $(LOCAL_DIR)/uzed-test.mk
+include project/uzed-test.mk

--- a/project/uzed-test.mk
+++ b/project/uzed-test.mk
@@ -1,14 +1,11 @@
 # top level project rules for the uzed-test project
 #
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 MODULES += \
 	app/inetsrv \
 	app/shell \
 	app/stringtests \
 	app/tests \
 	app/zynq-common \
-	app/lkboot \
 	lib/cksum \
 	lib/debugcommands \
 	lib/libm \
@@ -16,5 +13,5 @@ MODULES += \
 GLOBAL_DEFINES += \
 	SYSPARAM_ALLOW_WRITE=1

-include $(LOCAL_DIR)/uzed.mk
+include project/target/uzed.mk

--- a/project/vexpress-a9-test.mk
+++ b/project/vexpress-a9-test.mk
@@ -1,7 +1,3 @@
-# top level project rules for the armemu-test project
-#
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 TARGET := vexpress-a9

 MODULES += \
--- a/project/zybo-dram-test.mk
+++ b/project/zybo-dram-test.mk
@@ -1,6 +1,4 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 ZYNQ_USE_SRAM := 0

-include $(LOCAL_DIR)/zybo-test.mk
+include project/zybo-test.mk

--- a/project/zybo-test.mk
+++ b/project/zybo-test.mk
@@ -1,7 +1,5 @@
 # top level project rules for the zybo-test project
 #
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
 MODULES += \
 	app/inetsrv \
 	app/shell \
@@ -16,5 +14,5 @@ MODULES += \
 GLOBAL_DEFINES += \
 	SYSPARAM_ALLOW_WRITE=1

-include $(LOCAL_DIR)/zybo.mk
+include project/target/zybo.mk