From patchwork Sat Oct 14 20:26:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 825872 X-Patchwork-Delegate: f.fainelli@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.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jW2AiG0k"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sSVEb2oL"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yDx2c1BPpz9t2V for ; Sun, 15 Oct 2017 07:27:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=9/1xhH85j/sWTBOiWKt3EpWNnTEekm5OF4dxVZXWuI4=; b=jW2AiG0kC5A8jV NK4qnR8KYebxDo3d1LHyIkIqNfC6xUEfdSmbtoJuNVArnn3emE1AZUbGuywn3SlcXVAIAX/Rz3vKO qgsF/X4693vm4oBh+gfq8ka4KnJnB4/CstjhybefYVagnnF3ssDjZClVQ0NICe20b7lmmwn07gt7j db2ZkmGuljVoqStrtugVwz96wavXUuUDuPic/8y70qShWg3szb9Utm4S/h7ZBJy4kfPSun0BVKcPt l7a27xdBnFi0Cn8LOztZVvj91TdgC4xJtSYJXq3atqfqQApjwZNJ7X77TageAnLE7jCRKmngYZiiA /x9ik2pBTSlJzbWRB19g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e3T19-00021C-9l; Sat, 14 Oct 2017 20:26:43 +0000 Received: from mail-oi0-x241.google.com ([2607:f8b0:4003:c06::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e3T16-0001zr-3y for lede-dev@lists.infradead.org; Sat, 14 Oct 2017 20:26:42 +0000 Received: by mail-oi0-x241.google.com with SMTP id 14so5158606oii.0 for ; Sat, 14 Oct 2017 13:26:19 -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=TVux9ahGK1OgG0+tIh6EPAVXdd+XZAqs0KOEtPlRtVM=; b=sSVEb2oLsa+XNfzWpMctXlsvbrR3fbXYsrfSLgo3Mp/lIyiGAu06e++fhNMk7i/ANo x+W4/7ohcr4KlIUGOHHR1hki7t82VouR884jsL74AdLDAQJEF3oMYhuwq1tAunQmpB6V hZorwjxwF0x9Anjz/IQoKX6hmHoIRMEdOjrfM62hgQSmI0qHN8FYE82IaXJ5cF2gpUeM BtqzmTcliUrQ+qR5SiHPd1DTskDgzC8U+/DNlUuYS6ruG/2Gy9aHNGv0Rb5wlLBM+O7A ySYGpHBnw/XQStRAigYRJQguhEScBwJE6hQgSkHWS9mubrfl6k42ppfWrp2m54uXXe+T 1Jsg== 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=TVux9ahGK1OgG0+tIh6EPAVXdd+XZAqs0KOEtPlRtVM=; b=lqOxDyGnUsEGMSs0V7ii4uoE1MIKv522tJjv3DhJ2+5pjOYBS4NfWSM3/lrUUl3hOL HiXVYMZ2hGHDH9xTR8AL1qSgrs2TBKZHD8OnhPBwN7IA2h25wW9xPapNCaz9rJaKy9df 1HxK6jG64NS/mwrwmNJNJUsPXtpzp5XEzbTbbjvA4XxL25TQzcggMi0GZilRKWJj3UFB HPu+DytdmSIa8m/DYush0GVNIKicdIr33n8xC7JAswYX7LauP596raj9QcNMNboLXz9C BcB7PC3xxo6NzF24Vbbeji9y6LDesZM+5Y0MhqtDVcGNhR3PHfvyHbrsGkkaeQD3eCHG kR+g== X-Gm-Message-State: AMCzsaVd9+Xr8gduTcCxhHeeUwjlawfFVAge64KLGdwcO/dsSlgYVAPk CIA6l04vuf3k0pb3mNJzQWigM+1M X-Google-Smtp-Source: AOwi7QB6nUhV4u6XTvGlJjKmLmFWI+XrdeyW32MZOzl+s8GdNkMcrxiAopHaNQFTHWziI4OTfxc7mw== X-Received: by 10.157.83.6 with SMTP id g6mr3775515oth.432.1508012778116; Sat, 14 Oct 2017 13:26:18 -0700 (PDT) Received: from bender.lan ([2001:470:d:73f:d5a:2b53:a262:c0c4]) by smtp.gmail.com with ESMTPSA id 89sm1920327otd.32.2017.10.14.13.26.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Oct 2017 13:26:17 -0700 (PDT) From: Florian Fainelli To: lede-dev@lists.infradead.org Date: Sat, 14 Oct 2017 13:26:12 -0700 Message-Id: <20171014202612.19139-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171014_132640_240459_77C3E3C0 X-CRM114-Status: GOOD ( 13.23 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4003:c06:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (f.fainelli[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH] uboot-sunxi: Backport fix for stale CONFIG_SUNXIG_GMAC references X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hauke@hauke-m.de, Florian Fainelli MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This backports the upstream commit fixing stale references to CONFIG_SUNXI_GMAC which have been later replaced by CONFIG_SUN7I_GMAC. This fixes the designware MAC pinmuxing on e.g: Lamobo R1. Signed-off-by: Florian Fainelli Acked-by: Zoltan HERPAI Acked-by: Hauke Mehrtens --- ...02-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 package/boot/uboot-sunxi/patches/302-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch diff --git a/package/boot/uboot-sunxi/patches/302-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch b/package/boot/uboot-sunxi/patches/302-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch new file mode 100644 index 000000000000..6e8a1ec8509b --- /dev/null +++ b/package/boot/uboot-sunxi/patches/302-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch @@ -0,0 +1,93 @@ +From 6ff005cf19363382fc867d7876a75fd8a386e894 Mon Sep 17 00:00:00 2001 +From: Dave Prue +Date: Thu, 31 Aug 2017 19:21:01 +0200 +Subject: [PATCH] sunxi: Fix CONFIG_SUNXI_GMAC references + +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 +--- + 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(-) + +Index: u-boot-2017.07/arch/arm/include/asm/arch-sunxi/sys_proto.h +=================================================================== +--- u-boot-2017.07.orig/arch/arm/include/asm/arch-sunxi/sys_proto.h ++++ u-boot-2017.07/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) {} +Index: u-boot-2017.07/board/sunxi/Makefile +=================================================================== +--- u-boot-2017.07.orig/board/sunxi/Makefile ++++ u-boot-2017.07/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 + obj-$(CONFIG_SUNXI_AHCI) += ahci.o + obj-$(CONFIG_MACH_SUN4I) += dram_sun4i_auto.o + obj-$(CONFIG_MACH_SUN5I) += dram_sun5i_auto.o +Index: u-boot-2017.07/include/configs/sunxi-common.h +=================================================================== +--- u-boot-2017.07.orig/include/configs/sunxi-common.h ++++ u-boot-2017.07/include/configs/sunxi-common.h +@@ -302,7 +302,7 @@ extern int soft_i2c_gpio_scl; + #define CONFIG_PHYLIB + #endif + +-#ifdef CONFIG_SUNXI_GMAC ++#ifdef CONFIG_SUN7I_GMAC + #define CONFIG_PHY_GIGE /* GMAC can use gigabit PHY */ + #define CONFIG_PHY_ADDR 1 + #define CONFIG_MII /* MII PHY management */ +Index: u-boot-2017.07/scripts/build-whitelist.sh +=================================================================== +--- u-boot-2017.07.orig/scripts/build-whitelist.sh ++++ u-boot-2017.07/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 + # +Index: u-boot-2017.07/scripts/config_whitelist.txt +=================================================================== +--- u-boot-2017.07.orig/scripts/config_whitelist.txt ++++ u-boot-2017.07/scripts/config_whitelist.txt +@@ -2371,7 +2371,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