Merge pull request torvalds#440 from libos-nuse/feature-custom-make-c…

…onfig lkl-upstream: allow specify custom config name to make
lopsided98 · Jun 12, 2018 · ba78f51 · ba78f51
2 parents 593eb62 + dff35a6
commit ba78f51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/arch/lkl/Kconfig b/arch/lkl/Kconfig
@@ -20,6 +20,10 @@ config LKL
  select HAVE_UNDERSCORE_SYMBOL_PREFIX if OUTPUT_FORMAT = "pe-i386"
  select 64BIT if OUTPUT_FORMAT = "elf64-x86-64-freebsd"
  select 64BIT if OUTPUT_FORMAT = "elf64-littleaarch64"
+ select NET
+ select MULTIUSER
+ select INET
+ select IPV6
  select IP_PNP
  select IP_PNP_DHCP
  select TCP_CONG_ADVANCED

diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile
@@ -4,6 +4,8 @@
 .SUFFIXES:
 MAKEFLAGS += -r --no-print-directory
 
+KCONFIG?=defconfig
+
 ifneq ($(silent),1)
  ifneq ($(V),1)
  QUIET_AUTOCONF = @echo ' AUTOCONF '$@;
@@ -59,7 +61,7 @@ endif
 
 # rule to build lkl.o
 $(OUTPUT)lib/lkl.o: bin/stat
- $(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) defconfig
+ $(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) $(KCONFIG)
 # this workaround is for arm32 linker (ld.gold)
  $(Q)export PATH=$(srctree)/tools/lkl/bin/:${PATH} ;\
  $(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(OUTPUT)