From 949e63568ed738c4973ee2d5b91eca852366042d Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Mon, 11 Oct 2021 16:54:24 +0000
Subject: [PATCH] Fixed working are for SB2.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14898 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 ...T_STATIC (SB1)(build-ch.elf)(OpenOCD, Flash and Run).launch | 2 +-
 ...B_HOST_STATIC (build-ch.elf)(OpenOCD, Flash and Run).launch | 2 +-
 demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c      | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

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 839205d65..9811a61ce 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	
@@ -6,7 +6,7 @@
     <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="true"/>
     <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>
     <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>
-    <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value="set remotetimeout 20&#10;monitor reset init&#10;monitor sleep 50&#10;monitor erase_address pad 0x08070000 0x00010000&#10;load /home/giovanni/Projects/ChibiStudio/chibios_trunk/demos/various/SB-CLIENT-32k-08070000-4k-2001E000/build/sb.elf&#10;"/>
+    <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value="set remotetimeout 20&#10;monitor reset init&#10;monitor sleep 50&#10;monitor erase_address pad 0x08070000 0x00010000&#10;load /home/giovanni/Projects/ChibiStudio/chibios_trunk/demos/various/SB-CLIENT-32k-08070000-4k-2001E000/build/sb.elf&#10;load /home/giovanni/Projects/ChibiStudio/chibios_trunk/demos/various/SB-CLIENT-32k-08078000-4k-2001F000/build/sb.elf&#10;"/>
     <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDeviceId" value="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.OpenOCDSocket"/>
     <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
     <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
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 67756c4a6..5d5f87b5f 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	
@@ -6,7 +6,7 @@
     <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="true"/>
     <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>
     <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>
-    <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value="set remotetimeout 20&#10;monitor reset init&#10;monitor sleep 50&#10;monitor erase_address pad 0x08070000 0x00010000&#10;load /home/giovanni/Projects/ChibiStudio/chibios_trunk/demos/various/SB-CLIENT-32k-08070000-4k-2001E000/build/sb.elf&#10;"/>
+    <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value="set remotetimeout 20&#10;monitor reset init&#10;monitor sleep 50&#10;monitor erase_address pad 0x08070000 0x00010000&#10;load /home/giovanni/Projects/ChibiStudio/chibios_trunk/demos/various/SB-CLIENT-32k-08070000-4k-2001E000/build/sb.elf&#10;load /home/giovanni/Projects/ChibiStudio/chibios_trunk/demos/various/SB-CLIENT-32k-08078000-4k-2001F000/build/sb.elf&#10;"/>
     <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDeviceId" value="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.OpenOCDSocket"/>
     <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
     <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
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 11f9c70b9..66de13a92 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c
@@ -57,6 +57,7 @@ static const sb_config_t sb_config2 = {
 sb_class_t sbx1, sbx2;
 
 static THD_WORKING_AREA(waUnprivileged1, 256);
+static THD_WORKING_AREA(waUnprivileged2, 256);
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -134,7 +135,7 @@ int main(void) {
 
   /* Starting sandboxed thread 2.*/
   utp1 = sbStartThread(&sbx2, &sb_config2, "sbx2",
-                       waUnprivileged1, sizeof (waUnprivileged1),
+                       waUnprivileged2, sizeof (waUnprivileged2),
                        NORMALPRIO - 1);
   if (utp1 == NULL) {
     chSysHalt("sbx2 failed");