diff mbox

[v3] cmd: move CONFIG_CMD_UNZIP and CONFIG_CMD_ZIP to Kconfig

Message ID 1486258976-32141-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit e9d33e73264c61c87a40946abe4d44a2d2e47292
Headers show

Commit Message

Masahiro Yamada Feb. 5, 2017, 1:42 a.m. UTC
CONFIG_CMD_ZIP is not defined by any board.  I am moving
CONFIG_CMD_UNZIP to defconfig files except UniPhier SoC family.

I am the maintainer of UniPhier platform, so I know "select CMD_UNZIP"
is better for this platform.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Acked-by: Michal Simek <michal.simek@xilinx.com>

Acked-by: Stefan Roese <sr@denx.de>

---

Changes in v3:
  - Fix a typo in Kconfig help: Compresses -> Compress

Changes in v2:
  - Fix a typo in git-log:  CMD_ZIP -> CMD_UNZIP

 README                                           |  6 ------
 arch/arm/mach-uniphier/Kconfig                   |  1 +
 cmd/Kconfig                                      | 10 ++++++++++
 configs/brxre1_defconfig                         |  1 +
 configs/dragonboard410c_defconfig                |  1 +
 configs/ethernut5_defconfig                      |  1 +
 configs/hikey_defconfig                          |  1 +
 configs/icnova-a20-swac_defconfig                |  3 ++-
 configs/vexpress_aemv8a_dram_defconfig           |  1 +
 configs/vexpress_aemv8a_juno_defconfig           |  1 +
 configs/vexpress_aemv8a_semi_defconfig           |  1 +
 configs/xilinx_zynqmp_ep_defconfig               |  1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig |  1 +
 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig |  1 +
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig |  1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig |  1 +
 configs/xilinx_zynqmp_zcu102_defconfig           |  1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      |  1 +
 include/config_cmd_all.h                         |  1 -
 include/configs/brxre1.h                         |  1 -
 include/configs/dragonboard410c.h                |  1 -
 include/configs/ethernut5.h                      |  1 -
 include/configs/hikey.h                          |  1 -
 include/configs/uniphier.h                       |  4 ----
 include/configs/vexpress_aemv8a.h                |  1 -
 include/configs/xilinx_zynqmp.h                  |  2 --
 26 files changed, 27 insertions(+), 19 deletions(-)

-- 
2.7.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Comments

Ryan Harkin Feb. 6, 2017, 4 p.m. UTC | #1
On 5 February 2017 at 01:42, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> CONFIG_CMD_ZIP is not defined by any board.  I am moving

> CONFIG_CMD_UNZIP to defconfig files except UniPhier SoC family.

>

> I am the maintainer of UniPhier platform, so I know "select CMD_UNZIP"

> is better for this platform.

>

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> Acked-by: Michal Simek <michal.simek@xilinx.com>

> Acked-by: Stefan Roese <sr@denx.de>

Acked-by: Ryan Harkin <ryan.harkin@linaro.org>

Tested-by: Ryan Harkin <ryan.harkin@linaro.org>


Tested on TC2, FVP Foundation and AEMv8 models and Juno R0, R1 and R2.


> ---

>

> Changes in v3:

>   - Fix a typo in Kconfig help: Compresses -> Compress

>

> Changes in v2:

>   - Fix a typo in git-log:  CMD_ZIP -> CMD_UNZIP

>

>  README                                           |  6 ------

>  arch/arm/mach-uniphier/Kconfig                   |  1 +

>  cmd/Kconfig                                      | 10 ++++++++++

>  configs/brxre1_defconfig                         |  1 +

>  configs/dragonboard410c_defconfig                |  1 +

>  configs/ethernut5_defconfig                      |  1 +

>  configs/hikey_defconfig                          |  1 +

>  configs/icnova-a20-swac_defconfig                |  3 ++-

>  configs/vexpress_aemv8a_dram_defconfig           |  1 +

>  configs/vexpress_aemv8a_juno_defconfig           |  1 +

>  configs/vexpress_aemv8a_semi_defconfig           |  1 +

>  configs/xilinx_zynqmp_ep_defconfig               |  1 +

>  configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig |  1 +

>  configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig |  1 +

>  configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig |  1 +

>  configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig |  1 +

