From 23f3509be1a7877e7b3aaf41671110b5f8518ee4 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Thu, 21 May 2020 15:48:30 +0800 Subject: 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 --- conf/machine/p2041rdb.conf | 3 +-- conf/machine/p3041ds.conf | 3 +-- conf/machine/p4080ds.conf | 3 +-- conf/machine/p5040ds-64b.conf | 3 +-- conf/machine/p5040ds.conf | 3 +-- conf/machine/t1024rdb-64b.conf | 3 +-- conf/machine/t1024rdb.conf | 3 +-- conf/machine/t1042d4rdb-64b.conf | 3 +-- conf/machine/t1042d4rdb.conf | 3 +-- conf/machine/t2080rdb-64b.conf | 3 +-- conf/machine/t2080rdb.conf | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf index 685d327c4..67fa16d1c 100644 --- 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 2fbe0f66f..cb8099c21 100644 --- 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 d2f133a0f..e648a2427 100644 --- 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 4dc9030cf..a6a293930 100644 --- 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 8ab15ae28..daa8d4cd8 100644 --- 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 19b8d0beb..92ccc0e6d 100644 --- 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 0665463f1..9d39958e9 100644 --- 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 0e2bed55a..dd9acda19 100644 --- 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 a27f2b5e6..52a792c74 100644 --- 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 f900d5c11..2da8b3d2b 100644 --- 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 f8229f72d..9b6a85acb 100644 --- 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" -- cgit v1.2.3-54-g00ecf