You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2022/11/19 17:42:28 UTC
[incubator-nuttx] branch master updated (d088a48da4 -> 63bcca985f)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from d088a48da4 mpfs/knsh: Enable SHM for MPFS kernel mode build
new 4abd626288 arch/armv7-r: Remove the nonexistent SCTLR_IE
new 4d56ef5d8c arch/armv7-a: Support the big endian in arm_pghead.S like arm_head.S
new 63bcca985f arch/armv7-r: Don't clear SCTLR_U bit since spec require it's always one
The 3 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:
arch/arm/src/armv7-a/arm_pghead.S | 9 +++++++++
arch/arm/src/armv7-r/arm_head.S | 9 ++++-----
arch/arm/src/armv7-r/sctlr.h | 1 -
3 files changed, 13 insertions(+), 6 deletions(-)
[incubator-nuttx] 01/03: arch/armv7-r: Remove the nonexistent SCTLR_IE
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4abd6262883c632deca2a5059a3fd565cdeb4211
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Nov 19 04:14:45 2022 +0800
arch/armv7-r: Remove the nonexistent SCTLR_IE
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/armv7-r/arm_head.S | 3 +--
arch/arm/src/armv7-r/sctlr.h | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/src/armv7-r/arm_head.S b/arch/arm/src/armv7-r/arm_head.S
index 8d163a0ed0..d367533e46 100644
--- a/arch/arm/src/armv7-r/arm_head.S
+++ b/arch/arm/src/armv7-r/arm_head.S
@@ -191,7 +191,6 @@ __start:
* SCTLR_EE Bit 25: 0=Little endian.
* SCTLR_NMFI Bit 27: Non-maskable FIQ (NMFI) support
* SCTLR_TE Bit 30: All exceptions handled in ARM state.
- * SCTLR_IE Bit 31: Instruction endian-ness.
*/
/* Clear all configurable bits */
@@ -199,7 +198,7 @@ __start:
bic r0, r0, #(SCTLR_M | SCTLR_A | SCTLR_C | SCTLR_CCP15BEN | SCTLR_B)
bic r0, r0, #(SCTLR_SW | SCTLR_I | SCTLR_V | SCTLR_RR)
bic r0, r0, #(SCTLR_BR | SCTLR_DZ | SCTLR_FI | SCTLR_U)
- bic r0, r0, #(SCTLR_VE | SCTLR_EE | SCTLR_NMFI | SCTLR_TE | SCTLR_IE)
+ bic r0, r0, #(SCTLR_VE | SCTLR_EE | SCTLR_NMFI | SCTLR_TE)
/* Set configured bits */
diff --git a/arch/arm/src/armv7-r/sctlr.h b/arch/arm/src/armv7-r/sctlr.h
index 78c589e03c..532cc3617c 100644
--- a/arch/arm/src/armv7-r/sctlr.h
+++ b/arch/arm/src/armv7-r/sctlr.h
@@ -159,7 +159,6 @@
#define SCTLR_NMFI (1 << 27) /* Bit 27: Non-maskable FIQ (NMFI) support */
/* Bits 28-29: Reserved */
#define SCTLR_TE (1 << 30) /* Bit 30: Thumb exception enable */
-#define SCTLR_IE (1 << 31) /* Bit 31: Instruction endian-ness */
/* Auxiliary Control Register (ACTLR): CRn=c1, opc1=0, CRm=c0, opc2=1
* Implementation defined
[incubator-nuttx] 03/03: arch/armv7-r: Don't clear SCTLR_U bit since spec require it's always one
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 63bcca985fe53080fdae624141433df243fdb4e8
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Nov 19 06:26:17 2022 +0800
arch/armv7-r: Don't clear SCTLR_U bit since spec require it's always one
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/armv7-r/arm_head.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/armv7-r/arm_head.S b/arch/arm/src/armv7-r/arm_head.S
index d367533e46..5fd19f5dc4 100644
--- a/arch/arm/src/armv7-r/arm_head.S
+++ b/arch/arm/src/armv7-r/arm_head.S
@@ -195,9 +195,9 @@ __start:
/* Clear all configurable bits */
- bic r0, r0, #(SCTLR_M | SCTLR_A | SCTLR_C | SCTLR_CCP15BEN | SCTLR_B)
- bic r0, r0, #(SCTLR_SW | SCTLR_I | SCTLR_V | SCTLR_RR)
- bic r0, r0, #(SCTLR_BR | SCTLR_DZ | SCTLR_FI | SCTLR_U)
+ bic r0, r0, #(SCTLR_M | SCTLR_A | SCTLR_C | SCTLR_CCP15BEN | SCTLR_B)
+ bic r0, r0, #(SCTLR_SW | SCTLR_I | SCTLR_V | SCTLR_RR)
+ bic r0, r0, #(SCTLR_BR | SCTLR_DZ | SCTLR_FI)
bic r0, r0, #(SCTLR_VE | SCTLR_EE | SCTLR_NMFI | SCTLR_TE)
/* Set configured bits */
[incubator-nuttx] 02/03: arch/armv7-a: Support the big endian in arm_pghead.S like arm_head.S
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4d56ef5d8c68650ebdc9a14181ca27d6e6419471
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Nov 19 06:19:42 2022 +0800
arch/armv7-a: Support the big endian in arm_pghead.S like arm_head.S
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/armv7-a/arm_pghead.S | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/src/armv7-a/arm_pghead.S b/arch/arm/src/armv7-a/arm_pghead.S
index 5c82b3f0f3..a76f53a4c1 100644
--- a/arch/arm/src/armv7-a/arm_pghead.S
+++ b/arch/arm/src/armv7-a/arm_pghead.S
@@ -453,6 +453,15 @@ __start:
orr r0, r0, #(SCTLR_A)
#endif
+#ifdef CONFIG_ENDIAN_BIG
+ /* Big endian mode
+ *
+ * SCTLR_EE Bit 25: 1=Big endian.
+ */
+
+ orr r0, r0, #(SCTLR_EE)
+#endif
+
#ifdef CPU_AFE_ENABLE
/* AP[0:2] Permissions model
*