>  configs/xilinx_zynqmp_zcu102_defconfig           |  1 +

>  configs/xilinx_zynqmp_zcu102_revB_defconfig      |  1 +

>  include/config_cmd_all.h                         |  1 -

>  include/configs/brxre1.h                         |  1 -

>  include/configs/dragonboard410c.h                |  1 -

>  include/configs/ethernut5.h                      |  1 -

>  include/configs/hikey.h                          |  1 -

>  include/configs/uniphier.h                       |  4 ----

>  include/configs/vexpress_aemv8a.h                |  1 -

>  include/configs/xilinx_zynqmp.h                  |  2 --

>  26 files changed, 27 insertions(+), 19 deletions(-)

>

> diff --git a/README b/README

> index 9c992c1..89c12b0 100644

> --- a/README

> +++ b/README

> @@ -1765,12 +1765,6 @@ The following options need to be configured:

>                 can be displayed via the splashscreen support or the

>                 bmp command.

>

> -- Do compressing for memory range:

> -               CONFIG_CMD_ZIP

> -

> -               If this option is set, it would use zlib deflate method

> -               to compress the specified memory at its best effort.

> -

>  - Compression support:

>                 CONFIG_GZIP

>

> diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig

> index cd9ba6b..5739325 100644

> --- a/arch/arm/mach-uniphier/Kconfig

> +++ b/arch/arm/mach-uniphier/Kconfig

> @@ -13,6 +13,7 @@ config ARCH_UNIPHIER_32BIT

>  config ARCH_UNIPHIER_64BIT

>         bool

>         select ARM64

> +       select CMD_UNZIP

>         select SPL_SEPARATE_BSS if SPL

>         select ARMV8_MULTIENTRY if SPL

>         select ARMV8_SPIN_TABLE if SPL

> diff --git a/cmd/Kconfig b/cmd/Kconfig

> index 4a0d489..d618a51 100644

> --- a/cmd/Kconfig

> +++ b/cmd/Kconfig

> @@ -346,6 +346,16 @@ config CMD_MEMINFO

>         help

>           Display memory information.

>

> +config CMD_UNZIP

> +       bool "unzip"

> +       help

> +         Uncompress a zip-compressed memory region.

> +

> +config CMD_ZIP

> +       bool "zip"

> +       help

> +         Compress a memory region with zlib deflate method.

> +

>  endmenu

>

>  menu "Device access commands"

> diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig

> index 0b7b082..dfa8712 100644

> --- a/configs/brxre1_defconfig

> +++ b/configs/brxre1_defconfig

> @@ -31,6 +31,7 @@ CONFIG_CMD_BOOTZ=y

>  # CONFIG_CMD_XIMG is not set

>  # CONFIG_CMD_EDITENV is not set

>  # CONFIG_CMD_CRC32 is not set

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_LOADB is not set

>  # CONFIG_CMD_LOADS is not set

>  # CONFIG_CMD_FLASH is not set

> diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig

> index 8f206e2..e94f7b3 100644

> --- a/configs/dragonboard410c_defconfig

> +++ b/configs/dragonboard410c_defconfig

> @@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="dragonboard410c => "

>  # CONFIG_CMD_IMI is not set

>  # CONFIG_CMD_IMLS is not set

>  CONFIG_CMD_MEMINFO=y

> +CONFIG_CMD_UNZIP=y

>  CONFIG_CMD_GPT=y

>  CONFIG_CMD_MMC=y

>  CONFIG_CMD_USB=y

> diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig

> index c831aab..4d1b4b0 100644

> --- a/configs/ethernut5_defconfig

> +++ b/configs/ethernut5_defconfig

> @@ -8,6 +8,7 @@ CONFIG_HUSH_PARSER=y

>  CONFIG_SYS_PROMPT="U-Boot> "

>  # CONFIG_CMD_BDI is not set

>  CONFIG_CMD_ASKENV=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_LOADS is not set

>  CONFIG_CMD_MMC=y

>  CONFIG_CMD_SF=y

> diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig

> index 8dd330a..b112be2 100644

> --- a/configs/hikey_defconfig

> +++ b/configs/hikey_defconfig

> @@ -7,6 +7,7 @@ CONFIG_DISTRO_DEFAULTS=y

>  # CONFIG_DISPLAY_BOARDINFO is not set

