From cee45e68b5b2b415e786216e32fe3ef0f9dbbf02 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Thu, 26 Nov 2020 21:37:17 +0100 Subject: sandbox: retire CONFIG_LINUX symbol in favor of CONFIG_SANDBOX 5211e428cbab ("image: Convert the IH_... values to enums") removed the IH_ARCH_LINUX enumeration value leading to breakage of sandbox configurations that enable bootm. Instead of reinstating IH_ARCH_LINUX, just use IH_ARCH_SANDBOX and remove mention of CONFIG_LINUX altogether, it's always true anyway when CONFIG_SANDBOX is true. Fixes: 5211e428cbab ("image: Convert the IH_... values to enums") Cc: Antony Pavlov Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/sandbox/Kconfig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'arch/sandbox/Kconfig') diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index 113b619fc3..d9fc0c947b 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -11,17 +11,13 @@ config SANDBOX select BLOCK_WRITE select PARTITION_DISK select ARCH_HAS_STACK_DUMP if ASAN + select GENERIC_FIND_NEXT_BIT default y config ARCH_TEXT_BASE hex default 0x00000000 -config LINUX - bool - default y - select GENERIC_FIND_NEXT_BIT - config SANDBOX_REEXEC prompt "exec(2) reset handler" def_bool y -- cgit v1.2.3