downgrade packages to a state where kodi starts with 3.14.x kernel

6 files changed, 51 insertions, 77 deletions

diff --git a/target/arm/kernel/solidrun-imx6 b/target/arm/kernel/solidrun-imx6
index c861a5678..874ed9183 100644
--- a/target/arm/kernel/solidrun-imx6
+++ b/target/arm/kernel/solidrun-imx6
@@ -9,7 +9,5 @@ CONFIG_LOCAL_TIMERS=y
 CONFIG_MXC_DEBUG_BOARD=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_ATAGS=y
 CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/solidrun-imx6/patches/3.14.54/0000-solidrun.patch b/target/arm/solidrun-imx6/patches/3.14.54/0000-solidrun.patch
index 871a870e1..a4861348c 100644
--- a/target/arm/solidrun-imx6/patches/3.14.54/0000-solidrun.patch
+++ b/target/arm/solidrun-imx6/patches/3.14.54/0000-solidrun.patch
@@ -324747,10 +324747,10 @@ diff -Nur linux-3.14.40.orig/sound/soc/fsl/Kconfig linux-3.14.40/sound/soc/fsl/K
  	tristate
  
 +config SND_SOC_FSL_ASRC
-+	tristate
++	bool
 +
 +config SND_SOC_FSL_HDMI
-+	tristate
++	bool
 +
  config SND_SOC_FSL_UTILS
  	tristate
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 35c82299b..c212a16a9 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -31,11 +31,17 @@ config ADK_KERNEL_SND_RAWMIDI
 config ADK_KERNEL_SND_AC97_CODEC
 	tristate
 
+config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
+	bool
+
 config ADK_KERNEL_SND_SOC_SPDIF
 	tristate
 
 config ADK_KERNEL_SND_SOC_FSL_ASRC
-	tristate
+	bool
+
+config ADK_KERNEL_SND_SOC_FSL_HDMI
+	bool
 
 config ADK_KERNEL_SND_SOC_FSL_SPDIF
 	tristate
@@ -44,7 +50,7 @@ config ADK_KERNEL_SND_SOC_IMX_SGTL5000
 	tristate
 
 config ADK_KERNEL_SND_SOC_IMX_PCM_DMA
-	tristate
+	bool
 
 config ADK_KERNEL_SND_SOC_HDMI_CODEC
 	tristate
@@ -98,6 +104,7 @@ config ADK_KERNEL_SND
 	select ADK_KERNEL_SOUND
 	select ADK_KERNEL_SND_PCM
 	select ADK_KERNEL_SND_HWDEP
+	select ADK_KERNEL_SND_TIMER
 
 config ADK_KERNEL_SND_INTEL8X0
 	tristate "Intel AC97 driver"
@@ -206,6 +213,7 @@ config ADK_KERNEL_SND_IMX_SOC
 	tristate "IMX6 SoC sound chip"
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_SOC
+	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 	select ADK_KERNEL_SND_SOC_HDMI_CODEC
 	select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
 	select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
@@ -214,6 +222,7 @@ config ADK_KERNEL_SND_IMX_SOC
 	select ADK_KERNEL_SND_SOC_IMX_SGTL5000 if ADK_TARGET_MODEL_HUMMINGBOARD_I2EX
 	select ADK_KERNEL_SND_SOC_FSL_ASRC
 	select ADK_KERNEL_SND_SOC_FSL_SPDIF
+	select ADK_KERNEL_SND_SOC_FSL_HDMI
 	select ADK_KERNEL_REGMAP
 	select ADK_KERNEL_REGMAP_SPI
 	select ADK_KERNEL_REGMAP_I2C
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index f0cdb7e84..2a87d3ffc 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -36,6 +36,9 @@ config ADK_KERNEL_DMA_SHARED_BUFFER
 config ADK_KERNEL_DMA_CMA
 	bool
 
+config ADK_KERNEL_MXS_DMA
+	bool
+
 config ADK_KERNEL_BCM_VC_SM
 	bool
 
@@ -66,10 +69,12 @@ config ADK_KERNEL_DMA_BCM2708
 
 config ADK_KERNEL_IMX_SDMA
 	bool
+	select ADK_KERNEL_MXS_DMA
 	select ADK_KERNEL_CMA
 	select ADK_KERNEL_CMA_SIZE_SEL_MBYTES
 	select ADK_KERNEL_CMA_SIZE_256
 	select ADK_KERNEL_DMADEVICES
+	select ADK_KERNEL_DMA_CMA
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_FIRMWARE_IN_KERNEL
 	select ADK_KERNEL_FW_LOADER_USER_HELPER
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 6da2f20cd..67fc327fd 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -60,17 +60,26 @@ config ADK_KERNEL_FB_MXC_SYNC_PANEL
 config ADK_KERNEL_FB_MXC_HDMI
  	boolean
 
+config ADK_KERNEL_FB_MXC_EDID
+ 	boolean
+
 config ADK_KERNEL_MXC_IPU
  	boolean
 
+config ADK_KERNEL_MXC_IPU_V3
+ 	boolean
+
 config ADK_KERNEL_MXC_VPU
  	boolean
 
 config ADK_KERNEL_MXC_GPU_VIV
  	boolean
 
+config ADK_KERNEL_MXC_GPU_VIV_V4
+ 	boolean
+
 config ADK_KERNEL_MXC_ASRC
- 	tristate
+ 	boolean
 
 config ADK_KERNEL_MXC_HDMI_CEC
  	boolean
@@ -78,18 +87,12 @@ config ADK_KERNEL_MXC_HDMI_CEC
 config ADK_KERNEL_MXC_MIPI_CSI2
  	boolean
 
