bsp: u-boot-fio: drop common config options

Drop options that are already set in lmp-common.cfg. Force enable options for machines like qemuarm, qemuarm64, qemuriscv64, rpi, sun8i, beaglebone-yocto, that doesn't have full support of LmP boot sequence. Signed-off-by: Igor Opaniuk <[email protected]>
foundriesio · Jun 15, 2023 · 563cbf8 · 563cbf8
1 parent 2d30e9e
commit 563cbf8
Show file tree

Hide file tree

Showing 27 changed files with 0 additions and 194 deletions.
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6-sec/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6-sec/lmp.cfg
@@ -25,7 +25,6 @@ CONFIG_FSL_USDHC=y
 CONFIG_WDT=y
 CONFIG_WATCHDOG=y
 CONFIG_IMX_WATCHDOG=y
-CONFIG_RSA=y
 CONFIG_DM_RESET=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
@@ -51,10 +50,6 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
 CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_L2CACHE_OFF=y
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
 # CONFIG_LEGACY_IMAGE_FORMAT is not set
 CONFIG_MISC=y
 CONFIG_FIOVB=y
@@ -66,8 +61,6 @@ CONFIG_DM_I2C_GPIO=y
 # CONFIG_ENV_IS_IN_FAT is not set
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_BOOTDELAY=-2
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv script_addr 0x15000000; setenv verify 1; source ${script_addr}; reset"
 # CONFIG_NET is not set
 # CONFIG_CMD_NET is not set
@@ -101,7 +94,6 @@ CONFIG_BOOTCOMMAND="setenv script_addr 0x15000000; setenv verify 1; source ${scr
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
-# CONFIG_DISTRO_DEFAULTS is not set
 # CONFIG_DM_VIDEO is not set
 # CONFIG_OPTEE_TA_AVB is not set
 # CONFIG_CHIMP_OPTEE is not set
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6/lmp.cfg
@@ -25,7 +25,6 @@ CONFIG_FSL_USDHC=y
 CONFIG_WDT=y
 CONFIG_WATCHDOG=y
 CONFIG_IMX_WATCHDOG=y
-CONFIG_RSA=y
 CONFIG_DM_RESET=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
@@ -51,10 +50,6 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
 CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_L2CACHE_OFF=y
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
 # CONFIG_LEGACY_IMAGE_FORMAT is not set
 CONFIG_MISC=y
 # CONFIG_FIOVB is not set
@@ -67,8 +62,6 @@ CONFIG_ENV_FAT_INTERFACE="mmc"
 CONFIG_ENV_FAT_DEVICE_AND_PART="2:1"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_ENV_SIZE=0x4000
-CONFIG_BOOTDELAY=-2
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv script_addr 0x15000000; setenv verify 1; source ${script_addr}; reset"
 # CONFIG_NET is not set
 # CONFIG_CMD_NET is not set
@@ -102,7 +95,6 @@ CONFIG_BOOTCOMMAND="setenv script_addr 0x15000000; setenv verify 1; source ${scr
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
-# CONFIG_DISTRO_DEFAULTS is not set
 # CONFIG_DM_VIDEO is not set
 # CONFIG_OPTEE_TA_AVB is not set
 # CONFIG_CHIMP_OPTEE is not set
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8-sec/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8-sec/lmp.cfg
@@ -1,12 +1,8 @@
 CONFIG_SPL_DM=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
 CONFIG_SPL_FIT_SIGNATURE=y
 CONFIG_SPL_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_PSCI_BOARD_REBOOT=y
 # CONFIG_SPL_FIT_IMAGE_TINY is not set
@@ -21,7 +17,6 @@ CONFIG_SPL_SHA256=y
 CONFIG_SPL_MISC=y
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL_SERIAL=y
-CONFIG_RSA=y
 CONFIG_HASH=y
 CONFIG_PARTITION_UUIDS=y
 CONFIG_TEE=y
