You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/05/02 15:55:45 UTC
[incubator-nuttx] branch master updated: Remove the not existent
CONFIG_XXX_CMNVECTOR
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 54d0256 Remove the not existent CONFIG_XXX_CMNVECTOR
54d0256 is described below
commit 54d0256b9a664fc8172a8056a1e19e7da0a29c86
Author: Alan Carvalho de Assis <ac...@gmail.com>
AuthorDate: Sat May 2 12:01:11 2020 -0300
Remove the not existent CONFIG_XXX_CMNVECTOR
---
arch/arm/src/cxd56xx/Make.defs | 4 ----
arch/risc-v/src/nr5m100/chip.h | 12 ------------
boards/arm/cxd56xx/spresense/src/cxd56_ostest.c | 2 +-
3 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/arch/arm/src/cxd56xx/Make.defs b/arch/arm/src/cxd56xx/Make.defs
index 90c1372..18c6715 100644
--- a/arch/arm/src/cxd56xx/Make.defs
+++ b/arch/arm/src/cxd56xx/Make.defs
@@ -82,11 +82,7 @@ endif
ifeq ($(CONFIG_ARCH_FPU),y)
CMN_ASRCS += arm_fpu.S
-ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y)
CMN_CSRCS += arm_copyarmstate.c
-else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
-CMN_CSRCS += arm_copyarmstate.c
-endif
endif
ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y)
diff --git a/arch/risc-v/src/nr5m100/chip.h b/arch/risc-v/src/nr5m100/chip.h
index 57f9b81..79e045f 100644
--- a/arch/risc-v/src/nr5m100/chip.h
+++ b/arch/risc-v/src/nr5m100/chip.h
@@ -39,18 +39,6 @@
#include <nuttx/config.h>
-/* If the common RV32IM vector handling logic is used, then include the
- * required vector definitions as well.
- */
-
-#ifdef CONFIG_RV32IM_CMNVECTOR
-# if defined(CONFIG_NR5_NR5M1XX)
-# include "hardware/nr5m1xx_vectors.h"
-# else
-# error "No vector file for this NanoRisc5 family"
-# endif
-#endif
-
/* Include the chip memory map. */
#include "nr5_memorymap.h"
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c b/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c
index 6f43b7f..d0826e1 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c
@@ -58,7 +58,7 @@
#undef HAVE_FPU
#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_TESTING_OSTEST_FPUSIZE) && \
- defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_ARMV7M_CMNVECTOR)
+ defined(CONFIG_SCHED_WAITPID)
# define HAVE_FPU 1
#endif