sandbox: move compression option to Kconfig

CONFIG_BZIP2 and CONFIG_GZIP_COMPRESSED are Kconfig options. Select them
by CONFIG_SANDBOX instead of setting them in configs/sandbox.h.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index 91e049b..a11f872 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -86,6 +86,7 @@ config RISCV
 config SANDBOX
        bool "Sandbox"
        select BOARD_LATE_INIT
+       select BZIP2
        select DM
        select DM_GPIO
        select DM_I2C
@@ -94,6 +95,7 @@ config SANDBOX
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH
+       select GZIP_COMPRESSED
        select HAVE_BLOCK_DEVICE
        select LZO
        select OF_BOARD_SETUP

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 7fda63f..484a15d 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -114,9 +114,6 @@
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS
 
-#define CONFIG_GZIP_COMPRESSED
-#define CONFIG_BZIP2
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_IDE_MAXBUS          1
 #define CONFIG_SYS_ATA_IDE0_OFFSET     0