>  CONFIG_BOARD_EARLY_INIT_F=y

>  # CONFIG_CMD_IMLS is not set

> +CONFIG_CMD_UNZIP=y

>  CONFIG_CMD_MMC=y

>  CONFIG_CMD_USB=y

>  CONFIG_CMD_GPIO=y

> diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig

> index 567eb9b..5ef0e47 100644

> --- a/configs/icnova-a20-swac_defconfig

> +++ b/configs/icnova-a20-swac_defconfig

> @@ -13,9 +13,10 @@ CONFIG_VIDEO_LCD_POWER="PH22"

>  CONFIG_VIDEO_LCD_PANEL_LVDS=y

>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-swac"

>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

> -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP,CMD_UNZIP"

> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP"

>  CONFIG_SPL=y

>  # CONFIG_CMD_IMLS is not set

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_FLASH is not set

>  # CONFIG_CMD_FPGA is not set

>  # CONFIG_SPL_DOS_PARTITION is not set

> diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig

> index c899be0..db492af 100644

> --- a/configs/vexpress_aemv8a_dram_defconfig

> +++ b/configs/vexpress_aemv8a_dram_defconfig

> @@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="VExpress64# "

>  # CONFIG_CMD_EDITENV is not set

>  # CONFIG_CMD_ENV_EXISTS is not set

>  CONFIG_CMD_MEMTEST=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_LOADS is not set

>  CONFIG_CMD_ARMFLASH=y

>  # CONFIG_CMD_FPGA is not set

> diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig

> index 2267362..537301c 100644

> --- a/configs/vexpress_aemv8a_juno_defconfig

> +++ b/configs/vexpress_aemv8a_juno_defconfig

> @@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="VExpress64# "

>  # CONFIG_CMD_EDITENV is not set

>  # CONFIG_CMD_ENV_EXISTS is not set

>  CONFIG_CMD_MEMTEST=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_LOADS is not set

>  CONFIG_CMD_ARMFLASH=y

>  # CONFIG_CMD_FPGA is not set

> diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig

> index 02740a4..2720a71 100644

> --- a/configs/vexpress_aemv8a_semi_defconfig

> +++ b/configs/vexpress_aemv8a_semi_defconfig

> @@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="VExpress64# "

>  # CONFIG_CMD_EDITENV is not set

>  # CONFIG_CMD_ENV_EXISTS is not set

>  CONFIG_CMD_MEMTEST=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_LOADS is not set

>  CONFIG_CMD_ARMFLASH=y

>  # CONFIG_CMD_FPGA is not set

> diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig

> index 49c0786..6b568b4 100644

> --- a/configs/xilinx_zynqmp_ep_defconfig

> +++ b/configs/xilinx_zynqmp_ep_defconfig

> @@ -21,6 +21,7 @@ CONFIG_SYS_PROMPT="ZynqMP> "

>  # CONFIG_CMD_XIMG is not set

>  # CONFIG_CMD_EDITENV is not set

>  # CONFIG_CMD_ENV_EXISTS is not set

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_LOADB is not set

>  # CONFIG_CMD_LOADS is not set

>  CONFIG_CMD_GPT=y

> diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig

> index a3585d0..4d7bcf3 100644

> --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig

> +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig

> @@ -19,6 +19,7 @@ CONFIG_SPL_OS_BOOT=y

>  CONFIG_SYS_PROMPT="ZynqMP> "

>  # CONFIG_CMD_IMLS is not set

>  CONFIG_CMD_MEMTEST=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_FLASH is not set

>  CONFIG_CMD_GPT=y

>  CONFIG_CMD_MMC=y

> diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig

> index 3693d9b..822b25d 100644

> --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig

> +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig

> @@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y

>  CONFIG_SYS_PROMPT="ZynqMP> "

>  # CONFIG_CMD_IMLS is not set

>  CONFIG_CMD_MEMTEST=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_FLASH is not set

>  CONFIG_CMD_GPT=y

>  CONFIG_CMD_NAND=y

> diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig

> index a4c73f8..89813df 100644

> --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig

> +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig

> @@ -16,6 +16,7 @@ CONFIG_SPL_OS_BOOT=y

>  CONFIG_SYS_PROMPT="ZynqMP> "

