backup code, flashxip mode wip

Signed-off-by: Huaqi Fang <[email protected]>
Nuclei-Software · Jun 3, 2024 · 5be3694 · 5be3694
1 parent a30498d
commit 5be3694
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 25 deletions.
diff --git a/OS/FreeRTOS/Source/portable/IAR/portasm.S b/OS/FreeRTOS/Source/portable/IAR/portasm.S
@@ -37,7 +37,7 @@
 #define portCONTEXT_SIZE    ( portRegNum * REGBYTES )
 
 
-    PUBLIC prvPortStartFirstTask, eclic_msip_handler
+    PUBLIC prvPortStartFirstTask, irqc_msip_handler
     EXTERN xPortTaskSwitch
     EXTERN pxCurrentTCB
     EXTERN CSTACK$$Limit
@@ -55,8 +55,6 @@ prvPortStartFirstTask:
        before the scheduler is started is
        no longer required after the scheduler is started.
        Interrupt stack pointer is stored in CSR_MSCRATCH */
-    la t0, CSTACK$$Limit
-    csrw CSR_MSCRATCH, t0
     LOAD sp, pxCurrentTCB           /* Load pxCurrentTCB. */
     LOAD sp, 0x0(sp)                /* Read sp from first TCB member */
 
@@ -198,8 +196,4 @@ irqc_msip_handler:
     addi sp, sp, portCONTEXT_SIZE
     mret
 
-default_intexc_handler:
-Undef_Handler:
-    j Undef_Handler
-
     END
diff --git a/OS/RTThread/libcpu/risc-v/nuclei/iar/context_iar.S b/OS/RTThread/libcpu/risc-v/nuclei/iar/context_iar.S
@@ -5,7 +5,7 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2023/09/15     Huaqi        First Nuclei RISC-V porting implementation For IAR CC
+ * 2024/06/03     Huaqi        First Nuclei N100 RISC-V porting implementation For IAR CC
  */
 
 #include "riscv_encoding.h"
@@ -22,7 +22,7 @@
     EXTERN rt_interrupt_to_thread
     EXTERN CSTACK$$Limit
     EXTERN xPortTaskSwitch
-    PUBLIC rt_hw_context_switch_to, eclic_msip_handler
+    PUBLIC rt_hw_context_switch_to, irqc_msip_handler
 
     SECTION `.text`:CODE:NOROOT(2)
     CODE
@@ -43,8 +43,6 @@ rt_hw_context_switch_to:
        before the scheduler is started is
        no longer required after the scheduler is started.
        Interrupt stack pointer is stored in CSR_MSCRATCH */
-    la t0, CSTACK$$Limit
-    csrw CSR_MSCRATCH, t0
     LOAD sp, 0x0(a0)                /* Read sp from first TCB member(a0) */
 
     /* Pop PC from stack and set MEPC */
@@ -91,7 +89,7 @@ rt_hw_context_switch_to:
     mret
 
     ALIGN 2
-eclic_msip_handler:
+irqc_msip_handler:
     addi sp, sp, -portCONTEXT_SIZE
     STORE x1,  1  * REGBYTES(sp)    /* RA */
     STORE x5,  2  * REGBYTES(sp)

diff --git a/OS/UCOSII/arch/os_cpu_port.c b/OS/UCOSII/arch/os_cpu_port.c
@@ -54,7 +54,6 @@ void vPortSetupTimerInterrupt(void);
  */
 #define xPortSysTickHandler     irqc_mtip_handler
 
-void xPortSysTickHandler(void);
 
 /*
  * Start first task is a separate function so it can be tested in isolation.

diff --git a/ideprojects/iar/baremetal/helloworld.ewp b/ideprojects/iar/baremetal/helloworld.ewp
@@ -125,7 +125,7 @@
                 </option>
                 <option>
                     <name>GDeviceSelectSlave</name>
-                    <state>N300	Nuclei N300</state>
+                    <state>N200	Nuclei N200</state>
                 </option>
                 <option>
                     <name>GGeneralAutoVectorSetup</name>
@@ -258,11 +258,11 @@
                 </option>
                 <option>
                     <name>GDeviceCryptoNistSlave</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>GDeviceCryptoShangMiSlave</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>GGeneralMisalignedDataAccess</name>
@@ -755,7 +755,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$\..\..\..\SoC\evalsoc\Board\nuclei_fpga_eval\Source\IAR\iar_evalsoc_ilm.icf</state>
+                    <state>$PROJ_DIR$\..\..\..\SoC\evalsoc\Board\nuclei_fpga_eval\Source\IAR\iar_evalsoc_flashxip.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>

diff --git a/ideprojects/iar/rtos/rtthread_demo.ewp b/ideprojects/iar/rtos/rtthread_demo.ewp
@@ -258,11 +258,11 @@
                 </option>
                 <option>
                     <name>GDeviceCryptoNistSlave</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>GDeviceCryptoShangMiSlave</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>GGeneralMisalignedDataAccess</name>
@@ -2213,9 +2213,6 @@
                                 <file>
                                     <name>$PROJ_DIR$\..\..\..\OS\RTThread\libcpu\risc-v\nuclei\iar\context_iar.S</name>
                                 </file>
-                                <file>
-                                    <name>$PROJ_DIR$\..\..\..\OS\RTThread\libcpu\risc-v\nuclei\iar\interrupt_iar.S</name>
-                                </file>
                             </group>
                             <file>
                                 <name>$PROJ_DIR$\..\..\..\OS\RTThread\libcpu\risc-v\nuclei\cpuport.c</name>

diff --git a/ideprojects/iar/rtos/rtthread_msh.ewp b/ideprojects/iar/rtos/rtthread_msh.ewp
@@ -2241,9 +2241,6 @@
                                 <file>
                                     <name>$PROJ_DIR$\..\..\..\OS\RTThread\libcpu\risc-v\nuclei\iar\context_iar.S</name>
                                 </file>
-                                <file>
-                                    <name>$PROJ_DIR$\..\..\..\OS\RTThread\libcpu\risc-v\nuclei\iar\interrupt_iar.S</name>
-                                </file>
                             </group>
                             <file>
                                 <name>$PROJ_DIR$\..\..\..\OS\RTThread\libcpu\risc-v\nuclei\cpuport.c</name>
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,6 @@ void vPortSetupTimerInterrupt(void); @@
      */
     #define xPortSysTickHandler     irqc_mtip_handler
-    void xPortSysTickHandler(void);
     /*
      * Start first task is a separate function so it can be tested in isolation.
@@ Expand Down @@