You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/11/18 14:45:31 UTC
[incubator-nuttx] branch master updated (ce95db46b9 -> d088a48da4)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from ce95db46b9 include/nuttx/tls.h: add CXX extern define for tls
new 603992fc5f mpfs/ld-kernel: Increase size of kflash and ksram to 2MB
new d088a48da4 mpfs/knsh: Enable SHM for MPFS kernel mode build
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
boards/risc-v/mpfs/icicle/configs/knsh/defconfig | 12 ++++++++----
boards/risc-v/mpfs/icicle/scripts/ld-kernel.script | 6 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
[incubator-nuttx] 01/02: mpfs/ld-kernel: Increase size of kflash and ksram to 2MB
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 603992fc5f2bc20115fc750897862a848d303fcf
Author: Ville Juven <vi...@unikie.com>
AuthorDate: Fri Nov 18 13:42:47 2022 +0200
mpfs/ld-kernel: Increase size of kflash and ksram to 2MB
---
boards/risc-v/mpfs/icicle/configs/knsh/defconfig | 8 ++++----
boards/risc-v/mpfs/icicle/scripts/ld-kernel.script | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
index c50bee97af..e6e909be93 100644
--- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
@@ -23,9 +23,9 @@ CONFIG_ARCH_HEAP_VBASE=0x00000000
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_KERNEL_STACKSIZE=2048
CONFIG_ARCH_PGPOOL_MAPPING=y
-CONFIG_ARCH_PGPOOL_PBASE=0x80200000
+CONFIG_ARCH_PGPOOL_PBASE=0x80400000
CONFIG_ARCH_PGPOOL_SIZE=4194304
-CONFIG_ARCH_PGPOOL_VBASE=0x80200000
+CONFIG_ARCH_PGPOOL_VBASE=0x80400000
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_TEXT_NPAGES=0
@@ -78,8 +78,8 @@ CONFIG_NSH_FILE_APPS=y
CONFIG_NSH_LINELEN=160
CONFIG_NSH_STRERROR=y
CONFIG_PREALLOC_TIMERS=4
-CONFIG_RAM_SIZE=1048576
-CONFIG_RAM_START=0x80100000
+CONFIG_RAM_SIZE=2097152
+CONFIG_RAM_START=0x80200000
CONFIG_RAW_BINARY=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
diff --git a/boards/risc-v/mpfs/icicle/scripts/ld-kernel.script b/boards/risc-v/mpfs/icicle/scripts/ld-kernel.script
index ee026a31eb..6a5e718e93 100644
--- a/boards/risc-v/mpfs/icicle/scripts/ld-kernel.script
+++ b/boards/risc-v/mpfs/icicle/scripts/ld-kernel.script
@@ -25,9 +25,9 @@
MEMORY
{
- kflash (rx) : ORIGIN = 0x80000000, LENGTH = 1024K /* w/ cache */
- ksram (rwx) : ORIGIN = 0x80100000, LENGTH = 1024K /* w/ cache */
- pgram (rwx) : ORIGIN = 0x80200000, LENGTH = 4096K /* w/ cache */
+ kflash (rx) : ORIGIN = 0x80000000, LENGTH = 2048K /* w/ cache */
+ ksram (rwx) : ORIGIN = 0x80200000, LENGTH = 2048K /* w/ cache */
+ pgram (rwx) : ORIGIN = 0x80400000, LENGTH = 4096K /* w/ cache */
}
OUTPUT_ARCH("riscv")
[incubator-nuttx] 02/02: mpfs/knsh: Enable SHM for MPFS kernel mode build
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d088a48da45f106a95827385f5fad92d9d7220e3
Author: Ville Juven <vi...@unikie.com>
AuthorDate: Fri Nov 18 13:43:20 2022 +0200
mpfs/knsh: Enable SHM for MPFS kernel mode build
---
boards/risc-v/mpfs/icicle/configs/knsh/defconfig | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
index e6e909be93..0993cf09c3 100644
--- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
@@ -27,6 +27,8 @@ CONFIG_ARCH_PGPOOL_PBASE=0x80400000
CONFIG_ARCH_PGPOOL_SIZE=4194304
CONFIG_ARCH_PGPOOL_VBASE=0x80400000
CONFIG_ARCH_RISCV=y
+CONFIG_ARCH_SHM_NPAGES=4096
+CONFIG_ARCH_SHM_VBASE=0xFF000000
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_TEXT_NPAGES=0
CONFIG_ARCH_TEXT_VBASE=0x00000000
@@ -49,6 +51,7 @@ CONFIG_ELF_STACKSIZE=4096
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
+CONFIG_FS_PROCFS_EXCLUDE_ENVIRON=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_IDLETHREAD_STACKSIZE=2048
@@ -65,6 +68,7 @@ CONFIG_LIBM=y
CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y
CONFIG_MM_PGALLOC=y
+CONFIG_MM_SHM=y
CONFIG_MPFS_ENABLE_DPFPU=y
CONFIG_MPFS_ROMFS_MOUNT=y
CONFIG_MPFS_UART1=y