>  # CONFIG_CMD_IMLS is not set

>  CONFIG_CMD_MEMTEST=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_FLASH is not set

>  CONFIG_CMD_MMC=y

>  CONFIG_CMD_I2C=y

> diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig

> index f981b21..b8fe33e 100644

> --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig

> +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig

> @@ -17,6 +17,7 @@ CONFIG_SPL_OS_BOOT=y

>  CONFIG_SYS_PROMPT="ZynqMP> "

>  # CONFIG_CMD_IMLS is not set

>  CONFIG_CMD_MEMTEST=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_FLASH is not set

>  CONFIG_CMD_MMC=y

>  CONFIG_CMD_I2C=y

> diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig

> index 7b65fe0..b13bf5b 100644

> --- a/configs/xilinx_zynqmp_zcu102_defconfig

> +++ b/configs/xilinx_zynqmp_zcu102_defconfig

> @@ -19,6 +19,7 @@ CONFIG_SPL_OS_BOOT=y

>  CONFIG_SYS_PROMPT="ZynqMP> "

>  # CONFIG_CMD_IMLS is not set

>  CONFIG_CMD_MEMTEST=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_FLASH is not set

>  CONFIG_CMD_GPT=y

>  CONFIG_CMD_MMC=y

> diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig

> index 4bed589..2489d89 100644

> --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig

> +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig

> @@ -19,6 +19,7 @@ CONFIG_SPL_OS_BOOT=y

>  CONFIG_SYS_PROMPT="ZynqMP> "

>  # CONFIG_CMD_IMLS is not set

>  CONFIG_CMD_MEMTEST=y

> +CONFIG_CMD_UNZIP=y

>  # CONFIG_CMD_FLASH is not set

>  CONFIG_CMD_GPT=y

>  CONFIG_CMD_MMC=y

> diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h

> index a0d4e94..a8befe3 100644

> --- a/include/config_cmd_all.h

> +++ b/include/config_cmd_all.h

> @@ -49,7 +49,6 @@

>  #define CONFIG_CMD_TERMINAL    /* built-in Serial Terminal     */

>  #define CONFIG_CMD_UBIFS       /* UBIFS Support                */

>  #define CONFIG_CMD_UNIVERSE    /* Tundra Universe Support      */

> -#define CONFIG_CMD_UNZIP       /* unzip from memory to memory  */

>  #define CONFIG_CMD_ZFS         /* ZFS Support                  */

>

>  #endif /* _CONFIG_CMD_ALL_H */

> diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h

> index 02094b5..82ee7c6 100644

> --- a/include/configs/brxre1.h

> +++ b/include/configs/brxre1.h

> @@ -22,7 +22,6 @@

>

>  #define CONFIG_VIDEO_BMP_GZIP

>  #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4)

> -#define CONFIG_CMD_UNZIP

>  #define CONFIG_CMD_BMP

>  #define CONFIG_BMP_24BMP

>  #define CONFIG_BMP_32BPP

> diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h

> index da1c589..9b7f43f 100644

> --- a/include/configs/dragonboard410c.h

> +++ b/include/configs/dragonboard410c.h

> @@ -57,7 +57,6 @@

>  /*#define CONFIG_SUPPORT_EMMC_BOOT */

>  #define CONFIG_CMD_REGINFO     /* Register dump                */

>  #define CONFIG_CMD_TFTP

> -#define CONFIG_CMD_UNZIP

>

>  /* Partition table support */

>  #define HAVE_BLOCK_DEVICE /* Needed for partition commands */

> diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h

> index a3c40d6..55d65ef 100644

> --- a/include/configs/ethernut5.h

> +++ b/include/configs/ethernut5.h

> @@ -95,7 +95,6 @@

>  #define CONFIG_CMD_REISER

>  #define CONFIG_CMD_SAVES

>  #define CONFIG_CMD_UBIFS

> -#define CONFIG_CMD_UNZIP

>  #endif

>

>  /* NAND flash */

> diff --git a/include/configs/hikey.h b/include/configs/hikey.h

> index 9ec8140..899d62d 100644

> --- a/include/configs/hikey.h

> +++ b/include/configs/hikey.h

> @@ -74,7 +74,6 @@

>  #define CONFIG_FS_EXT4

