From 2cfe312258457c5c94c61e813448505d200fdc14 Mon Sep 17 00:00:00 2001 From: Andre Przywara <andre.przywara@arm.com> Date: Wed, 15 Mar 2017 01:19:07 +0000 Subject: [PATCH] configs: move CMD_MD5SUM definition to defconfigs Boards with an apparent need for the md5sum command had the connected config symbol defined in their board header file. Move this over to the respective defconfig files now that md5sum is configured via Kconfig. (This is a manual effort, which differs from moveconfig.py, not sure who is right here. Boards except sandbox loose the md5sum command with moveconfig.py, though it was explicitly mentioned in their config.h's) Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Simon Glass <sjg@chromium.org> [trini: migrate stih410-b2260] Signed-off-by: Tom Rini <trini@konsulko.com> --- configs/dragonboard410c_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + include/configs/dragonboard410c.h | 4 ---- include/configs/sandbox.h | 1 - include/configs/sh7752evb.h | 2 -- include/configs/sh7753evb.h | 2 -- include/configs/sh7757lcr.h | 2 -- include/configs/stih410-b2260.h | 3 --- scripts/config_whitelist.txt | 3 --- 14 files changed, 7 insertions(+), 17 deletions(-) diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index 743581802b..6b5096407e 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -36,3 +36,4 @@ CONFIG_USB_EHCI_MSM=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y +CONFIG_CMD_MD5SUM=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 01f6f5d5c6..7f3f5ac809 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MX_CYCLIC=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index 10e12bf50e..3f8e70d523 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MX_CYCLIC=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 281e441425..ade67143b1 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MX_CYCLIC=y diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig index ace75531fe..224b55bc90 100644 --- a/configs/sh7752evb_defconfig +++ b/configs/sh7752evb_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_MMC=y +CONFIG_CMD_MD5SUM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig index 48e3d552b0..7bf886290d 100644 --- a/configs/sh7753evb_defconfig +++ b/configs/sh7753evb_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_EXT2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_MMC=y +CONFIG_CMD_MD5SUM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig index dc6f4e11b2..00870ac720 100644 --- a/configs/sh7757lcr_defconfig +++ b/configs/sh7757lcr_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_MMC=y +CONFIG_CMD_MD5SUM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 7f0742abbb..238f4cd50d 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -46,12 +46,8 @@ #define CONFIG_USB_ETHER_MCS7830 #define CONFIG_USB_ETHER_SMSC95XX -/* Libraries */ -#define CONFIG_MD5 - /* Extra Commands */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_MD5SUM /* Enable that for switching of boot partitions */ /* Disabled by default as some sub-commands can brick eMMC */ /*#define CONFIG_SUPPORT_EMMC_BOOT */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index ac7973ceca..ad687b1770 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -44,7 +44,6 @@ #define CONFIG_CMD_CBFS #define CONFIG_CMD_CRAMFS #define CONFIG_HOST_MAX_DEVICES 4 -#define CONFIG_CMD_MD5SUM /* * Size of malloc() pool, before and after relocation diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index d8189816df..9b12324563 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -16,8 +16,6 @@ #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_MD5SUM -#define CONFIG_MD5 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index a7d8de4241..a4818ff0c2 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -16,8 +16,6 @@ #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_MD5SUM -#define CONFIG_MD5 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index c21a5f8fee..8b339988cc 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -16,8 +16,6 @@ #define CONFIG_SYS_TEXT_BASE 0x8ef80000 #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_MD5SUM -#define CONFIG_MD5 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 28e2f7f614..c7785b3fed 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -22,9 +22,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000000 /* 1 GHz */ -/* Libraries */ -#define CONFIG_MD5 - #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a62a60150c..668f238459 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -509,7 +509,6 @@ CONFIG_CMD_LDRINFO CONFIG_CMD_LOADY CONFIG_CMD_LZMADEC CONFIG_CMD_MAX6957 -CONFIG_CMD_MD5SUM CONFIG_CMD_MEM CONFIG_CMD_MFSL CONFIG_CMD_MMC_SPI @@ -1881,8 +1880,6 @@ CONFIG_MCFRTC CONFIG_MCFTMR CONFIG_MCFUART CONFIG_MCLK_DIS -CONFIG_MD5 -CONFIG_MD5SUM_VERIFY CONFIG_MDIO_TIMEOUT CONFIG_MECP5123 CONFIG_MEMSIZE -- 2.39.5