You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2022/02/25 00:22:17 UTC
[incubator-nuttx] branch master updated: arch/arm: Remove the empty spinlock.h file
This is an automated email from the ASF dual-hosted git repository.
masayuki 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 25213c4 arch/arm: Remove the empty spinlock.h file
25213c4 is described below
commit 25213c42a59ea738b0bcb1e607dd8c11576a7c6a
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Feb 25 02:20:30 2022 +0800
arch/arm: Remove the empty spinlock.h file
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/include/arm/spinlock.h | 24 ------------------------
arch/arm/include/armv6-m/spinlock.h | 24 ------------------------
arch/arm/include/armv7-a/spinlock.h | 24 ------------------------
arch/arm/include/armv7-m/spinlock.h | 24 ------------------------
arch/arm/include/armv7-r/spinlock.h | 24 ------------------------
arch/arm/include/armv8-m/spinlock.h | 24 ------------------------
arch/arm/include/spinlock.h | 18 ------------------
7 files changed, 162 deletions(-)
diff --git a/arch/arm/include/arm/spinlock.h b/arch/arm/include/arm/spinlock.h
deleted file mode 100644
index 66ae2b7..0000000
--- a/arch/arm/include/arm/spinlock.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * arch/arm/include/arm/spinlock.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_INCLUDE_ARM_SPINLOCK_H
-#define __ARCH_ARM_INCLUDE_ARM_SPINLOCK_H
-
-#endif /* __ARCH_ARM_INCLUDE_ARM_SPINLOCK_H */
diff --git a/arch/arm/include/armv6-m/spinlock.h b/arch/arm/include/armv6-m/spinlock.h
deleted file mode 100644
index b6769fa..0000000
--- a/arch/arm/include/armv6-m/spinlock.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * arch/arm/include/armv6-m/spinlock.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_INCLUDE_ARMV6_M_SPINLOCK_H
-#define __ARCH_ARM_INCLUDE_ARMV6_M_SPINLOCK_H
-
-#endif /* __ARCH_ARM_INCLUDE_ARMV6_M_SPINLOCK_H */
diff --git a/arch/arm/include/armv7-a/spinlock.h b/arch/arm/include/armv7-a/spinlock.h
deleted file mode 100644
index d306029..0000000
--- a/arch/arm/include/armv7-a/spinlock.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * arch/arm/include/armv7-a/spinlock.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H
-#define __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H
-
-#endif /* __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H */
diff --git a/arch/arm/include/armv7-m/spinlock.h b/arch/arm/include/armv7-m/spinlock.h
deleted file mode 100644
index a390fd8..0000000
--- a/arch/arm/include/armv7-m/spinlock.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * arch/arm/include/armv7-m/spinlock.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_INCLUDE_ARMV7_M_SPINLOCK_H
-#define __ARCH_ARM_INCLUDE_ARMV7_M_SPINLOCK_H
-
-#endif /* __ARCH_ARM_INCLUDE_ARMV7_M_SPINLOCK_H */
diff --git a/arch/arm/include/armv7-r/spinlock.h b/arch/arm/include/armv7-r/spinlock.h
deleted file mode 100644
index 79f4ff2..0000000
--- a/arch/arm/include/armv7-r/spinlock.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * arch/arm/include/armv7-r/spinlock.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_INCLUDE_ARMV7_R_SPINLOCK_H
-#define __ARCH_ARM_INCLUDE_ARMV7_R_SPINLOCK_H
-
-#endif /* __ARCH_ARM_INCLUDE_ARMV7_R_SPINLOCK_H */
diff --git a/arch/arm/include/armv8-m/spinlock.h b/arch/arm/include/armv8-m/spinlock.h
deleted file mode 100644
index 4bdb300..0000000
--- a/arch/arm/include/armv8-m/spinlock.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * arch/arm/include/armv8-m/spinlock.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_INCLUDE_ARMV8_M_SPINLOCK_H
-#define __ARCH_ARM_INCLUDE_ARMV8_M_SPINLOCK_H
-
-#endif /* __ARCH_ARM_INCLUDE_ARMV8_M_SPINLOCK_H */
diff --git a/arch/arm/include/spinlock.h b/arch/arm/include/spinlock.h
index 55c12c8..b9c53d9 100644
--- a/arch/arm/include/spinlock.h
+++ b/arch/arm/include/spinlock.h
@@ -29,24 +29,6 @@
# include <stdint.h>
#endif /* __ASSEMBLY__ */
-/* Include ARM architecture-specific IRQ definitions (including register
- * save structure and up_irq_save()/up_irq_restore() functions)
- */
-
-#if defined(CONFIG_ARCH_ARMV7A)
-# include <arch/armv7-a/spinlock.h>
-#elif defined(CONFIG_ARCH_ARMV7R)
-# include <arch/armv7-r/spinlock.h>
-#elif defined(CONFIG_ARCH_ARMV7M)
-# include <arch/armv7-m/spinlock.h>
-#elif defined(CONFIG_ARCH_ARMV8M)
-# include <arch/armv8-m/spinlock.h>
-#elif defined(CONFIG_ARCH_ARMV6M)
-# include <arch/armv6-m/spinlock.h>
-#else
-# include <arch/arm/spinlock.h>
-#endif
-
/****************************************************************************
* Pre-processor Prototypes
****************************************************************************/