From patchwork Fri Sep 1 15:23:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 808719 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q0+EpXjg"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xkNMS4bpsz9t1t for ; Sat, 2 Sep 2017 01:24:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D2703C21E0F; Fri, 1 Sep 2017 15:24:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5FC7AC21E0F; Fri, 1 Sep 2017 15:24:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B239AC21E0F; Fri, 1 Sep 2017 15:24:24 +0000 (UTC) Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by lists.denx.de (Postfix) with ESMTPS id 172F2C21DAC for ; Fri, 1 Sep 2017 15:24:24 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id k3so303723pfc.3 for ; Fri, 01 Sep 2017 08:24:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=NFPed9jRRBriUJw1aAyzwhjhO4tvbHF7ts2CvnBbctU=; b=q0+EpXjg0Lq1b2r6RiKTULepOSi3ZWUBlNTq6XmNu02FSo6TCr/bK4YZ7k1dGP2xby b4Wk+D023XpgtU3Rlqz3TOtddn7O+qVAQoU3+9wJdvEih1sSiQeXDwMbG0ExeioXVdle UgWC8SRj0fzR6VxUFYh4VNCq87i/oSmaDuVwejIprV010fJJKpPzhWUAwWmiTsVEPLiC jSfuyLGdVhVThf9bNRzwb6WaPBfIz6XJFvM/1CGtolj6ReA7WYQymbPk/4qF+NpDG3DT +GE4jiQHmgJn/chW34frzDnrcv1FcTy1pRkKUT430X4BYj+pjtfWNknYuLHgSwr0vqU5 BBIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NFPed9jRRBriUJw1aAyzwhjhO4tvbHF7ts2CvnBbctU=; b=IqC6WLDZHOS3+MjpHaYfKN5THB5aNxv6udelji/IT5A8TEkvEVTpbLucNx9WT5rLFZ etpJGFqc1X9U4+b8u5M5SG0YK6aYzZHhjUBZv5wNxuVnRmioWlWry1+Uhi/KbJwA98Ty XQ9ZFKOEO3sK6KjsUlv8rTe01YTL7MB3nU9kv32+ZLco/j52Quvp8YAl7+KULxFNwPqR j52CdCTEyjOr7czhSBsdmAd+My+F51Q4ubk4fohqMoywQV20d08gsJtU/OALTedS2ez2 +ssQaNsdKtEsxZYmq9JiELVJMU9ffxoqyF+gz6eVwWbtM98LmDksEJYQoAFBl0sYTOI0 lx5g== X-Gm-Message-State: AHPjjUgZzqgY01WHGwuUeFHLKmw2DIe8D7l7kE4qdyZh1Hv5bKPdPZZ6 Gx2JqgfAJiiGEg== X-Google-Smtp-Source: ADKCNb6NqHGPEQDjuDZdKLKpp7/ohcWmKN7DUiF5qJ/BSCvL6izz7ySPbsU9n5qSp066znj4Km4mhw== X-Received: by 10.99.182.71 with SMTP id v7mr2910753pgt.333.1504279462201; Fri, 01 Sep 2017 08:24:22 -0700 (PDT) Received: from localhost.localdomain ([115.97.191.18]) by smtp.gmail.com with ESMTPSA id d12sm755907pgn.53.2017.09.01.08.24.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Sep 2017 08:24:20 -0700 (PDT) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Maxime Ripard Date: Fri, 1 Sep 2017 20:53:57 +0530 Message-Id: <1504279437-11341-1-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 2.7.4 Cc: u-boot@lists.denx.de, Mark Kettenis , Jagan Teki , Lionel Koenig Subject: [U-Boot] [PATCH v2] sunxi: Fix CONFIG_SUNXI_GMAC references X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Dave Prue SUNXI_GMAC was still used to configure the code where as the same has been renamed and moved to Kconfig in below commit "sunxi: Move SUNXI_GMAC to Kconfig" (sha1: 4d43d065db3262f9a9918ba72457bf36dfb8e0bb) Signed-off-by: Dave Prue Reviewed-by: Simon Glass Reviewed-by: Jagan Teki Reviewed-by: Mark Kettenis Tested-by: Mark Kettenis [Tweek commit message, config_whitelist.txt, build-whitelist.sh] Signed-off-by: Jagan Teki --- Changes for v2: - Tweek the commit message - Remove SUNXI_GMAC from config_whitelist.txt - %s/SUNXI_GMAC/SUN7I_GMAC in build-whitelist.sh arch/arm/include/asm/arch-sunxi/sys_proto.h | 2 +- board/sunxi/Makefile | 2 +- include/configs/sunxi-common.h | 2 +- scripts/build-whitelist.sh | 4 ++-- scripts/config_whitelist.txt | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h index a373319..096510b 100644 --- a/arch/arm/include/asm/arch-sunxi/sys_proto.h +++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h @@ -24,7 +24,7 @@ void sdelay(unsigned long); void return_to_fel(uint32_t lr, uint32_t sp); /* Board / SoC level designware gmac init */ -#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUNXI_GMAC +#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUN7I_GMAC void eth_init_board(void); #else static inline void eth_init_board(void) {} diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile index f4411f0..526cb72 100644 --- a/board/sunxi/Makefile +++ b/board/sunxi/Makefile @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-2.0+ # obj-y += board.o -obj-$(CONFIG_SUNXI_GMAC) += gmac.o +obj-$(CONFIG_SUN7I_GMAC) += gmac.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_SUNXI_AHCI) += ahci.o endif diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 212862a..1373b1f 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -294,7 +294,7 @@ extern int soft_i2c_gpio_scl; #define CONFIG_MII /* MII PHY management */ #endif -#ifdef CONFIG_SUNXI_GMAC +#ifdef CONFIG_SUN7I_GMAC #define CONFIG_PHY_ADDR 1 #define CONFIG_MII /* MII PHY management */ #define CONFIG_PHY_REALTEK diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh index 7d8160d..6feb9b6 100755 --- a/scripts/build-whitelist.sh +++ b/scripts/build-whitelist.sh @@ -13,10 +13,10 @@ export LC_ALL=C LC_COLLATE=C # There are two independent greps. The first pulls out the component parts # of CONFIG_SYS_EXTRA_OPTIONS. An example is: # -# SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) +# SUN7I_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) # # We want this to produce: -# CONFIG_SUNXI_GMAC +# CONFIG_SUN7I_GMAC # CONFIG_AHCI # CONFIG_SATAPWR # diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d871095..4651bb5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2307,7 +2307,6 @@ CONFIG_STV0991_HZ_CLOCK CONFIG_ST_SMI CONFIG_SUNXI_AHCI CONFIG_SUNXI_EMAC -CONFIG_SUNXI_GMAC CONFIG_SUNXI_GPIO CONFIG_SUNXI_MAX_FB_SIZE CONFIG_SUNXI_USB_PHYS