>

>  /* Command line configuration */

> -#define CONFIG_CMD_UNZIP

>  #define CONFIG_CMD_ENV

>

>  #define CONFIG_MTD_PARTITIONS

> diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h

> index 22962392e..b453d8f 100644

> --- a/include/configs/uniphier.h

> +++ b/include/configs/uniphier.h

> @@ -15,10 +15,6 @@

>

>  #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10

>

> -#ifdef CONFIG_ARM64

> -#define CONFIG_CMD_UNZIP

> -#endif

> -

>  /*-----------------------------------------------------------------------

>   * MMU and Cache Setting

>   *----------------------------------------------------------------------*/

> diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h

> index 3a4bfe8..35ac60a 100644

> --- a/include/configs/vexpress_aemv8a.h

> +++ b/include/configs/vexpress_aemv8a.h

> @@ -126,7 +126,6 @@

>  #endif

>

>  /*#define CONFIG_MENU_SHOW*/

> -#define CONFIG_CMD_UNZIP

>  #define CONFIG_CMD_ENV

>

>  /* BOOTP options */

> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h

> index 4759373..73830b2 100644

> --- a/include/configs/xilinx_zynqmp.h

> +++ b/include/configs/xilinx_zynqmp.h

> @@ -207,8 +207,6 @@

>

>  #define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)

>

> -#define CONFIG_CMD_UNZIP

> -

>  #define CONFIG_BOARD_EARLY_INIT_R

>  #define CONFIG_CLOCKS

>

> --

> 2.7.4

>

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Tom Rini Feb. 9, 2017, 3:03 a.m. UTC | #2
On Sun, Feb 05, 2017 at 10:42:56AM +0900, Masahiro Yamada wrote:

> CONFIG_CMD_ZIP is not defined by any board.  I am moving

> CONFIG_CMD_UNZIP to defconfig files except UniPhier SoC family.

> 

> I am the maintainer of UniPhier platform, so I know "select CMD_UNZIP"

> is better for this platform.

> 

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> Acked-by: Michal Simek <michal.simek@xilinx.com>

> Acked-by: Stefan Roese <sr@denx.de>

> Acked-by: Ryan Harkin <ryan.harkin@linaro.org>

> Tested-by: Ryan Harkin <ryan.harkin@linaro.org>


Applied to u-boot/master, thanks!

-- 
Tom
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
diff mbox

Patch

diff --git a/README b/README
index 9c992c1..89c12b0 100644
--- a/README
+++ b/README
@@ -1765,12 +1765,6 @@  The following options need to be configured:
 		can be displayed via the splashscreen support or the
 		bmp command.
 
-- Do compressing for memory range:
-		CONFIG_CMD_ZIP
-
-		If this option is set, it would use zlib deflate method
-		to compress the specified memory at its best effort.
-
 - Compression support:
 		CONFIG_GZIP
 
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index cd9ba6b..5739325 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -13,6 +13,7 @@  config ARCH_UNIPHIER_32BIT
 config ARCH_UNIPHIER_64BIT
 	bool
 	select ARM64
+	select CMD_UNZIP
 	select SPL_SEPARATE_BSS if SPL
 	select ARMV8_MULTIENTRY if SPL
 	select ARMV8_SPIN_TABLE if SPL
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 4a0d489..d618a51 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -346,6 +346,16 @@  config CMD_MEMINFO
 	help
 	  Display memory information.
 
