diff --git a/project/adk2012-test.mk b/project/adk2012-test.mk index c017c7ab..79380cd2 100644 --- a/project/adk2012-test.mk +++ b/project/adk2012-test.mk @@ -1,5 +1,3 @@ -LOCAL_DIR := $(GET_LOCAL_DIR) - TARGET := adk2012 MODULES += \ app/tests \ diff --git a/project/beagle-test.mk b/project/beagle-test.mk index 6f4cbecd..52af2650 100644 --- 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 += \ diff --git a/project/beaglebone-test.mk b/project/beaglebone-test.mk index 567e412e..a4c8df3a 100644 --- 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 += \ diff --git a/project/helio-test.mk b/project/helio-test.mk new file mode 100644 index 00000000..f0cd47e2 --- /dev/null +++ b/project/helio-test.mk @@ -0,0 +1,8 @@ +MODULES += \ + app/tests \ + app/stringtests \ + app/shell \ + lib/debugcommands + +include project/target/helio.mk + diff --git a/project/helio.mk b/project/helio.mk deleted file mode 100644 index 4fe8dfd7..00000000 --- a/project/helio.mk +++ /dev/null @@ -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 - - diff --git a/project/lpcexpresso1549-test.mk b/project/lpcexpresso1549-test.mk index abab3798..c02ba257 100644 --- 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 diff --git a/project/lpcexpresso1549.mk b/project/lpcexpresso1549.mk deleted file mode 100644 index 3d562ec6..00000000 --- a/project/lpcexpresso1549.mk +++ /dev/null @@ -1,4 +0,0 @@ -LOCAL_DIR := $(GET_LOCAL_DIR) - -TARGET := lpcexpresso1549 - diff --git a/project/pc-x86-64-test.mk b/project/pc-x86-64-test.mk index e344a718..d15020b3 100644 --- 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 += \ diff --git a/project/sam3x-ek-test.mk b/project/sam3x-ek-test.mk index 4f636ed8..3067688f 100644 --- 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 \ diff --git a/project/stellaris-launchpad-test.mk b/project/stellaris-launchpad-test.mk index a84f3ad0..3398cc5c 100644 --- 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 \ diff --git a/project/stellaris-launchpad.mk b/project/stellaris-launchpad.mk index a34a4c7b..8e597e11 100644 --- a/project/stellaris-launchpad.mk +++ b/project/stellaris-launchpad.mk @@ -1,4 +1,2 @@ -LOCAL_DIR := $(GET_LOCAL_DIR) - TARGET := stellaris-launchpad diff --git a/project/stm32-h103-test.mk b/project/stm32-h103-test.mk index 235eb8b4..379b3fac 100644 --- 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 diff --git a/project/stm32-p107-test.mk b/project/stm32-p107-test.mk index 9951be94..e40466a5 100644 --- 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 diff --git a/project/stm32-p407-test.mk b/project/stm32-p407-test.mk index e0596f30..51da800a 100644 --- 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 diff --git a/project/stm3220g-eval.mk b/project/stm3220g-eval.mk index bee75429..6463dee9 100644 --- a/project/stm3220g-eval.mk +++ b/project/stm3220g-eval.mk @@ -1,5 +1,3 @@ -LOCAL_DIR := $(GET_LOCAL_DIR) - MODULES += \ lib/debugcommands \ app/tests \ diff --git a/project/stm32f4-discovery-test.mk b/project/stm32f4-discovery-test.mk index 1ab02546..b0c2e9fb 100644 --- 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 diff --git a/project/target/helio.mk b/project/target/helio.mk new file mode 100644 index 00000000..11b3e44c --- /dev/null +++ b/project/target/helio.mk @@ -0,0 +1 @@ +TARGET := helio diff --git a/project/target/lpcexpresso1549.mk b/project/target/lpcexpresso1549.mk new file mode 100644 index 00000000..3fb96e89 --- /dev/null +++ b/project/target/lpcexpresso1549.mk @@ -0,0 +1,2 @@ +TARGET := lpcexpresso1549 + diff --git a/project/stm32-h103.mk b/project/target/stm32-h103.mk similarity index 100% rename from project/stm32-h103.mk rename to project/target/stm32-h103.mk diff --git a/project/stm32-p107.mk b/project/target/stm32-p107.mk similarity index 100% rename from project/stm32-p107.mk rename to project/target/stm32-p107.mk diff --git a/project/stm32-p407.mk b/project/target/stm32-p407.mk similarity index 100% rename from project/stm32-p407.mk rename to project/target/stm32-p407.mk diff --git a/project/stm32f4-discovery.mk b/project/target/stm32f4-discovery.mk similarity index 100% rename from project/stm32f4-discovery.mk rename to project/target/stm32f4-discovery.mk diff --git a/project/uzed.mk b/project/target/uzed.mk similarity index 100% rename from project/uzed.mk rename to project/target/uzed.mk diff --git a/project/zybo.mk b/project/target/zybo.mk similarity index 100% rename from project/zybo.mk rename to project/target/zybo.mk diff --git a/project/uzed-dram-test.mk b/project/uzed-dram-test.mk index 498682f7..d4d678b8 100644 --- 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 diff --git a/project/uzed-test.mk b/project/uzed-test.mk index d40efd17..f9b8ecc0 100644 --- 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 diff --git a/project/vexpress-a9-test.mk b/project/vexpress-a9-test.mk index b123d481..8ad23041 100644 --- 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 += \ diff --git a/project/zybo-dram-test.mk b/project/zybo-dram-test.mk index de043c40..98c3bd48 100644 --- 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 diff --git a/project/zybo-test.mk b/project/zybo-test.mk index bd63cb6b..cb09c90f 100644 --- 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