Skip to content

Commit 1936e68

Browse files
kassanexiaoxiang781216
authored andcommitted
risc-v/qemu-rv: Add Build Config for leds64_zig
This PR adds a new Build Config `rv-virt:leds64_zig` that builds the Zig App `leds_zig` for QEMU RISC-V 64-bit. ref.: apache/nuttx-apps#2534
1 parent fc31c61 commit 1936e68

File tree

4 files changed

+89
-2
lines changed
  • Documentation
  • boards/risc-v/qemu-rv/rv-virt/configs/leds64_zig
  • tools/ci/docker/linux

4 files changed

+89
-2
lines changed
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
=================================
2+
``leds_zig`` Toggle LEDs in Zig
3+
=================================
4+
5+
This is a simple test in Zig of the board LED driver at
6+
``nuttx/drivers/leds/userled_*.c``.

Diff for: Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst

+5
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,11 @@ leds64_rust
262262

263263
Similar to the `leds64`_ configuration, but with ``leds_rust`` example enabled.
264264

265+
leds64_zig
266+
-----------
267+
268+
Similar to the `leds64`_ configuration, but with ``leds_zig`` example enabled.
269+
265270
netnsh
266271
------
267272

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
#
2+
# This file is autogenerated: PLEASE DO NOT EDIT IT.
3+
#
4+
# You can use "make menuconfig" to make any modifications to the installed .config file.
5+
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
6+
# modifications.
7+
#
8+
# CONFIG_DISABLE_OS_API is not set
9+
# CONFIG_NSH_DISABLE_LOSMART is not set
10+
CONFIG_16550_ADDRWIDTH=0
11+
CONFIG_16550_UART0=y
12+
CONFIG_16550_UART0_BASE=0x10000000
13+
CONFIG_16550_UART0_CLOCK=3686400
14+
CONFIG_16550_UART0_IRQ=37
15+
CONFIG_16550_UART0_SERIAL_CONSOLE=y
16+
CONFIG_16550_UART=y
17+
CONFIG_ARCH="risc-v"
18+
CONFIG_ARCH_BOARD="rv-virt"
19+
CONFIG_ARCH_BOARD_QEMU_RV_VIRT=y
20+
CONFIG_ARCH_CHIP="qemu-rv"
21+
CONFIG_ARCH_CHIP_QEMU_RV64=y
22+
CONFIG_ARCH_CHIP_QEMU_RV=y
23+
CONFIG_ARCH_CHIP_QEMU_RV_ISA_A=y
24+
CONFIG_ARCH_CHIP_QEMU_RV_ISA_C=y
25+
CONFIG_ARCH_CHIP_QEMU_RV_ISA_M=y
26+
CONFIG_ARCH_INTERRUPTSTACK=2048
27+
CONFIG_ARCH_RISCV=y
28+
CONFIG_ARCH_STACKDUMP=y
29+
CONFIG_BCH=y
30+
CONFIG_BOARDCTL_POWEROFF=y
31+
CONFIG_BOARD_LATE_INITIALIZE=y
32+
CONFIG_BOARD_LOOPSPERMSEC=6366
33+
CONFIG_BUILTIN=y
34+
CONFIG_DEBUG_FEATURES=y
35+
CONFIG_DEBUG_FULLOPT=y
36+
CONFIG_DEBUG_SYMBOLS=y
37+
CONFIG_DEVICE_TREE=y
38+
CONFIG_DEV_ZERO=y
39+
CONFIG_ELF=y
40+
CONFIG_EXAMPLES_HELLO=y
41+
CONFIG_EXAMPLES_LEDS=y
42+
CONFIG_EXAMPLES_LEDS_ZIG=y
43+
CONFIG_FS_HOSTFS=y
44+
CONFIG_FS_PROCFS=y
45+
CONFIG_IDLETHREAD_STACKSIZE=2048
46+
CONFIG_INIT_ENTRYPOINT="nsh_main"
47+
CONFIG_INIT_STACKSIZE=3072
48+
CONFIG_LIBC_ENVPATH=y
49+
CONFIG_LIBC_EXECFUNCS=y
50+
CONFIG_LIBC_PERROR_STDOUT=y
51+
CONFIG_LIBC_STRERROR=y
52+
CONFIG_LIBM=y
53+
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
54+
CONFIG_NSH_ARCHINIT=y
55+
CONFIG_NSH_BUILTIN_APPS=y
56+
CONFIG_NSH_FILEIOSIZE=512
57+
CONFIG_NSH_READLINE=y
58+
CONFIG_PATH_INITIAL="/system/bin"
59+
CONFIG_RAM_SIZE=33554432
60+
CONFIG_RAM_START=0x80000000
61+
CONFIG_READLINE_CMD_HISTORY=y
62+
CONFIG_RISCV_SEMIHOSTING_HOSTFS=y
63+
CONFIG_RR_INTERVAL=200
64+
CONFIG_SCHED_WAITPID=y
65+
CONFIG_SERIAL_UART_ARCH_MMIO=y
66+
CONFIG_STACK_COLORATION=y
67+
CONFIG_START_MONTH=12
68+
CONFIG_START_YEAR=2021
69+
CONFIG_SYMTAB_ORDEREDBYNAME=y
70+
CONFIG_SYSTEM_NSH=y
71+
CONFIG_SYSTEM_NSH_STACKSIZE=3072
72+
CONFIG_TESTING_GETPRIME=y
73+
CONFIG_TESTING_OSTEST=y
74+
CONFIG_USEC_PER_TICK=1000
75+
CONFIG_USERLED=y
76+
CONFIG_USERLED_LOWER=y

Diff for: tools/ci/docker/linux/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ ENV PATH="/tools/ldc2/ldc2-1.39.0-linux-x86_64/bin:$PATH"
431431

432432
# Pull in the swift 6.0 toolchain
433433
# COPY --from=nuttx-tools /tools/swift/ /tools/swift/
434-
# ENV PATH="/tools/swift/swift-6.0-DEVELOPMENT-SNAPSHOT-2024-08-22-a/bin:$PATH"
434+
# ENV PATH="/tools/swift/swift-6.0-DEVELOPMENT-SNAPSHOT-2024-08-22-a/usr/bin:$PATH"
435435

436436
# ARM clang toolchain
437437
COPY --from=nuttx-toolchain-arm /tools/clang-arm-none-eabi/ clang-arm-none-eabi/
@@ -532,4 +532,4 @@ RUN mkdir -p /ccache && \
532532
ENV PATH="/tools/ccache/bin:$PATH"
533533
ENV CCACHE_DIR="/ccache"
534534

535-
CMD [ "/bin/bash" ]
535+
CMD [ "/bin/bash" ]

0 commit comments

Comments
 (0)