summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@konsulko.com>2022-02-22 04:13:45 +0000
committerRyan Eatmon <reatmon@ti.com>2022-02-22 12:01:38 -0600
commit20f3191aeb592dd889eeaf96a31526297de95306 (patch)
treeaec879b9855ff8a54df171ee808e30ac26f1c80b /conf
parentbea4fd2c401af05b866bd6af1c4e501d31b7b420 (diff)
downloadmeta-ti-20f3191aeb592dd889eeaf96a31526297de95306.tar.gz
meta-ti: create a sub-layer meta-ti-bsp from existing content
Extra sub-layers will be created next and relevant content moved across them. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/layer.conf26
-rw-r--r--conf/machine/am335x-evm.conf35
-rw-r--r--conf/machine/am335x-hs-evm.conf18
-rw-r--r--conf/machine/am437x-evm.conf33
-rw-r--r--conf/machine/am437x-hs-evm.conf20
-rw-r--r--conf/machine/am57xx-evm.conf53
-rw-r--r--conf/machine/am57xx-hs-evm.conf21
-rw-r--r--conf/machine/am64xx-evm-k3r5.conf11
-rw-r--r--conf/machine/am64xx-evm.conf7
-rw-r--r--conf/machine/am64xx-hs-evm-k3r5.conf14
-rw-r--r--conf/machine/am64xx-hs-evm.conf22
-rw-r--r--conf/machine/am65xx-evm-k3r5-sr2.conf11
-rw-r--r--conf/machine/am65xx-evm-k3r5.conf12
-rw-r--r--conf/machine/am65xx-evm.conf7
-rw-r--r--conf/machine/am65xx-hs-evm-k3r5-sr2.conf11
-rw-r--r--conf/machine/am65xx-hs-evm-k3r5.conf14
-rw-r--r--conf/machine/am65xx-hs-evm.conf22
-rw-r--r--conf/machine/beagle-x15.conf13
-rw-r--r--conf/machine/beaglebone.conf16
-rw-r--r--conf/machine/dra7xx-evm.conf48
-rw-r--r--conf/machine/dra7xx-hs-evm.conf21
-rw-r--r--conf/machine/include/am64xx.inc24
-rw-r--r--conf/machine/include/am65xx.inc32
-rw-r--r--conf/machine/include/dra7xx.inc4
-rw-r--r--conf/machine/include/j7.inc7
-rw-r--r--conf/machine/include/k3.inc55
-rw-r--r--conf/machine/include/k3r5.inc24
-rw-r--r--conf/machine/include/omap-a15.inc55
-rw-r--r--conf/machine/include/omapl1.inc2
-rw-r--r--conf/machine/include/omapl138.inc2
-rw-r--r--conf/machine/include/ti-soc.inc5
-rw-r--r--conf/machine/include/ti33x.inc70
-rw-r--r--conf/machine/include/ti43x.inc67
-rw-r--r--conf/machine/j7-evm-k3r5.conf11
-rw-r--r--conf/machine/j7-evm.conf18
-rw-r--r--conf/machine/j7-hs-evm-k3r5-sr1-1.conf11
-rw-r--r--conf/machine/j7-hs-evm-k3r5.conf13
-rw-r--r--conf/machine/j7-hs-evm.conf30
-rw-r--r--conf/machine/j7200-evm-k3r5.conf11
-rw-r--r--conf/machine/j7200-evm.conf20
-rw-r--r--conf/machine/j7200-hs-evm-k3r5.conf13
-rw-r--r--conf/machine/j7200-hs-evm.conf22
-rw-r--r--conf/machine/omapl138-lcdk.conf19
-rw-r--r--conf/multiconfig/k3r5-sr1-1.conf3
-rw-r--r--conf/multiconfig/k3r5-sr2.conf3
-rw-r--r--conf/multiconfig/k3r5.conf5
46 files changed, 0 insertions, 961 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
deleted file mode 100644
index f64ac5eb..00000000
--- a/conf/layer.conf
+++ /dev/null
@@ -1,26 +0,0 @@
1# We have a conf and classes directory, append to BBPATH
2BBPATH .= ":${LAYERDIR}"
3METATIBASE := '${@os.path.normpath("${LAYERDIR}/")}'
4
5# We have a recipes directory, add to BBFILES
6BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7
8BBFILE_COLLECTIONS += "meta-ti"
9BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
10BBFILE_PRIORITY_meta-ti = "6"
11
12LAYERSERIES_COMPAT_meta-ti = "honister"
13
14LICENSE_PATH += "${LAYERDIR}/licenses"
15
16LAYERDEPENDS_meta-ti = " \
17 core \
18 meta-arm \
19"
20
21SIGGEN_EXCLUDERECIPES_ABISAFE += " \
22 ti-sgx-ddk-km \
23 ti-sgx-ddk-um \
24"
25
26HOSTTOOLS_NONFATAL += "truncate xxd comm"
diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf
deleted file mode 100644
index 469c4d37..00000000
--- a/conf/machine/am335x-evm.conf
+++ /dev/null
@@ -1,35 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM335x EVM
3#@DESCRIPTION: Machine configuration for the TI AM335x EVM
4
5require conf/machine/include/ti33x.inc
6
7MACHINE_GUI_CLASS = "smallscreen"
8MACHINE_FEATURES += "touchscreen"
9
10IMAGE_FSTYPES += "ubifs ubi"
11
12# Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both
13SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
14SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
15
16# UBI information. Note that this is board and kernel specific. Changes
17# in your kernel port may require changes in these variables. For more
18# details about this board please see
19# http://processors.wiki.ti.com/index.php/UBIFS_Support
20
21# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
22# From dmesg:
23# UBI: smallest flash I/O unit: 2048
24# UBI: logical eraseblock size: 126976 bytes
25# from ubiattach stdout:
26# UBI device number 0, total 1988 LEBs
27MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 9900"
28
29# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
30# from dmesg:
31# UBI: smallest flash I/O unit: 2048
32# UBI: physical eraseblock size: 131072 bytes (128 KiB)
33# UBI: sub-page size: 512
34# UBI: VID header offset: 2048 (aligned 2048)
35UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 512 -O 2048"
diff --git a/conf/machine/am335x-hs-evm.conf b/conf/machine/am335x-hs-evm.conf
deleted file mode 100644
index 7caa5bfd..00000000
--- a/conf/machine/am335x-hs-evm.conf
+++ /dev/null
@@ -1,18 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM335x HS EVM
3#@DESCRIPTION: Machine configuration for the TI AM335x HS EVM
4
5require conf/machine/am335x-evm.conf
6
7UBOOT_MACHINE = ""
8# Last config in the list is default
9UBOOT_CONFIG ??= "uart mmc"
10UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"
11UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"
12
13UBOOT_ENTRYPOINT = "0x82000000"
14UBOOT_LOADADDRESS = "0x82000000"
15UBOOT_RD_LOADADDRESS = "0x84000000"
16UBOOT_RD_ENTRYPOINT = "0x84000000"
17
18TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am3x"
diff --git a/conf/machine/am437x-evm.conf b/conf/machine/am437x-evm.conf
deleted file mode 100644
index 4e3681d5..00000000
--- a/conf/machine/am437x-evm.conf
+++ /dev/null
@@ -1,33 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM437x EVM
3#@DESCRIPTION: Machine configuration for the TI AM437x EVM
4
5require conf/machine/include/ti43x.inc
6
7MACHINE_GUI_CLASS = "smallscreen"
8MACHINE_FEATURES += "touchscreen"
9
10IMAGE_FSTYPES += "ubifs ubi"
11
12SERIAL_CONSOLES = "115200;ttyS0"
13
14# UBI information. Note that this is board and kernel specific. Changes
15# in your kernel port may require changes in these variables. For more
16# details about this board please see
17# http://processors.wiki.ti.com/index.php/UBIFS_Support
18
19# do ubiattach /dev/ubi_ctrl -m 11 -O 4096
20# From dmesg:
21# UBI: smallest flash I/O unit: 4096
22# UBI: logical eraseblock size: 253952 bytes
23# from ubiattach stdout:
24# UBI device number 0, total 994 LEBs
25MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4800"
26
27# do ubiattach /dev/ubi_ctrl -m 11 -O 4096
28# from dmesg:
29# UBI: smallest flash I/O unit: 4096
30# UBI: physical eraseblock size: 262144 bytes (256 KiB)
31# UBI: sub-page size: 4096
32# UBI: VID header offset: 4096 (aligned 4096)
33UBINIZE_ARGS = "-m 4096 -p 256KiB -s 4096 -O 4096"
diff --git a/conf/machine/am437x-hs-evm.conf b/conf/machine/am437x-hs-evm.conf
deleted file mode 100644
index 68b808d2..00000000
--- a/conf/machine/am437x-hs-evm.conf
+++ /dev/null
@@ -1,20 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM437x HS EVM
3#@DESCRIPTION: Machine configuration for the TI AM437x HS EVM
4
5require conf/machine/am437x-evm.conf
6
7UBOOT_MACHINE = "am43xx_hs_evm_config"
8
9UBOOT_ENTRYPOINT = "0x82000000"
10UBOOT_LOADADDRESS = "0x82000000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13
14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"
15
16OPTEEMACHINE = "ti-am43xx"
17OPTEEFLAVOR = "am43xx"
18OPTEEOUTPUTMACHINE = "ti"
19
20EXTRA_IMAGEDEPENDS += "optee-os"
diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf
deleted file mode 100644
index eb0082ee..00000000
--- a/conf/machine/am57xx-evm.conf
+++ /dev/null
@@ -1,53 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM57xx EVM
3#@DESCRIPTION: Machine configuration for the TI AM57xx EVM
4
5require conf/machine/include/dra7xx.inc
6
7MACHINE_FEATURES += "touchscreen"
8
9SERIAL_CONSOLES = "115200;ttyS2"
10
11KERNEL_DEVICETREE = " \
12 am57xx-beagle-x15.dtb \
13 am57xx-beagle-x15-revb1.dtb \
14 am57xx-beagle-x15-revc.dtb \
15 am5729-beagleboneai.dtb \
16 am57xx-evm.dtb \
17 ti/am57xx-evm-common.dtbo \
18 am57xx-evm-reva3.dtb \
19 ti/am57xx-evm-reva3.dtbo \
20 am571x-idk.dtb \
21 ti/am571x-idk-touchscreen.dtbo \
22 am572x-idk.dtb \
23 am574x-idk.dtb \
24 ti/am57xx-idk-osd-lcd-common.dtbo \
25 ti/am572x-idk-touchscreen.dtbo \
26 ti/lcd-osd101t2587.dtbo \
27 ti/lcd-osd101t2045.dtbo \
28"
29
30KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}"
31
32UBOOT_MACHINE = "am57xx_evm_config"
33
34# UBI information. Note that this is board and kernel specific. Changes
35# in your kernel port may require changes in these variables. For more
36# details about this board please see
37# http://processors.wiki.ti.com/index.php/UBIFS_Support
38
39# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
40# From dmesg:
41# UBI: smallest flash I/O unit: 2048
42# UBI: logical eraseblock size: 126976 bytes
43# from ubiattach stdout:
44# UBI device number 0, total 1988 LEBs
45MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
46
47# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
48# from dmesg:
49# UBI: smallest flash I/O unit: 2048
50# UBI: physical eraseblock size: 131072 bytes (128 KiB)
51# UBI: sub-page size: 512
52# UBI: VID header offset: 2048 (aligned 2048)
53UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
diff --git a/conf/machine/am57xx-hs-evm.conf b/conf/machine/am57xx-hs-evm.conf
deleted file mode 100644
index 5232cbd9..00000000
--- a/conf/machine/am57xx-hs-evm.conf
+++ /dev/null
@@ -1,21 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM57xx HS EVM
3#@DESCRIPTION: Machine configuration for the TI AM57xx HS EVM
4
5require conf/machine/am57xx-evm.conf
6
7UBOOT_MACHINE = "am57xx_hs_evm_config"
8
9UBOOT_ENTRYPOINT = "0x82000000"
10UBOOT_LOADADDRESS = "0x82000000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13
14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
15
16OPTEEMACHINE = "ti-am57xx"
17OPTEEFLAVOR = "am57xx"
18OPTEEOUTPUTMACHINE = "ti"
19OPTEEPAGER = "y"
20
21EXTRA_IMAGEDEPENDS += "optee-os"
diff --git a/conf/machine/am64xx-evm-k3r5.conf b/conf/machine/am64xx-evm-k3r5.conf
deleted file mode 100644
index afd36b72..00000000
--- a/conf/machine/am64xx-evm-k3r5.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM64xx EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "am64x"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp"
10
11UBOOT_MACHINE = "am64x_evm_r5_defconfig"
diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
deleted file mode 100644
index c6ba2a87..00000000
--- a/conf/machine/am64xx-evm.conf
+++ /dev/null
@@ -1,7 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM64xx EVM
3#@DESCRIPTION: Machine configuration for the TI AM64xx EVM
4
5require conf/machine/include/am64xx.inc
6
7UBOOT_MACHINE = "am64x_evm_a53_defconfig"
diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf
deleted file mode 100644
index d12c030f..00000000
--- a/conf/machine/am64xx-hs-evm-k3r5.conf
+++ /dev/null
@@ -1,14 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM64xx HS EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "am64x"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs"
10SYSFW_SYMLINK = ""
11
12UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig"
13
14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
deleted file mode 100644
index 44e81463..00000000
--- a/conf/machine/am64xx-hs-evm.conf
+++ /dev/null
@@ -1,22 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM64xx HS EVM
3#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM
4
5require conf/machine/include/am64xx.inc
6
7UBOOT_MACHINE = "am64x_hs_evm_a53_defconfig"
8
9UBOOT_ENTRYPOINT = "0x80080000"
10UBOOT_LOADADDRESS = "0x80080000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13UBOOT_DTB_LOADADDRESS = "0x83000000"
14UBOOT_DTBO_LOADADDRESS = "0x83080000"
15UBOOT_DTBO_OFFSET = "0x00010000"
16
17SPL_BINARY = "tispl.bin_HS"
18SPL_BINARYNAME = "tispl.bin"
19UBOOT_BINARY = "u-boot.img_HS"
20IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
21
22TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/am65xx-evm-k3r5-sr2.conf b/conf/machine/am65xx-evm-k3r5-sr2.conf
deleted file mode 100644
index e74dd3ab..00000000
--- a/conf/machine/am65xx-evm-k3r5-sr2.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM65xx SR2.0 EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 EVM (R5F core)
4
5# Booting SR2 requires different SYSFW, the rest is handled at runtime
6
7require conf/machine/am65xx-evm-k3r5.conf
8SOC_FAMILY:append = ":k3r5-sr2"
9
10SYSFW_SOC = "am65x_sr2"
11SYSFW_SYMLINK = "sysfw.itb"
diff --git a/conf/machine/am65xx-evm-k3r5.conf b/conf/machine/am65xx-evm-k3r5.conf
deleted file mode 100644
index bd17474e..00000000
--- a/conf/machine/am65xx-evm-k3r5.conf
+++ /dev/null
@@ -1,12 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM65xx EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM65xx EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "am65x"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp"
10SYSFW_SYMLINK = ""
11
12UBOOT_MACHINE = "am65x_evm_r5_defconfig"
diff --git a/conf/machine/am65xx-evm.conf b/conf/machine/am65xx-evm.conf
deleted file mode 100644
index 8b6ef546..00000000
--- a/conf/machine/am65xx-evm.conf
+++ /dev/null
@@ -1,7 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM65xx EVM
3#@DESCRIPTION: Machine configuration for the TI AM65xx EVM
4
5require conf/machine/include/am65xx.inc
6
7UBOOT_MACHINE = "am65x_evm_a53_defconfig"
diff --git a/conf/machine/am65xx-hs-evm-k3r5-sr2.conf b/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
deleted file mode 100644
index ff1645e4..00000000
--- a/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM65xx SR2.0 HS EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core)
4
5# Booting SR2 requires different SYSFW, the rest is handled at runtime
6
7require conf/machine/am65xx-hs-evm-k3r5.conf
8SOC_FAMILY:append = ":k3r5-sr2"
9
10SYSFW_SOC = "am65x_sr2"
11SYSFW_SYMLINK = "sysfw.itb"
diff --git a/conf/machine/am65xx-hs-evm-k3r5.conf b/conf/machine/am65xx-hs-evm-k3r5.conf
deleted file mode 100644
index d6d4b1e3..00000000
--- a/conf/machine/am65xx-hs-evm-k3r5.conf
+++ /dev/null
@@ -1,14 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM65xx HS EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "am65x"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs"
10SYSFW_SYMLINK = ""
11
12UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
13
14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf
deleted file mode 100644
index e4eebb6a..00000000
--- a/conf/machine/am65xx-hs-evm.conf
+++ /dev/null
@@ -1,22 +0,0 @@
1#@TYPE: Machine
2#@NAME: AM65xx HS EVM
3#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM
4
5require conf/machine/include/am65xx.inc
6
7UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
8
9UBOOT_ENTRYPOINT = "0x80080000"
10UBOOT_LOADADDRESS = "0x80080000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13UBOOT_DTB_LOADADDRESS = "0x83000000"
14UBOOT_DTBO_LOADADDRESS = "0x83080000"
15UBOOT_DTBO_OFFSET = "0x00010000"
16
17SPL_BINARY = "tispl.bin_HS"
18SPL_BINARYNAME = "tispl.bin"
19UBOOT_BINARY = "u-boot.img_HS"
20IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
21
22TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/beagle-x15.conf b/conf/machine/beagle-x15.conf
deleted file mode 100644
index c7503266..00000000
--- a/conf/machine/beagle-x15.conf
+++ /dev/null
@@ -1,13 +0,0 @@
1#@TYPE: Machine
2#@NAME: BeagleBoard X15
3#@DESCRIPTION: Machine configuration for the BeagleBoard X15
4
5require conf/machine/include/dra7xx.inc
6
7KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb"
8
9MACHINE_GUI_CLASS = "bigscreen"
10
11SERIAL_CONSOLES = "115200;ttyS2"
12
13UBOOT_MACHINE = "am57xx_evm_config"
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
deleted file mode 100644
index cce8fd09..00000000
--- a/conf/machine/beaglebone.conf
+++ /dev/null
@@ -1,16 +0,0 @@
1#@TYPE: Machine
2#@NAME: BeagleBone machine
3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
4
5require conf/machine/include/ti33x.inc
6
7KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \
8 am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
9 am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb"
10
11# Only has DVI connector for external screen
12MACHINE_GUI_CLASS = "bigscreen"
13
14SERIAL_CONSOLES = "115200;ttyS0"
15
16IMAGE_INSTALL:append = " kernel-devicetree kernel-image-zimage"
diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf
deleted file mode 100644
index 5fa1dfa5..00000000
--- a/conf/machine/dra7xx-evm.conf
+++ /dev/null
@@ -1,48 +0,0 @@
1#@TYPE: Machine
2#@NAME: DRA7xx EVM
3#@DESCRIPTION: Machine configuration for the TI DRA7xx EVM
4
5require conf/machine/include/dra7xx.inc
6
7MACHINE_FEATURES += "touchscreen"
8
9SERIAL_CONSOLES = "115200;ttyS0"
10
11KERNEL_DEVICETREE = " \
12 dra7-evm.dtb \
13 ti/dra7x-evm-osd-lcd-common.dtbo \
14 dra71-evm.dtb \
15 dra71-evm-nand.dtb \
16 ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \
17 dra72-evm.dtb \
18 dra72-evm-revc.dtb \
19 ti/dra72-evm-touchscreen.dtbo \
20 ti/dra74-evm-touchscreen.dtbo \
21 dra76-evm.dtb \
22 ti/dra76-evm-tfp410.dtbo \
23 ti/lcd-osd101t2045.dtbo \
24 ti/lcd-osd101t2587.dtbo \
25"
26
27UBOOT_MACHINE = "dra7xx_evm_config"
28
29# UBI information. Note that this is board and kernel specific. Changes
30# in your kernel port may require changes in these variables. For more
31# details about this board please see
32# http://processors.wiki.ti.com/index.php/UBIFS_Support
33
34# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
35# From dmesg:
36# UBI: smallest flash I/O unit: 2048
37# UBI: logical eraseblock size: 126976 bytes
38# from ubiattach stdout:
39# UBI device number 0, total 1988 LEBs
40MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
41
42# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
43# from dmesg:
44# UBI: smallest flash I/O unit: 2048
45# UBI: physical eraseblock size: 131072 bytes (128 KiB)
46# UBI: sub-page size: 512
47# UBI: VID header offset: 2048 (aligned 2048)
48UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
diff --git a/conf/machine/dra7xx-hs-evm.conf b/conf/machine/dra7xx-hs-evm.conf
deleted file mode 100644
index 49630081..00000000
--- a/conf/machine/dra7xx-hs-evm.conf
+++ /dev/null
@@ -1,21 +0,0 @@
1#@TYPE: Machine
2#@NAME: DRA7xx HS EVM
3#@DESCRIPTION: Machine configuration for the TI DRA7xx HS EVM
4
5require conf/machine/dra7xx-evm.conf
6
7UBOOT_MACHINE = "dra7xx_hs_evm_config"
8
9UBOOT_ENTRYPOINT = "0x82000000"
10UBOOT_LOADADDRESS = "0x82000000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13
14TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
15
16OPTEEMACHINE = "ti-dra7xx"
17OPTEEFLAVOR = "dra7xx"
18OPTEEOUTPUTMACHINE = "ti"
19OPTEEPAGER = "y"
20
21EXTRA_IMAGEDEPENDS += "optee-os"
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
deleted file mode 100644
index afb96a22..00000000
--- a/conf/machine/include/am64xx.inc
+++ /dev/null
@@ -1,24 +0,0 @@
1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":am64xx"
3
4MACHINE_FEATURES += "screen touchscreen"
5
6SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
8
9KERNEL_DEVICETREE = " \
10 ti/k3-am642-evm.dtb \
11 ti/k3-am642-sk.dtb \
12 ti/k3-am642-evm-icssg1-dualemac.dtbo \
13 ti/k3-am642-evm-nand.dtbo \
14"
15
16# AM64 supports multi-certificate images, use the same
17IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
18
19do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
20do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
21
22TFA_BOARD = "lite"
23OPTEEMACHINE = "k3-am65x"
24OPTEEOUTPUTMACHINE = "k3"
diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
deleted file mode 100644
index 111ef96f..00000000
--- a/conf/machine/include/am65xx.inc
+++ /dev/null
@@ -1,32 +0,0 @@
1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":am65xx"
3
4MACHINE_FEATURES += "screen touchscreen gpu"
5
6SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
8
9KERNEL_DEVICETREE = " \
10 ti/k3-am654-base-board.dtb \
11 ti/k3-am654-base-board-sr1.dtbo \
12 ti/k3-am654-gp.dtbo \
13 ti/k3-am654-idk.dtbo \
14 ti/k3-am654-idk-sr1.dtbo \
15 ti/k3-am654-sr1.dtbo \
16 ti/k3-am654-pcie-usb2.dtbo \
17 ti/k3-am654-pcie-usb3.dtbo \
18 ti/k3-am654-evm-tc358876.dtbo \
19 ti/k3-am654-evm-oldi-lcd1evm.dtbo \
20 ti/k3-am654-evm-ov5640.dtbo \
21"
22
23BBMULTICONFIG += "k3r5-sr2"
24
25# Use default IMAGE_BOOT_FILES_LEGACY files
26# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
27IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
28do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
29do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
30
31OPTEEMACHINE = "k3-am65x"
32OPTEEOUTPUTMACHINE = "k3"
diff --git a/conf/machine/include/dra7xx.inc b/conf/machine/include/dra7xx.inc
deleted file mode 100644
index a02421d9..00000000
--- a/conf/machine/include/dra7xx.inc
+++ /dev/null
@@ -1,4 +0,0 @@
1require conf/machine/include/omap-a15.inc
2SOC_FAMILY:append = ":dra7xx"
3
4MACHINE_FEATURES += "pci"
diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
deleted file mode 100644
index 4ea3a5d8..00000000
--- a/conf/machine/include/j7.inc
+++ /dev/null
@@ -1,7 +0,0 @@
1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":j7"
3
4OPTEEMACHINE = "k3-j721e"
5OPTEEOUTPUTMACHINE = "k3"
6
7# Use default IMAGE_BOOT_FILES_LEGACY files
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
deleted file mode 100644
index a39ddd2a..00000000
--- a/conf/machine/include/k3.inc
+++ /dev/null
@@ -1,55 +0,0 @@
1# TI K3 Aarch64 profile for Cortex-A53/A72 cores
2
3require conf/machine/include/ti-soc.inc
4SOC_FAMILY:append = ":k3"
5
6require conf/machine/include/arm/arch-arm64.inc
7
8BBMULTICONFIG += "k3r5"
9
10# Increase this everytime you change something in the kernel
11MACHINE_KERNEL_PR = "r0"
12
13PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
14PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
15PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
16
17KERNEL_IMAGETYPE = "Image"
18KERNEL_IMAGETYPES = "Image vmlinux.gz"
19
20UBOOT_ARCH = "arm"
21UBOOT_ENTRYPOINT = "0x80008000"
22UBOOT_LOADADDRESS = "0x80008000"
23
24SPL_BINARY = "tispl.bin"
25UBOOT_SUFFIX = "img"
26
27EXTRA_IMAGEDEPENDS += "virtual/bootloader"
28
29TFA_PLATFORM = "k3"
30TFA_BOARD = "generic"
31
32MACHINE_GUI_CLASS = "smallscreen"
33
34# Use the expected value of the ubifs filesystem's volume name in the kernel
35# and u-boot.
36UBI_VOLNAME = "rootfs"
37
38# List common SoC features, may need to add touchscreen for specific machines
39MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
40
41IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
42
43IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
44IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
45
46IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
47IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
48
49EFI_PROVIDER ?= "grub-efi"
50MACHINE_FEATURES += "efi"
51
52WKS_FILE ?= "sdimage-2part-efi.wks"
53do_image_wic[depends] += "virtual/bootloader:do_deploy"
54do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
55do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc
deleted file mode 100644
index 3cc79061..00000000
--- a/conf/machine/include/k3r5.inc
+++ /dev/null
@@ -1,24 +0,0 @@
1# TI K3 Armv7 profile for Cortex-R5F cores
2
3require conf/machine/include/ti-soc.inc
4SOC_FAMILY:append = ":k3r5"
5
6# The closest of existing tunes for Cortex-R5F
7DEFAULTTUNE = "armv7athf"
8require conf/machine/include/arm/armv7a/tune-cortexa8.inc
9
10# R5 runs early bootloader and loads SYSFW
11# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/am65x/README
12# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/j721e/README
13PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
14PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
15PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
16
17SPL_BINARY = ""
18UBOOT_SUFFIX = "bin"
19UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
20UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
21UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
22
23PACKAGECONFIG:pn-u-boot-ti-staging = ""
24PACKAGECONFIG:pn-u-boot-ti-mainline = ""
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
deleted file mode 100644
index 9a2e0044..00000000
--- a/conf/machine/include/omap-a15.inc
+++ /dev/null
@@ -1,55 +0,0 @@
1require conf/machine/include/ti-soc.inc
2SOC_FAMILY:append = ":omap-a15"
3
4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/arm/armv7a/tune-cortexa15.inc
6
7# Increase this everytime you change something in the kernel
8MACHINE_KERNEL_PR = "r7"
9
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
11PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
12PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
13
14KERNEL_IMAGETYPE = "zImage"
15KERNEL_IMAGETYPES = "zImage uImage"
16KERNEL_CLASSES += "kernel-uimage"
17
18UBOOT_ARCH = "arm"
19UBOOT_ENTRYPOINT = "0x80008000"
20UBOOT_LOADADDRESS = "0x80008000"
21
22DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}"
23
24# Generate an extlinux.conf file
25UBOOT_EXTLINUX = "1"
26UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
27UBOOT_EXTLINUX_BOOT_FILES = " \
28 extlinux.conf;extlinux/extlinux.conf \
29 ${KERNEL_IMAGETYPE} \
30 ${DEVICETREE_FILE} \
31"
32
33SPL_BINARY = "MLO"
34UBOOT_SUFFIX = "img"
35
36EXTRA_IMAGEDEPENDS += "virtual/bootloader"
37
38PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
39XSERVER = "xserver-xorg \
40 xf86-input-evdev \
41 xf86-video-fbdev"
42
43MACHINE_GUI_CLASS = "smallscreen"
44
45# Use the expected value of the ubifs filesystem's volume name in the kernel
46# and u-boot.
47UBI_VOLNAME = "rootfs"
48
49# List common SoC features, may need to add touchscreen for specific machines
50MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320"
51
52IMAGE_FSTYPES += "tar.xz wic.xz"
53WKS_FILE ?= "sdimage-2part.wks"
54IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
55do_image_wic[depends] += "u-boot:do_deploy"
diff --git a/conf/machine/include/omapl1.inc b/conf/machine/include/omapl1.inc
deleted file mode 100644
index d0262c3f..00000000
--- a/conf/machine/include/omapl1.inc
+++ /dev/null
@@ -1,2 +0,0 @@
1require conf/machine/include/ti-soc.inc
2SOC_FAMILY:append = ":omapl1"
diff --git a/conf/machine/include/omapl138.inc b/conf/machine/include/omapl138.inc
deleted file mode 100644
index c6eb0cd9..00000000
--- a/conf/machine/include/omapl138.inc
+++ /dev/null
@@ -1,2 +0,0 @@
1require conf/machine/include/omapl1.inc
2SOC_FAMILY:append = ":omapl138"
diff --git a/conf/machine/include/ti-soc.inc b/conf/machine/include/ti-soc.inc
deleted file mode 100644
index 2792d2a0..00000000
--- a/conf/machine/include/ti-soc.inc
+++ /dev/null
@@ -1,5 +0,0 @@
1# This is a generic TI SOC family. It is a superset of all other SOCs
2# and platforms defined in meta-ti to allow BSP-level overrides.
3SOC_FAMILY = "ti-soc"
4KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
5require conf/machine/include/soc-family.inc
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
deleted file mode 100644
index afb80fd6..00000000
--- a/conf/machine/include/ti33x.inc
+++ /dev/null
@@ -1,70 +0,0 @@
1require conf/machine/include/ti-soc.inc
2SOC_FAMILY:append = ":ti33x"
3
4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/arm/armv7a/tune-cortexa8.inc
6
7PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
8
9# For built-in LCD, add xf86-input-tslib
10XSERVER = "xserver-xorg \
11 xf86-input-evdev \
12 xf86-input-mouse \
13 xf86-video-fbdev \
14 xf86-input-keyboard"
15
16# Default to external video, change to smallscreen for built-in LCD
17MACHINE_GUI_CLASS = "bigscreen"
18
19# Increase this everytime you change something in the kernel
20MACHINE_KERNEL_PR = "r22"
21
22# Default providers, may need to override for specific machines
23PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
24PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
25PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
26
27KERNEL_IMAGETYPE = "zImage"
28
29KERNEL_DEVICETREE = " \
30 am335x-evm.dtb am335x-evmsk.dtb \
31 am335x-icev2.dtb \
32 am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \
33 am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \
34 am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
35 am335x-sancloud-bbe.dtb \
36"
37
38KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}"
39
40UBOOT_ARCH = "arm"
41UBOOT_MACHINE = "am335x_evm_config"
42
43UBOOT_ENTRYPOINT = "0x80008000"
44UBOOT_LOADADDRESS = "0x80008000"
45
46# Generate an extlinux.conf file
47UBOOT_EXTLINUX = "1"
48UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
49UBOOT_EXTLINUX_BOOT_FILES = " \
50 extlinux.conf;extlinux/extlinux.conf \
51 ${KERNEL_IMAGETYPE} \
52 ${KERNEL_DEVICETREE} \
53"
54
55SPL_BINARY = "MLO"
56UBOOT_SUFFIX = "img"
57
58# Use the expected value of the ubifs filesystem's volume name in the kernel
59# and u-boot.
60UBI_VOLNAME = "rootfs"
61
62EXTRA_IMAGEDEPENDS += "virtual/bootloader"
63
64# List common SoC features, may need to add touchscreen for specific machines
65MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
66
67IMAGE_FSTYPES += "tar.xz wic.xz"
68WKS_FILE ?= "sdimage-2part.wks"
69IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
70do_image_wic[depends] += "virtual/bootloader:do_deploy"
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
deleted file mode 100644
index 2c3a3770..00000000
--- a/conf/machine/include/ti43x.inc
+++ /dev/null
@@ -1,67 +0,0 @@
1require conf/machine/include/ti-soc.inc
2SOC_FAMILY:append = ":ti43x"
3
4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/arm/armv7a/tune-cortexa9.inc
6
7PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
8
9# For built-in LCD, add xf86-input-tslib
10XSERVER = "xserver-xorg \
11 xf86-input-evdev \
12 xf86-input-mouse \
13 xf86-video-fbdev \
14 xf86-input-keyboard"
15
16# Default to external video, change to smallscreen for built-in LCD
17MACHINE_GUI_CLASS = "bigscreen"
18
19# Increase this everytime you change something in the kernel
20MACHINE_KERNEL_PR = "r3"
21
22# Default providers, may need to override for specific machines
23PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
24PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
25PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
26
27KERNEL_IMAGETYPE = "zImage"
28
29KERNEL_DEVICETREE = " \
30 am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \
31 am437x-sk-evm.dtb am437x-idk-evm.dtb \
32 am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \
33"
34
35KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
36
37UBOOT_ARCH = "arm"
38UBOOT_MACHINE = "am43xx_evm_config"
39
40UBOOT_ENTRYPOINT = "0x80008000"
41UBOOT_LOADADDRESS = "0x80008000"
42
43# Generate an extlinux.conf file
44UBOOT_EXTLINUX = "1"
45UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
46UBOOT_EXTLINUX_BOOT_FILES = " \
47 extlinux.conf;extlinux/extlinux.conf \
48 ${KERNEL_IMAGETYPE} \
49 ${KERNEL_DEVICETREE} \
50"
51
52SPL_BINARY = "MLO"
53UBOOT_SUFFIX = "img"
54
55# Use the expected value of the ubifs filesystem's volume name in the kernel
56# and u-boot.
57UBI_VOLNAME = "rootfs"
58
59EXTRA_IMAGEDEPENDS += "u-boot"
60
61# List common SoC features, may need to add touchscreen for specific machines
62MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
63
64IMAGE_FSTYPES += "tar.xz wic.xz"
65WKS_FILE ?= "sdimage-2part.wks"
66IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
67do_image_wic[depends] += "u-boot:do_deploy"
diff --git a/conf/machine/j7-evm-k3r5.conf b/conf/machine/j7-evm-k3r5.conf
deleted file mode 100644
index b9e8cc01..00000000
--- a/conf/machine/j7-evm-k3r5.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1#@TYPE: Machine
2#@NAME: J7 EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI J7 EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "j721e"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp"
10
11UBOOT_MACHINE = "j721e_evm_r5_defconfig"
diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf
deleted file mode 100644
index 267a5e14..00000000
--- a/conf/machine/j7-evm.conf
+++ /dev/null
@@ -1,18 +0,0 @@
1#@TYPE: Machine
2#@NAME: J7 EVM
3#@DESCRIPTION: Machine configuration for the TI J7 EVM
4
5require conf/machine/include/j7.inc
6
7MACHINE_FEATURES += "gpu"
8
9SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
10SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
11
12KERNEL_DEVICETREE = " \
13 ti/k3-j721e-common-proc-board.dtb \
14 ti/k3-j721e-common-proc-board-infotainment.dtbo \
15 ti/k3-j721e-sk.dtb \
16"
17
18UBOOT_MACHINE = "j721e_evm_a72_config"
diff --git a/conf/machine/j7-hs-evm-k3r5-sr1-1.conf b/conf/machine/j7-hs-evm-k3r5-sr1-1.conf
deleted file mode 100644
index 73f5afd6..00000000
--- a/conf/machine/j7-hs-evm-k3r5-sr1-1.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1#@TYPE: Machine
2#@NAME: J7 SR1.1 HS EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI J7 SR1.1 HS EVM (R5F core)
4
5# Booting SR1.1 requires different SYSFW, the rest is handled at runtime
6
7require conf/machine/j7-hs-evm-k3r5.conf
8SOC_FAMILY:append = ":k3r5-sr1-1"
9
10SYSFW_SOC = "j721e_sr1_1"
11SYSFW_SYMLINK = "sysfw.itb"
diff --git a/conf/machine/j7-hs-evm-k3r5.conf b/conf/machine/j7-hs-evm-k3r5.conf
deleted file mode 100644
index 53a7016f..00000000
--- a/conf/machine/j7-hs-evm-k3r5.conf
+++ /dev/null
@@ -1,13 +0,0 @@
1#@TYPE: Machine
2#@NAME: J7 HS EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI J7 HS EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "j721e"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs"
10
11UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"
12
13TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
deleted file mode 100644
index f2e3ccf5..00000000
--- a/conf/machine/j7-hs-evm.conf
+++ /dev/null
@@ -1,30 +0,0 @@
1#@TYPE: Machine
2#@NAME: J7 HS EVM
3#@DESCRIPTION: Machine configuration for the TI J7 HS EVM
4
5require conf/machine/j7-evm.conf
6
7UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig"
8
9UBOOT_ENTRYPOINT = "0x80080000"
10UBOOT_LOADADDRESS = "0x80080000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13UBOOT_DTB_LOADADDRESS = "0x83000000"
14UBOOT_DTBO_LOADADDRESS = "0x83080000"
15UBOOT_DTBO_OFFSET = "0x00010000"
16
17SPL_BINARY = "tispl.bin_HS"
18SPL_BINARYNAME = "tispl.bin"
19UBOOT_BINARY = "u-boot.img_HS"
20IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
21
22BBMULTICONFIG += "k3r5-sr1-1"
23
24# Use default IMAGE_BOOT_FILES_LEGACY files
25# Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0
26IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
27do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
28do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
29
30TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/j7200-evm-k3r5.conf b/conf/machine/j7200-evm-k3r5.conf
deleted file mode 100644
index 68061883..00000000
--- a/conf/machine/j7200-evm-k3r5.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1#@TYPE: Machine
2#@NAME: J7200 EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI J7200 EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "j7200"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp"
10
11UBOOT_MACHINE = "j7200_evm_r5_defconfig"
diff --git a/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf
deleted file mode 100644
index 2565c90c..00000000
--- a/conf/machine/j7200-evm.conf
+++ /dev/null
@@ -1,20 +0,0 @@
1#@TYPE: Machine
2#@NAME: J7200 EVM
3#@DESCRIPTION: Machine configuration for the TI J7200 EVM
4
5require conf/machine/include/j7.inc
6
7SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
8SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
9
10KERNEL_DEVICETREE = " \
11 ti/k3-j7200-common-proc-board.dtb \
12"
13
14UBOOT_MACHINE = "j7200_evm_a72_config"
15
16# J7200 supports multi-certificate images, use the same
17IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
18
19do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
20do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
diff --git a/conf/machine/j7200-hs-evm-k3r5.conf b/conf/machine/j7200-hs-evm-k3r5.conf
deleted file mode 100644
index 488f19ec..00000000
--- a/conf/machine/j7200-hs-evm-k3r5.conf
+++ /dev/null
@@ -1,13 +0,0 @@
1#@TYPE: Machine
2#@NAME: J7200 HS EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "j7200"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs"
10
11UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig"
12
13TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf
deleted file mode 100644
index a5bd637e..00000000
--- a/conf/machine/j7200-hs-evm.conf
+++ /dev/null
@@ -1,22 +0,0 @@
1#@TYPE: Machine
2#@NAME: J7200 HS EVM
3#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM
4
5require conf/machine/j7200-evm.conf
6
7UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig"
8
9UBOOT_ENTRYPOINT = "0x80080000"
10UBOOT_LOADADDRESS = "0x80080000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13UBOOT_DTB_LOADADDRESS = "0x83000000"
14UBOOT_DTBO_LOADADDRESS = "0x83080000"
15UBOOT_DTBO_OFFSET = "0x00010000"
16
17SPL_BINARY = "tispl.bin_HS"
18SPL_BINARYNAME = "tispl.bin"
19UBOOT_BINARY = "u-boot.img_HS"
20IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
21
22TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/omapl138-lcdk.conf b/conf/machine/omapl138-lcdk.conf
deleted file mode 100644
index ba4d5645..00000000
--- a/conf/machine/omapl138-lcdk.conf
+++ /dev/null
@@ -1,19 +0,0 @@
1#@TYPE: Machine
2#@NAME: OMAP-L138 LCDK
3#@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board
4
5require conf/machine/include/davinci.inc
6require conf/machine/include/omapl138.inc
7
8UBOOT_MACHINE = "omapl138_lcdk_config"
9UBOOT_SUFFIX = "ais"
10SPL_BINARY = ""
11
12UBOOT_ENTRYPOINT = "0xc0008000"
13UBOOT_LOADADDRESS = "0xc0008000"
14
15IMAGE_FSTYPES += "tar.xz"
16
17SERIAL_CONSOLES = "115200;ttyS2"
18
19KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb"
diff --git a/conf/multiconfig/k3r5-sr1-1.conf b/conf/multiconfig/k3r5-sr1-1.conf
deleted file mode 100644
index 428f2212..00000000
--- a/conf/multiconfig/k3r5-sr1-1.conf
+++ /dev/null
@@ -1,3 +0,0 @@
1require k3r5.conf
2
3MACHINE:append = "-sr1-1"
diff --git a/conf/multiconfig/k3r5-sr2.conf b/conf/multiconfig/k3r5-sr2.conf
deleted file mode 100644
index e933b9cc..00000000
--- a/conf/multiconfig/k3r5-sr2.conf
+++ /dev/null
@@ -1,3 +0,0 @@
1require k3r5.conf
2
3MACHINE:append = "-sr2"
diff --git a/conf/multiconfig/k3r5.conf b/conf/multiconfig/k3r5.conf
deleted file mode 100644
index deb07210..00000000
--- a/conf/multiconfig/k3r5.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1MAINMACHINE := "${MACHINE}"
2
3DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MAINMACHINE}"
4
5MACHINE:append = "-k3r5"