Browse Source

fixup allmodconfig target

Waldemar Brodkorb 7 years ago
parent
commit
492d40f88d
3 changed files with 9 additions and 3 deletions
  1. 7 2
      mk/build.mk
  2. 0 1
      target/linux/config/Config.in.debug
  3. 2 0
      target/linux/config/Config.in.kernel

+ 7 - 2
mk/build.mk

@@ -6,12 +6,18 @@ CONFIG = adk/config
 DEFCONFIG=		ADK_DEBUG=n \
 			ADK_BUILD_WITH_DEBUG=n \
 			ADK_DISABLE_CHECKSUM=n \
+			ADK_APPLIANCE_MPD=n \
+			ADK_APPLIANCE_TOOLCHAIN=n \
+			ADK_APPLIANCE_KODI=n \
+			ADK_APPLIANCE_BRUTEFIR=n \
+			ADK_APPLIANCE_TEST=n \
+			ADK_APPLIANCE_FIREFOX=n \
+			ADK_APPLIANCE_DEVELOPMENT=n \
 			ADK_PACKAGE_BUSYBOX_HIDE=n \
 			ADK_DISABLE_KERNEL_PATCHES=n \
 			ADK_DISABLE_TARGET_KERNEL_PATCHES=n \
 			ADK_DISABLE_HONOUR_CFLAGS=n \
 			ADK_KERNEL_FB_CON_DECOR=n \
-			ADK_CHOOSE_APPLIANCE=n \
 			ADK_MAKE_PARALLEL=y \
 			ADK_MAKE_JOBS=4 \
 			ADK_LEAVE_ETC_ALONE=n \
@@ -30,7 +36,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_SSLTUNNEL=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_CRYPTINIT=n \
-			ADK_KERNEL_MPTCP=n \
 			ADK_STATIC_TOOLCHAIN=n \
 			ADK_TOOLCHAIN_WITH_SSP=n \
 			ADK_TARGET_USE_SSP=n \

+ 0 - 1
target/linux/config/Config.in.debug

@@ -118,7 +118,6 @@ config ADK_KERNEL_OPROFILE
 	tristate "Oprofile support"
 	select ADK_KERNEL_PROFILING
 	depends on !ADK_TARGET_ARCH_M68K
-	depends on !ADK_KERNEL_PREEMPT_RT_FULL
 	default n
 	help
 	  use oprofile package to make use of the kernel support.

+ 2 - 0
target/linux/config/Config.in.kernel

@@ -141,6 +141,7 @@ config ADK_KERNEL_PREEMPT_RTB
 	bool "Preemptible Kernel (Basic RealTime)"
 	select ADK_KERNEL_HIGH_RES_TIMERS
 	select ADK_KERNEL_PATCH_REALTIME
+	depends on !ADK_KERNEL_OPROFILE
 	depends on ADK_TARGET_KERNEL_VERSION_4_1 \
 		|| ADK_TARGET_KERNEL_VERSION_4_4
         help
@@ -150,6 +151,7 @@ config ADK_KERNEL_PREEMPT_RT_FULL
 	bool "Fully Preemptible Kernel (RealTime)"
 	select ADK_KERNEL_HIGH_RES_TIMERS
 	select ADK_KERNEL_PATCH_REALTIME
+	depends on !ADK_KERNEL_OPROFILE
 	depends on ADK_TARGET_KERNEL_VERSION_4_1 \
 		|| ADK_TARGET_KERNEL_VERSION_4_4
         help