-config ADK_KERNEL_MXC_MLB150
+config ADK_KERNEL_MXC_MLB
  	boolean
 
-config ADK_KERNEL_FB_MXC_EDID
+config ADK_KERNEL_MXC_MLB150
  	boolean
 
-config ADK_KERNEL_DRM_DW_HDMI_AUDIO
-	tristate
-
-config ADK_KERNEL_DRM_DW_HDMI_CEC
-	tristate
-
 config ADK_KERNEL_MFD_SM501
 	boolean
 
@@ -128,30 +131,6 @@ config ADK_KERNEL_DRM_I915_KMS
 config ADK_KERNEL_DRM_I915_FBDEV
 	boolean
 
-config ADK_KERNEL_DRM_VIVANTE
-	boolean
-
-config ADK_KERNEL_DRM_IMX_FB_HELPER
-	boolean
-
-config ADK_KERNEL_DRM_IMX_PARALLEL_DISPLAY
-	boolean
-
-config ADK_KERNEL_DRM_IMX_LDB
-	boolean
-
-config ADK_KERNEL_DRM_IMX_TVE
-	boolean
-
-config ADK_KERNEL_IMX_IPUV3_CORE
-	boolean
-
-config ADK_KERNEL_DRM_IMX_IPUV3
-	boolean
-
-config ADK_KERNEL_DRM_IMX_HDMI
-	boolean
-
 config ADK_KERNEL_AGP
 	boolean
 
@@ -186,60 +165,31 @@ config ADK_KERNEL_FB_VESA
  	help
 	 Framebuffer support for VirtualBox Emulator.
 
-config ADK_KERNEL_DRM_IMX
-	prompt "Framebuffer support for Cubox-i/Hummingboard"
-	boolean
-	select ADK_KERNEL_DRM
-	select ADK_KERNEL_DMA_CMA
-	select ADK_KERNEL_RESET_CONTROLLER
-	select ADK_KERNEL_DRM_IMX_FB_HELPER
-	select ADK_KERNEL_DRM_IMX_LDB
-	select ADK_KERNEL_DRM_IMX_TVE
-	select ADK_KERNEL_DRM_IMX_PARALLEL_DISPLAY
-	select ADK_KERNEL_IMX_IPUV3_CORE
-	select ADK_KERNEL_DRM_IMX_IPUV3
-	select ADK_KERNEL_DRM_IMX_HDMI
-	select ADK_KERNEL_FB
-	select ADK_KERNEL_STAGING
-	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
-	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
-	select ADK_KERNEL_I2C_IMX
-	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on ADK_TARGET_KERNEL_VERSION_3_18
-	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
- 	default n
- 	help
-	  Framebuffer support for Cubox-i/Hummingboard
-
-config ADK_KERNEL_DRM_VIVANTE
+config ADK_KERNEL_MXC_GPU_VIV
 	prompt "Framebuffer support for Cubox-i/Hummingboard (Vivante)"
 	boolean
-	select ADK_KERNEL_DRM
-	select ADK_KERNEL_DMA_CMA
 	select ADK_KERNEL_FB
-	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
-	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 	select ADK_KERNEL_FB_MXC
 	select ADK_KERNEL_FB_MXC_LDB
 	select ADK_KERNEL_FB_MXC_SYNC_PANEL
 	select ADK_KERNEL_FB_MXC_HDMI
-	select ADK_KERNEL_SND
-	select ADK_KERNEL_SND_PCM
-	select ADK_KERNEL_SND_DMAENGINE_PCM
-	select ADK_KERNEL_SND_SOC
-	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
+	select ADK_KERNEL_FB_MXC_EDID
+	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
+	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 	select ADK_KERNEL_MXC_IPU
-	select ADK_KERNEL_MXC_GPU_VIV
+	select ADK_KERNEL_MXC_IPU_V3
+	select ADK_KERNEL_MXC_GPU_VIV_V4
+	select ADK_KERNEL_MXC_ASRC
 	select ADK_KERNEL_MXC_HDMI_CEC
 	select ADK_KERNEL_MXC_MIPI_CSI2
+	select ADK_KERNEL_MXC_MLB
 	select ADK_KERNEL_MXC_MLB150
-	select ADK_KERNEL_FB_MXC_EDID
 	select ADK_KERNEL_MXC_VPU
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
  	default n
  	help
-	 Framebuffer support for Cubox-i/Hummingboard (Vivante)
+	  Framebuffer support for Cubox-i/Hummingboard (Vivante)
 	
 config ADK_KERNEL_FB_PXA
 	prompt "Framebuffer support for Sharp Zaurus (PXA)"
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index d7090cbf4..14489e9be 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -7,6 +7,9 @@ config ADK_KERNEL_SERIAL_8250_CONSOLE
 config ADK_KERNEL_SERIAL_8250_PNP
 	bool
 
+config ADK_KERNEL_SERIAL_IMX_CONSOLE
+	bool
+
 config ADK_KERNEL_SERIAL_OF_PLATFORM
 	bool
 
@@ -75,6 +78,15 @@ config ADK_KERNEL_SERIAL_ETRAXFS
 	help
 	  Serial driver for ETRAXFS CRISv32 Qemu Emulation.
 
+config ADK_KERNEL_SERIAL_IMX
+	bool "IMX serial driver"
+	select ADK_KERNEL_SERIAL_IMX_CONSOLE
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default n
+	help
+	  Serial driver for IMX6 chip.
+
 config ADK_KERNEL_SERIAL_AMBA_PL011
 	bool "AMBA PL011 serial driver"
 	select ADK_KERNEL_SERIAL_AMBA_PL011_CONSOLE