From: Tom Rini <trini@konsulko.com>
Date: Sun, 4 Dec 2016 18:55:15 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-mpc85xx
X-Git-Tag: v2017.01-rc1~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=194eded14ccb40af18e1a9fb8ab85903ee0803ef;p=u-boot

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

194eded14ccb40af18e1a9fb8ab85903ee0803ef
diff --cc configs/ls2080aqds_SECURE_BOOT_defconfig
index 41ae2b11c4,e18af5fb43..0c70f928f0
--- a/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 e17660725c,c465e80513..1d20175fe6
--- a/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