From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE78BC61DA4 for ; Wed, 22 Feb 2023 16:45:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1E77385B8F; Wed, 22 Feb 2023 17:37:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="K4QGChJV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5C68D85AEF; Wed, 22 Feb 2023 17:36:05 +0100 (CET) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 38D4E85B3C for ; Wed, 22 Feb 2023 17:35:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2f.google.com with SMTP id d11so3371428iow.0 for ; Wed, 22 Feb 2023 08:35:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JY5BtDQCXO1KKk2FWl7yGbHT2bIbRWvirzciiWE3OoQ=; b=K4QGChJVED0gbNOeZMnCZgbhXmBB/yknuNjklLLS20xbntFE7H9LCpaWppwMc1u4Z3 2mLMxWpWKec8hbucZoh2xfwa1p4xJ/mpG333fXVS5xmpSf00XPh+M3wcdqIXxSV0sFum aFUsFV+0EKii5x9Gap/ITyJfrBHVUui5u0Pbc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JY5BtDQCXO1KKk2FWl7yGbHT2bIbRWvirzciiWE3OoQ=; b=ooM2g22WjfDStn5I3B/1Q3WRyTO1Bm0jsURNHc1qY4rpVgUagU/oonjxUIy6NGjSby t0moXuUqA20upQRlAdN4wfGoxwQIhYtCZJRxXfOga5/6/FyuNHCAl+JKKszFGJhuxH4f H8nvbgmaen2U/UEzOXPIIuvCMW5l+rUWUcQmv5UfFBFEmWXPU9ecuYBtYktrqdHYqn/F szCAMb+a1zSB35d/UdCKgMJG3ZHP8eqEM5APY3b4fmGGnOKNHr4O2nnlyB9WyPYQNgOv jCTlUjg5oxeNTBcRGW1eCpR4qjSUL+4Zsv6+2buBa4oQG2I/Z47PpsMpCFveDBdahjW4 yN+w== X-Gm-Message-State: AO0yUKWS4Pq3yLFUUKTu21lbYkA+sr9MlgqgpSuMjePWAn4RxzPGvjF+ AqmruKUGGEHaU+JZ1S36/AWfzW/BwEKAvy5O X-Google-Smtp-Source: AK7set9uzyU1s/PHdhSTzebBLYvZ1r64H+BETWAJZQ8ZIzYMHbqRHSttt/YaUamNzL4skiKWlUTvBA== X-Received: by 2002:a6b:d803:0:b0:74c:88df:2cbb with SMTP id y3-20020a6bd803000000b0074c88df2cbbmr3888362iob.3.1677083711554; Wed, 22 Feb 2023 08:35:11 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z26-20020a056602005a00b00716eb44b97esm2164541ioz.27.2023.02.22.08.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 08:35:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v5 35/44] freescale: Drop old pre-DM_ETH code Date: Wed, 22 Feb 2023 09:34:16 -0700 Message-Id: <20230222163425.2043934-36-sjg@chromium.org> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog In-Reply-To: <20230222163425.2043934-1-sjg@chromium.org> References: <20230222163425.2043934-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This is used by ls1021atwr_sdcard_ifc_SECURE_BOOT with split config, but is not needed anymore, since Ethernet migration is complete. Drop it. Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/cpu/armv7/ls102xa/fdt.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index 599b7e18ef3..a5c5c780ae8 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -25,11 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; void ft_fixup_enet_phy_connect_type(void *fdt) { -#ifdef CONFIG_DM_ETH struct udevice *dev; -#else - struct eth_device *dev; -#endif struct tsec_private *priv; const char *enet_path, *phy_path; char enet[16]; @@ -37,12 +33,8 @@ void ft_fixup_enet_phy_connect_type(void *fdt) int phy_node; int i = 0; uint32_t ph; -#ifdef CONFIG_DM_ETH char *name[3] = { "ethernet@2d10000", "ethernet@2d50000", "ethernet@2d90000" }; -#else - char *name[3] = { "eTSEC1", "eTSEC2", "eTSEC3" }; -#endif for (; i < ARRAY_SIZE(name); i++) { dev = eth_get_dev_by_name(name[i]); @@ -53,11 +45,7 @@ void ft_fixup_enet_phy_connect_type(void *fdt) continue; } -#ifdef CONFIG_DM_ETH priv = dev_get_priv(dev); -#else - priv = dev->priv; -#endif if (priv->flags & TSEC_SGMII) continue; -- 2.39.2.637.g21b0678d19-goog