+config CMD_UNZIP
+	bool "unzip"
+	help
+	  Uncompress a zip-compressed memory region.
+
+config CMD_ZIP
+	bool "zip"
+	help
+	  Compress a memory region with zlib deflate method.
+
 endmenu
 
 menu "Device access commands"
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index 0b7b082..dfa8712 100644
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -31,6 +31,7 @@  CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
index 8f206e2..e94f7b3 100644
--- a/configs/dragonboard410c_defconfig
+++ b/configs/dragonboard410c_defconfig
@@ -9,6 +9,7 @@  CONFIG_SYS_PROMPT="dragonboard410c => "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_UNZIP=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index c831aab..4d1b4b0 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -8,6 +8,7 @@  CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig
index 8dd330a..b112be2 100644
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -7,6 +7,7 @@  CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_UNZIP=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_GPIO=y
diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig
index 567eb9b..5ef0e47 100644
--- a/configs/icnova-a20-swac_defconfig
+++ b/configs/icnova-a20-swac_defconfig
@@ -13,9 +13,10 @@  CONFIG_VIDEO_LCD_POWER="PH22"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-swac"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP,CMD_UNZIP"
+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig
index c899be0..db492af 100644
--- a/configs/vexpress_aemv8a_dram_defconfig
+++ b/configs/vexpress_aemv8a_dram_defconfig
@@ -14,6 +14,7 @@  CONFIG_SYS_PROMPT="VExpress64# "
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_FPGA is not set
diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 2267362..537301c 100644
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -14,6 +14,7 @@  CONFIG_SYS_PROMPT="VExpress64# "
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_FPGA is not set
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 02740a4..2720a71 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -14,6 +14,7 @@  CONFIG_SYS_PROMPT="VExpress64# "
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_FPGA is not set
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index 49c0786..6b568b4 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -21,6 +21,7 @@  CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_GPT=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
index a3585d0..4d7bcf3 100644
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
@@ -19,6 +19,7 @@  CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
index 3693d9b..822b25d 100644
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -21,6 +21,7 @@  CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
 CONFIG_CMD_NAND=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
index a4c73f8..89813df 100644
--- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
@@ -16,6 +16,7 @@  CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
index f981b21..b8fe33e 100644
--- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
@@ -17,6 +17,7 @@  CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig
index 7b65fe0..b13bf5b 100644
--- a/configs/xilinx_zynqmp_zcu102_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_defconfig
@@ -19,6 +19,7 @@  CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
index 4bed589..2489d89 100644
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -19,6 +19,7 @@  CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index a0d4e94..a8befe3 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -49,7 +49,6 @@ 
 #define CONFIG_CMD_TERMINAL	/* built-in Serial Terminal	*/
 #define CONFIG_CMD_UBIFS	/* UBIFS Support		*/
 #define CONFIG_CMD_UNIVERSE	/* Tundra Universe Support	*/
-#define CONFIG_CMD_UNZIP	/* unzip from memory to memory	*/
 #define CONFIG_CMD_ZFS		/* ZFS Support			*/
 
 #endif	/* _CONFIG_CMD_ALL_H */
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 02094b5..82ee7c6 100644
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -22,7 +22,6 @@ 
 
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(1366*767*4)
-#define CONFIG_CMD_UNZIP
 #define CONFIG_CMD_BMP
 #define CONFIG_BMP_24BMP
 #define CONFIG_BMP_32BPP
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index da1c589..9b7f43f 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -57,7 +57,6 @@ 
 /*#define CONFIG_SUPPORT_EMMC_BOOT */
 #define CONFIG_CMD_REGINFO	/* Register dump		*/
 #define CONFIG_CMD_TFTP
-#define CONFIG_CMD_UNZIP
 
 /* Partition table support */
 #define HAVE_BLOCK_DEVICE /* Needed for partition commands */
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index a3c40d6..55d65ef 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -95,7 +95,6 @@ 
 #define CONFIG_CMD_REISER
 #define CONFIG_CMD_SAVES
 #define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_UNZIP
 #endif
 
 /* NAND flash */
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 9ec8140..899d62d 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -74,7 +74,6 @@ 
 #define CONFIG_FS_EXT4
 
 /* Command line configuration */
-#define CONFIG_CMD_UNZIP
 #define CONFIG_CMD_ENV
 
 #define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 22962392e..b453d8f 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -15,10 +15,6 @@ 
 
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
 
-#ifdef CONFIG_ARM64
-#define CONFIG_CMD_UNZIP
-#endif
-
 /*-----------------------------------------------------------------------
  * MMU and Cache Setting
  *----------------------------------------------------------------------*/
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 3a4bfe8..35ac60a 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -126,7 +126,6 @@ 
 #endif
 
 /*#define CONFIG_MENU_SHOW*/
-#define CONFIG_CMD_UNZIP
 #define CONFIG_CMD_ENV
 
 /* BOOTP options */
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 4759373..73830b2 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -207,8 +207,6 @@ 
 
 #define CONFIG_SYS_BOOTM_LEN	(60 * 1024 * 1024)
 
-#define CONFIG_CMD_UNZIP
-
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_CLOCKS