PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

organize risc-v code for spike and bumblebee

Browse Source
This commit is contained in:
acevest
2019-09-25 21:53:27 +08:00
parent 379427f879
commit b1b2d1eabc
15 changed files with 129 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
arch/risc-v/bumblebee/gcc/riscv_port.h Normal file
View File

@@ -0,0 +1,29 @@
/*----------------------------------------------------------------------------
* Tencent is pleased to support the open source community by making TencentOS
* available.
*
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
* If you have downloaded a copy of the TencentOS binary from Tencent, please
* note that the TencentOS binary is licensed under the BSD 3-Clause License.
*
* If you have downloaded a copy of the TencentOS source code from Tencent,
* please note that TencentOS source code is licensed under the BSD 3-Clause
* License, except for the third-party components listed below which are
* subject to different license terms. Your integration of TencentOS into your
* own projects may require compliance with the BSD 3-Clause License, as well
* as the other licenses applicable to the third-party components included
* within TencentOS.
*---------------------------------------------------------------------------*/
#ifndef _RISCV_PORT_H_
#define _RISCV_PORT_H_
#define CLINT_CTRL_ADDR 0xD1000000
#define CLINT_MSIP 0x0FFC
#define CLINT_MTIMECMP 0x0008
#define CLINT_MTIME 0x0000
void riscv_cpu_init();
#endif // _RISCV_PORT_H_

5
arch/risc-v/bumblebee/gcc/riscv_port_c.c Normal file
View File

@@ -0,0 +1,5 @@
#include "gd32vf103.h"
void riscv_cpu_init() {
eclic_irq_enable(CLIC_INT_TMR, 0, 0);
}

6
arch/risc-v/common/tos_cpu.c
View File

@@ -1,6 +1,6 @@
#include <tos.h>
#include <riscv_encoding.h>
#include <riscv_port.h>
__KERNEL__ void cpu_systick_init(k_cycle_t cycle_per_tick)
{
@@ -11,6 +11,8 @@ __KERNEL__ void cpu_systick_init(k_cycle_t cycle_per_tick)
__KERNEL__ void cpu_init(void) {
k_cpu_cycle_per_tick = TOS_CFG_CPU_CLOCK / k_cpu_tick_per_second;
cpu_systick_init(k_cpu_cycle_per_tick);
riscv_cpu_init();
}
__API__ cpu_cpsr_t tos_cpu_cpsr_save(void)
@@ -99,7 +101,7 @@ __KERNEL__ k_stack_t *cpu_task_stk_init(void *entry,
#undef _V
}
cpu_data_t gp;
cpu_data_t gp = regs->gp;
asm("mv %0, gp"::"r"(gp));
regs->gp = (cpu_data_t)gp; // gp: global pointer

16
arch/risc-v/rv32i/gcc/port_c.c
View File

@@ -1,18 +1,8 @@
#include "riscv_encoding.h"
#include "riscv_port.h"
#include <tos.h>
#if 0
#define CLINT_CTRL_ADDR 0x2000000
#define CLINT_MSIP 0x0000
#define CLINT_MTIMECMP 0x4000
#define CLINT_MTIME 0xBFF8
#else
#include "gd32vf103.h"
#define CLINT_CTRL_ADDR 0xD1000000
#define CLINT_MSIP 0x0FFC
#define CLINT_MTIMECMP 0x0008
#define CLINT_MTIME 0x0000
#endif
//#include "gd32vf103.h"
__PORT__ void port_systick_config(uint32_t cycle_per_tick)
{
@@ -43,8 +33,6 @@ __PORT__ void port_systick_config(uint32_t cycle_per_tick)
*(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIMECMP + 0) = 0xFFFFFFFF;
*(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIMECMP + 4) = 0xFFFFFFFF & (mtimecmp >> 32);
*(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIMECMP + 0) = 0xFFFFFFFF & (mtimecmp >> 0);
}
__PORT__ void port_systick_priority_set(uint32_t prio)

28
arch/risc-v/spike/gcc/riscv_port.h Normal file
View File

@@ -0,0 +1,28 @@
/*----------------------------------------------------------------------------
* Tencent is pleased to support the open source community by making TencentOS
* available.
*
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
* If you have downloaded a copy of the TencentOS binary from Tencent, please
* note that the TencentOS binary is licensed under the BSD 3-Clause License.
*
* If you have downloaded a copy of the TencentOS source code from Tencent,
* please note that TencentOS source code is licensed under the BSD 3-Clause
* License, except for the third-party components listed below which are
* subject to different license terms. Your integration of TencentOS into your
* own projects may require compliance with the BSD 3-Clause License, as well
* as the other licenses applicable to the third-party components included
* within TencentOS.
*---------------------------------------------------------------------------*/
#ifndef _RISCV_PORT_H_
#define _RISCV_PORT_H_
#define CLINT_CTRL_ADDR 0x2000000
#define CLINT_MSIP 0x0000
#define CLINT_MTIMECMP 0x4000
#define CLINT_MTIME 0xBFF8
void riscv_cpu_init();
#endif // _RISCV_PORT_H_

3
arch/risc-v/spike/gcc/riscv_port_c.c Normal file
View File

@@ -0,0 +1,3 @@
void riscv_cpu_init() {
// DO NOTHING
}

6
board/GD32VF103C_START/eclipse/hello_world/.cproject
View File

@@ -127,8 +127,6 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/TencentOS_tiny/arch/risc-v/common/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/TencentOS_tiny/arch/risc-v/rv32i/gcc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/GD32VF103_Firmware_Library/RISCV/drivers}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/GD32VF103_Firmware_Library/GD32VF103_standard_peripheral/Include}&quot;"/>
@@ -140,6 +138,10 @@
<listOptionValue builtIn="false" value=".././"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/TencentOS_tiny/arch/kernel/core/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/TencentOS_tiny/arch/risc-v/rv32i}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/TencentOS_tiny/arch/risc-v/bumblebee}&quot;"/>
</option>

