qoriq-ppc: not build secure-boot u-boot configs

Secure boot does not have DM mode support for PPC, and driver
related changes are not tested due to bandwidth limitation.

Remove secure-boot u-boot configs from the build list.

Signed-off-by: Ting Liu <ting.liu@nxp.com>

diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index 685d327c4b7da9fbffe0481798f7700efb0da035..67fa16d1c8999a94ffe2dff2ef0d2431f3ddd203 100644 (file)
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -9,10 +9,9 @@ require conf/machine/include/e500mc.inc
 
 MACHINEOVERRIDES =. "p2041:"
 
-UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
 UBOOT_CONFIG[nor] = "P2041RDB_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[nand] = "P2041RDB_NAND_config,,u-boot.pbl"
-UBOOT_CONFIG[secure-boot] = "P2041RDB_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P2041RDB_SDCARD_config,,u-boot.pbl"
 UBOOT_CONFIG[spi] = "P2041RDB_SPIFLASH_config,,u-boot.pbl"
 

diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 2fbe0f66fe6a4428bc47dd65986f771bc866c0de..cb8099c218590a774be3a020c3b95462570f6c0b 100644 (file)
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -9,10 +9,9 @@ require conf/machine/include/e500mc.inc
 
 MACHINEOVERRIDES =. "p3041:"
 
-UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
 UBOOT_CONFIG[nor] = "P3041DS_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[nand] = "P3041DS_NAND_config,,u-boot.pbl"
-UBOOT_CONFIG[secure-boot] = "P3041DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P3041DS_SDCARD_config,,u-boot.pbl"
 UBOOT_CONFIG[spi] = "P3041DS_SPIFLASH_config,,u-boot.pbl"
 

diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index d2f133a0f33fb73e8f1c8fb23a16179359422443..e648a2427685dd0222e13ccbc4f114021b395b9b 100644 (file)
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -9,9 +9,8 @@ require conf/machine/include/e500mc.inc
 
 MACHINEOVERRIDES =. "p4080:"
 
-UBOOT_CONFIG ??= "secure-boot sdcard spi nor"
+UBOOT_CONFIG ??= "sdcard spi nor"
 UBOOT_CONFIG[nor] = "P4080DS_config,,u-boot-with-dtb.bin"
-UBOOT_CONFIG[secure-boot] = "P4080DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P4080DS_SDCARD_config,,u-boot.pbl"
 UBOOT_CONFIG[spi] = "P4080DS_SPIFLASH_config,,u-boot.pbl"
 

diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 4dc9030cf4a338f658162693aaed8bfe40654b08..a6a293930b6e68038ac61065f0216f34c6a6748b 100644 (file)
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -9,10 +9,9 @@ require conf/machine/include/e5500-64b.inc
 
 MACHINEOVERRIDES =. "p5040:"
 
-UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5040DS_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl"
-UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl"
 UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl"
 

diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 8ab15ae28b08f99b635c28a2eeb7f3a00b601ead..daa8d4cd8aa7cf997126f04f6ad3b2b8602ffe8c 100644 (file)
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -9,10 +9,9 @@ require conf/machine/include/e5500.inc
 
 MACHINEOVERRIDES =. "p5040:"
 
-UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5040DS_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl"
-UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl"
 UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl"
 

diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index 19b8d0beb83c4642541235c8ba32fe96fd25f46d..92ccc0e6db9be354bdfe0a77c8b5ab7fcd3c13d9 100644 (file)
--- a/conf/machine/t1024rdb-64b.conf
+++ b/conf/machine/t1024rdb-64b.conf
@@ -9,12 +9,11 @@ require conf/machine/include/e5500-64b.inc
 
 MACHINEOVERRIDES =. "t1:t1024:"
 
-UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
 UBOOT_CONFIG[nor] = "T1024RDB_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
 
 HV_CFG_M = "t1024rdb"
 

diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index 0665463f14c05c366f438b8b680ff8d2ac2e602e..9d39958e9b0f8e92dbacafd599a0444b3766aee6 100644 (file)
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -9,12 +9,11 @@ require conf/machine/include/e5500.inc
 
 MACHINEOVERRIDES =. "t1:t1024:"
 
-UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
 UBOOT_CONFIG[nor] = "T1024RDB_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
 
 HV_CFG_M = "t1024rdb"
 

diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index 0e2bed55a06424277b3b6fa16f9825113f4e3aea..dd9acda1986ca5fee114eb41e168c04cd2c13996 100644 (file)
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -9,12 +9,11 @@ require conf/machine/include/e5500-64b.inc
 
 MACHINEOVERRIDES =. "t1:t1042:"
 
-UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
 UBOOT_CONFIG[nor] = "T1042D4RDB_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config,,u-boot.bin"
 
 HV_CFG_M = "t1040rdb"
 

diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index a27f2b5e6ea883f435fe38c6052cbafa9d533edf..52a792c74b211671c4776b7bf9912e908f3499bc 100644 (file)
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -9,12 +9,11 @@ require conf/machine/include/e5500.inc
 
 MACHINEOVERRIDES =. "t1:t1042:"
 
-UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
+UBOOT_CONFIG ??= "nand sdcard spi nor"
 UBOOT_CONFIG[nor] = "T1042D4RDB_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config,,u-boot.bin"
 
 HV_CFG_M = "t1040rdb"
 

diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index f900d5c1195fe4914e9f68d68242b71d48b9f134..2da8b3d2b36b2c21da78945a9a3f8ba45a9d160e 100644 (file)
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -9,12 +9,11 @@ require conf/machine/include/e6500-64b.inc
 
 MACHINEOVERRIDES =. "t2:t2080:"
 
-UBOOT_CONFIG ??= "sdcard spi nand secure-boot nor"
+UBOOT_CONFIG ??= "sdcard spi nand nor"
 UBOOT_CONFIG[nor] = "T2080RDB_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[nand] = "T2080RDB_NAND_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
 
 HV_CFG_M = "t2080rdb"
 

diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index f8229f72da4d0ca5e0f2ca42d6b64c410fdbca09..9b6a85acb41ffd6e2020e36c7fc10c26ea489ee2 100644 (file)
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -9,12 +9,11 @@ require conf/machine/include/e6500.inc
 
 MACHINEOVERRIDES =. "t2:t2080:"
 
-UBOOT_CONFIG ??= "sdcard spi nand secure-boot nor"
+UBOOT_CONFIG ??= "sdcard spi nand nor"
 UBOOT_CONFIG[nor] = "T2080RDB_config,,u-boot-with-dtb.bin"
 UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[nand] = "T2080RDB_NAND_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
 
 HV_CFG_M = "t2080rdb"