samples: watchdog: use 'userprogs' syntax

Kbuild now supports the 'userprogs' syntax to compile userspace
programs for the same architecture as the kernel.

Add the entry to samples/Makefile to put this into the build bot
coverage.

I also added the CONFIG option guarded by 'depends on CC_CAN_LINK'
because $(CC) may not provide libc.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

diff --git a/samples/Kconfig b/samples/Kconfig
index a8629a0d4f96c40799f3f5cbb833fd67c4205a2d..5005f74ac0eb7030b14c3c26bde9ae3735ddcc39 100644 (file)
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -205,5 +205,8 @@ config SAMPLE_INTEL_MEI
        help
          Build a sample program to work with mei device.
 
+config SAMPLE_WATCHDOG
+       bool "watchdog sample"
+       depends on CC_CAN_LINK
 
 endif # SAMPLES

diff --git a/samples/Makefile b/samples/Makefile
index 042208326689b0286583de825493b44abb4a2b6c..29c66aadd954af429ce40d4ef608b8e8e7a19a41 100644 (file)
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -26,3 +26,4 @@ obj-$(CONFIG_VIDEO_PCI_SKELETON)      += v4l/
 obj-y                                  += vfio-mdev/
 subdir-$(CONFIG_SAMPLE_VFS)            += vfs
 obj-$(CONFIG_SAMPLE_INTEL_MEI)         += mei/
+subdir-$(CONFIG_SAMPLE_WATCHDOG)       += watchdog

diff --git a/samples/watchdog/Makefile b/samples/watchdog/Makefile
index a9430fa60253dc1a1ad57957a093046137668be8..17384cfb387e9e72031b101779dffe1c484711cf 100644 (file)
--- a/samples/watchdog/Makefile
+++ b/samples/watchdog/Makefile
@@ -1,9 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-CC := $(CROSS_COMPILE)gcc
-PROGS := watchdog-simple
-
-all: $(PROGS)
-
-clean:
-       rm -fr $(PROGS)
-
+userprogs := watchdog-simple
+always-y := $(userprogs)