소스 검색

enable 3.14.4 for cubox

Waldemar Brodkorb 10 년 전
부모
커밋
71386be78c
3개의 변경된 파일4개의 추가작업 그리고 5개의 파일을 삭제
  1. 0 1
      target/config/Config.in.kernelversion.choice
  2. 1 1
      target/linux/config/Config.in.audio
  3. 3 3
      target/linux/config/Config.in.bluetooth

+ 0 - 1
target/config/Config.in.kernelversion.choice

@@ -13,7 +13,6 @@ config ADK_KERNEL_VERSION_3_15_RC6
 
 config ADK_KERNEL_VERSION_3_14_4
 	prompt "3.14.4"
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
 	boolean
 	select ADK_KERNEL_VERSION_3_14
 

+ 1 - 1
target/linux/config/Config.in.audio

@@ -184,7 +184,7 @@ config ADK_KERNEL_SND_IMX_SOC
 	select ADK_KERNEL_REGMAP_SPI
 	select ADK_KERNEL_REGMAP_I2C
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14
 	default n
 
 endmenu

+ 3 - 3
target/linux/config/Config.in.bluetooth

@@ -82,7 +82,7 @@ config ADK_KERNEL_BT_HCIBTSDIO
 	tristate
 	select ADK_KERNEL_BT
 	depends on ADK_TARGET_WITH_SDIO
-	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14
 	default n
 	help
 	  Bluetooth HCI SDIO driver.
@@ -117,7 +117,7 @@ config ADK_KERNEL_BT_MRVL
 	tristate
 	select ADK_KERNEL_BT
 	select ADK_PACKAGE_BRCM_BLUETOOTH
-	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14
 	default n
 	help
 	  Bluetooth Marvell driver.
@@ -128,7 +128,7 @@ config ADK_KERNEL_BT_MRVL_SDIO
 	depends on ADK_KERNEL_BT_MRVL
 	depends on ADK_KERNEL_BT_HCIBTSDIO
 	depends on ADK_TARGET_WITH_SDIO
-	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14
 	default n
 	help
 	  Bluetooth Marvell driver.