diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-11-23 16:21:50 +0100 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-11-23 16:21:50 +0100 |
| commit | 9e2f8fa1e5df297c172ce1472eb076c3c0b27cad (patch) | |
| tree | d87851afa0c09b71ff6685b56fc49837f6815517 /package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch | |
| parent | ce116bc6f997d8d6e6b976cacce5d4c60d705fc6 (diff) | |
| download | master-187ad058-9e2f8fa1e5df297c172ce1472eb076c3c0b27cad.tar.gz master-187ad058-9e2f8fa1e5df297c172ce1472eb076c3c0b27cad.tar.bz2 master-187ad058-9e2f8fa1e5df297c172ce1472eb076c3c0b27cad.zip | |
uboot-sunxi: fix default config for OLIMEX A13 SOM (FS#239)
The current uboot default config for the A13 SOM erroneously enables support
for the AXP209 power regulator IC which is not present on the board.
This superfluous support module sets an incorrect initial clock frequency and
confuses the kernel, ultimately leading to a boot failure later on.
Properly disable the PMIC support and enable the EHCI support by translating
the deprecated SYS_EXTRA_OPTIONS values into proper SUNXI_NO_PMIC and
USB_EHCI_HCD symbols respectively.
Also rename 002-add-olimex-a13-som.diff to 002-add-olimex-a13-som.patch and
refresh the remaining patches of the series while we're at it.
Reported-by: Mario Fischer <mario-fischer@web.de>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch')
| -rw-r--r-- | package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch b/package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch index a4e43869a6..cf511ce773 100644 --- a/package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch +++ b/package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch @@ -28,11 +28,9 @@ Tested-by: Michael Haas <haas@computerlinguist.org> board/sunxi/gmac.c | 14 +------------- 4 files changed, 12 insertions(+), 41 deletions(-) -diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c -index e80785b..7653148 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c -@@ -152,6 +152,7 @@ void s_init(void) +@@ -136,6 +136,7 @@ void s_init(void) timer_init(); gpio_init(); i2c_init_board(); @@ -40,7 +38,7 @@ index e80785b..7653148 100644 } #ifdef CONFIG_SPL_BUILD -@@ -259,30 +260,3 @@ void enable_caches(void) +@@ -243,30 +244,3 @@ void enable_caches(void) dcache_enable(); } #endif @@ -71,8 +69,6 @@ index e80785b..7653148 100644 - return 0; -} -#endif -diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h -index 9df3744..a373319 100644 --- a/arch/arm/include/asm/arch-sunxi/sys_proto.h +++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h @@ -24,6 +24,10 @@ void sdelay(unsigned long); @@ -87,8 +83,6 @@ index 9df3744..a373319 100644 +#endif #endif -diff --git a/board/sunxi/board.c b/board/sunxi/board.c -index 80eae9c..e16718f 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -90,6 +90,11 @@ int board_init(void) @@ -103,8 +97,6 @@ index 80eae9c..e16718f 100644 /* Uses dm gpio code so do this here and not in i2c_init_board() */ return soft_i2c_board_init(); } -diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c -index 4e222d8..69eb8ff 100644 --- a/board/sunxi/gmac.c +++ b/board/sunxi/gmac.c @@ -6,7 +6,7 @@ |