diff --git a/arch/arm/include/arm/spinlock.h b/arch/arm/include/arm/spinlock.h deleted file mode 100644 index 66ae2b79f0..0000000000 --- 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 b6769fa45f..0000000000 --- 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 d306029e17..0000000000 --- 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 a390fd81fa..0000000000 --- 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 79f4ff2182..0000000000 --- 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 4bdb300597..0000000000 --- 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 55c12c8792..b9c53d9418 100644 --- a/arch/arm/include/spinlock.h +++ b/arch/arm/include/spinlock.h @@ -29,24 +29,6 @@ # include #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 -#elif defined(CONFIG_ARCH_ARMV7R) -# include -#elif defined(CONFIG_ARCH_ARMV7M) -# include -#elif defined(CONFIG_ARCH_ARMV8M) -# include -#elif defined(CONFIG_ARCH_ARMV6M) -# include -#else -# include -#endif - /**************************************************************************** * Pre-processor Prototypes ****************************************************************************/