From d16c9d0b3729b1b120caa1b9836660c3bbcd7b87 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 26 May 2020 15:06:17 -0400 Subject: [PATCH] Convert CONFIG_BZIP2 et al to Kconfig This converts the following to Kconfig: CONFIG_BZIP2 CONFIG_GZIP CONFIG_LZO CONFIG_ZLIB CONFIG_LZMA CONFIG_LZO Signed-off-by: Tom Rini --- README | 15 --------------- configs/bayleybay_defconfig | 1 + configs/cherryhill_defconfig | 1 + configs/chromebook_coral_defconfig | 1 + configs/chromebook_link64_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebook_samus_defconfig | 1 + configs/chromebook_samus_tpl_defconfig | 1 + configs/chromebox_panther_defconfig | 1 + ...onga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/coreboot64_defconfig | 1 + configs/coreboot_defconfig | 1 + configs/cougarcanyon2_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/efi-x86_app_defconfig | 1 + configs/efi-x86_payload32_defconfig | 1 + configs/efi-x86_payload64_defconfig | 1 + configs/galileo_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/slimbootloader_defconfig | 1 + configs/som-db5800-som-6867_defconfig | 1 + ...adorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/wb45n_defconfig | 1 + configs/x530_defconfig | 1 + configs/xilinx_versal_mini_defconfig | 1 + configs/xilinx_versal_mini_emmc0_defconfig | 1 + configs/xilinx_versal_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_single_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + include/configs/dh_imx6.h | 2 -- include/configs/guruplug.h | 1 - include/configs/ib62x0.h | 5 ----- include/configs/iconnect.h | 5 ----- include/configs/nsa310s.h | 3 --- include/configs/sheevaplug.h | 1 - include/configs/wb45n.h | 1 - include/configs/x530.h | 1 - include/configs/x86-common.h | 2 -- include/configs/xilinx_versal_mini.h | 2 -- include/configs/xilinx_zynqmp_mini.h | 2 -- include/configs/zynq_cse.h | 2 -- 60 files changed, 47 insertions(+), 42 deletions(-) diff --git a/README b/README index 17dc0ee33b..aefdfe4f6b 100644 --- a/README +++ b/README @@ -1330,21 +1330,6 @@ The following options need to be configured: can be displayed via the splashscreen support or the bmp command. -- Compression support: - CONFIG_GZIP - - Enabled by default to support gzip compressed images. - - CONFIG_BZIP2 - - If this option is set, support for bzip2 compressed - images is included. If not, only uncompressed and gzip - compressed images are supported. - - NOTE: the bzip2 algorithm requires a lot of RAM, so - the malloc area (as defined by CONFIG_SYS_MALLOC_LEN) should - be at least 4MB. - - MII/PHY support: CONFIG_PHY_CLOCK_FREQ (ppc4xx) diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 80a817a3f3..ee032e25f6 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -56,3 +56,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11B=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/cherryhill_defconfig b/configs/cherryhill_defconfig index c3ad39c725..c1b6e715f4 100644 --- a/configs/cherryhill_defconfig +++ b/configs/cherryhill_defconfig @@ -41,3 +41,4 @@ CONFIG_RTL8169=y CONFIG_SPI=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y +# CONFIG_GZIP is not set diff --git a/configs/chromebook_coral_defconfig b/configs/chromebook_coral_defconfig index 2039ea6186..d7cab2334b 100644 --- a/configs/chromebook_coral_defconfig +++ b/configs/chromebook_coral_defconfig @@ -98,4 +98,5 @@ CONFIG_SPL_FS_CBFS=y CONFIG_TPL_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index a13f6eac80..75f3d2c411 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -73,3 +73,4 @@ CONFIG_VIDEO_IVYBRIDGE_IGD=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y +# CONFIG_GZIP is not set diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index de4186cdf2..3d51ec9606 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -68,4 +68,5 @@ CONFIG_VIDEO_IVYBRIDGE_IGD=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index fb4d88028c..c18cba9cf4 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -71,3 +71,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_TPM=y +# CONFIG_GZIP is not set diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig index a12a04b0bf..82172ba810 100644 --- a/configs/chromebook_samus_tpl_defconfig +++ b/configs/chromebook_samus_tpl_defconfig @@ -87,3 +87,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_TPM=y +# CONFIG_GZIP is not set diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index 48bcd94a62..fd87ab262b 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -55,3 +55,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_TPM=y +# CONFIG_GZIP is not set diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index abf5263081..eacc9852bd 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -66,3 +66,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index aac0ed2928..04b9d5eee9 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -62,3 +62,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/coreboot64_defconfig b/configs/coreboot64_defconfig index 39469b5203..6bba9ec72b 100644 --- a/configs/coreboot64_defconfig +++ b/configs/coreboot64_defconfig @@ -46,3 +46,4 @@ CONFIG_SYSCON=y CONFIG_SOUND=y CONFIG_SOUND_I8254=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig index ad41c91e6e..4a43b59e0f 100644 --- a/configs/coreboot_defconfig +++ b/configs/coreboot_defconfig @@ -41,3 +41,4 @@ CONFIG_SYSCON=y CONFIG_SOUND=y CONFIG_SOUND_I8254=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig index aac8a391fd..4cb734477e 100644 --- a/configs/cougarcanyon2_defconfig +++ b/configs/cougarcanyon2_defconfig @@ -46,3 +46,4 @@ CONFIG_SPI=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y # CONFIG_VIDEO_VESA is not set +# CONFIG_GZIP is not set diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 06d5ce4cad..706f5cd1c4 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -52,3 +52,4 @@ CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index fdf686f956..56fc282762 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -61,3 +61,4 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index e0dfffa4b5..d20405e5b2 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -100,3 +100,4 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_IMX_WATCHDOG=y +CONFIG_BZIP2=y diff --git a/configs/efi-x86_app_defconfig b/configs/efi-x86_app_defconfig index 790268a1ff..5252659942 100644 --- a/configs/efi-x86_app_defconfig +++ b/configs/efi-x86_app_defconfig @@ -34,5 +34,6 @@ CONFIG_SYSCON=y # CONFIG_DM_ETH is not set CONFIG_DEBUG_EFI_CONSOLE=y # CONFIG_REGEX is not set +# CONFIG_GZIP is not set CONFIG_EFI=y # CONFIG_EFI_LOADER is not set diff --git a/configs/efi-x86_payload32_defconfig b/configs/efi-x86_payload32_defconfig index f3ee5284d5..0f5f787707 100644 --- a/configs/efi-x86_payload32_defconfig +++ b/configs/efi-x86_payload32_defconfig @@ -36,5 +36,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_PCI_PNP is not set +# CONFIG_GZIP is not set CONFIG_EFI=y CONFIG_EFI_STUB=y diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig index b83e609966..dafad67e7e 100644 --- a/configs/efi-x86_payload64_defconfig +++ b/configs/efi-x86_payload64_defconfig @@ -36,6 +36,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_PCI_PNP is not set +# CONFIG_GZIP is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_STUB_64BIT=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 4e2a23f638..612fbacf99 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -45,3 +45,4 @@ CONFIG_CPU=y CONFIG_SPI=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y +# CONFIG_GZIP is not set diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 8d862696ca..0401effee6 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -51,3 +51,4 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index fea69d32e9..ac7a794afe 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -44,3 +44,4 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index 4281aa93bc..d5a0ecada0 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -39,3 +39,4 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 127fd5d53e..40ed9e4120 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -62,3 +62,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11B=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 7a864bddf3..62edcd83f3 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -41,4 +41,5 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y CONFIG_OF_LIBFDT=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 4e8eab531c..90d287b7b0 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -60,3 +60,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_USER=y CONFIG_FRAMEBUFFER_VESA_MODE=0x144 CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 565f232b4f..4309c2352d 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -44,3 +44,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_USER=y CONFIG_FRAMEBUFFER_VESA_MODE=0x144 CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index d350429cad..39939ccf60 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -50,3 +50,4 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +CONFIG_BZIP2=y diff --git a/configs/slimbootloader_defconfig b/configs/slimbootloader_defconfig index 4a4fb1100d..dce540342b 100644 --- a/configs/slimbootloader_defconfig +++ b/configs/slimbootloader_defconfig @@ -21,3 +21,4 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_PCI_PNP is not set CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index 4d7accc7c4..854381d6e7 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -57,3 +57,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig index 7a8feee521..ed68f09d14 100644 --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -65,3 +65,4 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig index dbbac6b103..c414b95f6f 100644 --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -64,3 +64,4 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index de9701afe6..3a8037757e 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -61,3 +61,4 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index d2de463aaa..5728cfb454 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -40,4 +40,5 @@ CONFIG_NAND_ATMEL=y CONFIG_PMECC_CAP=4 CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y CONFIG_LZMA=y +CONFIG_LZO=y CONFIG_OF_LIBFDT=y diff --git a/configs/x530_defconfig b/configs/x530_defconfig index 67c8fbf663..ab23fd5ab1 100644 --- a/configs/x530_defconfig +++ b/configs/x530_defconfig @@ -80,3 +80,4 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_WDT=y CONFIG_WDT_ORION=y +CONFIG_LZO=y diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig index 3186c9843e..6ad53b798a 100644 --- a/configs/xilinx_versal_mini_defconfig +++ b/configs/xilinx_versal_mini_defconfig @@ -55,4 +55,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_MMC is not set CONFIG_ARM_DCC=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig index 1024021267..99880d80de 100644 --- a/configs/xilinx_versal_mini_emmc0_defconfig +++ b/configs/xilinx_versal_mini_emmc0_defconfig @@ -54,4 +54,5 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_FAT_WRITE=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig index d38a52016f..c1b27d3b54 100644 --- a/configs/xilinx_versal_mini_emmc1_defconfig +++ b/configs/xilinx_versal_mini_emmc1_defconfig @@ -54,4 +54,5 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_FAT_WRITE=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index d010f429cb..4305db4058 100644 --- a/configs/xilinx_zynqmp_mini_defconfig +++ b/configs/xilinx_zynqmp_mini_defconfig @@ -54,4 +54,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_MMC is not set CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index 2fdc0f9ac4..b041b40b84 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -57,4 +57,5 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index 2f1c6e266b..bd5603a6a1 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -57,4 +57,5 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index 02d2e29dea..4f4efa0cfa 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -53,4 +53,5 @@ CONFIG_NAND_ARASAN=y CONFIG_SYS_NAND_MAX_CHIPS=2 CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig index 1d5a30c140..3f780f746c 100644 --- a/configs/xilinx_zynqmp_mini_nand_single_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig @@ -52,4 +52,5 @@ CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ARASAN=y CONFIG_ARM_DCC=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 6faf3bed81..1f36f5c8e9 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -64,4 +64,5 @@ CONFIG_ARM_DCC=y CONFIG_SPI=y CONFIG_ZYNQMP_GQSPI=y CONFIG_PANIC_HANG=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig index 8ba8000b13..0c05a73a57 100644 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@ -57,4 +57,5 @@ CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ZYNQ=y CONFIG_ARM_DCC=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig index 159606c7c7..abf9401313 100644 --- a/configs/zynq_cse_nor_defconfig +++ b/configs/zynq_cse_nor_defconfig @@ -60,4 +60,5 @@ CONFIG_CFI_FLASH=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_ARM_DCC=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index c8cd1f938e..6ef0e23110 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -71,4 +71,5 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_DEBUG_UART_ARM_DCC=y CONFIG_ARM_DCC=y CONFIG_ZYNQ_QSPI=y +# CONFIG_GZIP is not set # CONFIG_EFI_LOADER is not set diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index efb3cfee35..5bfdf4044b 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -32,8 +32,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_BZIP2 - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M) diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 768f4ebcbb..1e1e5da4d5 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -17,7 +17,6 @@ /* * Standard filesystems */ -#define CONFIG_BZIP2 /* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 71738bfb7d..f27dbfbc5f 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -15,11 +15,6 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* - * Compression configuration - */ -#define CONFIG_BZIP2 - /* * Commands configuration */ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index a694b2e92b..3754cd1e65 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -20,11 +20,6 @@ */ #define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT -/* - * Compression configuration - */ -#define CONFIG_BZIP2 - /* * Commands configuration */ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index e59ef11e66..ce1e3214a6 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -15,9 +15,6 @@ #define CONFIG_KW88F6702 1 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* compression configuration */ -#define CONFIG_BZIP2 - /* commands configuration */ /* diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index ed5e284077..3ee6e684fd 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -21,7 +21,6 @@ /* * Standard filesystems */ -#define CONFIG_BZIP2 /* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index aecf2737f8..d256ce8e4b 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5 #define CONFIG_RBTREE -#define CONFIG_LZO /* Ethernet */ #define CONFIG_MACB diff --git a/include/configs/x530.h b/include/configs/x530.h index 9081f41660..99531ed319 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -71,7 +71,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS -#define CONFIG_LZO #define CONFIG_CMD_MTDPARTS #define CONFIG_SYS_MALLOC_LEN (4 << 20) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 016b797a53..ff45714c82 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -18,8 +18,6 @@ #define CONFIG_LMB -#undef CONFIG_ZLIB -#undef CONFIG_GZIP #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* SATA AHCI storage */ diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h index ae7eca1155..a1a98f9193 100644 --- a/include/configs/xilinx_versal_mini.h +++ b/include/configs/xilinx_versal_mini.h @@ -17,8 +17,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS -#undef CONFIG_ZLIB -#undef CONFIG_GZIP #undef CONFIG_CMD_ENV /* BOOTP options */ diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 3078b9c55b..ccc938267d 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -19,8 +19,6 @@ #undef CONFIG_BOOTCOMMAND #undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_SYS_MALLOC_LEN -#undef CONFIG_ZLIB -#undef CONFIG_GZIP #undef CONFIG_CMD_ENV #undef CONFIG_SYS_INIT_SP_ADDR diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index 917f35b24c..0491cf5136 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -15,8 +15,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS -#undef CONFIG_ZLIB -#undef CONFIG_GZIP #undef CONFIG_SYS_CBSIZE -- 2.25.1