@@ -37,8 +32,6 @@ CONFIG_CMD_IMPORTENV=y
 CONFIG_CMD_EDITENV=y
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_BOOTCOUNT_LIMIT is not set
-CONFIG_BOOTDELAY=-2
-# CONFIG_DISTRO_DEFAULTS is not set
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_EFI_PARTITION=y
@@ -47,7 +40,6 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_ENV_IS_IN_MMC is not set
 # CONFIG_ENV_IS_IN_FAT is not set
 CONFIG_ENV_IS_NOWHERE=y
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv verify 1; source 0x83100000"
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp.cfg
@@ -1,12 +1,8 @@
 CONFIG_SPL_DM=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
 CONFIG_SPL_FIT_SIGNATURE=y
 CONFIG_SPL_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_PSCI_BOARD_REBOOT=y
 # CONFIG_SPL_FIT_IMAGE_TINY is not set
@@ -21,7 +17,6 @@ CONFIG_SPL_SHA256=y
 CONFIG_SPL_MISC=y
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL_SERIAL=y
-CONFIG_RSA=y
 CONFIG_HASH=y
 CONFIG_PARTITION_UUIDS=y
 CONFIG_TEE=y
@@ -38,8 +33,6 @@ CONFIG_CMD_IMPORTENV=y
 CONFIG_CMD_EDITENV=y
 CONFIG_CMD_SAVEENV=y
 # CONFIG_BOOTCOUNT_LIMIT is not set
-CONFIG_BOOTDELAY=-2
-# CONFIG_DISTRO_DEFAULTS is not set
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_EFI_PARTITION=y
@@ -49,7 +42,6 @@ CONFIG_HUSH_PARSER=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_FAT_INTERFACE="mmc"
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv verify 1; source 0x83100000"
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/beaglebone-yocto/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/beaglebone-yocto/lmp.cfg
@@ -1,8 +1,4 @@
-CONFIG_FIT=y
-CONFIG_FIT_VERBOSE=y
-CONFIG_FIT_SIGNATURE=y
 # CONFIG_ANDROID_BOOT_IMAGE is not set
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="run findfdt; if test ${devtype}1 = 1; then setenv devtype mmc; fi; if test ${devnum}x = x; then setenv devnum 0; fi; fatload ${devtype} ${devnum}:1 ${rdaddr} /boot.itb; setenv verify 1; source ${rdaddr}; reset"
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx6ulevk/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx6ulevk/lmp.cfg
@@ -26,7 +26,6 @@ CONFIG_LOGLEVEL=2
 # CONFIG_SPL_BLK is not set
 # CONFIG_SPL_CRC32 is not set
 # CONFIG_SPL_WDT is not set
-CONFIG_RSA=y
 CONFIG_RSA_VERIFY=y
 CONFIG_WDT=y
 CONFIG_WATCHDOG=y
@@ -54,10 +53,6 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
 CONFIG_OPTEE_TZDRAM_BASE=0x9E000000
 CONFIG_SKIP_LOWLEVEL_INIT=y
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
 # CONFIG_LEGACY_IMAGE_FORMAT is not set
 CONFIG_PARTITION_UUIDS=y
 CONFIG_CMD_XIMG=y
@@ -72,8 +67,6 @@ CONFIG_ENV_FAT_INTERFACE="mmc"
 CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_ENV_SIZE=0x4000
-CONFIG_BOOTDELAY=-2
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv script_addr 0x85000000; setenv verify 1; source ${script_addr}; reset"
 CONFIG_DEFAULT_FDT_FILE="imx6ul-14x14-evk"
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x80800000
@@ -111,7 +104,6 @@ CONFIG_MISC=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
-# CONFIG_DISTRO_DEFAULTS is not set
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_LOADB is not set

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx6ullevk/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx6ullevk/lmp.cfg
@@ -51,9 +51,6 @@ CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
 CONFIG_OPTEE_TZDRAM_BASE=0x9E000000
 CONFIG_SKIP_LOWLEVEL_INIT=y
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
 # CONFIG_LEGACY_IMAGE_FORMAT is not set
 CONFIG_PARTITION_UUIDS=y
 CONFIG_CMD_XIMG=y
