| Message ID | 20200522120738.13376-5-michael@walle.cc |
|---|---|
| State | Accepted |
| Commit | efc0644802a2c9c1747539e017562aabde1f54ec |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | cmd: {zip, unzip} fixes | expand |
On Fri, 22 May 2020 at 06:07, Michael Walle <michael@walle.cc> wrote: > > 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> > --- > arch/Kconfig | 2 ++ > include/configs/sandbox.h | 3 --- > 2 files changed, 2 insertions(+), 3 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Fri, May 22, 2020 at 02:07:38PM +0200, Michael Walle wrote: > 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> Applied to u-boot/master, thanks!
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 4549c81169..a2c9811eca 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
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> --- arch/Kconfig | 2 ++ include/configs/sandbox.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)