add more secure u-boot into default build list

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

diff --git a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
index acc72d466230f251e6b51b58be70e3b0bd9d5d15..7e1f5bf94d735d58036593de2bfb0f4bdbedf8e8 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "b4:b4860"
-UBOOT_MACHINES ?= "B4860QDS"
+UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/b4860qds.conf b/meta-fsl-ppc/conf/machine/b4860qds.conf
index c2d28edbef1ecb466235aaea72631954f8caeaa0..bae326e036e8fec1715c1123d0164851374b435b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "b4:b4860"
-UBOOT_MACHINES ?= "B4860QDS"
+UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/bsc9132qds.conf b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
index 82078ee3ddc69cbb6dd90d7ce7d80249ba9423f8..90ac2a3bf28b525768b3aae2cd088dbbaac468e2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/bsc9132qds.conf
+++ b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
@@ -7,7 +7,15 @@
 require conf/machine/include/e500v2.inc
 
 SOC_FAMILY = "bsc9132"
-UBOOT_MACHINES ?= " BSC9132QDS_NAND_DDRCLK133 BSC9132QDS_NAND_DDRCLK100 BSC9132QDS_NOR_DDRCLK100 BSC9132QDS_NOR_DDRCLK133 BSC9132QDS_SDCARD_DDRCLK100 BSC9132QDS_SDCARD_DDRCLK133 BSC9132QDS_SPIFLASH_DDRCLK100 BSC9132QDS_SPIFLASH_DDRCLK133"
+UBOOT_MACHINES ?= " BSC9132QDS_NAND_DDRCLK133 BSC9132QDS_NAND_DDRCLK100 \
+    BSC9132QDS_NOR_DDRCLK100 BSC9132QDS_NOR_DDRCLK133 \
+    BSC9132QDS_SDCARD_DDRCLK100 BSC9132QDS_SDCARD_DDRCLK133 \
+    BSC9132QDS_SPIFLASH_DDRCLK100 BSC9132QDS_SPIFLASH_DDRCLK133 \
+    BSC9132QDS_NAND_DDRCLK100_SECURE BSC9132QDS_NAND_DDRCLK133_SECURE \
+    BSC9132QDS_NOR_DDRCLK100_SECURE BSC9132QDS_NOR_DDRCLK133_SECURE \
+    BSC9132QDS_SDCARD_DDRCLK100_SECURE BSC9132QDS_SDCARD_DDRCLK133_SECURE \
+    BSC9132QDS_SPIFLASH_DDRCLK100_SECURE BSC9132QDS_SPIFLASH_DDRCLK133_SECURE \
+"
 KERNEL_DEVICETREE ?= "bsc9132qds.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/p1010rdb.conf b/meta-fsl-ppc/conf/machine/p1010rdb.conf
index ee7a9b61a548beac6f067c1eee2de75bd71fdd9b..e24c341e64511022a4a8ee919ca4f6340bfafc69 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1010rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1010rdb.conf
@@ -10,7 +10,11 @@ SOC_FAMILY = "p1010"
 BOOTFORMAT_CONFIG = "config_sram_p1010rdb.dat"
 UBOOT_MACHINES ?= "P1010RDB-PB_NAND P1010RDB-PB_NOR \
     P1010RDB-PB_SPIFLASH P1010RDB-PB_36BIT_NOR P1010RDB-PB_36BIT_NAND \
-    P1010RDB-PB_36BIT_SPIFLASH"
+    P1010RDB-PB_36BIT_SPIFLASH P1010RDB-PB_36BIT_NAND_SECBOOT \
+    P1010RDB-PB_36BIT_NOR_SECBOOT P1010RDB-PB_36BIT_SPIFLASH_SECBOOT \
+    P1010RDB-PB_NAND_SECBOOT P1010RDB-PB_NOR_SECBOOT \
+    P1010RDB-PB_SPIFLASH_SECBOOT \
+"
 KERNEL_DEVICETREE ?= "p1010rdb-pa.dtb p1010rdb-pb.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index 057e9f3a080bd509e61c833163289d24980c36b2..615157f88b65509e4b2a6041b7e64d41b29911eb 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -7,7 +7,9 @@
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "p5020"
-UBOOT_MACHINES ?= "P5020DS"
+UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT \
+    P5020DS_SDCARD P5020DS_SPIFLASH \
+"
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf
index 7e52b724f6be5f5fa4eb9da96917bf2cfe26b820..c489f8f828890f3f6c69dcac7378fed091ffeb40 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1040"
-UBOOT_MACHINES ?= "T1040RDB"
+UBOOT_MACHINES ?= "T1040RDB T1040RDB_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t1040rdb.dtb t1040rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t1040rdb.conf b/meta-fsl-ppc/conf/machine/t1040rdb.conf
index d108819ad72569ac5cbbd964bcdb67dd849c5771..5c4f682ffe2de6c0a859ddadc4ba61db10186149 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1040rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t1040rdb.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1040"
-UBOOT_MACHINES ?= "T1040RDB"
+UBOOT_MACHINES ?= "T1040RDB T1040RDB_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t1040rdb.dtb t1040rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
index 6b0f943621a4370fba0ca1f2b6b1eca165238679..88cb2c98822a867ebb12ebe8b6d43f53a1bbb7cf 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
@@ -7,7 +7,9 @@
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
+UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \
+    T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \
+"
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t2080qds.conf b/meta-fsl-ppc/conf/machine/t2080qds.conf
index c675aecdcfeb42687564fc81714c7c6a23a7ef71..30478e9dbca5bceab127ead3888c8a40911957cd 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080qds.conf
+++ b/meta-fsl-ppc/conf/machine/t2080qds.conf
@@ -7,7 +7,9 @@
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
+UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \
+    T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \
+"
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
index 22f3f0fd1a5e76886443c5b65aca0c419c4185e2..3892ffba14c4d94204338a8ceb59dd940c8540de 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
@@ -7,7 +7,9 @@
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
+UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \
+    T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \
+"
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t2080rdb.conf b/meta-fsl-ppc/conf/machine/t2080rdb.conf
index 67b6d920e59536a70a6dc9ce64cc4eacc830ff28..28dca0db460f96999f173e39e2af5eff12f72ac9 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t2080rdb.conf
@@ -7,7 +7,9 @@
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
+UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \
+    T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \
+"
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
index 970e54eb2e1c2f5e046f9263afa63cb17a11c919..c63aba8829ed8be5d792adf6bdaf0528aa0c7bcb 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t4:t4160"
-UBOOT_MACHINES ?= "T4160QDS"
+UBOOT_MACHINES ?= "T4160QDS T4160QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t4160qds.conf b/meta-fsl-ppc/conf/machine/t4160qds.conf
index 66c114e2bb0a09e1e954f9b342b3c2d0175f598f..83fb5c84f9b46102218d95aff72347249e92d61d 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t4:t4160"
-UBOOT_MACHINES ?= "T4160QDS"
+UBOOT_MACHINES ?= "T4160QDS T4160QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
index 5d1c12ac19ee4081b39a643c8be84f1b7213c9fe..006c2c1fc6fae737137941e3c7e38356b6fae725 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240QDS"
+UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/t4240qds.conf b/meta-fsl-ppc/conf/machine/t4240qds.conf
index 06673fa439e2a4505f61100e69d2e2b66faeeeb2..fe67584c9933b9cc5f7249a136e22d734be579f6 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240QDS"
+UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"