@@ -68,15 +65,12 @@ CONFIG_ENV_FAT_INTERFACE="mmc"
 CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_ENV_SIZE=0x4000
-CONFIG_BOOTDELAY=-2
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv script_addr 0x85000000; setenv verify 1; source ${script_addr}; reset"
 CONFIG_DEFAULT_FDT_FILE="imx6ull-14x14-evk"
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x80800000
 CONFIG_SYS_I2C_MXC=y
 CONFIG_SYS_I2C_MXC_I2C1=y
 CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_RSA=y
 # CONFIG_DM_VIDEO is not set
 # CONFIG_OPTEE_TA_AVB is not set
 # CONFIG_CHIMP_OPTEE is not set
@@ -106,7 +100,6 @@ CONFIG_RSA=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
-# CONFIG_DISTRO_DEFAULTS is not set
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_LOADB is not set

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx7ulpea-ucom/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx7ulpea-ucom/lmp.cfg
@@ -37,10 +37,6 @@ CONFIG_OPTEE=y
 CONFIG_OPTEE_LIB=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
 # CONFIG_LEGACY_IMAGE_FORMAT is not set
 CONFIG_PARTITION_UUIDS=y
 # CONFIG_FIOVB is not set
@@ -51,8 +47,6 @@ CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SECONDARY_BOOT_RUNTIME_DETECTION=y
 CONFIG_SECONDARY_BOOT_SECTOR_OFFSET=0x1000
 CONFIG_CMD_SECONDARY_BOOT=y
-CONFIG_BOOTDELAY=-2
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv verify 1; source 0x60800000; reset"
 # CONFIG_LDO_ENABLED_MODE is not set
 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
@@ -68,10 +62,8 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_CMD_IMPORTENV=y
 CONFIG_CMD_EDITENV=y
 CONFIG_CMD_SAVEENV=y
-# CONFIG_DISTRO_DEFAULTS is not set
 CONFIG_FS_EXT4=y
 CONFIG_CMD_EXT4=y
-CONFIG_RSA=y
 # CONFIG_ANDROID_BOOT_IMAGE is not set
 # CONFIG_NET is not set
 # CONFIG_CMD_NET is not set
@@ -111,7 +103,6 @@ CONFIG_RSA=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
-# CONFIG_DISTRO_DEFAULTS is not set
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_LOADB is not set

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mm-lpddr4-evk-sec/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mm-lpddr4-evk-sec/lmp.cfg
@@ -6,7 +6,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_SPL_FIT_IMAGE_TINY is not set
 CONFIG_SPL_CRYPTO=y
 CONFIG_SPL_HASH=y
-CONFIG_RSA=y
 CONFIG_HASH=y
 # CONFIG_FSL_CAAM is not set
 # CONFIG_SPL_SHA_HW_ACCEL is not set
@@ -20,13 +19,9 @@ CONFIG_HASH=y
 # CONFIG_SPL_USB_SDP_SUPPORT is not set
 # CONFIG_CMD_DEKBLOB is not set
 CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_FIT=y
 CONFIG_SPL_WATCHDOG=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
 CONFIG_SPL_FIT_SIGNATURE=y
 CONFIG_SPL_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300
 CONFIG_SECONDARY_BOOT_RUNTIME_DETECTION=y
@@ -51,8 +46,6 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_CMD_IMPORTENV=y
 CONFIG_CMD_EDITENV=y
 CONFIG_CMD_SAVEENV=y
-CONFIG_BOOTDELAY=-2
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv verify 1; source 0x44800000; reset"
 CONFIG_IMX_WATCHDOG=y
 CONFIG_SPL_HW_WATCHDOG=y
@@ -111,7 +104,6 @@ CONFIG_POWER_I2C=y
 # CONFIG_VIDEO_SEC_MIPI_DSI is not set
 # CONFIG_VIDEO_IMX_SEC_DSI is not set
 # CONFIG_VIDEO_LINK is not set
