From b26988feebd5a185866119f6c85fa5496e6a7bc2 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Wed, 1 Feb 2017 15:02:00 +0100 Subject: [PATCH] gpio_drv: get rid of specs foc_rpi and hw_rpi Ref #2268 --- repos/os/lib/mk/spec/foc_rpi/gpio.mk | 2 -- repos/os/lib/mk/spec/hw_rpi/gpio.mk | 2 -- repos/os/lib/mk/spec/rpi/gpio.inc | 5 ----- repos/os/src/drivers/gpio/spec/rpi/{spec => }/foc/irq.h | 0 repos/os/src/drivers/gpio/spec/rpi/foc/target.mk | 5 +++++ repos/os/src/drivers/gpio/spec/rpi/{spec => }/hw/irq.h | 0 repos/os/src/drivers/gpio/spec/rpi/hw/target.mk | 5 +++++ repos/os/src/drivers/gpio/spec/rpi/target.mk | 4 ---- tool/run/boot_dir/foc | 1 + tool/run/boot_dir/hw | 1 + 10 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 repos/os/lib/mk/spec/foc_rpi/gpio.mk delete mode 100644 repos/os/lib/mk/spec/hw_rpi/gpio.mk delete mode 100644 repos/os/lib/mk/spec/rpi/gpio.inc rename repos/os/src/drivers/gpio/spec/rpi/{spec => }/foc/irq.h (100%) create mode 100644 repos/os/src/drivers/gpio/spec/rpi/foc/target.mk rename repos/os/src/drivers/gpio/spec/rpi/{spec => }/hw/irq.h (100%) create mode 100644 repos/os/src/drivers/gpio/spec/rpi/hw/target.mk delete mode 100644 repos/os/src/drivers/gpio/spec/rpi/target.mk diff --git a/repos/os/lib/mk/spec/foc_rpi/gpio.mk b/repos/os/lib/mk/spec/foc_rpi/gpio.mk deleted file mode 100644 index 3b25f9146..000000000 --- a/repos/os/lib/mk/spec/foc_rpi/gpio.mk +++ /dev/null @@ -1,2 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/gpio/spec/rpi/spec/foc -include $(REP_DIR)/lib/mk/spec/rpi/gpio.inc diff --git a/repos/os/lib/mk/spec/hw_rpi/gpio.mk b/repos/os/lib/mk/spec/hw_rpi/gpio.mk deleted file mode 100644 index 10953e09d..000000000 --- a/repos/os/lib/mk/spec/hw_rpi/gpio.mk +++ /dev/null @@ -1,2 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/gpio/spec/rpi/spec/hw -include $(REP_DIR)/lib/mk/spec/rpi/gpio.inc diff --git a/repos/os/lib/mk/spec/rpi/gpio.inc b/repos/os/lib/mk/spec/rpi/gpio.inc deleted file mode 100644 index d268ab269..000000000 --- a/repos/os/lib/mk/spec/rpi/gpio.inc +++ /dev/null @@ -1,5 +0,0 @@ -SRC_CC += main.cc -LIBS += base config server -INC_DIR += $(REP_DIR)/src/drivers/gpio/spec/rpi - -vpath % $(REP_DIR)/src/drivers/gpio/spec/rpi diff --git a/repos/os/src/drivers/gpio/spec/rpi/spec/foc/irq.h b/repos/os/src/drivers/gpio/spec/rpi/foc/irq.h similarity index 100% rename from repos/os/src/drivers/gpio/spec/rpi/spec/foc/irq.h rename to repos/os/src/drivers/gpio/spec/rpi/foc/irq.h diff --git a/repos/os/src/drivers/gpio/spec/rpi/foc/target.mk b/repos/os/src/drivers/gpio/spec/rpi/foc/target.mk new file mode 100644 index 000000000..7080c79ff --- /dev/null +++ b/repos/os/src/drivers/gpio/spec/rpi/foc/target.mk @@ -0,0 +1,5 @@ +TARGET = foc_gpio_drv +REQUIRES = rpi +SRC_CC += ../main.cc +LIBS += base config server +INC_DIR += $(PRG_DIR) $(PRG_DIR)/.. diff --git a/repos/os/src/drivers/gpio/spec/rpi/spec/hw/irq.h b/repos/os/src/drivers/gpio/spec/rpi/hw/irq.h similarity index 100% rename from repos/os/src/drivers/gpio/spec/rpi/spec/hw/irq.h rename to repos/os/src/drivers/gpio/spec/rpi/hw/irq.h diff --git a/repos/os/src/drivers/gpio/spec/rpi/hw/target.mk b/repos/os/src/drivers/gpio/spec/rpi/hw/target.mk new file mode 100644 index 000000000..a7dea62c5 --- /dev/null +++ b/repos/os/src/drivers/gpio/spec/rpi/hw/target.mk @@ -0,0 +1,5 @@ +TARGET = hw_gpio_drv +REQUIRES = rpi +SRC_CC += ../main.cc +LIBS += base config server +INC_DIR += $(PRG_DIR) $(PRG_DIR)/.. diff --git a/repos/os/src/drivers/gpio/spec/rpi/target.mk b/repos/os/src/drivers/gpio/spec/rpi/target.mk deleted file mode 100644 index 786803f8e..000000000 --- a/repos/os/src/drivers/gpio/spec/rpi/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -TARGET = gpio_drv -REQUIRES = rpi -LIBS += gpio -SRC_CC = empty.cc diff --git a/tool/run/boot_dir/foc b/tool/run/boot_dir/foc index ff2805c37..417deae6e 100644 --- a/tool/run/boot_dir/foc +++ b/tool/run/boot_dir/foc @@ -1,6 +1,7 @@ proc binary_name_ld_lib_so { } { return "ld-foc.lib.so" } proc binary_name_core_o { } { return "foc/core.o" } proc binary_name_timer { } { return "foc_timer_drv" } +proc binary_name_gpio_drv { } { return "foc_gpio_drv" } proc run_boot_string { } { return "\nL4 Bootstrapper" } diff --git a/tool/run/boot_dir/hw b/tool/run/boot_dir/hw index 2b7488b6a..3b6c54858 100644 --- a/tool/run/boot_dir/hw +++ b/tool/run/boot_dir/hw @@ -1,6 +1,7 @@ proc binary_name_ld_lib_so { } { return "ld-hw.lib.so" } proc binary_name_core_o { } { return "hw/core.o" } proc binary_name_timer { } { return "hw_timer_drv" } +proc binary_name_gpio_drv { } { return "hw_gpio_drv" } proc run_boot_string { } { return "\nkernel initialized" }