{"id":808615,"url":"http://patchwork.ozlabs.org/api/patches/808615/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170831172101.2613-1-lionel.koenig@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":"<20170831172101.2613-1-lionel.koenig@gmail.com>","list_archive_url":null,"date":"2017-08-31T17:21:01","name":"[U-Boot] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"60a4ac4dd28ec419447d1a3bac1bc5e110382556","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/20170831172101.2613-1-lionel.koenig@gmail.com/mbox/","series":[{"id":990,"url":"http://patchwork.ozlabs.org/api/series/990/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=990","date":"2017-08-31T17:21:01","name":"[U-Boot] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources","version":1,"mbox":"http://patchwork.ozlabs.org/series/990/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808615/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808615/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=\"DPfEX3xN\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xkFzX2yQQz9sMN\n\tfor ;\n\tFri, 1 Sep 2017 20:36:56 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 1BD48C21E41; Fri, 1 Sep 2017 10:35:42 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 6AE92C21E8E;\n\tFri, 1 Sep 2017 10:35:17 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid F41BDC21D7A; Thu, 31 Aug 2017 17:21:22 +0000 (UTC)","from mail-lf0-f65.google.com (mail-lf0-f65.google.com\n\t[209.85.215.65])\n\tby lists.denx.de (Postfix) with ESMTPS id 8AC5AC21D63\n\tfor ; Thu, 31 Aug 2017 17:21:22 +0000 (UTC)","by mail-lf0-f65.google.com with SMTP id y15so155583lfd.0\n\tfor ; Thu, 31 Aug 2017 10:21:22 -0700 (PDT)","from localhost.localdomain\n\t(c-18cbe555.022-327-73746f39.cust.bredbandsbolaget.se.\n\t[85.229.203.24])\n\tby smtp.gmail.com with ESMTPSA id 26sm40403ljw.87.2017.08.31.10.21.18\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 31 Aug 2017 10:21:19 -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=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=RjM2UQoXwY8ydTIR9AoSEBlPvhwFCeUHciIgqxWaWkU=;\n\tb=DPfEX3xNaolDRIWq0ujGVqWw2+p458rfxQ95jUpSZU9cbQxsOyHlXN/d67mmjPXY8O\n\teJ3js4+cercEqUCG6G9IJXQxmFoMqkvpEJSUh98rErQJ6vHujwKaTS9/baaylZIElTz6\n\tmGl6JkZ/jg79CoalWOywipb+npMe17IgYenB7cLD/7fX7zZ1Z1yfFY346h7dChHf+8Ij\n\tpkdWMiN3hBpZ8CTm8dzOfqgDqmugRhjV5Ie+A898hAQfWs4FK8gXI86ShfM7YlHgiqTK\n\tKV4dL0MbZS0hBgV2HTyOoevFwLjDeMR0VhCoziqU1iEKtqts+iGBB/dw5SL7J3Pn/Azr\n\thzww==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=RjM2UQoXwY8ydTIR9AoSEBlPvhwFCeUHciIgqxWaWkU=;\n\tb=QZKa5f3OSQCwCRV7syezy9dJpBkZabaxd0gPgKxQggFhZXbC4sgUnvrnJNdJiRN5lE\n\tDmsVM9E8Oz75lD5YmnCCd+6iAM1Aa+PJsoO30wZqNVJKSD11N1yRVSwlBtk1IKMJdakV\n\tPpsnzLUI0zgIgG67nYCqLNVnao6a3EzeqL6dIsNMPK8UyAZ3Ad7od/S9VN5t88awpzn+\n\tYti3hlAA3ex0zunVgTyB1On5eiHsTey+PfvZIt/P9cSoV3DGwrifkpKadfGF0Jbkb0wW\n\tnslCtdDu6iQTE+YsW2aNAWsbRAQpNk811gbBRgFzZUUdatm49lAD8olr6d/k8hSIa3uk\n\tn6FA==","X-Gm-Message-State":"AHPjjUhOrpD5KYt80k1/cnRMoc1qs0ny3gqSxC+XTCqeHgk9kUIZvDzp\n\tx+Pg/BeEWnFkFh3bqUU=","X-Google-Smtp-Source":"ADKCNb4wXVXhVJohWhvMQrr8CtDQ/isKv3ZMgjK7uW0ASjcOBx+zbnX1kf6e/jOq6oa9FsDWUYgwEg==","X-Received":"by 10.25.147.78 with SMTP id v75mr2509739lfd.148.1504200081716; \n\tThu, 31 Aug 2017 10:21:21 -0700 (PDT)","From":"Lionel Koenig ","To":"u-boot@lists.denx.de","Date":"Thu, 31 Aug 2017 19:21:01 +0200","Message-Id":"<20170831172101.2613-1-lionel.koenig@gmail.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"","References":"","X-Mailman-Approved-At":"Fri, 01 Sep 2017 10:35:15 +0000","Cc":"maxime.ripard@free-electrons.com, Lionel Koenig ","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","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":"Following 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(-)","diff":"diff --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","prefixes":["U-Boot"]}