23
board/GD32VF103C_START/eclipse/hello_world/.project
View File

@@ -57,7 +57,28 @@
<link>
<name>TencentOS_tiny/arch/risc-v</name>
<type>2</type>
<locationURI>$%7BPARENT-4-PROJECT_LOC%7D/arch/risc-v</locationURI>
<locationURI>virtual:/virtual</locationURI>
</link>
<link>
<name>TencentOS_tiny/arch/risc-v/bumblebee</name>
<type>2</type>
<locationURI>TOP_DIR/arch/risc-v/bumblebee/gcc</locationURI>
</link>
<link>
<name>TencentOS_tiny/arch/risc-v/common</name>
<type>2</type>
<locationURI>$%7BPARENT-4-PROJECT_LOC%7D/arch/risc-v/common</locationURI>
</link>
<link>
<name>TencentOS_tiny/arch/risc-v/rv32i</name>
<type>2</type>
<locationURI>TOP_DIR/arch/risc-v/rv32i/gcc</locationURI>
</link>
</linkedResources>
<variableList>
<variable>
<name>TOP_DIR</name>
<value>$%7BPARENT-4-PROJECT_LOC%7D</value>
</variable>
</variableList>
</projectDescription>

2
board/GD32VF103C_START/eclipse/hello_world/.settings/language.settings.xml
View File

@@ -11,7 +11,7 @@
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1313707600086139110" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1372898985477160516" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>

1
board/GD32VF103C_START/eclipse/hello_world/main.c
View File

@@ -61,7 +61,6 @@ void main(void) {
gpio_bit_reset(GPIOA, GPIO_PIN_7);
tos_knl_init();
eclic_irq_enable(CLIC_INT_TMR, 0, 0);
tos_task_create(&k_task_task1, "task1", task1, NULL, 3, k_task1_stk, TASK_SIZE, 0);
//tos_task_create(&k_task_task2, "task2", task2, NULL, 3, k_task2_stk, TASK_SIZE, 0);

2
board/QEMU_Spike/GCC/demo/Makefile
View File

@@ -41,6 +41,7 @@ KERNEL_SRC = \
ARCH_SRC = \
${wildcard $(TOP_DIR)/arch/risc-v/rv32i/gcc/*.c} \
${wildcard $(TOP_DIR)/arch/risc-v/spike/gcc/*.c} \
${wildcard $(TOP_DIR)/arch/risc-v/common/*.c}
C_SOURCES += $(ARCH_SRC)
@@ -108,6 +109,7 @@ KERNEL_INC = \
-I $(TOP_DIR)/kernel/hal/include \
-I $(TOP_DIR)/arch/risc-v/common/include \
-I $(TOP_DIR)/arch/risc-v/rv32i/gcc \
-I $(TOP_DIR)/arch/risc-v/spike/gcc \
-I $(TOP_DIR)/platform/vendor_bsp/gd/GD32VF103_Firmware_Library/RISCV/drivers \
-I $(TOP_DIR)/board/QEMU_Spike/TOS-CONFIG
C_INCLUDES += $(KERNEL_INC)

3
board/QEMU_Spike/GCC/demo/start.S
View File

@@ -6,9 +6,6 @@
.globl _start
.type _start,@function
_start:
lui s0, 0x20000
lw a0, 148(s0)
csrc mstatus, MSTATUS_MIE
csrw mie, 0

10
board/QEMU_Spike/eclipse/demo/.cproject
View File

@@ -109,9 +109,9 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TencentOS_tiny/arch/risc-v/common/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TencentOS_tiny/arch/risc-v/rv32i/gcc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/Inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TencentOS_tiny/arch/risc-v/rv32i}&quot;"/>
</option>
@@ -133,11 +133,13 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TencentOS_tiny/arch/risc-v/common/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TencentOS_tiny/arch/risc-v/rv32i/gcc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/Inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TOS-CONFIG}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TencentOS_tiny/arch/risc-v/rv32i}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TencentOS_tiny/arch/risc-v/spike}&quot;"/>
</option>

23
board/QEMU_Spike/eclipse/demo/.project
View File

@@ -52,7 +52,28 @@
<link>
<name>TencentOS_tiny/arch/risc-v</name>
<type>2</type>
<locationURI>$%7BPARENT-4-PROJECT_LOC%7D/arch/risc-v</locationURI>
<locationURI>virtual:/virtual</locationURI>
</link>
<link>
<name>TencentOS_tiny/arch/risc-v/common</name>
<type>2</type>
<locationURI>TOP_DIR/arch/risc-v/common</locationURI>
</link>
<link>
<name>TencentOS_tiny/arch/risc-v/rv32i</name>
<type>2</type>
<locationURI>TOP_DIR/arch/risc-v/rv32i/gcc</locationURI>
</link>
<link>
<name>TencentOS_tiny/arch/risc-v/spike</name>
<type>2</type>
<locationURI>TOP_DIR/arch/risc-v/spike/gcc</locationURI>
</link>
</linkedResources>
<variableList>
<variable>
<name>TOP_DIR</name>
<value>$%7BPARENT-4-PROJECT_LOC%7D</value>
</variable>
</variableList>
</projectDescription>

2
board/QEMU_Spike/eclipse/demo/.settings/language.settings.xml
View File

@@ -11,7 +11,7 @@
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1292697017733054825" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1306101209105946474" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>