From 658547d0588942887cf9a6e17ff47ba64a605d6a Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Mon, 2 Jan 2017 15:51:09 +0100 Subject: [PATCH] hw: remove core/ARM specific aspect perf_counter This aspect was always enabled when creating a build directory for hw, but is not enabled anymore due to recent build directory unifications. On the other hand it is needed for jitter entropy anyway. Ref #2190 --- repos/base-hw/lib/mk/core-hw-perf_counter.mk | 14 ----------- repos/base-hw/lib/mk/core-hw.inc | 2 +- .../mk/spec/arm_v6/core-hw-perf_counter_on.mk | 14 ----------- repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc | 1 + .../mk/spec/arm_v7/core-hw-perf_counter_on.mk | 14 ----------- repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc | 1 + .../spec/perf_counter/core-hw-perf_counter.mk | 1 - repos/base-hw/src/core/perf_counter.cc | 25 ------------------- .../lib/mk/spec/arm_v6/jitterentropy.mk | 2 -- .../lib/mk/spec/arm_v7/jitterentropy.mk | 2 -- 10 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 repos/base-hw/lib/mk/core-hw-perf_counter.mk delete mode 100644 repos/base-hw/lib/mk/spec/arm_v6/core-hw-perf_counter_on.mk delete mode 100644 repos/base-hw/lib/mk/spec/arm_v7/core-hw-perf_counter_on.mk delete mode 100644 repos/base-hw/lib/mk/spec/perf_counter/core-hw-perf_counter.mk delete mode 100644 repos/base-hw/src/core/perf_counter.cc diff --git a/repos/base-hw/lib/mk/core-hw-perf_counter.mk b/repos/base-hw/lib/mk/core-hw-perf_counter.mk deleted file mode 100644 index 6e310d908..000000000 --- a/repos/base-hw/lib/mk/core-hw-perf_counter.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -# \brief Core build-config that depends on performance-counter status -# \author Josef Soentgen -# \date 2013-09-26 -# - -# add include paths -INC_DIR += $(REP_DIR)/src/core/include - -# add C++ sources -SRC_CC += perf_counter.cc - -# declare source locations -vpath % $(REP_DIR)/src/core diff --git a/repos/base-hw/lib/mk/core-hw.inc b/repos/base-hw/lib/mk/core-hw.inc index dbaf093d4..5567aa83b 100644 --- a/repos/base-hw/lib/mk/core-hw.inc +++ b/repos/base-hw/lib/mk/core-hw.inc @@ -4,7 +4,7 @@ # \date 2011-12-16 # -LIBS += core-hw-perf_counter base-hw-common cxx +LIBS += base-hw-common cxx # add include paths INC_DIR += $(BASE_DIR)/../base-hw/src/core/include diff --git a/repos/base-hw/lib/mk/spec/arm_v6/core-hw-perf_counter_on.mk b/repos/base-hw/lib/mk/spec/arm_v6/core-hw-perf_counter_on.mk deleted file mode 100644 index 84b1a08bf..000000000 --- a/repos/base-hw/lib/mk/spec/arm_v6/core-hw-perf_counter_on.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -# \brief Core build-config that depends on performance-counter status -# \author Josef Soentgen -# \date 2013-09-26 -# - -# add include paths -INC_DIR += $(REP_DIR)/src/core/include - -# add C++ sources -SRC_CC += spec/arm_v6/perf_counter.cc - -# declare source locations -vpath % $(REP_DIR)/src/core diff --git a/repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc b/repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc index c29b4afcb..44568cf71 100644 --- a/repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc @@ -10,6 +10,7 @@ INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/arm_v6 # add C++ sources SRC_CC += spec/arm_v6/cpu.cc +SRC_CC += spec/arm_v6/perf_counter.cc SRC_CC += spec/arm/kernel/cpu_context.cc SRC_CC += spec/arm/kernel/cpu.cc SRC_CC += spec/arm/kernel/thread_update_pd.cc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-perf_counter_on.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-perf_counter_on.mk deleted file mode 100644 index 410086dd7..000000000 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-perf_counter_on.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -# \brief Core build-config that depends on performance-counter status -# \author Josef Soentgen -# \date 2013-09-26 -# - -# add include paths -INC_DIR += $(REP_DIR)/src/core/include - -# add C++ sources -SRC_CC += spec/arm_v7/perf_counter.cc - -# declare source locations -vpath % $(REP_DIR)/src/core diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc b/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc index 477bc7664..14b5b5e9e 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc @@ -9,6 +9,7 @@ INC_DIR += $(BASE_DIR)/../base-hw/src/core/include/spec/arm_v7 # add C++ sources SRC_CC += spec/arm_v7/cpu.cc +SRC_CC += spec/arm_v7/perf_counter.cc # add assembly sources SRC_S += spec/arm_v7/mode_transition.s diff --git a/repos/base-hw/lib/mk/spec/perf_counter/core-hw-perf_counter.mk b/repos/base-hw/lib/mk/spec/perf_counter/core-hw-perf_counter.mk deleted file mode 100644 index c6c31d61e..000000000 --- a/repos/base-hw/lib/mk/spec/perf_counter/core-hw-perf_counter.mk +++ /dev/null @@ -1 +0,0 @@ -LIBS += core-hw-perf_counter_on diff --git a/repos/base-hw/src/core/perf_counter.cc b/repos/base-hw/src/core/perf_counter.cc deleted file mode 100644 index ae11ddc0b..000000000 --- a/repos/base-hw/src/core/perf_counter.cc +++ /dev/null @@ -1,25 +0,0 @@ -/* - * \brief Performance counter dummy - * \author Josef Soentgen - * \date 2013-09-26 - */ - -/* - * Copyright (C) 2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -/* base-hw includes */ -#include - - -void Kernel::Perf_counter::enable() { } - - -Kernel::Perf_counter* Kernel::perf_counter() -{ - static Kernel::Perf_counter inst; - return &inst; -} diff --git a/repos/libports/lib/mk/spec/arm_v6/jitterentropy.mk b/repos/libports/lib/mk/spec/arm_v6/jitterentropy.mk index 629f6ece1..774bebe94 100644 --- a/repos/libports/lib/mk/spec/arm_v6/jitterentropy.mk +++ b/repos/libports/lib/mk/spec/arm_v6/jitterentropy.mk @@ -1,5 +1,3 @@ INC_DIR += $(REP_DIR)/src/lib/jitterentropy/spec/arm_v6 -SPECS += perf_counter - include $(REP_DIR)/lib/mk/jitterentropy.inc diff --git a/repos/libports/lib/mk/spec/arm_v7/jitterentropy.mk b/repos/libports/lib/mk/spec/arm_v7/jitterentropy.mk index 821f33231..006c91f95 100644 --- a/repos/libports/lib/mk/spec/arm_v7/jitterentropy.mk +++ b/repos/libports/lib/mk/spec/arm_v7/jitterentropy.mk @@ -1,5 +1,3 @@ INC_DIR += $(REP_DIR)/src/lib/jitterentropy/spec/arm_v7 -SPECS += perf_counter - include $(REP_DIR)/lib/mk/jitterentropy.inc