Commit 964cbe6

committed

Resolve conflicts

2 parents 3b2fa47 + d2ff505 commit 964cbe6Copy full SHA for 964cbe6

36 files changed

+2996

-23

lines changed

bsp
- nuclei
  - .gitignore
  - gd32vf103_rvstar
    - .config
    - Kconfig
    - README.md
    - SConscript
    - SConstruct
    - applications
      - SConscript
      - main.c
    - board
    - rtconfig.h
    - rtconfig.py
  - libraries/gd32vf103/HAL_Drivers
- raspberry-pi
  - raspi3-64
    - README.md
  - raspi4/driver
components/finsh
- finsh.h
- finsh_compiler.c
libcpu/risc-v
- SConscript
- nuclei
tools
- mkdist.py

36 files changed

+2996

-23

lines changed

`‎bsp/nuclei/.gitignore‎`

-Original file line number
+Diff line change
@@ @@ -0,0 +1,26 @@ @@
 +*.i
 +*.o
 +*.d
 +*.elf
 +*.diss
 +*.map
 +*.bin
 +*.log
 +.vscode
++
 +*.dump
 +*.verilog
++
 +*.swp
 +*.swo
++
 +prebuilt_tools/
 +setup_config.sh
 +setup_config.bat
++
 +tags
 +TAGS
 +TAG
 +CTAGS
 +Makefile.local
 +Makefile.global

Comments

(0)