Merge remote-tracking branch 'origin/seventeen' into seventeen

This commit is contained in:
Michael Tremer
2014-11-04 23:52:28 +01:00
7 changed files with 1581 additions and 7 deletions

View File

@@ -333,6 +333,17 @@ CONFIG_MACH_OPENRD_ULTIMATE=y
CONFIG_MACH_RD88F6192_NAS=y
CONFIG_MACH_RD88F6281=y
CONFIG_MACH_T5325=y
CONFIG_MACH_DB88F6281_BP=y
CONFIG_MACH_DOCKSTAR=y
CONFIG_MACH_SHEEVAPLUG=y
CONFIG_MACH_ESATA_SHEEVAPLUG=y
CONFIG_MACH_GURUPLUG=y
CONFIG_MACH_INETSPACE_V2=y
CONFIG_MACH_NETSPACE_MAX_V2=y
CONFIG_MACH_NETSPACE_V2=y
CONFIG_MACH_DREAMPLUG=y
CONFIG_MACH_ICONNECT=y
CONFIG_MACH_NAS6210=y
CONFIG_MACH_TS219=y
CONFIG_MACH_TS41X=y
@@ -2083,7 +2094,7 @@ CONFIG_ATH9K_HTC=m
CONFIG_CARL9170=m
CONFIG_CARL9170_LEDS=y
CONFIG_CARL9170_WPC=y
# CONFIG_CARL9170_HWRNG is not set
CONFIG_CARL9170_HWRNG=y
# CONFIG_ATH6KL is not set
CONFIG_AR5523=m
CONFIG_WIL6210=m

View File

@@ -2279,7 +2279,7 @@ CONFIG_ATH9K_HTC=m
CONFIG_CARL9170=m
CONFIG_CARL9170_LEDS=y
CONFIG_CARL9170_WPC=y
# CONFIG_CARL9170_HWRNG is not set
CONFIG_CARL9170_HWRNG=y
# CONFIG_ATH6KL is not set
CONFIG_AR5523=m
# CONFIG_WIL6210 is not set
@@ -4383,7 +4383,7 @@ CONFIG_USB_WUSB_CBAF=m
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_XHCI_HCD is not set
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -5892,7 +5892,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
CONFIG_CRYPTO_DEV_OMAP_SHAM=y
CONFIG_CRYPTO_DEV_OMAP_AES=y
CONFIG_CRYPTO_DEV_SAHARA=y
CONFIG_CRYPTO_DEV_SUNXI_SS=y
CONFIG_CRYPTO_DEV_SUNXI_SS=m
CONFIG_ASYMMETRIC_KEY_TYPE=m
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
CONFIG_PUBLIC_KEY_ALGO_RSA=m

View File

@@ -1515,7 +1515,7 @@ CONFIG_ATH9K_HTC=m
CONFIG_CARL9170=m
CONFIG_CARL9170_LEDS=y
CONFIG_CARL9170_WPC=y
# CONFIG_CARL9170_HWRNG is not set
CONFIG_CARL9170_HWRNG=y
CONFIG_ATH6KL=m
# CONFIG_ATH6KL_SDIO is not set
CONFIG_ATH6KL_USB=m

View File

@@ -2243,7 +2243,7 @@ CONFIG_ATH9K_HTC=m
CONFIG_CARL9170=m
CONFIG_CARL9170_LEDS=y
CONFIG_CARL9170_WPC=y
# CONFIG_CARL9170_HWRNG is not set
CONFIG_CARL9170_HWRNG=y
# CONFIG_ATH6KL is not set
CONFIG_AR5523=m
CONFIG_WIL6210=m

View File

@@ -2260,7 +2260,7 @@ CONFIG_ATH9K_HTC=m
CONFIG_CARL9170=m
CONFIG_CARL9170_LEDS=y
CONFIG_CARL9170_WPC=y
# CONFIG_CARL9170_HWRNG is not set
CONFIG_CARL9170_HWRNG=y
# CONFIG_ATH6KL is not set
CONFIG_AR5523=m
CONFIG_WIL6210=m

View File

@@ -161,6 +161,7 @@ endif
ifeq "$(KCFG)" "-kirkwood"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
endif
ifeq "$(KCFG)" "-multi"

File diff suppressed because it is too large Load Diff