From 1172ed306ce264eb9c288553c962c3a43ccb7da5 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 5 May 2022 00:06:27 +0800 Subject: [PATCH] arch/arm: Remove arm_etherstub.c Signed-off-by: Xiang Xiao --- arch/arm/src/common/Make.defs | 12 +----- arch/arm/src/common/arm_etherstub.c | 57 ----------------------------- 2 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 arch/arm/src/common/arm_etherstub.c diff --git a/arch/arm/src/common/Make.defs b/arch/arm/src/common/Make.defs index 82371bf759..665cefc103 100644 --- a/arch/arm/src/common/Make.defs +++ b/arch/arm/src/common/Make.defs @@ -72,21 +72,13 @@ ifeq ($(CONFIG_SCHED_BACKTRACE),y) endif CMN_ASRCS += vfork.S + ifeq ($(CONFIG_ARCH_HAVE_TESTSET),y) ifeq ($(CONFIG_ARCH_ARMV6M),) CMN_ASRCS += arm_testset.S endif endif + ifeq ($(CONFIG_ARCH_HAVE_FETCHADD),y) CMN_ASRCS += arm_fetchadd.S endif - -# Use of common/arm_etherstub.c is deprecated. The preferred mechanism is to -# use CONFIG_NETDEV_LATEINIT=y to suppress the call to arm_netinitialize() in -# up_initialize(). Then this stub would not be needed. - -ifeq ($(CONFIG_NET),y) - ifneq ($(CONFIG_ARCH_HAVE_PHY),y) - CMN_CSRCS += arm_etherstub.c - endif -endif diff --git a/arch/arm/src/common/arm_etherstub.c b/arch/arm/src/common/arm_etherstub.c deleted file mode 100644 index d46699ea80..0000000000 --- a/arch/arm/src/common/arm_etherstub.c +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** - * arch/arm/src/common/arm_etherstub.c - * - * 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. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include "arm_internal.h" - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: arm_netinitialize (stub) - * - * Description: - * This is a stub version os arm_netinitialize. Normally, arm_netinitialize - * is defined in board/xyz_network.c for board-specific Ethernet - * implementations, or chip/xyx_ethernet.c for chip-specific Ethernet - * implementations. The stub version here is used in the corner case where - * the network is enable yet there is no Ethernet driver to be initialized. - * In this case, up_initialize will still try to call arm_netinitialize() - * when one does not exist. This corner case would occur if, for example, - * only a USB network interface is being used or perhaps if a SLIP is - * being used). - * - * Use of this stub is deprecated. The preferred mechanism is to use - * CONFIG_NETDEV_LATEINIT=y to suppress the call to arm_netinitialize() in - * up_initialize(). Then this stub would not be needed. - * - ****************************************************************************/ - -#if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) -void arm_netinitialize(void) -{ -} -#endif