From b7ccf4587003ffb4bf7560f83defa4b0f1f9b27d Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Mon, 5 Sep 2022 10:35:13 +0000 Subject: [PATCH] Raised to 16kB RAM per-VM. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15760 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- .../STM32G474xE_SB.ld | 6 +- ...ild-ch.elf)(OpenOCD, Flash and Run).launch | 96 +++++++++---------- ...ild-ch.elf)(OpenOCD, Flash and Run).launch | 96 +++++++++---------- .../main.c | 4 +- .../Makefile | 8 +- .../sandbox.ld | 2 +- .../sandbox.ld | 2 +- 7 files changed, 107 insertions(+), 107 deletions(-) diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/STM32G474xE_SB.ld b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/STM32G474xE_SB.ld index 32330977b..3191b9a1b 100644 --- a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/STM32G474xE_SB.ld +++ b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/STM32G474xE_SB.ld @@ -19,9 +19,9 @@ */ MEMORY { - flash0 (rx) : org = 0x08000000, len = 512k - 64k /* Host code. */ - flash1 (rx) : org = 0x08070000, len = 32k /* Sandbox 1 code. */ - flash2 (rx) : org = 0x08078000, len = 32k /* Sandbox 2 code. */ + flash0 (rx) : org = 0x08000000, len = 512k - 256k /* Host code. */ + flash1 (rx) : org = 0x08040000, len = 128k /* Sandbox 1 code. */ + flash2 (rx) : org = 0x08060000, len = 128k /* Sandbox 2 code. */ flash3 (rx) : org = 0x00000000, len = 0 flash4 (rx) : org = 0x00000000, len = 0 flash5 (rx) : org = 0x00000000, len = 0 diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/debug/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC (SB1)(build-ch.elf)(OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/debug/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC (SB1)(build-ch.elf)(OpenOCD, Flash and Run).launch index 0bd5c943b..90fc938c5 100644 --- a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/debug/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC (SB1)(build-ch.elf)(OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/debug/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC (SB1)(build-ch.elf)(OpenOCD, Flash and Run).launch @@ -1,48 +1,48 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/debug/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC (build-ch.elf)(OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/debug/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC (build-ch.elf)(OpenOCD, Flash and Run).launch index b5a9f6ab9..2c7a0b3cd 100644 --- a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/debug/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC (build-ch.elf)(OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/debug/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC (build-ch.elf)(OpenOCD, Flash and Run).launch @@ -1,48 +1,48 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c index 69fdfd67f..cf1ed27bc 100644 --- a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c +++ b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c @@ -267,10 +267,10 @@ int main(void) { * isolation among them. */ mpuConfigureRegion(MPU_REGION_0, - 0x08070000U, + 0x08040000U, MPU_RASR_ATTR_AP_RO_RO | MPU_RASR_ATTR_CACHEABLE_WT_NWA | - MPU_RASR_SIZE_64K | + MPU_RASR_SIZE_256K | MPU_RASR_ENABLE); mpuConfigureRegion(MPU_REGION_1, 0x20018000U, diff --git a/demos/various/SB-CLIENT-32k-08070000-16k-20018000/Makefile b/demos/various/SB-CLIENT-32k-08070000-16k-20018000/Makefile index fbee07d22..7c44980aa 100644 --- a/demos/various/SB-CLIENT-32k-08070000-16k-20018000/Makefile +++ b/demos/various/SB-CLIENT-32k-08070000-16k-20018000/Makefile @@ -113,9 +113,9 @@ include $(CHIBIOS)/os/sb/user/sbuser.mk # Auto-build files in ./source recursively. include $(CHIBIOS)/tools/mk/autobuild.mk # Other files (optional). -#include $(CHIBIOS)/os/test/test.mk -#include $(CHIBIOS)/test/rt/rt_test.mk -#include $(CHIBIOS)/test/oslib/oslib_test.mk +include $(CHIBIOS)/os/test/test.mk +include $(CHIBIOS)/test/rt/rt_test.mk +include $(CHIBIOS)/test/oslib/oslib_test.mk include $(CHIBIOS)/os/hal/lib/streams/streams.mk include $(CHIBIOS)/os/various/shell/shell.mk @@ -156,7 +156,7 @@ CPPWARN = -Wall -Wextra -Wundef # # List all user C define here, like -D_DEBUG=1 -UDEFS = -DSHELL_CMD_TEST_ENABLED=0 +UDEFS = # Define ASM defines here UADEFS = diff --git a/demos/various/SB-CLIENT-32k-08070000-16k-20018000/sandbox.ld b/demos/various/SB-CLIENT-32k-08070000-16k-20018000/sandbox.ld index 3f968ad7a..5f977a5ed 100644 --- a/demos/various/SB-CLIENT-32k-08070000-16k-20018000/sandbox.ld +++ b/demos/various/SB-CLIENT-32k-08070000-16k-20018000/sandbox.ld @@ -19,7 +19,7 @@ */ MEMORY { - flash0 (rx) : org = 0x08070000, len = 32k + flash0 (rx) : org = 0x08040000, len = 128k ram0 (wx) : org = 0x20018000, len = 16k } diff --git a/demos/various/SB-CLIENT-32k-08078000-16k-2001C000/sandbox.ld b/demos/various/SB-CLIENT-32k-08078000-16k-2001C000/sandbox.ld index 27c893a6e..bfa56d9ea 100644 --- a/demos/various/SB-CLIENT-32k-08078000-16k-2001C000/sandbox.ld +++ b/demos/various/SB-CLIENT-32k-08078000-16k-2001C000/sandbox.ld @@ -19,7 +19,7 @@ */ MEMORY { - flash0 (rx) : org = 0x08078000, len = 32k + flash0 (rx) : org = 0x08060000, len = 128k ram0 (wx) : org = 0x2001C000, len = 16k }