ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Stefan Kalkowski 2017-01-02 15:51:09 +01:00 committed by Norman Feske
parent 3886686b83
commit 658547d058
10 changed files with 3 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
repos/base-hw/lib/mk/core-hw-perf_counter.mk
View File

@ -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

2
repos/base-hw/lib/mk/core-hw.inc
View File

@ -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

14
repos/base-hw/lib/mk/spec/arm_v6/core-hw-perf_counter_on.mk
View File

@ -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

1
repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc
View File

@ -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

14
repos/base-hw/lib/mk/spec/arm_v7/core-hw-perf_counter_on.mk
View File

@ -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

1
repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc
View File

@ -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

1
repos/base-hw/lib/mk/spec/perf_counter/core-hw-perf_counter.mk
View File

@ -1 +0,0 @@
LIBS += core-hw-perf_counter_on

25
repos/base-hw/src/core/perf_counter.cc
View File

@ -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 <kernel/perf_counter.h>
void Kernel::Perf_counter::enable() { }
Kernel::Perf_counter* Kernel::perf_counter()
{
static Kernel::Perf_counter inst;
return &inst;
}

2
repos/libports/lib/mk/spec/arm_v6/jitterentropy.mk
View File

@ -1,5 +1,3 @@
INC_DIR += $(REP_DIR)/src/lib/jitterentropy/spec/arm_v6
SPECS += perf_counter
include $(REP_DIR)/lib/mk/jitterentropy.inc

2
repos/libports/lib/mk/spec/arm_v7/jitterentropy.mk
View File

@ -1,5 +1,3 @@
INC_DIR += $(REP_DIR)/src/lib/jitterentropy/spec/arm_v7
SPECS += perf_counter
include $(REP_DIR)/lib/mk/jitterentropy.inc