From 83932d115b156f60930345fc643f58e0589c7d68 Mon Sep 17 00:00:00 2001 From: Yanfeng Liu Date: Fri, 9 Aug 2024 09:53:47 +0800 Subject: [PATCH] boards/rv-virt: unify rv32 config names This renames a few RV32 configs to follow the convention that names w/o numbers are for RV32, so that to be in line with majority RV32 configs. As a result, we have: `nsh` vs `nsh64`, `knsh` vs `knsh64`, `pnsh` vs `pnsh64`,`flats` vs `flats64`, `nsbi` vs `nsbi64`, `libcxx` vs `libcxx64` etc. This helps us pick the right config name w/o checking file contents. Signed-off-by: Yanfeng Liu --- Documentation/components/paging.rst | 2 +- .../risc-v/qemu-rv/boards/rv-virt/index.rst | 18 +++++++++--------- .../rv-virt/configs/{knsh32 => knsh}/defconfig | 0 .../{knsh32_paging => knsh_paging}/defconfig | 0 .../{knsh32_romfs => knsh_romfs}/defconfig | 0 .../configs/{libcxx32 => libcxx}/defconfig | 0 6 files changed, 10 insertions(+), 10 deletions(-) rename boards/risc-v/qemu-rv/rv-virt/configs/{knsh32 => knsh}/defconfig (100%) rename boards/risc-v/qemu-rv/rv-virt/configs/{knsh32_paging => knsh_paging}/defconfig (100%) rename boards/risc-v/qemu-rv/rv-virt/configs/{knsh32_romfs => knsh_romfs}/defconfig (100%) rename boards/risc-v/qemu-rv/rv-virt/configs/{libcxx32 => libcxx}/defconfig (100%) diff --git a/Documentation/components/paging.rst b/Documentation/components/paging.rst index 7adf8b2235..787fa57f16 100644 --- a/Documentation/components/paging.rst +++ b/Documentation/components/paging.rst @@ -65,7 +65,7 @@ allocates a physical page and maps it to the virtual memory space that triggered the page fault exception and then resumes execution from the same point where the page fault first occurred. -:ref:`knsh32_paging` simulates a device with 4MiB physical memory with 8MiB +:ref:`knsh_paging` simulates a device with 4MiB physical memory with 8MiB of virtual heap memory allocated for each process. This is possible by enabling on-demand paging. diff --git a/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst b/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst index 16a1869600..34f137e6fd 100644 --- a/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst +++ b/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst @@ -59,7 +59,7 @@ All of the configurations presented below can be tested by running the following $ ./tools/configure.sh rv-virt: -Where is the name of the configuration you want to use, i.e.: nsh, knsh32, knsh64... +Where is the name of the configuration you want to use, i.e.: nsh, knsh, knsh64... To build it, run the following command:: @@ -146,7 +146,7 @@ To run it with QEMU, use the following command:: knetnsh64 --------- -Similar to the `knsh32`_ configuration, but with networking support and 64-bit RISC-V. +Similar to the `knsh`_ configuration, but with networking support and 64-bit RISC-V. To run it with QEMU, use the following command:: @@ -169,7 +169,7 @@ knetnsh64_smp Similar to the `knetnsh64`_ configuration, but with SMP support for 64-bit RISC-V. -knsh32 +knsh ------ This is similar to the `nsh`_ configuration except that NuttX @@ -192,12 +192,12 @@ In `nsh`, applications can be run from the `/system/bin` directory:: nsh> /system/bin/hello -.. _knsh32_paging: +.. _knsh_paging: -knsh32_paging +knsh_paging ------------- -Similar to ``knsh32_romfs``, but enabling on-demand paging: this +Similar to ``knsh_romfs``, but enabling on-demand paging: this configuration simulates a 4MiB device (using QEMU), but sets the number of heap pages equal to ``CONFIG_ARCH_HEAP_NPAGES=2048``. This means that each process's heap is 8MiB, whereas ``CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE`` is @@ -208,10 +208,10 @@ to have their own address space larger than the available physical memory. This is particularly useful for implementing a set of programming language interpreters. -knsh32_romfs +knsh_romfs ------------ -Similar to the `knsh32`_ configuration, but uses ROMFS instead of `hostfs`. +Similar to the `knsh`_ configuration, but uses ROMFS instead of `hostfs`. A ROMFS image is generated and linked to the kernel. This requires re-running ``make``:: $ make V=1 -j$(nproc) @@ -234,7 +234,7 @@ In `nsh`, applications can be run from the `/system/bin` directory:: knsh64 ------ -Similar to the `knsh32`_ configuration, but for 64-bit RISC-V. +Similar to the `knsh`_ configuration, but for 64-bit RISC-V. Run it with QEMU using the default command for 64-bit RISC-V. diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knsh32/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knsh/defconfig similarity index 100% rename from boards/risc-v/qemu-rv/rv-virt/configs/knsh32/defconfig rename to boards/risc-v/qemu-rv/rv-virt/configs/knsh/defconfig diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knsh32_paging/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knsh_paging/defconfig similarity index 100% rename from boards/risc-v/qemu-rv/rv-virt/configs/knsh32_paging/defconfig rename to boards/risc-v/qemu-rv/rv-virt/configs/knsh_paging/defconfig diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knsh32_romfs/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knsh_romfs/defconfig similarity index 100% rename from boards/risc-v/qemu-rv/rv-virt/configs/knsh32_romfs/defconfig rename to boards/risc-v/qemu-rv/rv-virt/configs/knsh_romfs/defconfig diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/libcxx32/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/libcxx/defconfig similarity index 100% rename from boards/risc-v/qemu-rv/rv-virt/configs/libcxx32/defconfig rename to boards/risc-v/qemu-rv/rv-virt/configs/libcxx/defconfig