sd_card: cleanup driver library structure

Now both, the sd_card_drv and sd_card_bench use LIBS=sd_card_drv.
2017-06-21 11:38:28 +02:00 · 2017-06-21 11:38:28 +02:00 · ad824cea11
commit ad824cea11
parent 4d11b7e5a8
18 changed files with 44 additions and 72 deletions
--- a/repos/os/lib/import/import-sd_card_drv.mk
+++ b/repos/os/lib/import/import-sd_card_drv.mk
@ -0,0 +1,15 @@
+ifeq ($(filter-out $(SPECS),exynos5),)
+SPEC = exynos5
+else ifeq ($(filter-out $(SPECS),imx53),)
+SPEC = imx
+else ifeq ($(filter-out $(SPECS),imx6),)
+SPEC = imx
+else ifeq ($(filter-out $(SPECS),omap4),)
+SPEC = omap4
+else ifeq ($(filter-out $(SPECS),pbxa9),)
+SPEC = pbxa9
+else ifeq ($(filter-out $(SPECS),rpi),)
+SPEC = rpi
+endif
+
+INC_DIR += $(REP_DIR)/src/drivers/sd_card $(REP_DIR)/src/drivers/sd_card/spec/$(SPEC)
--- a/repos/os/lib/mk/sd_card.inc
+++ b/repos/os/lib/mk/sd_card.inc
@ -1,5 +0,0 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card
-SRC_CC  += main.cc
-LIBS    += base
-
-vpath %.cc $(REP_DIR)/src/drivers/sd_card
--- a/repos/os/lib/mk/spec/exynos5/sd_card_bench.mk
+++ b/repos/os/lib/mk/spec/exynos5/sd_card_bench.mk
@ -1,6 +0,0 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/exynos5
-SRC_CC  += spec/exynos5/driver.cc
-
-vpath main.cc $(REP_DIR)/src/test/sd_card_bench
-
-include $(REP_DIR)/lib/mk/sd_card.inc
--- a/repos/os/lib/mk/spec/exynos5/sd_card_drv.mk
+++ b/repos/os/lib/mk/spec/exynos5/sd_card_drv.mk
@ -1,4 +1,6 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/exynos5
 SRC_CC  += spec/exynos5/driver.cc
+LIBS    += base

-include $(REP_DIR)/lib/mk/sd_card.inc
+vpath %.cc $(REP_DIR)/src/drivers/sd_card
+
+include $(REP_DIR)/lib/import/import-sd_card_drv.mk
--- a/repos/os/lib/mk/spec/imx53/sd_card_bench.mk
+++ b/repos/os/lib/mk/spec/imx53/sd_card_bench.mk
@ -1,8 +0,0 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/imx
-SRC_CC  += adma2.cc
-SRC_CC  += spec/imx/driver.cc
-SRC_CC  += spec/imx53/driver.cc
-
-vpath main.cc $(REP_DIR)/src/test/sd_card_bench
-
-include $(REP_DIR)/lib/mk/sd_card.inc
--- a/repos/os/lib/mk/spec/imx53/sd_card_drv.mk
+++ b/repos/os/lib/mk/spec/imx53/sd_card_drv.mk
@ -1,6 +1,6 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/imx
-SRC_CC  += adma2.cc
-SRC_CC  += spec/imx/driver.cc
-SRC_CC  += spec/imx53/driver.cc
+SRC_CC  += adma2.cc spec/imx53/driver.cc spec/imx/driver.cc
+LIBS    += base

-include $(REP_DIR)/lib/mk/sd_card.inc
+vpath %.cc $(REP_DIR)/src/drivers/sd_card
+
+include $(REP_DIR)/lib/import/import-sd_card_drv.mk
--- a/repos/os/lib/mk/spec/imx6/sd_card_bench.mk
+++ b/repos/os/lib/mk/spec/imx6/sd_card_bench.mk
@ -1,8 +0,0 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/imx
-SRC_CC  += adma2.cc
-SRC_CC  += spec/imx/driver.cc
-SRC_CC  += spec/imx6/driver.cc
-
-vpath main.cc $(REP_DIR)/src/test/sd_card_bench
-
-include $(REP_DIR)/lib/mk/sd_card.inc
--- a/repos/os/lib/mk/spec/imx6/sd_card_drv.mk
+++ b/repos/os/lib/mk/spec/imx6/sd_card_drv.mk
@ -1,6 +1,6 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/imx
-SRC_CC  += adma2.cc
-SRC_CC  += spec/imx/driver.cc
-SRC_CC  += spec/imx6/driver.cc
+SRC_CC  += adma2.cc spec/imx/driver.cc spec/imx6/driver.cc
+LIBS    += base

