You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/03/24 09:54:54 UTC
[incubator-nuttx] branch pr618 updated (272a146 -> 9c052c6)
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a change to branch pr618
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 272a146 Revert "tools/testbuild.sh: suppress lots of stdout log from configure.sh"
new 9f48f63 arch/arm: Fix linker error: undefined reference to `g_intstackalloc'
new 660b969 arm/imx6: compile up_hostfs.c when CONFIG_ARM_SEMIHOSTING_HOSTFS equal true
new 9c052c6 arm/common: Fix nxstyle issue in arch/arm/src/common/up_checkstack.c
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/common/up_checkstack.c | 8 +++++++-
arch/arm/src/common/up_initialize.c | 8 ++++++--
arch/arm/src/imx6/Make.defs | 4 ++++
3 files changed, 17 insertions(+), 3 deletions(-)
[incubator-nuttx] 02/03: arm/imx6: compile up_hostfs.c when
CONFIG_ARM_SEMIHOSTING_HOSTFS equal true
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr618
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 660b9699829ecf9092d482a827065cef8d24766b
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Mar 24 10:30:29 2020 +0800
arm/imx6: compile up_hostfs.c when CONFIG_ARM_SEMIHOSTING_HOSTFS equal true
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/imx6/Make.defs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/src/imx6/Make.defs b/arch/arm/src/imx6/Make.defs
index ae9e98d..ad28670 100644
--- a/arch/arm/src/imx6/Make.defs
+++ b/arch/arm/src/imx6/Make.defs
@@ -75,6 +75,10 @@ CMN_CSRCS += arm_prefetchabort.c arm_releasepending.c arm_reprioritizertr.c
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_syscall.c
CMN_CSRCS += arm_unblocktask.c arm_undefinedinsn.c
+ifeq ($(CONFIG_ARM_SEMIHOSTING_HOSTFS),y)
+CMN_CSRCS += up_hostfs.c
+endif
+
ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
CMN_CSRCS += imx_idle.c
endif
[incubator-nuttx] 03/03: arm/common: Fix nxstyle issue in
arch/arm/src/common/up_checkstack.c
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr618
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9c052c6d9f16b4b53ff80d16b5b53ec8e36cacb9
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Mar 24 11:02:56 2020 +0800
arm/common: Fix nxstyle issue in arch/arm/src/common/up_checkstack.c
and arch/arm/src/common/up_initialize.c
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/common/up_checkstack.c | 2 +-
arch/arm/src/common/up_initialize.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/common/up_checkstack.c b/arch/arm/src/common/up_checkstack.c
index 12ce6f7..55426b5 100644
--- a/arch/arm/src/common/up_checkstack.c
+++ b/arch/arm/src/common/up_checkstack.c
@@ -140,7 +140,7 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size, bool int_stack)
int j;
ptr = (FAR uint32_t *)start;
- for (i = 0; i < size; i += 4*64)
+ for (i = 0; i < size; i += 4 * 64)
{
for (j = 0; j < 64; j++)
{
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 7389b32..35807bc 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -139,8 +139,8 @@ void up_initialize(void)
#endif
#ifdef CONFIG_ARCH_DMA
- /* Initialize the DMA subsystem if the weak function up_dma_initialize has been
- * brought into the build
+ /* Initialize the DMA subsystem if the weak function up_dma_initialize has
+ * been brought into the build
*/
#ifdef CONFIG_HAVE_WEAKFUNCTIONS
[incubator-nuttx] 01/03: arch/arm: Fix linker error: undefined
reference to `g_intstackalloc'
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr618
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9f48f6352c55ba5f0cadc1d1eb84457f6e18720c
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Mar 23 19:43:23 2020 +0800
arch/arm: Fix linker error: undefined reference to `g_intstackalloc'
when CONFIG_ARCH_INTERRUPTSTACK, CONFIG_SMP and CONFIG_STACK_COLORATION are true
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/common/up_checkstack.c | 6 ++++++
arch/arm/src/common/up_initialize.c | 4 ++++
2 files changed, 10 insertions(+)
diff --git a/arch/arm/src/common/up_checkstack.c b/arch/arm/src/common/up_checkstack.c
index fe75ed9..12ce6f7 100644
--- a/arch/arm/src/common/up_checkstack.c
+++ b/arch/arm/src/common/up_checkstack.c
@@ -211,9 +211,15 @@ ssize_t up_check_stack_remain(void)
#if CONFIG_ARCH_INTERRUPTSTACK > 3
size_t up_check_intstack(void)
{
+#ifdef CONFIG_SMP
+ return do_stackcheck(up_intstack_base(),
+ (CONFIG_ARCH_INTERRUPTSTACK & ~3),
+ true);
+#else
return do_stackcheck((uintptr_t)&g_intstackalloc,
(CONFIG_ARCH_INTERRUPTSTACK & ~3),
true);
+#endif
}
size_t up_check_intstack_remain(void)
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 7e802f4..7389b32 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -75,7 +75,11 @@
#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3
static inline void up_color_intstack(void)
{
+#ifdef CONFIG_SMP
+ uint32_t *ptr = (uint32_t *)up_intstack_base();
+#else
uint32_t *ptr = (uint32_t *)&g_intstackalloc;
+#endif
ssize_t size;
for (size = (CONFIG_ARCH_INTERRUPTSTACK & ~3);