common/spl: Drop [ST]PL_HASH_SUPPORT in favor of [ST]PL_HASH

All of these configs exist. Stick to using CONFIG_[ST]PL_HASH, and drop all
references to CONFIG_[ST]PL_HASH_SUPPORT.  This means we need for
CHAIN_OF_TRUST to select SPL_HASH now.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
[trini: Add TPL case, fix CHAIN_OF_TRUST, other tweaks]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig
index ab9c14ae8858ea45a70139391a3424ad421cd6ce..35a6115e5e437ffa59d3daf6aab835e08d10eee3 100644 (file)
--- a/board/freescale/common/Kconfig
+++ b/board/freescale/common/Kconfig
@@ -4,6 +4,7 @@ config CHAIN_OF_TRUST
        imply CMD_HASH if ARM
        select FSL_CAAM
        select SPL_BOARD_INIT if (ARM && SPL)
+       select SPL_HASH if (ARM && SPL)
        select SHA_HW_ACCEL
        select SHA_PROG_HW_ACCEL
        select ENV_IS_NOWHERE

diff --git a/common/Kconfig.boot b/common/Kconfig.boot
index 8736e6af476cb876c059fd742ac0c659ef8233f0..1f365d4a810cd324fc4cca234ab1967f2a98d0b2 100644 (file)
--- a/common/Kconfig.boot
+++ b/common/Kconfig.boot
@@ -158,7 +158,7 @@ config SPL_FIT_SIGNATURE
        select FIT_SIGNATURE
        select SPL_FIT
        select SPL_CRYPTO
-       select SPL_HASH_SUPPORT
+       select SPL_HASH
        imply SPL_RSA
        imply SPL_RSA_VERIFY
        select SPL_IMAGE_SIGN_INFO

diff --git a/common/Makefile b/common/Makefile
index 9063ed93910b255e10792a8f23f826832efa0f31..ae0430c35fe460318b8711758815b8c84deaaf65 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -8,7 +8,6 @@ ifndef CONFIG_SPL_BUILD
 obj-y += init/
 obj-y += main.o
 obj-y += exports.o
-obj-$(CONFIG_HASH) += hash.o
 obj-$(CONFIG_HUSH_PARSER) += cli_hush.o
 obj-$(CONFIG_AUTOBOOT) += autoboot.o
 
@@ -66,8 +65,6 @@ ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_DFU
 obj-$(CONFIG_DFU_OVER_USB) += dfu.o
 endif
-obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o
-obj-$(CONFIG_TPL_HASH_SUPPORT) += hash.o
 obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o
 obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
@@ -105,6 +102,7 @@ endif
 endif
 
 obj-y += image.o
+obj-$(CONFIG_$(SPL_TPL_)HASH) += hash.o
 obj-$(CONFIG_ANDROID_AB) += android_ab.o
 obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index d69d1fa5f78c23265d09ef4dbc0f8430b1aa898f..29a46c47877a4d930be4ca66107ce42451325c9f 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -477,27 +477,6 @@ config SPL_CRYPTO
          this option to build the drivers in drivers/crypto as part of an
          SPL build.
 
-config SPL_HASH_SUPPORT
-       bool "Support hashing drivers"
-       select SHA1
-       select SHA256
-       help
-         Enable hashing drivers in SPL. These drivers can be used to
-         accelerate secure boot processing in secure applications. Enable
-         this option to build system-specific drivers for hash acceleration
-         as part of an SPL build.
-
-config TPL_HASH_SUPPORT
-       bool "Support hashing drivers in TPL"
-       depends on TPL
-       select SHA1
-       select SHA256
-       help
-         Enable hashing drivers in SPL. These drivers can be used to
-         accelerate secure boot processing in secure applications. Enable
-         this option to build system-specific drivers for hash acceleration
-         as part of an SPL build.
-
 config SPL_DMA
        bool "Support DMA drivers"
        help
@@ -1193,7 +1172,7 @@ config SPL_USB_ETHER
 
 config SPL_DFU
        bool "Support DFU (Device Firmware Upgrade)"
-       select SPL_HASH_SUPPORT
+       select SPL_HASH
        select SPL_DFU_NO_RESET
        depends on SPL_RAM_SUPPORT
        help

diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
index 78196e6485d63653eee7668989e087f8382b8f47..f9d551c6a89bfe3a3ec0dc424ea733fa6ce76806 100644 (file)
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -31,7 +31,6 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8
 CONFIG_SPL_CRYPTO=y
-CONFIG_SPL_HASH_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_I2C=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y

diff --git a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
index 3736445d47c396eea718cacf1701032b2b6b1e7f..2733ca83587d58e835b1164d5e8bbccdfb6c8e8d 100644 (file)
--- a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
@@ -27,7 +27,6 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0
 CONFIG_SPL_CRYPTO=y
-CONFIG_SPL_HASH_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y

diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
index b879a0c361422ec16fbc0dd018833d697373b692..392ef1cbd55978d8d9729c05629448a38a640bdc 100644 (file)
--- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
@@ -27,7 +27,6 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110
 CONFIG_SPL_CRYPTO=y
-CONFIG_SPL_HASH_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_SPL_WATCHDOG=y

diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
index c46d0dbedd3f1c1889a3f80f4f032323ba606e6b..3d5783aa260f71db2b638ed67e63ba492f3f93b1 100644 (file)
--- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
@@ -27,7 +27,6 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110
 CONFIG_SPL_CRYPTO=y
-CONFIG_SPL_HASH_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_I2C=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y

diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
index 96d44799fa84be9ac37a25e94266c67de242ca23..0d94027ccb9e8171119bfbfb586571ee3e6e4ae5 100644 (file)
--- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
@@ -33,7 +33,6 @@ CONFIG_MISC_INIT_R=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x8b0
 CONFIG_SPL_CRYPTO=y
-CONFIG_SPL_HASH_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_I2C=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 262154cdffdcb7135a7162df6404d5b38d31f680..42758ba75897a70eb0523ebfe9bafbef903a4b7a 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -258,7 +258,7 @@
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
 # define CONFIG_SPL_ENV_SUPPORT
-# define CONFIG_SPL_HASH_SUPPORT
+# define CONFIG_SPL_HASH
 # define CONFIG_ENV_MAX_ENTRIES        10
 #endif
 

diff --git a/lib/Makefile b/lib/Makefile
index 6aa48ca3d507308a2f51d420335862c0542d845a..93be86c34a0195c2c0735d1bd6ebe81efd967f1c 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -87,7 +87,7 @@ endif
 
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o
-obj-$(CONFIG_$(SPL_TPL_)HASH_SUPPORT) += crc16.o
+obj-$(CONFIG_$(SPL_TPL_)HASH) += crc16.o
 obj-y += net_utils.o
 endif
 obj-$(CONFIG_ADDR_MAP) += addr_map.o