* [U-Boot] [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources
@ 2017-08-30 9:29 Lionel Koenig
2017-08-31 9:10 ` Jagan Teki
0 siblings, 1 reply; 6+ messages in thread
From: Lionel Koenig @ 2017-08-30 9:29 UTC (permalink / raw)
To: u-boot
Hi,
I found that in commit-id 4d43d065db3262f9a9918ba72457bf36dfb8e0bb was
changing SUNXI_GMAC config to SUN7I_GMAC. However, after that change, the
PHY was not initialized correctly on my board (Olimex
Olinuxino-A20-Lime2-eMMC).
This patch should correct the behavior. However, beeing my first patch to
u-boot, I wouldn't mind few other pair of eyes.
Kind regards,
Lionel
--
Lionel Koenig
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-sunxi-Change-SUNXI_GMAC-to-SUN7I_GMAC-in-sources.patch
Type: text/x-patch
Size: 3072 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170830/a013ac7d/attachment.bin>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources
2017-08-30 9:29 [U-Boot] [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources Lionel Koenig
@ 2017-08-31 9:10 ` Jagan Teki
2017-08-31 17:21 ` Lionel Koenig
0 siblings, 1 reply; 6+ messages in thread
From: Jagan Teki @ 2017-08-31 9:10 UTC (permalink / raw)
To: u-boot
On Wed, Aug 30, 2017 at 2:59 PM, Lionel Koenig <lionel.koenig@gmail.com> wrote:
> Hi,
> I found that in commit-id 4d43d065db3262f9a9918ba72457bf36dfb8e0bb was
> changing SUNXI_GMAC config to SUN7I_GMAC. However, after that change, the
> PHY was not initialized correctly on my board (Olimex
> Olinuxino-A20-Lime2-eMMC).
> This patch should correct the behavior. However, beeing my first patch to
> u-boot, I wouldn't mind few other pair of eyes.
Please use git send-email for patch submission, read here [1] for more info.
[1] https://www.denx.de/wiki/view/U-Boot/Patches#General_Patch_Submission_Rules
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources
2017-08-31 9:10 ` Jagan Teki
@ 2017-08-31 17:21 ` Lionel Koenig
2017-09-01 12:06 ` Mark Kettenis
2017-09-01 14:33 ` Jagan Teki
0 siblings, 2 replies; 6+ messages in thread
From: Lionel Koenig @ 2017-08-31 17:21 UTC (permalink / raw)
To: u-boot
Following 4d43d065db3262f9a9918ba72457bf36dfb8e0bb,
SUNXI_GMAC was still used to configure the code while
SUN7I_GMAC was used in the configuration tools.
Signed-off-by: Lionel Koenig <lionel.koenig@gmail.com>
---
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 | 2 +-
5 files changed, 6 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 a373319a2b..096510b787 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 f4411f01c3..526cb72a51 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 212862acd1..1373b1f037 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 7d8160d5f2..6feb9b67cf 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 d8710958a3..19416dddca 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2307,7 +2307,7 @@ CONFIG_STV0991_HZ_CLOCK
CONFIG_ST_SMI
CONFIG_SUNXI_AHCI
CONFIG_SUNXI_EMAC
-CONFIG_SUNXI_GMAC
+CONFIG_SUN7I_GMAC
CONFIG_SUNXI_GPIO
CONFIG_SUNXI_MAX_FB_SIZE
CONFIG_SUNXI_USB_PHYS
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources
2017-08-31 17:21 ` Lionel Koenig
@ 2017-09-01 12:06 ` Mark Kettenis
2017-09-01 14:33 ` Jagan Teki
1 sibling, 0 replies; 6+ messages in thread
From: Mark Kettenis @ 2017-09-01 12:06 UTC (permalink / raw)
To: u-boot
> From: Lionel Koenig <lionel.koenig@gmail.com>
> Date: Thu, 31 Aug 2017 19:21:01 +0200
>
> Following 4d43d065db3262f9a9918ba72457bf36dfb8e0bb,
> SUNXI_GMAC was still used to configure the code while
> SUN7I_GMAC was used in the configuration tools.
>
> Signed-off-by: Lionel Koenig <lionel.koenig@gmail.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
This is fixes an annoying regression in on Allwinner A20 boards. So
it would be good if this can be fixed ASAP.
> ---
> 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 | 2 +-
> 5 files changed, 6 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 a373319a2b..096510b787 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 f4411f01c3..526cb72a51 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 212862acd1..1373b1f037 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 7d8160d5f2..6feb9b67cf 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 d8710958a3..19416dddca 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -2307,7 +2307,7 @@ CONFIG_STV0991_HZ_CLOCK
> CONFIG_ST_SMI
> CONFIG_SUNXI_AHCI
> CONFIG_SUNXI_EMAC
> -CONFIG_SUNXI_GMAC
> +CONFIG_SUN7I_GMAC
> CONFIG_SUNXI_GPIO
> CONFIG_SUNXI_MAX_FB_SIZE
> CONFIG_SUNXI_USB_PHYS
> --
> 2.14.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources
2017-08-31 17:21 ` Lionel Koenig
2017-09-01 12:06 ` Mark Kettenis
@ 2017-09-01 14:33 ` Jagan Teki
2017-09-01 14:45 ` Jagan Teki
1 sibling, 1 reply; 6+ messages in thread
From: Jagan Teki @ 2017-09-01 14:33 UTC (permalink / raw)
To: u-boot
On Thu, Aug 31, 2017 at 10:51 PM, Lionel Koenig <lionel.koenig@gmail.com> wrote:
> Following 4d43d065db3262f9a9918ba72457bf36dfb8e0bb,
> SUNXI_GMAC was still used to configure the code while
> SUN7I_GMAC was used in the configuration tools.
>
> Signed-off-by: Lionel Koenig <lionel.koenig@gmail.com>
> ---
> 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 | 2 +-
> 5 files changed, 6 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 a373319a2b..096510b787 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 f4411f01c3..526cb72a51 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 212862acd1..1373b1f037 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 7d8160d5f2..6feb9b67cf 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 d8710958a3..19416dddca 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -2307,7 +2307,7 @@ CONFIG_STV0991_HZ_CLOCK
> CONFIG_ST_SMI
> CONFIG_SUNXI_AHCI
> CONFIG_SUNXI_EMAC
> -CONFIG_SUNXI_GMAC
> +CONFIG_SUN7I_GMAC
This shouldn't require since CONFIG_ is part of Kconfig
Reviewed-by: Jagan Teki <jagan@openedev.com>
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources
2017-09-01 14:33 ` Jagan Teki
@ 2017-09-01 14:45 ` Jagan Teki
0 siblings, 0 replies; 6+ messages in thread
From: Jagan Teki @ 2017-09-01 14:45 UTC (permalink / raw)
To: u-boot
On Fri, Sep 1, 2017 at 8:03 PM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> On Thu, Aug 31, 2017 at 10:51 PM, Lionel Koenig <lionel.koenig@gmail.com> wrote:
>> Following 4d43d065db3262f9a9918ba72457bf36dfb8e0bb,
>> SUNXI_GMAC was still used to configure the code while
>> SUN7I_GMAC was used in the configuration tools.
>>
>> Signed-off-by: Lionel Koenig <lionel.koenig@gmail.com>
There was a patch already[1] will proceed with that.
[1] https://patchwork.ozlabs.org/patch/793903/
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-09-01 14:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-30 9:29 [U-Boot] [PATCH] sunxi: Change SUNXI_GMAC to SUN7I_GMAC in sources Lionel Koenig
2017-08-31 9:10 ` Jagan Teki
2017-08-31 17:21 ` Lionel Koenig
2017-09-01 12:06 ` Mark Kettenis
2017-09-01 14:33 ` Jagan Teki
2017-09-01 14:45 ` Jagan Teki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.