summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-02-17 19:47:53 -0500
committerTom Rini <trini@konsulko.com>2017-02-17 19:47:53 -0500
commit79be18a60f577e776068e2b1687bfa1c7bd59537 (patch)
treef3e5dec4294ebfa2be7112d0a4e5d116e85b327c
parent66c246cce7c66019a93ff7105157c3e2126dd277 (diff)
Drop CONFIG_ENABLE_VBOOT
This is no longer used anywhere. Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--configs/am335x_boneblack_vboot_defconfig2
-rw-r--r--include/configs/bav335x.h2
-rw-r--r--scripts/config_whitelist.txt1
3 files changed, 1 insertions, 4 deletions
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index e425260dd6..3d3f85f27e 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -8,7 +8,7 @@ CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT"
+CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_ARCH_MISC_INIT=y
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 6dd6f09662..fc9dc9c825 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -23,8 +23,6 @@
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
# define CONFIG_LZO
-# ifdef CONFIG_ENABLE_VBOOT
-# endif
#endif
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 826d031852..f6c9101e95 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -951,7 +951,6 @@ CONFIG_EMU
CONFIG_ENABLE_36BIT_PHYS
CONFIG_ENABLE_MMU
CONFIG_ENABLE_MUST_CHECK
-CONFIG_ENABLE_VBOOT
CONFIG_ENABLE_WARN_DEPRECATED
CONFIG_ENC_SILENTLINK
CONFIG_ENV_ACCESS_IGNORE_FORCE