From ec0f5d417cbe13518d8f24f6ac0b78d2fc5b69fc Mon Sep 17 00:00:00 2001 From: Filipe Cavalcanti Date: Wed, 19 Feb 2025 10:45:16 -0300 Subject: [PATCH] boards/esp32s3: move QEMU toywasm to different defconfig Remove WebAssembly from qemu_debug defconfig and create a new one for this purpose: qemu_toywasm. Signed-off-by: Filipe Cavalcanti --- .../esp32s3/boards/esp32s3-devkit/index.rst | 16 ++- .../configs/qemu_debug/defconfig | 2 +- .../configs/qemu_toywasm/defconfig | 99 +++++++++++++++++++ 3 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig diff --git a/Documentation/platforms/xtensa/esp32s3/boards/esp32s3-devkit/index.rst b/Documentation/platforms/xtensa/esp32s3/boards/esp32s3-devkit/index.rst index a26d244dd28cb..d7c2b779d6c53 100644 --- a/Documentation/platforms/xtensa/esp32s3/boards/esp32s3-devkit/index.rst +++ b/Documentation/platforms/xtensa/esp32s3/boards/esp32s3-devkit/index.rst @@ -157,10 +157,10 @@ the following output is expected:: nsh> cap cap_main: Hardware initialized. Opening the capture device: /dev/capture0 cap_main: Number of samples: 0 - pwm duty cycle: 50 % - pwm frequence: 50 Hz - pwm duty cycle: 50 % - pwm frequence: 50 Hz + pwm duty cycle: 50 % + pwm frequence: 50 Hz + pwm duty cycle: 50 % + pwm frequence: 50 Hz coremark -------- @@ -470,6 +470,12 @@ A configuration tailored for the `Espressif fork of QEMU`_. .. _Espressif fork of QEMU: https://github.com/espressif/qemu +qemu_toywasm +------------ + +Based on ``qemu_debug`` defconfig, with the addition of WebAssembly support. +See :ref:`toywasm` for more further details. + random ------ @@ -650,6 +656,8 @@ To test it, just run the following:: Where x in the timer instance. +.. _toywasm: + toywasm ------- diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig index 955bf2886d497..399fe8a685313 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig @@ -27,6 +27,7 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4096 CONFIG_DRIVERS_IEEE80211=y CONFIG_DRIVERS_WIRELESS=y +CONFIG_ESP32S3_QEMU_IMAGE=y CONFIG_ESP32S3_RNG=y CONFIG_ESP32S3_RT_TIMER=y CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096 @@ -43,7 +44,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y -CONFIG_INTERPRETERS_TOYWASM=y CONFIG_IOB_NBUFFERS=124 CONFIG_IOB_THROTTLE=24 CONFIG_LINE_MAX=255 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig new file mode 100644 index 0000000000000..74aac80b8d011 --- /dev/null +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig @@ -0,0 +1,99 @@ +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +# CONFIG_ARCH_LEDS is not set +# CONFIG_ESP32S3_SYSTEM_BBPLL_RECALIB is not set +# CONFIG_NSH_ARGCAT is not set +# CONFIG_NSH_CMDOPT_HEXDUMP is not set +CONFIG_ALLOW_BSD_COMPONENTS=y +CONFIG_ARCH="xtensa" +CONFIG_ARCH_BOARD="esp32s3-devkit" +CONFIG_ARCH_BOARD_COMMON=y +CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y +CONFIG_ARCH_CHIP="esp32s3" +CONFIG_ARCH_CHIP_ESP32S3=y +CONFIG_ARCH_CHIP_ESP32S3WROOM2N16R8V=y +CONFIG_ARCH_INTERRUPTSTACK=2048 +CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_XTENSA=y +CONFIG_BOARD_LOOPSPERMSEC=16717 +CONFIG_BUILTIN=y +CONFIG_DEBUG_FULLOPT=y +CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEFAULT_TASK_STACKSIZE=4096 +CONFIG_DRIVERS_IEEE80211=y +CONFIG_DRIVERS_WIRELESS=y +CONFIG_ESP32S3_QEMU_IMAGE=y +CONFIG_ESP32S3_RNG=y +CONFIG_ESP32S3_RT_TIMER=y +CONFIG_ESP32S3_RT_TIMER_TASK_STACK_SIZE=4096 +CONFIG_ESP32S3_SPIFLASH=y +CONFIG_ESP32S3_TIMER0=y +CONFIG_ESP32S3_UART0=y +CONFIG_EXAMPLES_RANDOM=y +CONFIG_FS_HOSTFS=y +CONFIG_FS_LARGEFILE=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_PROCFS=y +CONFIG_HOST_MACOS=y +CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_STACKSIZE=8192 +CONFIG_INTELHEX_BINARY=y +CONFIG_INTERPRETERS_TOYWASM=y +CONFIG_IOB_NBUFFERS=124 +CONFIG_IOB_THROTTLE=24 +CONFIG_LINE_MAX=255 +CONFIG_MM_REGIONS=2 +CONFIG_NAME_MAX=48 +CONFIG_NET=y +CONFIG_NETDB_DNSCLIENT=y +CONFIG_NETDEV_LATEINIT=y +CONFIG_NETDEV_PHY_IOCTL=y +CONFIG_NETDEV_WIRELESS_IOCTL=y +CONFIG_NETUTILS_CJSON=y +CONFIG_NETUTILS_IPERF=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_PKTSIZE=1514 +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_TCP=y +CONFIG_NET_TCP_DELAYED_ACK=y +CONFIG_NET_TCP_WRITE_BUFFERS=y +CONFIG_NET_UDP=y +CONFIG_NET_UDP_WRITE_BUFFERS=y +CONFIG_NSH_ARCHINIT=y +CONFIG_NSH_BUILTIN_APPS=y +CONFIG_NSH_FILEIOSIZE=512 +CONFIG_NSH_READLINE=y +CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 +CONFIG_PREALLOC_TIMERS=4 +CONFIG_PSEUDOFS_SOFTLINKS=y +CONFIG_PTHREAD_MUTEX_TYPES=y +CONFIG_RAM_SIZE=114688 +CONFIG_RAM_START=0x20000000 +CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_LPWORK=y +CONFIG_SCHED_WAITPID=y +CONFIG_SIG_DEFAULT=y +CONFIG_SMP=y +CONFIG_SMP_NCPUS=2 +CONFIG_START_DAY=6 +CONFIG_START_MONTH=12 +CONFIG_START_YEAR=2011 +CONFIG_SYSLOG_BUFFER=y +CONFIG_SYSTEM_DHCPC_RENEW=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_PING=y +CONFIG_TIMER=y +CONFIG_TLS_TASK_NELEM=4 +CONFIG_UART0_SERIAL_CONSOLE=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_WAPI=y +CONFIG_WIRELESS_WAPI_CMDTOOL=y +CONFIG_WIRELESS_WAPI_INITCONF=y +CONFIG_WIRELESS_WAPI_STACKSIZE=8192 +CONFIG_XTENSA_SEMIHOSTING_HOSTFS=y