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 41ae2b11c433acc80f9adce490f9f1531b0e5cb6,e18af5fb43c26e627df35512752bfa945be61067..0c70f928f082afa0bca9275607850258112bdd20
--- 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 e17660725c5bfe09069cd4ee805b2ce864b6ba18,c465e80513398b5ef939b5722a3b10475949e68d..1d20175fe6acaee267ffafedec05066cd772a4b8
--- 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