diff options
| author | Ahmad Fatoum <ahmad@a3f.at> | 2020-11-26 21:37:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-11-27 10:05:20 +0100 |
| commit | cee45e68b5b2b415e786216e32fe3ef0f9dbbf02 (patch) | |
| tree | 82a97058920f87250e3bbad97c8e37dabe693965 | |
| parent | 7cc491383b9de67abfd5bb9e1222287243cc3741 (diff) | |
| download | barebox-cee45e68b5b2b415e786216e32fe3ef0f9dbbf02.tar.gz barebox-cee45e68b5b2b415e786216e32fe3ef0f9dbbf02.tar.xz | |
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 <antonynpavlov@gmail.com>
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/sandbox/Kconfig | 6 | ||||
| -rw-r--r-- | commands/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/serial/Kconfig | 2 | ||||
| -rw-r--r-- | include/image.h | 4 |
5 files changed, 6 insertions, 10 deletions
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 diff --git a/commands/Kconfig b/commands/Kconfig index 8b4ed9aa53..03ddfc8870 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -2058,7 +2058,7 @@ config CMD_KEYSTORE config CMD_LINUX_EXEC bool "linux exec" - depends on LINUX + depends on SANDBOX help Execute a command on the host diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 76509a52a1..0d55ea7a3b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -242,7 +242,7 @@ config DRIVER_NET_SMC91111 config DRIVER_NET_TAP bool "tap Ethernet driver" - depends on LINUX + depends on SANDBOX config DRIVER_NET_EFI_SNP bool "EFI SNP ethernet driver" diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 14cd430ee4..5c6f0e88e3 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -52,7 +52,7 @@ config DRIVER_SERIAL_AUART bool "i.MX23/i.MX28 application UART serial driver" config DRIVER_SERIAL_LINUX_CONSOLE - depends on LINUX + depends on SANDBOX default y bool "linux console driver" 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 |