-include $(REP_DIR)/lib/mk/sd_card.inc
+vpath %.cc $(REP_DIR)/src/drivers/sd_card
+
+include $(REP_DIR)/lib/import/import-sd_card_drv.mk
--- a/repos/os/lib/mk/spec/omap4/sd_card_bench.mk
+++ b/repos/os/lib/mk/spec/omap4/sd_card_bench.mk
@ -1,6 +0,0 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/omap4
-SRC_CC  += spec/omap4/driver.cc
-
-vpath main.cc $(REP_DIR)/src/test/sd_card_bench
-
-include $(REP_DIR)/lib/mk/sd_card.inc
--- a/repos/os/lib/mk/spec/omap4/sd_card_drv.mk
+++ b/repos/os/lib/mk/spec/omap4/sd_card_drv.mk
@ -1,4 +1,6 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/omap4
 SRC_CC  += spec/omap4/driver.cc
+LIBS    += base

-include $(REP_DIR)/lib/mk/sd_card.inc
+vpath %.cc $(REP_DIR)/src/drivers/sd_card
+
+include $(REP_DIR)/lib/import/import-sd_card_drv.mk
--- a/repos/os/lib/mk/spec/pbxa9/sd_card_bench.mk
+++ b/repos/os/lib/mk/spec/pbxa9/sd_card_bench.mk
@ -1,6 +0,0 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/pbxa9
-SRC_CC  += spec/pbxa9/driver.cc
-
-vpath main.cc $(REP_DIR)/src/test/sd_card_bench
-
-include $(REP_DIR)/lib/mk/sd_card.inc
--- a/repos/os/lib/mk/spec/pbxa9/sd_card_drv.mk
+++ b/repos/os/lib/mk/spec/pbxa9/sd_card_drv.mk
@ -1,4 +1,6 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/pbxa9
 SRC_CC  += spec/pbxa9/driver.cc
+LIBS    += base

-include $(REP_DIR)/lib/mk/sd_card.inc
+vpath %.cc $(REP_DIR)/src/drivers/sd_card
+
+include $(REP_DIR)/lib/import/import-sd_card_drv.mk
--- a/repos/os/lib/mk/spec/rpi/sd_card_bench.mk
+++ b/repos/os/lib/mk/spec/rpi/sd_card_bench.mk
@ -1,6 +0,0 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/rpi
-SRC_CC  += spec/rpi/driver.cc
-
-vpath main.cc $(REP_DIR)/src/test/sd_card_bench
-
-include $(REP_DIR)/lib/mk/sd_card.inc
--- a/repos/os/lib/mk/spec/rpi/sd_card_drv.mk
+++ b/repos/os/lib/mk/spec/rpi/sd_card_drv.mk
@ -1,4 +1,6 @@
-INC_DIR += $(REP_DIR)/src/drivers/sd_card/spec/rpi
 SRC_CC  += spec/rpi/driver.cc
+LIBS    += base

-include $(REP_DIR)/lib/mk/sd_card.inc
+vpath %.cc $(REP_DIR)/src/drivers/sd_card
+
+include $(REP_DIR)/lib/import/import-sd_card_drv.mk
--- a/repos/os/src/drivers/sd_card/empty.cc
+++ b/repos/os/src/drivers/sd_card/empty.cc
@ -1,3 +0,0 @@
-/*
- * Dummy compilation unit needed to link a valid target.
- */
--- a/repos/os/src/drivers/sd_card/target.mk
+++ b/repos/os/src/drivers/sd_card/target.mk
@ -1,3 +1,3 @@
 TARGET = sd_card_drv
 LIBS   = sd_card_drv
-SRC_CC = empty.cc
+SRC_CC = main.cc
--- a/repos/os/src/test/sd_card_bench/empty.cc
+++ b/repos/os/src/test/sd_card_bench/empty.cc
@ -1,3 +0,0 @@
-/*
- * Dummy compilation unit needed to link a valid target.
- */
--- a/repos/os/src/test/sd_card_bench/target.mk
+++ b/repos/os/src/test/sd_card_bench/target.mk
@ -1,3 +1,3 @@
 TARGET = sd_card_bench
-LIBS   = sd_card_bench
-SRC_CC = empty.cc
+LIBS   = sd_card_drv
+SRC_CC = main.cc