dra7xx-evm.conf: removing am57xx SOCS from PDK

opencl-monitor does not distinguish between dra7xx and am57xx devices,
treating both as the same and attempting to build for am57xx regardless.
However, this is dependent on common-csl-ip-rtos, a component of PDK,
which in general does handle these devices differently.  The definition
of am57xx SOCs in the PDK list from omap-15.conf gets inherited by
dra7xx-evm.conf, thereby creating a rule that all dra7xx PDK recipes
must build am57xx libraries. This results in a dra7xx image which is
much larger than necessary, and more severely, creates an artifical
dependency link between these two devices and introduces build failures
for various PDK recipes.

Instead, we now override the PDK SOC definition in dra7xx-evm.conf, and
only in the CSL RTOS recipe do we append the am57xx SOCS for dra7xx-evm
machine build.  This allows for opencl-monitor to build successfully for
dra7xx while preventing any other PDK recipes from attempting to build
libraries for am57xx devices.

This is a workaround that must stay in place until opencl build can
properly comprehend am57xx and dra7xx independently, and/or omap-a15
is not implied to be synonymous with am57xx in various recipes.

Signed-off-by: Stephen Molfetta <sjmolfetta@ti.com>
Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

4 files changed, 6 insertions, 5 deletions

diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf
index 6e2eedf3..18325481 100644
--- a/conf/machine/am57xx-evm.conf
+++ b/conf/machine/am57xx-evm.conf
@@ -42,4 +42,5 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
 
 # Set the list of device targets for ti-pdk class recipes
+TI_PDK_LIMIT_SOCS = "am571x am572x am574x"
 TI_PDK_LIMIT_BOARDS = "evmAM571x evmAM572x idkAM571x idkAM572x idkAM574x"
diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf
index 91afd855..7db9ff69 100644
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -40,4 +40,4 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
 
 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_BOARDS = "evmDRA72x evmDRA75x evmDRA78x"
-TI_PDK_LIMIT_SOCS_append = " dra72x dra75x dra78x"
+TI_PDK_LIMIT_SOCS = "dra72x dra75x dra78x"
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index cda9e0c9..6dcff82b 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -34,6 +34,3 @@ UBI_VOLNAME = "rootfs"
 
 # List common SoC features, may need to add touchscreen for specific machines
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx mmip dsp"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am571x am572x am574x"
diff --git a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
index f4496b96..100d2f4d 100644
--- a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
@@ -1,5 +1,5 @@
 require common-csl-ip.inc
-PR = "${INC_PR}.5"
+PR = "${INC_PR}.6"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE_append = "|c66x"
@@ -16,3 +16,6 @@ export DEST_ROOT="${S}"
 
 # HTML doc link params
 PDK_COMP_LINK_TEXT = "CSL-Chip Support Library"
+
+# Workaround: dra7xx build requires am57xx CSL libraries for opencl-monitor
+TI_PDK_LIMIT_SOCS_append_dra7xx = " am571x am572x"