{"id":807718,"url":"http://patchwork.ozlabs.org/api/patches/807718/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/CAPyAkpYm9pFga+FwLm18PKC5G=NoNBva4AuVsZb4CDFTjbVt6g@mail.gmail.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":"","list_archive_url":null,"date":"2017-08-30T09:29:58","name":"[U-Boot] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources","commit_ref":null,"pull_url":null,"state":"rejected","archived":false,"hash":"736e2aabab7d03e9493adddbd29da86392a9a67a","submitter":{"id":72260,"url":"http://patchwork.ozlabs.org/api/people/72260/?format=json","name":"Lionel Koenig","email":"lionel.koenig@gmail.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/CAPyAkpYm9pFga+FwLm18PKC5G=NoNBva4AuVsZb4CDFTjbVt6g@mail.gmail.com/mbox/","series":[{"id":653,"url":"http://patchwork.ozlabs.org/api/series/653/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=653","date":"2017-08-30T09:29:58","name":"[U-Boot] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources","version":1,"mbox":"http://patchwork.ozlabs.org/series/653/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807718/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807718/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\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"J5CeIx8Q\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjBKT2Kvhz9sQl\n\tfor ;\n\tThu, 31 Aug 2017 02:48:44 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid AD7AAC226D3; Wed, 30 Aug 2017 16:45:27 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 9C6E4C22279;\n\tWed, 30 Aug 2017 16:44:24 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 3FD3FC227E6; Wed, 30 Aug 2017 09:30:01 +0000 (UTC)","from mail-oi0-f49.google.com (mail-oi0-f49.google.com\n\t[209.85.218.49])\n\tby lists.denx.de (Postfix) with ESMTPS id 9A88CC227DC\n\tfor ; Wed, 30 Aug 2017 09:30:00 +0000 (UTC)","by mail-oi0-f49.google.com with SMTP id t75so46971702oie.3\n\tfor ; Wed, 30 Aug 2017 02:30:00 -0700 (PDT)","by 10.157.34.129 with HTTP; Wed, 30 Aug 2017 02:29:58 -0700 (PDT)"],"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,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=mime-version:from:date:message-id:subject:to:cc;\n\tbh=3V1IXfNBLVWLN+lcz/t5KxcN62wYpMICxqwZNr8U1q0=;\n\tb=J5CeIx8Qfsh2KTfdDBGB8UB9SPccoCVmvhjQTerDZf6y40aGWy1X9Rt6cUvJcniEWs\n\t86NTiFmOtf9sJlG4YNmsyf9/7MTCw+c9P/x+chN6G94JwxwNtI9YuwY+ZlJ6+gSBkgge\n\tA7OzRUOnSweOC4hKZp5UVLQq1dz7jNYHmprIlRqx9yqHIvc3r7H0cSvB2wt+szp884z0\n\tK5NXCH8EoWiwLBXNQ1Kvuw0/reFslNynaV0G0M4MWdIUbCP4xdWU6MutBU7LNZKhqoLp\n\tdtcr3UTdhCbDoxBXoR7+ud8BzV6geqeBCmrbhY4fuqCvxqKXtXDY3OKITmKZKp8r5ZV9\n\tvMXA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; \n\tbh=3V1IXfNBLVWLN+lcz/t5KxcN62wYpMICxqwZNr8U1q0=;\n\tb=QM5Y9pqGMFnsOU+qjuS2jnIM/jb8WlOW2JKBhWpFLVIn2G+zAKv29JG0AnwiuGn3JY\n\tmGZHiHlnhAzkTvMcuUeqe2j9c1gghgPyFCVd1vrh8O99vkSN4UwkoGnl6mMVyhnEG8g1\n\tWGgAxx5nRUXgr1bMLwieyEh9Uxf+Swz7HaCW6A3y5v5lsKFr4AltlhximUqDvbAo6lWy\n\tHlYeQvzM3qqzFydiUzv2Wy2HP4/4eE6uMVDjQX2G0VwboYHCyXU4o5wstMhe+3lD7XxW\n\tvPzhCvDs6RWalDbctGPgQ83zKm9XC+CZBJmvSLixjHZwRvWu/KUoRCjKgJyO8HHEoECZ\n\tdKAg==","X-Gm-Message-State":"AHYfb5iENC8ttAy6V1PpOb9myaiotGfOyWNihKBzXmNNOgQ2pgGsxzXN\n\tlrl0w4Uwg5F1YbJZeHsJ4duo+p7ljc/Ta3o=","X-Received":"by 10.202.172.66 with SMTP id v63mr1004804oie.83.1504085399052; \n\tWed, 30 Aug 2017 02:29:59 -0700 (PDT)","MIME-Version":"1.0","From":"Lionel Koenig ","Date":"Wed, 30 Aug 2017 11:29:58 +0200","Message-ID":"","To":"u-boot@lists.denx.de","Content-Type":"multipart/mixed; boundary=\"001a113ced86ed27760557f52b05\"","X-Mailman-Approved-At":"Wed, 30 Aug 2017 16:44:19 +0000","X-Content-Filtered-By":"Mailman/MimeDel 2.1.18","Cc":"maxime.ripard@free-electrons.com","Subject":"[U-Boot] [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources","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","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"Hi,\nI found that in commit-id 4d43d065db3262f9a9918ba72457bf36dfb8e0bb was\nchanging SUNXI_GMAC config to SUN7I_GMAC. However, after that change, the\nPHY was not initialized correctly on my board (Olimex\nOlinuxino-A20-Lime2-eMMC).\nThis patch should correct the behavior. However, beeing my first patch to\nu-boot, I wouldn't mind few other pair of eyes.\n\nKind regards,\nLionel","diff":"From f084d330a3e9e491f055199190a9addb9f2d566c Mon Sep 17 00:00:00 2001\nFrom: Lionel Koenig \nDate: Wed, 30 Aug 2017 11:10:28 +0200\nSubject: [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources\n\nFollowing 4d43d065db3262f9a9918ba72457bf36dfb8e0bb,\nSUNXI_GMAC was still used to configure the code while\nSUN7I_GMAC was used in the configuration tools.\n\nSigned-off-by: Lionel Koenig \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 | 4 ++--\n scripts/config_whitelist.txt | 2 +-\n 5 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h\nindex a373319a2b..096510b787 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 f4411f01c3..526cb72a51 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 ifndef CONFIG_SPL_BUILD\n obj-$(CONFIG_SUNXI_AHCI)\t+= ahci.o\n endif\ndiff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h\nindex 212862acd1..1373b1f037 100644\n--- a/include/configs/sunxi-common.h\n+++ b/include/configs/sunxi-common.h\n@@ -294,7 +294,7 @@ extern int soft_i2c_gpio_scl;\n #define CONFIG_MII\t\t\t/* MII PHY management\t\t*/\n #endif\n \n-#ifdef CONFIG_SUNXI_GMAC\n+#ifdef CONFIG_SUN7I_GMAC\n #define CONFIG_PHY_ADDR\t\t1\n #define CONFIG_MII\t\t\t/* MII PHY management\t\t*/\n #define CONFIG_PHY_REALTEK\ndiff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh\nindex 7d8160d5f2..6feb9b67cf 100755\n--- a/scripts/build-whitelist.sh\n+++ b/scripts/build-whitelist.sh\n@@ -13,10 +13,10 @@ export LC_ALL=C LC_COLLATE=C\n # There are two independent greps. The first pulls out the component parts\n # of CONFIG_SYS_EXTRA_OPTIONS. An example is:\n #\n-#\tSUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)\n+#\tSUN7I_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 d8710958a3..19416dddca 100644\n--- a/scripts/config_whitelist.txt\n+++ b/scripts/config_whitelist.txt\n@@ -2307,7 +2307,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-- \n2.14.1\n\n","prefixes":["U-Boot"]}