Commit 4d9baaaaf041ac4a6ad8b919a75216313c4191d1

Authored by Benoit Parrot
Committed by Jyri Sarha
1 parent 9760c42d55

TI-Integration: Move all Media/V4L2 related config to audio-display fragment

Some of the V4L2 related config in audio_display.cfg are getting
overwritten when the connectivity.cfg fragment gets merge
because some of the config are duplicated there and since it is
getting merged last then whatver we intend in the audio_display.cfg
gets thrown away.

Up to now CONFIG_MEDA_SUPPORT was set to "=m" in both fragment
so the conflict was not visible.

But with the addition of the Write Back feature as part of omapdrm,
which is configured as built-in, the needed V4L2 config must be also
be switch to buil-in.

But in the current state it gets switch back to module which basically
disabled Writeback altogether.

In order to fix these config conflict while configuring
V4L2, it is preferable if all of the V4L2 config are handled
by a single config fragment.

Now as part of merging these config into a single file
we also cleaned up (as in remove) configs which are automatically
derived form higher level selection.

These lines are removed for the following reason:

-#USB Video
-CONFIG_MEDIA_SUPPORT=m
 	Already in audio-displat.cfg
-CONFIG_MEDIA_CAMERA_SUPPORT=y
 	Already in audio-displat.cfg
-CONFIG_VIDEO_DEV=m
 	Not directly settable in menuconfig, this is derived from
	CONFIG_MEDIA_SUPPORT
-CONFIG_VIDEO_V4L2=m
 	Not directly settable in menuconfig, this is derived from
	CONFIG_MEDIA_SUPPORT
-CONFIG_VIDEOBUF2_CORE=m
 	Not directly settable in menuconfig, this is/should be
	"selected" by the requesting driver module
-CONFIG_VIDEOBUF2_MEMOPS=m
 	Not directly settable in menuconfig, this is/should be
	"selected" by the requesting driver module
-CONFIG_VIDEOBUF2_VMALLOC=m
 	Not directly settable in menuconfig, this is/should be
	"selected" by the requesting driver module
-CONFIG_MEDIA_USB_SUPPORT=y
	Move to audio-display.cfg
-CONFIG_USB_VIDEO_CLASS=m
	Move to audio-display.cfg
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 	Looks like this are automatically selected by
	CONFIG_USB_VIDEO_CLASS
-CONFIG_USB_GSPCA=m
 	Looks like this are automatically selected by
	CONFIG_USB_VIDEO_CLASS

These were found by carefully comparing "make savedefconfig" outputs
before and after these changes.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>

Showing 2 changed files with 3 additions and 13 deletions Side-by-side Diff

ti_config_fragments/audio_display.cfg
... ... @@ -54,6 +54,9 @@
54 54 CONFIG_VIDEO_OV1063X=m
55 55 CONFIG_VIDEO_MT9T11X=m
56 56  
  57 +CONFIG_MEDIA_USB_SUPPORT=y
  58 +CONFIG_USB_VIDEO_CLASS=m
  59 +
57 60 CONFIG_SOUND=y
58 61 CONFIG_SND=y
59 62 CONFIG_SND_SOC=y
ti_config_fragments/connectivity.cfg
... ... @@ -147,19 +147,6 @@
147 147 CONFIG_CAN_C_CAN=m
148 148 CONFIG_CAN_C_CAN_PLATFORM=m
149 149  
150   -#USB Video
151   -CONFIG_MEDIA_SUPPORT=m
152   -CONFIG_MEDIA_CAMERA_SUPPORT=y
153   -CONFIG_VIDEO_DEV=m
154   -CONFIG_VIDEO_V4L2=m
155   -CONFIG_VIDEOBUF2_CORE=m
156   -CONFIG_VIDEOBUF2_MEMOPS=m
157   -CONFIG_VIDEOBUF2_VMALLOC=m
158   -CONFIG_MEDIA_USB_SUPPORT=y
159   -CONFIG_USB_VIDEO_CLASS=m
160   -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
161   -CONFIG_USB_GSPCA=m
162   -
163 150 #USB gadgets
164 151 CONFIG_USB_AUDIO=m
165 152 CONFIG_USB_ETH=m