From d66494b9b4a998ac49fd23a7f316a09584b47b9c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 6 Sep 2014 18:10:53 +0200 Subject: [PATCH] projects/*/linux: add STK1160 support Signed-off-by: Stephan Raue --- projects/Cuboxi/linux/linux.arm.conf | 9 +++++++-- projects/Generic/linux/linux.i386.conf | 4 +++- projects/Generic/linux/linux.x86_64.conf | 4 +++- projects/RPi/linux/linux.arm.conf | 9 +++++++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/projects/Cuboxi/linux/linux.arm.conf b/projects/Cuboxi/linux/linux.arm.conf index cc5bdf2432..8fc2957db1 100644 --- a/projects/Cuboxi/linux/linux.arm.conf +++ b/projects/Cuboxi/linux/linux.arm.conf @@ -508,7 +508,7 @@ CONFIG_CMA_AREAS=7 # CONFIG_ZSMALLOC is not set CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_ALIGNMENT_TRAP=y -CONFIG_UACCESS_WITH_MEMCPY=y is not set +CONFIG_UACCESS_WITH_MEMCPY=y # CONFIG_SECCOMP is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y @@ -1997,6 +1997,7 @@ CONFIG_MFD_MC13XXX_I2C=m # CONFIG_MFD_VIPERBOARD is not set # CONFIG_MFD_RETU is not set # CONFIG_MFD_PCF50633 is not set +# CONFIG_UCB1400_CORE is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_SEC_CORE is not set # CONFIG_MFD_SI476X_CORE is not set @@ -2147,7 +2148,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_HDPVR is not set # CONFIG_VIDEO_TLG2300 is not set # CONFIG_VIDEO_USBVISION is not set -# CONFIG_VIDEO_STK1160_COMMON is not set +CONFIG_VIDEO_STK1160_COMMON=m +# CONFIG_VIDEO_STK1160_AC97 is not set +CONFIG_VIDEO_STK1160=m # # Analog/digital TV USB devices @@ -2525,6 +2528,7 @@ CONFIG_SND_VMASTER=y # CONFIG_SND_OPL4_LIB_SEQ is not set # CONFIG_SND_SBAWE_SEQ is not set # CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_AC97_CODEC=m # CONFIG_SND_DRIVERS is not set # CONFIG_SND_ARM is not set # CONFIG_SND_SPI is not set @@ -2558,6 +2562,7 @@ CONFIG_SND_SOC_HDMI_CODEC=y CONFIG_SND_SOC_SGTL5000=m # CONFIG_SND_SIMPLE_CARD is not set # CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m # # HID support diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 2d7c564ff8..706f7c0382 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -2349,7 +2349,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_HDPVR is not set # CONFIG_VIDEO_TLG2300 is not set # CONFIG_VIDEO_USBVISION is not set -# CONFIG_VIDEO_STK1160_COMMON is not set +CONFIG_VIDEO_STK1160_COMMON=m +# CONFIG_VIDEO_STK1160_AC97 is not set +CONFIG_VIDEO_STK1160=m # # Analog/digital TV USB devices diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 0b21912c67..22ecae9e4f 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -2327,7 +2327,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_HDPVR is not set # CONFIG_VIDEO_TLG2300 is not set # CONFIG_VIDEO_USBVISION is not set -# CONFIG_VIDEO_STK1160_COMMON is not set +CONFIG_VIDEO_STK1160_COMMON=m +# CONFIG_VIDEO_STK1160_AC97 is not set +CONFIG_VIDEO_STK1160=m # # Analog/digital TV USB devices diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 9462d5ab64..818307e4c2 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.16.1 Kernel Configuration +# Linux/arm 3.16.2 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1674,6 +1674,7 @@ CONFIG_MFD_CORE=m # CONFIG_MFD_VIPERBOARD is not set # CONFIG_MFD_RETU is not set # CONFIG_MFD_PCF50633 is not set +# CONFIG_UCB1400_CORE is not set # CONFIG_MFD_PM8921_CORE is not set CONFIG_MFD_RTSX_USB=m # CONFIG_MFD_RC5T583 is not set @@ -1796,7 +1797,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_HDPVR is not set # CONFIG_VIDEO_TLG2300 is not set # CONFIG_VIDEO_USBVISION is not set -# CONFIG_VIDEO_STK1160_COMMON is not set +CONFIG_VIDEO_STK1160_COMMON=m +# CONFIG_VIDEO_STK1160_AC97 is not set +CONFIG_VIDEO_STK1160=m # # Analog/digital TV USB devices @@ -2168,6 +2171,7 @@ CONFIG_SND_VMASTER=y # CONFIG_SND_OPL4_LIB_SEQ is not set # CONFIG_SND_SBAWE_SEQ is not set # CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_AC97_CODEC=m # CONFIG_SND_DRIVERS is not set # @@ -2257,6 +2261,7 @@ CONFIG_SND_SOC_WM8804=m # CONFIG_SND_SOC_TPA6130A2 is not set # CONFIG_SND_SIMPLE_CARD is not set # CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m # # HID support