Merge git://git.denx.de/u-boot-mpc85xx

diff --cc configs/ls1043ardb_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls2080aqds_SECURE_BOOT_defconfig
index 41ae2b1,e18af5f..0c70f92
--- 1/configs/ls2080aqds_SECURE_BOOT_defconfig
--- 2/configs/ls2080aqds_SECURE_BOOT_defconfig
+++ b/configs/ls2080aqds_SECURE_BOOT_defconfig
@@@ -6,8 -6,10 +6,9 @@@ CONFIG_FIT=
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
- CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A, SECURE_BOOT"
+ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A"
+ CONFIG_SECURE_BOOT=y
  CONFIG_BOOTDELAY=10
 -CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y

diff --cc configs/ls2080ardb_SECURE_BOOT_defconfig
index e176607,c465e80..1d20175
--- 1/configs/ls2080ardb_SECURE_BOOT_defconfig
--- 2/configs/ls2080ardb_SECURE_BOOT_defconfig
+++ b/configs/ls2080ardb_SECURE_BOOT_defconfig
@@@ -6,8 -6,10 +6,9 @@@ CONFIG_FIT=
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
- CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A, SECURE_BOOT"
+ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A"
+ CONFIG_SECURE_BOOT=y
  CONFIG_BOOTDELAY=10
 -CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y

diff --cc scripts/config_whitelist.txt
Simple merge