aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@konsulko.com>2021-08-11 14:39:05 -0400
committerYogesh Siraswar <yogeshs@ti.com>2021-08-17 11:21:54 +0000
commite21c11b4a44417f67c78503bc3f954c175ac20e2 (patch)
treee1d5252c9a4cc979e67e154abeb8dd7ad0b545a7 /conf
parentf56051c9a8cf09f54c43b81301073eed71bbda97 (diff)
downloadmeta-ti-e21c11b4a44417f67c78503bc3f954c175ac20e2.tar.gz
meta-ti-e21c11b4a44417f67c78503bc3f954c175ac20e2.tar.bz2
meta-ti-e21c11b4a44417f67c78503bc3f954c175ac20e2.zip
meta-ti: convert to new override syntax in honister
Upcoming "honister" release changes the override syntax to improve usability, speed and memory footprint. Update recipes with the new syntax and set layer compatibility to honister. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Tested-by: Paul Barker <paul.barker@sancloud.com> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/layer.conf2
-rw-r--r--conf/machine/am3517-evm.conf2
-rw-r--r--conf/machine/am37x-evm.conf2
-rw-r--r--conf/machine/am65xx-evm-k3r5-sr2.conf2
-rw-r--r--conf/machine/am65xx-hs-evm-k3r5-sr2.conf2
-rw-r--r--conf/machine/beagleboard.conf2
-rw-r--r--conf/machine/beaglebone.conf2
-rw-r--r--conf/machine/include/am64xx.inc2
-rw-r--r--conf/machine/include/am65xx.inc2
-rw-r--r--conf/machine/include/c66x.inc2
-rw-r--r--conf/machine/include/davinci.inc2
-rw-r--r--conf/machine/include/dra7xx.inc2
-rw-r--r--conf/machine/include/j7.inc2
-rw-r--r--conf/machine/include/k2e.inc2
-rw-r--r--conf/machine/include/k2g.inc2
-rw-r--r--conf/machine/include/k2hk.inc2
-rw-r--r--conf/machine/include/k2l.inc2
-rw-r--r--conf/machine/include/k3.inc2
-rw-r--r--conf/machine/include/k3r5.inc6
-rw-r--r--conf/machine/include/keystone.inc2
-rw-r--r--conf/machine/include/omap-a15.inc2
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--conf/machine/include/omap4.inc2
-rw-r--r--conf/machine/include/omapl1.inc2
-rw-r--r--conf/machine/include/omapl137.inc2
-rw-r--r--conf/machine/include/omapl138.inc2
-rw-r--r--conf/machine/include/ti33x.inc2
-rw-r--r--conf/machine/include/ti43x.inc2
-rw-r--r--conf/machine/omap3evm.conf2
-rw-r--r--conf/multiconfig/k3r5-sr2.conf2
-rw-r--r--conf/multiconfig/k3r5.conf2
31 files changed, 33 insertions, 33 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 0be0ef92..f399ff03 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti"
BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-ti = "6"
-LAYERSERIES_COMPAT_meta-ti = "dunfell gatesgarth hardknott"
+LAYERSERIES_COMPAT_meta-ti = "honister"
LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf
index c20e2f6a..f194c648 100644
--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -8,7 +8,7 @@ MACHINE_GUI_CLASS = "smallscreen"
MACHINE_FEATURES += "touchscreen ethernet"
IMAGE_FSTYPES += "ubi tar.xz"
-EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
+EXTRA_IMAGECMD:jffs2 = "-lnp -e 0x20000 -s 2048"
SERIAL_CONSOLES = "115200;ttyS2"
USE_VT = "2"
diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf
index a512c8d0..9750fe64 100644
--- a/conf/machine/am37x-evm.conf
+++ b/conf/machine/am37x-evm.conf
@@ -8,7 +8,7 @@ MACHINE_GUI_CLASS = "smallscreen"
MACHINE_FEATURES += "touchscreen ethernet"
IMAGE_FSTYPES += "ubi tar.xz"
-EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
+EXTRA_IMAGECMD:jffs2 = "-lnp -e 0x20000 -s 2048"
KERNEL_DEVICETREE = "omap3-evm-37xx.dtb"
diff --git a/conf/machine/am65xx-evm-k3r5-sr2.conf b/conf/machine/am65xx-evm-k3r5-sr2.conf
index c0b3cd51..e74dd3ab 100644
--- a/conf/machine/am65xx-evm-k3r5-sr2.conf
+++ b/conf/machine/am65xx-evm-k3r5-sr2.conf
@@ -5,7 +5,7 @@
# Booting SR2 requires different SYSFW, the rest is handled at runtime
require conf/machine/am65xx-evm-k3r5.conf
-SOC_FAMILY_append = ":k3r5-sr2"
+SOC_FAMILY:append = ":k3r5-sr2"
SYSFW_SOC = "am65x_sr2"
SYSFW_SYMLINK = "sysfw.itb"
diff --git a/conf/machine/am65xx-hs-evm-k3r5-sr2.conf b/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
index ef1b6fbe..ff1645e4 100644
--- a/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
+++ b/conf/machine/am65xx-hs-evm-k3r5-sr2.conf
@@ -5,7 +5,7 @@
# Booting SR2 requires different SYSFW, the rest is handled at runtime
require conf/machine/am65xx-hs-evm-k3r5.conf
-SOC_FAMILY_append = ":k3r5-sr2"
+SOC_FAMILY:append = ":k3r5-sr2"
SYSFW_SOC = "am65x_sr2"
SYSFW_SYMLINK = "sysfw.itb"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index ee51fd66..06777795 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -8,7 +8,7 @@ require conf/machine/include/omap3.inc
MACHINE_GUI_CLASS = "bigscreen"
IMAGE_FSTYPES += "tar.xz ubi"
-EXTRA_IMAGECMD_jffs2 = "-lnp"
+EXTRA_IMAGECMD:jffs2 = "-lnp"
KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb"
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index 896a9d73..dcb14cc9 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -13,7 +13,7 @@ MACHINE_GUI_CLASS = "bigscreen"
SERIAL_CONSOLES = "115200;ttyS0"
-IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
+IMAGE_INSTALL:append = " kernel-devicetree kernel-image-zimage"
# Refine the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_BOARDS = "bbbAM335x"
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
index 95fdc79d..18e3757a 100644
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -1,5 +1,5 @@
require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am64xx"
+SOC_FAMILY:append = ":am64xx"
MACHINE_FEATURES += "screen touchscreen"
diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
index 8516ca4c..2838c58f 100644
--- a/conf/machine/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -1,5 +1,5 @@
require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am65xx"
+SOC_FAMILY:append = ":am65xx"
MACHINE_FEATURES += "screen touchscreen gpu"
diff --git a/conf/machine/include/c66x.inc b/conf/machine/include/c66x.inc
index e35f2eda..33a657f1 100644
--- a/conf/machine/include/c66x.inc
+++ b/conf/machine/include/c66x.inc
@@ -1,5 +1,5 @@
require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":c66x"
+SOC_FAMILY:append = ":c66x"
# HACK: The c66x family is composed of devices with only DSP cores, and no ARM
# cores. The Linux kernel is not supported on these machines.
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 62ca6887..d2681740 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -17,6 +17,6 @@ UBOOT_LOADADDRESS = "0x80008000"
EXTRA_IMAGEDEPENDS += "u-boot"
SERIAL_CONSOLES ?= "115200;ttyS0"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+EXTRA_IMAGECMD:jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"
diff --git a/conf/machine/include/dra7xx.inc b/conf/machine/include/dra7xx.inc
index 857e1b35..a02421d9 100644
--- a/conf/machine/include/dra7xx.inc
+++ b/conf/machine/include/dra7xx.inc
@@ -1,4 +1,4 @@
require conf/machine/include/omap-a15.inc
-SOC_FAMILY_append = ":dra7xx"
+SOC_FAMILY:append = ":dra7xx"
MACHINE_FEATURES += "pci"
diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
index d3eda1a8..cf5f6a94 100644
--- a/conf/machine/include/j7.inc
+++ b/conf/machine/include/j7.inc
@@ -1,5 +1,5 @@
require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":j7"
+SOC_FAMILY:append = ":j7"
OPTEEMACHINE = "k3-j721e"
OPTEEOUTPUTMACHINE = "k3"
diff --git a/conf/machine/include/k2e.inc b/conf/machine/include/k2e.inc
index 6797fb29..a6d58bb3 100644
--- a/conf/machine/include/k2e.inc
+++ b/conf/machine/include/k2e.inc
@@ -1,5 +1,5 @@
require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":k2e"
+SOC_FAMILY:append = ":k2e"
# Set the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_SOCS = "k2e"
diff --git a/conf/machine/include/k2g.inc b/conf/machine/include/k2g.inc
index 7bcc412b..be40d9e7 100644
--- a/conf/machine/include/k2g.inc
+++ b/conf/machine/include/k2g.inc
@@ -1,5 +1,5 @@
require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":k2g"
+SOC_FAMILY:append = ":k2g"
# Set the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_SOCS = "k2g"
diff --git a/conf/machine/include/k2hk.inc b/conf/machine/include/k2hk.inc
index 2d2dd6a0..456fda75 100644
--- a/conf/machine/include/k2hk.inc
+++ b/conf/machine/include/k2hk.inc
@@ -1,5 +1,5 @@
require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":k2hk"
+SOC_FAMILY:append = ":k2hk"
# Set the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_SOCS = "k2h k2k"
diff --git a/conf/machine/include/k2l.inc b/conf/machine/include/k2l.inc
index 997bcbe2..b6a4bc7d 100644
--- a/conf/machine/include/k2l.inc
+++ b/conf/machine/include/k2l.inc
@@ -1,5 +1,5 @@
require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":k2l"
+SOC_FAMILY:append = ":k2l"
# Set the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_SOCS = "k2l"
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index e0970698..20ab7a9e 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -1,7 +1,7 @@
# TI K3 Aarch64 profile for Cortex-A53/A72 cores
require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":k3"
+SOC_FAMILY:append = ":k3"
require conf/machine/include/arm/arch-arm64.inc
diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc
index a32accae..93f08c04 100644
--- a/conf/machine/include/k3r5.inc
+++ b/conf/machine/include/k3r5.inc
@@ -1,7 +1,7 @@
# TI K3 Armv7 profile for Cortex-R5F cores
require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":k3r5"
+SOC_FAMILY:append = ":k3r5"
# The closest of existing tunes for Cortex-R5F
DEFAULTTUNE = "armv7athf"
@@ -20,5 +20,5 @@ UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-PACKAGECONFIG_pn-u-boot-ti-staging = ""
-PACKAGECONFIG_pn-u-boot-ti-mainline = ""
+PACKAGECONFIG:pn-u-boot-ti-staging = ""
+PACKAGECONFIG:pn-u-boot-ti-mainline = ""
diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
index e7ea9758..83dca19d 100644
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -1,5 +1,5 @@
require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":keystone"
+SOC_FAMILY:append = ":keystone"
DEFAULTTUNE ?= "armv7athf-neon"
require conf/machine/include/tune-cortexa15.inc
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index e491d2b5..553835c8 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -1,5 +1,5 @@
require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omap-a15"
+SOC_FAMILY:append = ":omap-a15"
DEFAULTTUNE ?= "armv7athf-neon"
require conf/machine/include/tune-cortexa15.inc
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 5696c82d..ab069b00 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,5 +1,5 @@
require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omap3"
+SOC_FAMILY:append = ":omap3"
DEFAULTTUNE ?= "armv7athf-neon"
require conf/machine/include/tune-cortexa8.inc
diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index cbca267c..b6f43744 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -1,5 +1,5 @@
require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omap4"
+SOC_FAMILY:append = ":omap4"
DEFAULTTUNE ?= "armv7athf-neon"
require conf/machine/include/tune-cortexa9.inc
diff --git a/conf/machine/include/omapl1.inc b/conf/machine/include/omapl1.inc
index 9942c944..d0262c3f 100644
--- a/conf/machine/include/omapl1.inc
+++ b/conf/machine/include/omapl1.inc
@@ -1,2 +1,2 @@
require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omapl1"
+SOC_FAMILY:append = ":omapl1"
diff --git a/conf/machine/include/omapl137.inc b/conf/machine/include/omapl137.inc
index 5d8a6dd8..6dd49418 100644
--- a/conf/machine/include/omapl137.inc
+++ b/conf/machine/include/omapl137.inc
@@ -1,5 +1,5 @@
require conf/machine/include/omapl1.inc
-SOC_FAMILY_append = ":omapl137"
+SOC_FAMILY:append = ":omapl137"
# Set the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_SOCS = "omapl137"
diff --git a/conf/machine/include/omapl138.inc b/conf/machine/include/omapl138.inc
index 999cbc3a..f73517d0 100644
--- a/conf/machine/include/omapl138.inc
+++ b/conf/machine/include/omapl138.inc
@@ -1,5 +1,5 @@
require conf/machine/include/omapl1.inc
-SOC_FAMILY_append = ":omapl138"
+SOC_FAMILY:append = ":omapl138"
# Set the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_SOCS = "omapl138"
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
index 6dfda754..3da2aba5 100644
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -1,5 +1,5 @@
require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":ti33x"
+SOC_FAMILY:append = ":ti33x"
DEFAULTTUNE ?= "armv7athf-neon"
require conf/machine/include/tune-cortexa8.inc
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
index b1a27f93..eaed1812 100644
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -1,5 +1,5 @@
require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":ti43x"
+SOC_FAMILY:append = ":ti43x"
DEFAULTTUNE ?= "armv7athf-neon"
require conf/machine/include/tune-cortexa9.inc
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 01808b68..dc56d57a 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -8,7 +8,7 @@ MACHINE_GUI_CLASS = "smallscreen"
MACHINE_FEATURES += "touchscreen ethernet"
IMAGE_FSTYPES += "jffs2 tar.xz"
-EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
+EXTRA_IMAGECMD:jffs2 = "-lnp -e 0x20000 -s 2048"
SERIAL_CONSOLES = "115200;ttyS0"
USE_VT = "0"
diff --git a/conf/multiconfig/k3r5-sr2.conf b/conf/multiconfig/k3r5-sr2.conf
index 17082141..e933b9cc 100644
--- a/conf/multiconfig/k3r5-sr2.conf
+++ b/conf/multiconfig/k3r5-sr2.conf
@@ -1,3 +1,3 @@
require k3r5.conf
-MACHINE_append = "-sr2"
+MACHINE:append = "-sr2"
diff --git a/conf/multiconfig/k3r5.conf b/conf/multiconfig/k3r5.conf
index 8c8f0c3f..deb07210 100644
--- a/conf/multiconfig/k3r5.conf
+++ b/conf/multiconfig/k3r5.conf
@@ -2,4 +2,4 @@ MAINMACHINE := "${MACHINE}"
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MAINMACHINE}"
-MACHINE_append = "-k3r5"
+MACHINE:append = "-k3r5"