From 26651ed9bc0c50f3e587da3a8d203bb4f4f27cb6 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Wed, 7 Jan 2015 17:55:03 +0800 Subject: add more secure u-boot into default build list Signed-off-by: Ting Liu --- conf/machine/b4860qds-64b.conf | 2 +- conf/machine/b4860qds.conf | 2 +- conf/machine/bsc9132qds.conf | 10 +++++++++- conf/machine/p1010rdb.conf | 6 +++++- conf/machine/p5020ds-64b.conf | 4 +++- conf/machine/t1040rdb-64b.conf | 2 +- conf/machine/t1040rdb.conf | 2 +- conf/machine/t2080qds-64b.conf | 4 +++- conf/machine/t2080qds.conf | 4 +++- conf/machine/t2080rdb-64b.conf | 4 +++- conf/machine/t2080rdb.conf | 4 +++- conf/machine/t4160qds-64b.conf | 2 +- conf/machine/t4160qds.conf | 2 +- conf/machine/t4240qds-64b.conf | 2 +- conf/machine/t4240qds.conf | 2 +- 15 files changed, 37 insertions(+), 15 deletions(-) diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf index acc72d4..7e1f5bf 100644 --- a/conf/machine/b4860qds-64b.conf +++ b/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/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf index c2d28ed..bae326e 100644 --- a/conf/machine/b4860qds.conf +++ b/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/conf/machine/bsc9132qds.conf b/conf/machine/bsc9132qds.conf index 82078ee..90ac2a3 100644 --- a/conf/machine/bsc9132qds.conf +++ b/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/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf index ee7a9b6..e24c341 100644 --- a/conf/machine/p1010rdb.conf +++ b/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/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf index 057e9f3..615157f 100644 --- a/conf/machine/p5020ds-64b.conf +++ b/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/conf/machine/t1040rdb-64b.conf b/conf/machine/t1040rdb-64b.conf index 7e52b72..c489f8f 100644 --- a/conf/machine/t1040rdb-64b.conf +++ b/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/conf/machine/t1040rdb.conf b/conf/machine/t1040rdb.conf index d108819..5c4f682 100644 --- a/conf/machine/t1040rdb.conf +++ b/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/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf index 6b0f943..88cb2c9 100644 --- a/conf/machine/t2080qds-64b.conf +++ b/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/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf index c675aec..30478e9 100644 --- a/conf/machine/t2080qds.conf +++ b/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/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf index 22f3f0f..3892ffb 100644 --- a/conf/machine/t2080rdb-64b.conf +++ b/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/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf index 67b6d92..28dca0d 100644 --- a/conf/machine/t2080rdb.conf +++ b/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/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf index 970e54e..c63aba8 100644 --- a/conf/machine/t4160qds-64b.conf +++ b/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/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf index 66c114e..83fb5c8 100644 --- a/conf/machine/t4160qds.conf +++ b/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/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf index 5d1c12a..006c2c1 100644 --- a/conf/machine/t4240qds-64b.conf +++ b/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/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf index 06673fa..fe67584 100644 --- a/conf/machine/t4240qds.conf +++ b/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" -- cgit v1.2.3-54-g00ecf