summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2020-05-22 14:07:38 +0200
committerTom Rini <trini@konsulko.com>2020-05-25 11:54:53 -0400
commitefc0644802a2c9c1747539e017562aabde1f54ec (patch)
tree19a90e91b62dec0f1098a8585e795e9480792898
parent2843444a6eaf1bf287aa00ad46ccfac54fac26b0 (diff)
downloadu-boot-efc0644802a2c9c1747539e017562aabde1f54ec.tar.gz
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>
-rw-r--r--arch/Kconfig2
-rw-r--r--include/configs/sandbox.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 91e049b322..a11f872938 100644
--- 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 7fda63f71a..484a15df79 100644
--- 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