diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-07-01 00:32:10 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-07-01 00:32:10 +0000 |
commit | ee00711ff8aea18194dd685f0916cced2addb5ba (patch) | |
tree | ed500f5b93ae18493d90514ef512a8b30b40eccc /target/linux/ar71xx/patches-3.18/904-MIPS-ath79-bitmain-antminer-s1-support.patch | |
parent | da318364ff2a71c8c9b3e683733d42c5eb2ba58b (diff) | |
download | upstream-ee00711ff8aea18194dd685f0916cced2addb5ba.tar.gz upstream-ee00711ff8aea18194dd685f0916cced2addb5ba.tar.bz2 upstream-ee00711ff8aea18194dd685f0916cced2addb5ba.zip |
CC: kernel: update 3.18 to 3.18.17
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17
Backport of r46150.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46155 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/904-MIPS-ath79-bitmain-antminer-s1-support.patch')
-rw-r--r-- | target/linux/ar71xx/patches-3.18/904-MIPS-ath79-bitmain-antminer-s1-support.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/ar71xx/patches-3.18/904-MIPS-ath79-bitmain-antminer-s1-support.patch b/target/linux/ar71xx/patches-3.18/904-MIPS-ath79-bitmain-antminer-s1-support.patch index dfecc8224b..875061467c 100644 --- a/target/linux/ar71xx/patches-3.18/904-MIPS-ath79-bitmain-antminer-s1-support.patch +++ b/target/linux/ar71xx/patches-3.18/904-MIPS-ath79-bitmain-antminer-s1-support.patch @@ -1,19 +1,19 @@ --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -21,6 +21,7 @@ - ATH79_MACH_ALL0258N, /* Allnet ALL0258N */ - ATH79_MACH_ALL0305, /* Allnet ALL0305 */ - ATH79_MACH_ALL0315N, /* Allnet ALL0315N */ +@@ -21,6 +21,7 @@ enum ath79_mach_type { + ATH79_MACH_ALL0258N, /* Allnet ALL0258N */ + ATH79_MACH_ALL0305, /* Allnet ALL0305 */ + ATH79_MACH_ALL0315N, /* Allnet ALL0315N */ + ATH79_MACH_ANTMINER_S1, /* Bitmain Antminer S1 */ - ATH79_MACH_AP113, /* Atheros AP113 reference board */ - ATH79_MACH_AP121, /* Atheros AP121 reference board */ - ATH79_MACH_AP121_MINI, /* Atheros AP121-MINI reference board */ + ATH79_MACH_AP113, /* Atheros AP113 reference board */ + ATH79_MACH_AP121, /* Atheros AP121 reference board */ + ATH79_MACH_AP121_MINI, /* Atheros AP121-MINI reference board */ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -56,6 +56,16 @@ - select ATH79_DEV_LEDS_GPIO - select ATH79_DEV_M25P80 - +@@ -56,6 +56,16 @@ config ATH79_MACH_ALL0315N + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 + +config ATH79_MACH_ANTMINER_S1 + bool "Bitmain Antminer S1 support" + select SOC_AR933X @@ -25,11 +25,11 @@ + select ATH79_DEV_WMAC + config ATH79_MACH_AP113 - bool "Atheros AP113 board support" - select SOC_AR724X + bool "Atheros AP113 board support" + select SOC_AR724X --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -42,6 +42,7 @@ +@@ -42,6 +42,7 @@ obj-$(CONFIG_ATH79_MACH_ALFA_AP96) += ma obj-$(CONFIG_ATH79_MACH_ALFA_NX) += mach-alfa-nx.o obj-$(CONFIG_ATH79_MACH_ALL0258N) += mach-all0258n.o obj-$(CONFIG_ATH79_MACH_ALL0315N) += mach-all0315n.o |