2 files changed, 9 insertions, 9 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 2d05adb98401..3967c2356e37 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -657,7 +657,7 @@ config DEBUG_HIGHMEM
          Disable for production systems.
 config DEBUG_BUGVERBOSE
-        bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
+        bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EXPERT
        depends on BUG
        depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || \
                   FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300
@@ -729,8 +729,8 @@ config DEBUG_WRITECOUNT
          If unsure, say N.
 config DEBUG_MEMORY_INIT
-        bool "Debug memory initialisation" if EMBEDDED
+        bool "Debug memory initialisation" if EXPERT
-        default !EMBEDDED
+        default !EXPERT
        help
          Enable this for additional checks during memory initialisation.
          The sanity checks verify aspects of the VM such as the memory model
diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index e3b6e18fdac5..60a6088d0e5e 100644
--- a/lib/xz/Kconfig
+++ b/lib/xz/Kconfig
@@ -7,37 +7,37 @@ config XZ_DEC
          CRC32 is supported. See Documentation/xz.txt for more information.
 config XZ_DEC_X86
-        bool "x86 BCJ filter decoder" if EMBEDDED
+        bool "x86 BCJ filter decoder" if EXPERT
        default y
        depends on XZ_DEC
        select XZ_DEC_BCJ
 config XZ_DEC_POWERPC
-        bool "PowerPC BCJ filter decoder" if EMBEDDED
+        bool "PowerPC BCJ filter decoder" if EXPERT
        default y
        depends on XZ_DEC
        select XZ_DEC_BCJ
 config XZ_DEC_IA64
-        bool "IA-64 BCJ filter decoder" if EMBEDDED
+        bool "IA-64 BCJ filter decoder" if EXPERT
        default y
        depends on XZ_DEC
        select XZ_DEC_BCJ
 config XZ_DEC_ARM
-        bool "ARM BCJ filter decoder" if EMBEDDED
+        bool "ARM BCJ filter decoder" if EXPERT
        default y
        depends on XZ_DEC
        select XZ_DEC_BCJ
 config XZ_DEC_ARMTHUMB
-        bool "ARM-Thumb BCJ filter decoder" if EMBEDDED
+        bool "ARM-Thumb BCJ filter decoder" if EXPERT
        default y
        depends on XZ_DEC
        select XZ_DEC_BCJ
 config XZ_DEC_SPARC
-        bool "SPARC BCJ filter decoder" if EMBEDDED
+        bool "SPARC BCJ filter decoder" if EXPERT
        default y
        depends on XZ_DEC
        select XZ_DEC_BCJ

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 2d05adb98401..3967c2356e37 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug
@@ -657,7 +657,7 @@ config DEBUG_HIGHMEM
657	Disable for production systems.	657	Disable for production systems.
658		658
659	config DEBUG_BUGVERBOSE	659	config DEBUG_BUGVERBOSE
660	bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED	660	bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EXPERT
661	depends on BUG	661	depends on BUG
662	depends on ARM \|\| AVR32 \|\| M32R \|\| M68K \|\| SPARC32 \|\| SPARC64 \|\| \	662	depends on ARM \|\| AVR32 \|\| M32R \|\| M68K \|\| SPARC32 \|\| SPARC64 \|\| \
663	FRV \|\| SUPERH \|\| GENERIC_BUG \|\| BLACKFIN \|\| MN10300	663	FRV \|\| SUPERH \|\| GENERIC_BUG \|\| BLACKFIN \|\| MN10300
@@ -729,8 +729,8 @@ config DEBUG_WRITECOUNT
729	If unsure, say N.	729	If unsure, say N.
730		730
731	config DEBUG_MEMORY_INIT	731	config DEBUG_MEMORY_INIT
732	bool "Debug memory initialisation" if EMBEDDED	732	bool "Debug memory initialisation" if EXPERT
733	default !EMBEDDED	733	default !EXPERT
734	help	734	help
735	Enable this for additional checks during memory initialisation.	735	Enable this for additional checks during memory initialisation.
736	The sanity checks verify aspects of the VM such as the memory model	736	The sanity checks verify aspects of the VM such as the memory model


diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig index e3b6e18fdac5..60a6088d0e5e 100644 --- a/lib/xz/Kconfig +++ b/lib/xz/Kconfig
@@ -7,37 +7,37 @@ config XZ_DEC
7	CRC32 is supported. See Documentation/xz.txt for more information.	7	CRC32 is supported. See Documentation/xz.txt for more information.
8		8
9	config XZ_DEC_X86	9	config XZ_DEC_X86
10	bool "x86 BCJ filter decoder" if EMBEDDED	10	bool "x86 BCJ filter decoder" if EXPERT
11	default y	11	default y
12	depends on XZ_DEC	12	depends on XZ_DEC
13	select XZ_DEC_BCJ	13	select XZ_DEC_BCJ
14		14
15	config XZ_DEC_POWERPC	15	config XZ_DEC_POWERPC
16	bool "PowerPC BCJ filter decoder" if EMBEDDED	16	bool "PowerPC BCJ filter decoder" if EXPERT
17	default y	17	default y
18	depends on XZ_DEC	18	depends on XZ_DEC
19	select XZ_DEC_BCJ	19	select XZ_DEC_BCJ
20		20
21	config XZ_DEC_IA64	21	config XZ_DEC_IA64
22	bool "IA-64 BCJ filter decoder" if EMBEDDED	22	bool "IA-64 BCJ filter decoder" if EXPERT
23	default y	23	default y
24	depends on XZ_DEC	24	depends on XZ_DEC
25	select XZ_DEC_BCJ	25	select XZ_DEC_BCJ
26		26
27	config XZ_DEC_ARM	27	config XZ_DEC_ARM
28	bool "ARM BCJ filter decoder" if EMBEDDED	28	bool "ARM BCJ filter decoder" if EXPERT
29	default y	29	default y
30	depends on XZ_DEC	30	depends on XZ_DEC
31	select XZ_DEC_BCJ	31	select XZ_DEC_BCJ
32		32
33	config XZ_DEC_ARMTHUMB	33	config XZ_DEC_ARMTHUMB
34	bool "ARM-Thumb BCJ filter decoder" if EMBEDDED	34	bool "ARM-Thumb BCJ filter decoder" if EXPERT
35	default y	35	default y
36	depends on XZ_DEC	36	depends on XZ_DEC
37	select XZ_DEC_BCJ	37	select XZ_DEC_BCJ
38		38
39	config XZ_DEC_SPARC	39	config XZ_DEC_SPARC
40	bool "SPARC BCJ filter decoder" if EMBEDDED	40	bool "SPARC BCJ filter decoder" if EXPERT
41	default y	41	default y
42	depends on XZ_DEC	42	depends on XZ_DEC
43	select XZ_DEC_BCJ	43	select XZ_DEC_BCJ