Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-06 16:49:51 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix fallout from removing the spurious CMSIS

Browse Source
This commit is contained in:
px4dev
2013-01-06 19:20:22 -08:00
parent 6b341e583a
commit 91dba46524
5 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/mathlib/CMSIS/Include/core_cm3.h
+2 -2
View File
@@ -118,8 +118,8 @@
#endif
#include <stdint.h> /* standard types definitions */
#include <core_cmInstr.h> /* Core Instruction Access */
#include <core_cmFunc.h> /* Core Function Access */
#include "core_cmInstr.h" /* Core Instruction Access */
#include "core_cmFunc.h" /* Core Function Access */
#endif /* __CORE_CM3_H_GENERIC */
apps/mathlib/CMSIS/Include/core_cm4.h
+3 -3
View File
@@ -151,9 +151,9 @@
#endif
#include <stdint.h> /* standard types definitions */
#include <core_cmInstr.h> /* Core Instruction Access */
#include <core_cmFunc.h> /* Core Function Access */
#include <core_cm4_simd.h> /* Compiler specific SIMD Intrinsics */
#include "core_cmInstr.h" /* Core Instruction Access */
#include "core_cmFunc.h" /* Core Function Access */
#include "core_cm4_simd.h" /* Compiler specific SIMD Intrinsics */
#endif /* __CORE_CM4_H_GENERIC */
apps/mathlib/math/arm/Matrix.hpp
+1 -1
View File
@@ -51,7 +51,7 @@
#include "../Matrix.hpp"
// arm specific
#include "arm_math.h"
#include "../../CMSIS/Include/arm_math.h"
namespace math
{
apps/mathlib/math/arm/Vector.hpp
+1 -1
View File
@@ -50,7 +50,7 @@
#include "../test/test.hpp"
// arm specific
#include "arm_math.h"
#include "../../CMSIS/Include/arm_math.h"
namespace math
{
nuttx/configs/px4fmu/common/Make.defs
-5
View File
@@ -67,11 +67,6 @@ ARCHCPUFLAGS = -mcpu=cortex-m4 \
INSTRUMENTATIONDEFINES = -finstrument-functions \
-ffixed-r10
#CMSIS
CMSIS_INCLUDE = $(TOPDIR)/../CMSIS/Include
CMSIS_LIB = $(TOPDIR)/../CMSIS/Lib/GCC/libarm_cortexM4lf_math.a
EXTRA_LIBS += $(CMSIS_LIB)
# pull in *just* libm from the toolchain ... this is grody
LIBM = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}"
EXTRA_LIBS += $(LIBM)