Renamed ports/ARMCMAx-TZ as ports/ARMCAx-TZ

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10342 35acf78f-673a-0410-8e92-d51de3d6d3f4

7 files changed, 13 insertions, 13 deletions

diff --git a/os/common/ports/ARMCMAx-TZ/chcore.c b/os/common/ports/ARMCAx-TZ/chcore.c
index fc283864a..fc283864a 100755..100644
--- a/os/common/ports/ARMCMAx-TZ/chcore.c
+++ b/os/common/ports/ARMCAx-TZ/chcore.c
diff --git a/os/common/ports/ARMCMAx-TZ/chcore.h b/os/common/ports/ARMCAx-TZ/chcore.h
index 7be2cdaca..7be2cdaca 100755..100644
--- a/os/common/ports/ARMCMAx-TZ/chcore.h
+++ b/os/common/ports/ARMCAx-TZ/chcore.h
diff --git a/os/common/ports/ARMCMAx-TZ/chcore_timer.h b/os/common/ports/ARMCAx-TZ/chcore_timer.h
index c27b0b3c8..c27b0b3c8 100755..100644
--- a/os/common/ports/ARMCMAx-TZ/chcore_timer.h
+++ b/os/common/ports/ARMCAx-TZ/chcore_timer.h
diff --git a/os/common/ports/ARMCMAx-TZ/compilers/GCC/chcoreasm.S b/os/common/ports/ARMCAx-TZ/compilers/GCC/chcoreasm.S
index 7a6e679a8..90438ea6d 100644
--- a/os/common/ports/ARMCMAx-TZ/compilers/GCC/chcoreasm.S
+++ b/os/common/ports/ARMCAx-TZ/compilers/GCC/chcoreasm.S
@@ -64,8 +64,8 @@
                 .equ    SCR_FW,     0x10

                 .equ    SCR_AW,     0x20

 

-                .set    MON_S_SCR,  SCR_IRQ

-                .set    MON_NS_SCR, SCR_FIQ|SCR_NS

+                .equ    MON_S_SCR,  SCR_IRQ

+                .equ    MON_NS_SCR, SCR_FIQ|SCR_NS

 

                 .text

 

@@ -161,7 +161,7 @@ Mon_Irq_Handler:
                 ldmfd   sp!, {r0-r3, r12, lr}

                 msr     CPSR_c, #MODE_MON | I_BIT | F_BIT

                 stmfd   sp!, {lr}               // save lr into monitor stack

-                ldr     lr, =#MON_NS_SCR        // set non-secure SCR before return

+                ldr     lr, =MON_NS_SCR        // set non-secure SCR before return

                 mrc     p15, 0, lr, c1, c1, 0

                 ldmfd   sp!, {lr}

                 subs    pc, lr, #4              // return into non-secure world

@@ -173,7 +173,7 @@ Mon_Fiq_Handler:
                 // here the fiq is taken from non-secure state

                 // current mode is monitor (so current state is secure)

                 stmfd   sp!, {lr}               // save lr into monitor stack

-                ldr     lr, =#MON_S_SCR         // set secure SCR before to switch to FIQ mode

+                ldr     lr, =MON_S_SCR         // set secure SCR before to switch to FIQ mode

                 mrc     p15, 0, lr, c1, c1, 0

                 cpsid   if, #MODE_FIQ           // secure FIQ mode

                 stmfd   sp!, {r0-r3, r12}       // IRQ frame, save scratch registers

@@ -185,7 +185,7 @@ _mon_fiq_ret_arm:
                 cmp     r0, #0

                 ldmfd   sp!, {r0-r3, r12}

                 cpsid   if, #MODE_MON

-                ldr     lr, =#MON_NS_SCR        // set non-secure SCR before return

+                ldr     lr, =MON_NS_SCR        // set non-secure SCR before return

                 mrceq   p15, 0, lr, c1, c1, 0   // only if it will return

                 ldmfd   sp!, {lr}

                 subeqs  pc, lr, #4              // No reschedule, returns.

@@ -218,7 +218,7 @@ _mon_fiq_ret_arm:
                 ldmfd   sp!, {r0-r3, r12, lr}

                 msr     CPSR_c, #MODE_MON | I_BIT | F_BIT

                 stmfd   sp!, {lr}               // save lr into monitor stack

-                ldr     lr, =#MON_NS_SCR        // set non-secure SCR before return

+                ldr     lr, =MON_NS_SCR        // set non-secure SCR before return

                 mrc     p15, 0, lr, c1, c1, 0

                 ldmfd   sp!, {lr}

                 subs    pc, lr, #4              // return into non-secure world

diff --git a/os/common/ports/ARMCMAx-TZ/compilers/GCC/chtypes.h b/os/common/ports/ARMCAx-TZ/compilers/GCC/chtypes.h
index 1bd3b07c5..1bd3b07c5 100755..100644
--- a/os/common/ports/ARMCMAx-TZ/compilers/GCC/chtypes.h
+++ b/os/common/ports/ARMCAx-TZ/compilers/GCC/chtypes.h
diff --git a/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk b/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk
new file mode 100644
index 000000000..7b156c938
--- /dev/null
+++ b/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk
@@ -0,0 +1,7 @@
+# List of the ChibiOS/RT ARMCAx-TZ generic port files.

+PORTSRC = ${CHIBIOS}/os/common/ports/ARMCAx-TZ/chcore.c

+

+PORTASM = $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/chcoreasm.S

+

+PORTINC = ${CHIBIOS}/os/common/ports/ARMCAx-TZ \

+          ${CHIBIOS}/os/common/ports/ARMCAx-TZ/compilers/GCC

diff --git a/os/common/ports/ARMCMAx-TZ/compilers/GCC/mk/port_generic.mk b/os/common/ports/ARMCMAx-TZ/compilers/GCC/mk/port_generic.mk
deleted file mode 100755
index 08f02f6d7..000000000
--- a/os/common/ports/ARMCMAx-TZ/compilers/GCC/mk/port_generic.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# List of the ChibiOS/RT ARMCMAx-TZ generic port files.

-PORTSRC = ${CHIBIOS}/os/common/ports/ARMCMAx-TZ/chcore.c

-

-PORTASM = $(CHIBIOS)/os/common/ports/ARMCMAx-TZ/compilers/GCC/chcoreasm.S

-

-PORTINC = ${CHIBIOS}/os/common/ports/ARMCMAx-TZ \

-          ${CHIBIOS}/os/common/ports/ARMCMAx-TZ/compilers/GCC