diff options
author | Andrew Davis <afd@ti.com> | 2022-08-01 16:40:04 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2022-08-05 08:29:17 -0500 |
commit | 038148a6d018c971e15a89c80192179fc04cf170 (patch) | |
tree | d07477c626028c5f30aea6bcee52cd161791ecfb | |
parent | 5c3373071eb4cc18dc51ba4821bb163615bff105 (diff) | |
download | meta-ti-038148a6d018c971e15a89c80192179fc04cf170.tar.gz |
conf: machine: Make multi-certificate image the default
Only the first two K3 devices do not support multi-cert boot so
lets make multi-cert the default and only add back sysfw.itb
for these two devices.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: lines be preserved?
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | conf/machine/include/am62xx.inc | 3 | ||||
-rw-r--r-- | conf/machine/include/am64xx.inc | 3 | ||||
-rw-r--r-- | conf/machine/include/am65xx.inc | 5 | ||||
-rw-r--r-- | conf/machine/include/j7.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/k3.inc | 5 | ||||
-rw-r--r-- | conf/machine/j7-evm.conf | 3 | ||||
-rw-r--r-- | conf/machine/j7-hs-evm.conf | 1 | ||||
-rw-r--r-- | conf/machine/j7200-evm.conf | 3 | ||||
-rw-r--r-- | conf/machine/j721s2-evm.conf | 3 |
9 files changed, 8 insertions, 20 deletions
diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc index 0364edd1..0231235f 100644 --- a/conf/machine/include/am62xx.inc +++ b/conf/machine/include/am62xx.inc | |||
@@ -8,9 +8,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | |||
8 | 8 | ||
9 | TFA_K3_SYSTEM_SUSPEND = "1" | 9 | TFA_K3_SYSTEM_SUSPEND = "1" |
10 | 10 | ||
11 | # AM62 supports multi-certificate images, use the same | ||
12 | IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" | ||
13 | |||
14 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 11 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |
15 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 12 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |
16 | 13 | ||
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index 8e8e146f..930fba08 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc | |||
@@ -14,9 +14,6 @@ KERNEL_DEVICETREE = " \ | |||
14 | ti/k3-am642-evm-nand.dtbo \ | 14 | ti/k3-am642-evm-nand.dtbo \ |
15 | " | 15 | " |
16 | 16 | ||
17 | # AM64 supports multi-certificate images, use the same | ||
18 | IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" | ||
19 | |||
20 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 17 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |
21 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 18 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |
22 | 19 | ||
diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc index 1898f19c..b70d212f 100644 --- a/conf/machine/include/am65xx.inc +++ b/conf/machine/include/am65xx.inc | |||
@@ -22,9 +22,12 @@ KERNEL_DEVICETREE = " \ | |||
22 | 22 | ||
23 | BBMULTICONFIG += "k3r5-sr2" | 23 | BBMULTICONFIG += "k3r5-sr2" |
24 | 24 | ||
25 | # Use default IMAGE_BOOT_FILES_LEGACY files | 25 | # Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb |
26 | IMAGE_BOOT_FILES += "sysfw.itb" | ||
27 | |||
26 | # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 | 28 | # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 |
27 | IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" | 29 | IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" |
30 | |||
28 | do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" | 31 | do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" |
29 | do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" | 32 | do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" |
30 | 33 | ||
diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc index d3eda1a8..c187f299 100644 --- a/conf/machine/include/j7.inc +++ b/conf/machine/include/j7.inc | |||
@@ -4,8 +4,6 @@ SOC_FAMILY_append = ":j7" | |||
4 | OPTEEMACHINE = "k3-j721e" | 4 | OPTEEMACHINE = "k3-j721e" |
5 | OPTEEOUTPUTMACHINE = "k3" | 5 | OPTEEOUTPUTMACHINE = "k3" |
6 | 6 | ||
7 | # Use default IMAGE_BOOT_FILES_LEGACY files | ||
8 | |||
9 | # Set the list of device targets for ti-pdk class recipes | 7 | # Set the list of device targets for ti-pdk class recipes |
10 | TI_PDK_LIMIT_SOCS = "j721e j7200" | 8 | TI_PDK_LIMIT_SOCS = "j721e j7200" |
11 | TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm" | 9 | TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm" |
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index f85e6b98..24741dee 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc | |||
@@ -41,10 +41,7 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" | |||
41 | 41 | ||
42 | IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" | 42 | IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" |
43 | 43 | ||
44 | IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" | 44 | IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" |
45 | IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" | ||
46 | |||
47 | IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}" | ||
48 | 45 | ||
49 | WKS_FILE ?= "sdimage-2part.wks" | 46 | WKS_FILE ?= "sdimage-2part.wks" |
50 | do_image_wic[depends] += "virtual/bootloader:do_deploy" | 47 | do_image_wic[depends] += "virtual/bootloader:do_deploy" |
diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf index 1f47f00c..514695d6 100644 --- a/conf/machine/j7-evm.conf +++ b/conf/machine/j7-evm.conf | |||
@@ -9,6 +9,9 @@ MACHINE_FEATURES += "gpu" | |||
9 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" | 9 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" |
10 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 10 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
11 | 11 | ||
12 | # Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb | ||
13 | IMAGE_BOOT_FILES += "sysfw.itb" | ||
14 | |||
12 | KERNEL_DEVICETREE = " \ | 15 | KERNEL_DEVICETREE = " \ |
13 | ti/k3-j721e-common-proc-board.dtb \ | 16 | ti/k3-j721e-common-proc-board.dtb \ |
14 | ti/k3-j721e-proc-board-tps65917.dtb \ | 17 | ti/k3-j721e-proc-board-tps65917.dtb \ |
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf index ece0d85e..5cb2a3cd 100644 --- a/conf/machine/j7-hs-evm.conf +++ b/conf/machine/j7-hs-evm.conf | |||
@@ -20,7 +20,6 @@ UBOOT_SYMLINK = "u-boot.img" | |||
20 | 20 | ||
21 | BBMULTICONFIG += "k3r5-sr1-1" | 21 | BBMULTICONFIG += "k3r5-sr1-1" |
22 | 22 | ||
23 | # Use default IMAGE_BOOT_FILES_LEGACY files | ||
24 | # Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0 | 23 | # Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0 |
25 | IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb" | 24 | IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb" |
26 | do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" | 25 | do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" |
diff --git a/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf index 2565c90c..c8a03a7b 100644 --- a/conf/machine/j7200-evm.conf +++ b/conf/machine/j7200-evm.conf | |||
@@ -13,8 +13,5 @@ KERNEL_DEVICETREE = " \ | |||
13 | 13 | ||
14 | UBOOT_MACHINE = "j7200_evm_a72_config" | 14 | UBOOT_MACHINE = "j7200_evm_a72_config" |
15 | 15 | ||
16 | # J7200 supports multi-certificate images, use the same | ||
17 | IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" | ||
18 | |||
19 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 16 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |
20 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 17 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |
diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf index 8cf3a414..ba5e8def 100644 --- a/conf/machine/j721s2-evm.conf +++ b/conf/machine/j721s2-evm.conf | |||
@@ -18,8 +18,5 @@ KERNEL_DEVICETREE = " \ | |||
18 | 18 | ||
19 | UBOOT_MACHINE = "j721s2_evm_a72_defconfig" | 19 | UBOOT_MACHINE = "j721s2_evm_a72_defconfig" |
20 | 20 | ||
21 | # J721S2 supports multi-certificate images, use the same | ||
22 | IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" | ||
23 | |||
24 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 21 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |
25 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 22 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" |