-# CONFIG_DISTRO_DEFAULTS is not set
 # CONFIG_SHA_HW_ACCEL is not set
 # CONFIG_DFU is not set
 # CONFIG_CMD_DFU is not set

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mm-lpddr4-evk/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mm-lpddr4-evk/lmp.cfg
@@ -6,7 +6,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_SPL_FIT_IMAGE_TINY is not set
 CONFIG_SPL_CRYPTO=y
 CONFIG_SPL_HASH=y
-CONFIG_RSA=y
 CONFIG_HASH=y
 # CONFIG_FSL_CAAM is not set
 # CONFIG_SPL_SHA_HW_ACCEL is not set
@@ -20,13 +19,9 @@ CONFIG_HASH=y
 # CONFIG_SPL_USB_SDP_SUPPORT is not set
 # CONFIG_CMD_DEKBLOB is not set
 CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_FIT=y
 CONFIG_SPL_WATCHDOG=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
 CONFIG_SPL_FIT_SIGNATURE=y
 CONFIG_SPL_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_MMC=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300
@@ -51,8 +46,6 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_CMD_IMPORTENV=y
 CONFIG_CMD_EDITENV=y
 CONFIG_CMD_SAVEENV=y
-CONFIG_BOOTDELAY=-2
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv verify 1; source 0x44800000; reset"
 CONFIG_IMX_WATCHDOG=y
 CONFIG_SPL_HW_WATCHDOG=y
@@ -111,7 +104,6 @@ CONFIG_POWER_I2C=y
 # CONFIG_VIDEO_SEC_MIPI_DSI is not set
 # CONFIG_VIDEO_IMX_SEC_DSI is not set
 # CONFIG_VIDEO_LINK is not set
-# CONFIG_DISTRO_DEFAULTS is not set
 # CONFIG_SHA_HW_ACCEL is not set
 # CONFIG_DFU is not set
 # CONFIG_CMD_DFU is not set

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mn-ddr4-evk-sec/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mn-ddr4-evk-sec/lmp.cfg
@@ -12,7 +12,6 @@ CONFIG_SPL_HASH=y
 CONFIG_SPL_SHA256=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_HW_WATCHDOG=y
-CONFIG_RSA=y
 CONFIG_HASH=y
 CONFIG_SPL_ATF=y
 CONFIG_SPL_MMC=y
@@ -33,10 +32,6 @@ CONFIG_FSL_CAAM=y
 # CONFIG_SPL_SHA_HW_ACCEL is not set
 # CONFIG_CMD_DEKBLOB is not set
 CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
 CONFIG_SECONDARY_BOOT_RUNTIME_DETECTION=y
 # TODO: fix hard-coded secondary boot offset
 # defined in fuse 0x490 [22:19] IMG_CNTN_SET1_OFFSET
@@ -62,8 +57,6 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_CMD_IMPORTENV=y
 CONFIG_CMD_EDITENV=y
 CONFIG_CMD_SAVEENV=y
-CONFIG_BOOTDELAY=-2
-CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="setenv verify 1; source 0x44800000; reset"
 CONFIG_IMX_WATCHDOG=y
 # CONFIG_ANDROID_BOOT_IMAGE is not set
@@ -101,7 +94,6 @@ CONFIG_IMX_WATCHDOG=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
-# CONFIG_DISTRO_DEFAULTS is not set
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_LOADB is not set
@@ -112,7 +104,6 @@ CONFIG_IMX_WATCHDOG=y
 # CONFIG_VIDEO_SEC_MIPI_DSI is not set
 # CONFIG_VIDEO_IMX_SEC_DSI is not set
 # CONFIG_VIDEO_LINK is not set
-# CONFIG_DISTRO_DEFAULTS is not set
 # CONFIG_SHA_HW_ACCEL is not set
 # CONFIG_DFU is not set
 # CONFIG_DFU_TFTP is not set