{"id":793903,"url":"http://patchwork.ozlabs.org/api/patches/793903/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1501068386-3706-1-git-send-email-dave@prue.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1501068386-3706-1-git-send-email-dave@prue.com>","list_archive_url":null,"date":"2017-07-26T11:26:26","name":"[U-Boot] sunxi: Fix CONFIG_SUNXI_GMAC references","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f89a40ef0bc25dc6505183adb9f5f17800d2820d","submitter":{"id":72045,"url":"http://patchwork.ozlabs.org/api/people/72045/?format=json","name":"Dave Prue","email":"dave@prue.com"},"delegate":{"id":17739,"url":"http://patchwork.ozlabs.org/api/users/17739/?format=json","username":"jagan","first_name":"Jagannadha Sutradharudu","last_name":"Teki","email":"jagannadh.teki@gmail.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1501068386-3706-1-git-send-email-dave@prue.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/793903/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/793903/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=prue.com header.i=@prue.com header.b=\"nlTFHt89\";\n\tdkim-atps=neutral","smtp.lahar.net;\n\tdmarc=none (p=none dis=none) header.from=prue.com","smtp.lahar.net; spf=fail smtp.mailfrom=dave@prue.com"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xHZ276N7sz9sMN\n\tfor ;\n\tWed, 26 Jul 2017 22:20:31 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 8E792C2201F; Wed, 26 Jul 2017 12:19:55 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id BFDF1C21FCB;\n\tWed, 26 Jul 2017 12:18:22 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid DDBD7C220E2; Wed, 26 Jul 2017 11:28:29 +0000 (UTC)","from smtp.lahar.net (smtp.lahar.net [64.235.39.176])\n\tby lists.denx.de (Postfix) with ESMTP id C0551C220B7\n\tfor ; Wed, 26 Jul 2017 11:28:28 +0000 (UTC)","from dave.lahar.net (unknown [210.213.88.250])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.lahar.net (Postfix) with ESMTPSA id 301E6438B9;\n\tWed, 26 Jul 2017 19:28:04 +0800 (+08)"],"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=T_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0","DMARC-Filter":"OpenDMARC Filter v1.3.2 smtp.lahar.net 301E6438B9","DKIM-Filter":"OpenDKIM Filter v2.11.0 smtp.lahar.net 301E6438B9","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=prue.com; s=default; \n\tt=1501068507; bh=dBW5sOi2irADEktrFMIbo5d6CmMmdVRIUqOMHRyVLTU=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=nlTFHt89jCoqmjshO9jVWMs4C7yZwbI3D0WQPSbZgOdLH2xg+0sRfPU1f5RrSKgE4\n\tDWXdi+3plaIVuww4/IfTgo6IQMPsm7RlXU1D93tmVKHu3IUp/amfqFPsIQiZvOqxgq\n\tO4IrWQAK8LU30038u0+U3Bpz62it9XX43PwhnuDc=","From":"Dave Prue ","To":"u-boot@lists.denx.de, Jagan Teki ,\n\tMaxime Ripard ","Date":"Wed, 26 Jul 2017 19:26:26 +0800","Message-Id":"<1501068386-3706-1-git-send-email-dave@prue.com>","X-Mailer":"git-send-email 1.8.3.1","X-Mailman-Approved-At":"Wed, 26 Jul 2017 12:18:19 +0000","Cc":"Albert Aribaud ,\n\tHans de Goede ,\n\tAndre Przywara , \n\tJernej Skrabec ,\n\tIcenowy Zheng , \n\t=?UTF-8?q?Andreas=20F=C3=A4rber?= ","Subject":"[U-Boot] [PATCH] 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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"GMAC Initialization for sun7i targets has been broken since v2017.05-rc3\ndue to the renaming of CONFIG_SUNXI_GMAC to CONFIG_SUN7I_GMAC in Kconfig\nwithout propogating the name change throughout the code.\n\nSigned-off-by: Dave Prue \n---\n\n arch/arm/include/asm/arch-sunxi/sys_proto.h | 2 +-\n board/sunxi/Makefile | 2 +-\n include/configs/sunxi-common.h | 2 +-\n scripts/build-whitelist.sh | 2 +-\n scripts/config_whitelist.txt | 2 +-\n 5 files changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h\nindex a373319..096510b 100644\n--- a/arch/arm/include/asm/arch-sunxi/sys_proto.h\n+++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h\n@@ -24,7 +24,7 @@ void sdelay(unsigned long);\n void return_to_fel(uint32_t lr, uint32_t sp);\n \n /* Board / SoC level designware gmac init */\n-#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUNXI_GMAC\n+#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUN7I_GMAC\n void eth_init_board(void);\n #else\n static inline void eth_init_board(void) {}\ndiff --git a/board/sunxi/Makefile b/board/sunxi/Makefile\nindex 43766e0..34a2786 100644\n--- a/board/sunxi/Makefile\n+++ b/board/sunxi/Makefile\n@@ -9,7 +9,7 @@\n # SPDX-License-Identifier:\tGPL-2.0+\n #\n obj-y\t+= board.o\n-obj-$(CONFIG_SUNXI_GMAC)\t+= gmac.o\n+obj-$(CONFIG_SUN7I_GMAC)\t+= gmac.o\n obj-$(CONFIG_SUNXI_AHCI)\t+= ahci.o\n obj-$(CONFIG_MACH_SUN4I)\t+= dram_sun4i_auto.o\n obj-$(CONFIG_MACH_SUN5I)\t+= dram_sun5i_auto.o\ndiff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h\nindex 9b514ff..93e0281 100644\n--- a/include/configs/sunxi-common.h\n+++ b/include/configs/sunxi-common.h\n@@ -300,7 +300,7 @@ extern int soft_i2c_gpio_scl;\n #define CONFIG_PHYLIB\n #endif\n \n-#ifdef CONFIG_SUNXI_GMAC\n+#ifdef CONFIG_SUN7I_GMAC\n #define CONFIG_PHY_GIGE\t\t\t/* GMAC can use gigabit PHY\t*/\n #define CONFIG_PHY_ADDR\t\t1\n #define CONFIG_MII\t\t\t/* MII PHY management\t\t*/\ndiff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh\nindex f169eaa..8e0496b 100755\n--- a/scripts/build-whitelist.sh\n+++ b/scripts/build-whitelist.sh\n@@ -16,7 +16,7 @@ export LC_ALL=C LC_COLLATE=C\n #\tSUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)\n #\n # We want this to produce:\n-#\tCONFIG_SUNXI_GMAC\n+#\tCONFIG_SUN7I_GMAC\n #\tCONFIG_AHCI\n #\tCONFIG_SATAPWR\n #\ndiff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt\nindex c8cf428..8c13e4d 100644\n--- a/scripts/config_whitelist.txt\n+++ b/scripts/config_whitelist.txt\n@@ -2696,7 +2696,7 @@ CONFIG_STV0991_HZ_CLOCK\n CONFIG_ST_SMI\n CONFIG_SUNXI_AHCI\n CONFIG_SUNXI_EMAC\n-CONFIG_SUNXI_GMAC\n+CONFIG_SUN7I_GMAC\n CONFIG_SUNXI_GPIO\n CONFIG_SUNXI_MAX_FB_SIZE\n CONFIG_SUNXI_USB_PHYS\n","prefixes":["U-Boot"]}