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 --- include/image.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/image.h b/include/image.h index 963ea96863..fa06476845 100644 --- a/include/image.h +++ b/include/image.h @@ -127,8 +127,8 @@ enum { #define IH_ARCH IH_ARCH_BLACKFIN #elif defined(__avr32__) #define IH_ARCH IH_ARCH_AVR32 -#elif defined(CONFIG_LINUX) -#define IH_ARCH IH_ARCH_LINUX +#elif defined(CONFIG_SANDBOX) +#define IH_ARCH IH_ARCH_SANDBOX #else #define IH_ARCH IH_ARCH_INVALID #endif -- cgit v1.2.3