forked from luck/tmp_suning_uos_patched
samples: move blackfin gptimers-example from Documentation
Move blackfin gptimers-example to samples and remove it from Documentation Makefile. Update samples Kconfig and Makefile to build gptimers-example. blackfin is the last CONFIG_BUILD_DOCSRC target in Documentation/Makefile. Hence this patch also includes changes to remove CONFIG_BUILD_DOCSRC from Makefile and lib/Kconfig.debug and updates VIDEO_PCI_SKELETON dependency on BUILD_DOCSRC. Documentation/Makefile is not deleted to avoid braking make htmldocs and make distclean. Acked-by: Michal Marek <mmarek@suse.com> Acked-by: Jonathan Corbet <corbet@lwn.net> Reviewed-by: Kees Cook <keescook@chromium.org> Reported-by: Valentin Rothberg <valentinrothberg@gmail.com> Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
This commit is contained in:
parent
a67cd5482f
commit
1848929251
|
@ -1 +1 @@
|
|||
subdir-y := blackfin
|
||||
subdir-y :=
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
00-INDEX
|
||||
- This file
|
||||
Makefile
|
||||
- Makefile for gptimers example file.
|
||||
bfin-gpio-notes.txt
|
||||
- Notes in developing/using bfin-gpio driver.
|
||||
bfin-spi-notes.txt
|
||||
- Notes for using bfin spi bus driver.
|
||||
gptimers-example.c
|
||||
- gptimers example
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
ifneq ($(CONFIG_BLACKFIN),)
|
||||
ifneq ($(CONFIG_BFIN_GPTIMERS),)
|
||||
obj-m := gptimers-example.o
|
||||
endif
|
||||
endif
|
3
Makefile
3
Makefile
|
@ -933,9 +933,6 @@ vmlinux_prereq: $(vmlinux-deps) FORCE
|
|||
ifdef CONFIG_HEADERS_CHECK
|
||||
$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
|
||||
endif
|
||||
ifdef CONFIG_BUILD_DOCSRC
|
||||
$(Q)$(MAKE) $(build)=Documentation
|
||||
endif
|
||||
ifdef CONFIG_GDB_SCRIPTS
|
||||
$(Q)ln -fsn `cd $(srctree) && /bin/pwd`/scripts/gdb/vmlinux-gdb.py
|
||||
endif
|
||||
|
|
|
@ -27,7 +27,7 @@ config VIDEO_FIXED_MINOR_RANGES
|
|||
|
||||
config VIDEO_PCI_SKELETON
|
||||
tristate "Skeleton PCI V4L2 driver"
|
||||
depends on PCI && BUILD_DOCSRC
|
||||
depends on PCI
|
||||
depends on VIDEO_V4L2 && VIDEOBUF2_CORE
|
||||
depends on VIDEOBUF2_MEMOPS && VIDEOBUF2_DMA_CONTIG
|
||||
---help---
|
||||
|
|
|
@ -1875,15 +1875,6 @@ config PROVIDE_OHCI1394_DMA_INIT
|
|||
|
||||
See Documentation/debugging-via-ohci1394.txt for more information.
|
||||
|
||||
config BUILD_DOCSRC
|
||||
bool "Build targets in Documentation/ tree"
|
||||
depends on HEADERS_CHECK
|
||||
help
|
||||
This option attempts to build objects from the source files in the
|
||||
kernel Documentation/ tree.
|
||||
|
||||
Say N if you are unsure.
|
||||
|
||||
config DMA_API_DEBUG
|
||||
bool "Enable debugging of DMA-API usage"
|
||||
depends on HAVE_DMA_API_DEBUG
|
||||
|
|
|
@ -99,4 +99,10 @@ config SAMPLE_SECCOMP
|
|||
Build samples of seccomp filters using various methods of
|
||||
BPF filter construction.
|
||||
|
||||
config SAMPLE_BLACKFIN_GPTIMERS
|
||||
tristate "Build blackfin gptimers sample code -- loadable modules only"
|
||||
depends on BLACKFIN && BFIN_GPTIMERS && m
|
||||
help
|
||||
Build samples of blackfin gptimers sample module.
|
||||
|
||||
endif # SAMPLES
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \
|
||||
hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
|
||||
configfs/ connector/ v4l/ trace_printk/
|
||||
configfs/ connector/ v4l/ trace_printk/ blackfin/
|
||||
|
|
1
samples/blackfin/Makefile
Normal file
1
samples/blackfin/Makefile
Normal file
|
@ -0,0 +1 @@
|
|||
obj-$(CONFIG_SAMPLE_BLACKFIN_GPTIMERS) += gptimers-example.o
|
Loading…
Reference in New Issue
Block a user