Commit 422f9548 authored by Michael Zehrer's avatar Michael Zehrer
Browse files

add "RPI_ENABLE_CACHE" option and unify default tunings

parent 61e2dfc6
......@@ -59,6 +59,13 @@
</option.description>
<option.value>true</option.value>
</option>
<option definition="RPI_ENABLE_CACHE" readable="Enable cache" type="bool">
<option.description>
ON = Use the cache to speed up execution
OFF = Don't use cache at all
</option.description>
<option.value>true</option.value>
</option>
<option definition="RPI_BOARD" readable="Board / Model" type="rpi_board">
<option.description>Target Raspberry Pi board / model</option.description>
</option>
......
......@@ -132,8 +132,10 @@ void *volatile g_p_cur_task_context;
void _hwInit(void) {
_mmu_init();
#ifdef RPI_ENABLE_CACHE
_iCache_enable();
_dCache_enable();
#endif
#if ARM_ARCH <= 7
_branchPredictor_enable();
#endif
......
......@@ -4,10 +4,9 @@
Default settings for the Raspberry Pi B
</tuning.description>
<modules>
<use>matlib</use>
<!-- Nothing here -->
</modules>
<settings for="raspberry">
<set definition="RPI_BOARD" value="RASPBERRY_PI_B" />
<set definition="RPI_ENABLE_FPU" value="true" />
</settings>
</tuning>
/**
* Generated on 2019-09-12 19:07
* Generated on 2019-10-17 22:59
* DO NOT EDIT
*
* @brief automatically generated params header
......@@ -11,6 +11,7 @@
#define ARCTOS_DEFAULT_STACKSIZE 1024
#define ARCTOS_SCHEDULER_TIME_SLOT_SIZE 100000
#define RPI_ENABLE_FPU
#define RPI_ENABLE_CACHE
#define RPI_BOARD RASPBERRY_PI_B
#define RPI_DEBUG_SERIAL_IDX SERIAL_IDX1
......
/**
* Generated on 2019-09-12 19:07
* DO NOT EDIT
*
* @brief automatically generated params header
*/
#ifndef MATLIB_PARAMS_H
#define MATLIB_PARAMS_H
#endif /* MATLIB_PARAMS_H */
\ No newline at end of file
/**
* Generated on 2019-09-12 19:07
* Generated on 2019-10-17 22:59
* DO NOT EDIT
*
* @brief automatically generated params header
......
f27d06936bbb7f81fb7a8228609b116442786bef5b39060f163d13fbdac6c169
\ No newline at end of file
ac24200006c016bf29a864e20f97daedcbcda6895a5b07464044e8d4e6c7ea8a
\ No newline at end of file
......@@ -2,7 +2,7 @@
# This script is automatically generated
# DO NOT EDIT
#
# Generated on 2019-09-12 19:07
# Generated on 2019-10-17 22:59
#
set(ARCTOS_TARGET "raspberry")
......@@ -15,18 +15,12 @@ add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../modules/serial")
target_link_libraries(${UNIT} ${ARCTOS_INTERFACE})
############### END-MODULE: serial ###############
############## BEGIN-MODULE: matlib ##############
set(UNIT "module_matlib")
add_library(${UNIT} OBJECT "${CMAKE_CURRENT_LIST_DIR}/matlib/params.h")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../modules/matlib")
target_link_libraries(${UNIT} ${ARCTOS_INTERFACE})
############### END-MODULE: matlib ###############
############ BEGIN-TARGET: raspberry #############
set(ARCTOS_DEFAULT_TASK_PRIORITY "10")
set(ARCTOS_DEFAULT_STACKSIZE "1024")
set(ARCTOS_SCHEDULER_TIME_SLOT_SIZE "100000")
set(RPI_ENABLE_FPU on)
set(RPI_ENABLE_CACHE on)
set(RPI_BOARD "RASPBERRY_PI_B")
set(RPI_DEBUG_SERIAL_IDX "SERIAL_IDX1")
......@@ -56,7 +50,6 @@ target_link_libraries(${UNIT} segment_bare-metal)
add_library(${ARCTOS_LIB_TARGET} STATIC
$<TARGET_OBJECTS:module_serial>
$<TARGET_OBJECTS:module_matlib>
$<TARGET_OBJECTS:segment_independent>
$<TARGET_OBJECTS:segment_bare-metal>
$<TARGET_OBJECTS:target_raspberry>
......
......@@ -8,6 +8,5 @@
</modules>
<settings for="raspberry">
<set definition="RPI_BOARD" value="RASPBERRY_PI_B3" />
<set definition="RPI_ENABLE_FPU" value="true" />
</settings>
</tuning>
/**
* Generated on 2019-10-09 14:09
* Generated on 2019-10-17 22:59
* DO NOT EDIT
*
* @brief automatically generated params header
......@@ -11,6 +11,7 @@
#define ARCTOS_DEFAULT_STACKSIZE 1024
#define ARCTOS_SCHEDULER_TIME_SLOT_SIZE 100000
#define RPI_ENABLE_FPU
#define RPI_ENABLE_CACHE
#define RPI_BOARD RASPBERRY_PI_B3
#define RPI_DEBUG_SERIAL_IDX SERIAL_IDX1
......
/**
* Generated on 2019-10-09 14:09
* Generated on 2019-10-17 22:59
* DO NOT EDIT
*
* @brief automatically generated params header
......
2f4f24d694bf2079fcb66d71786bcc56f04b8b196d91b115c3e3cf2246a1e5da
\ No newline at end of file
95ea8c19f7da4c40e74cb1fd46b2a9dab650f6b934c27146ff9fb05bbacb672c
\ No newline at end of file
......@@ -2,7 +2,7 @@
# This script is automatically generated
# DO NOT EDIT
#
# Generated on 2019-10-09 14:09
# Generated on 2019-10-17 22:59
#
set(ARCTOS_TARGET "raspberry")
......@@ -20,6 +20,7 @@ set(ARCTOS_DEFAULT_TASK_PRIORITY "10")
set(ARCTOS_DEFAULT_STACKSIZE "1024")
set(ARCTOS_SCHEDULER_TIME_SLOT_SIZE "100000")
set(RPI_ENABLE_FPU on)
set(RPI_ENABLE_CACHE on)
set(RPI_BOARD "RASPBERRY_PI_B3")
set(RPI_DEBUG_SERIAL_IDX "SERIAL_IDX1")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment