12 files changed, 10 insertions, 53 deletions
diff --git a/meta-amd-bsp/conf/machine/r1000.conf b/meta-amd-bsp/conf/machine/r1000.conf
index abc2bc25..955a15ae 100644
--- a/meta-amd-bsp/conf/machine/r1000.conf
+++ b/meta-amd-bsp/conf/machine/r1000.conf
@@ -5,6 +5,7 @@
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "4.19%"
+PREFERRED_VERSION_rgp ?= "1.5.1"
 
 require conf/machine/include/tune-r1000.inc
 
diff --git a/meta-amd-bsp/conf/machine/v1000.conf b/meta-amd-bsp/conf/machine/v1000.conf
index 5e3c6516..8ca0c51a 100644
--- a/meta-amd-bsp/conf/machine/v1000.conf
+++ b/meta-amd-bsp/conf/machine/v1000.conf
@@ -5,6 +5,7 @@
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "4.14%"
+PREFERRED_VERSION_rgp ?= "1.3.1"
 
 require conf/machine/include/tune-v1000.inc
 
diff --git a/meta-r1000/recipes-devtools/rgp/files/rds-cli.service b/meta-amd-bsp/recipes-devtools/rgp/files/rds-cli.service
index c44d1f07..c44d1f07 100644
--- a/meta-r1000/recipes-devtools/rgp/files/rds-cli.service
+++ b/meta-amd-bsp/recipes-devtools/rgp/files/rds-cli.service
diff --git a/meta-v1000/recipes-devtools/rgp/files/License.rtf b/meta-amd-bsp/recipes-devtools/rgp/rgp-1.3.1/License.rtf
index 0bcb1a27..0bcb1a27 100644
--- a/meta-v1000/recipes-devtools/rgp/files/License.rtf
+++ b/meta-amd-bsp/recipes-devtools/rgp/rgp-1.3.1/License.rtf
diff --git a/meta-v1000/recipes-devtools/rgp/files/RadeonDeveloperServiceCLI b/meta-amd-bsp/recipes-devtools/rgp/rgp-1.3.1/RadeonDeveloperServiceCLI
index 1ed6757a..1ed6757a 100755
--- a/meta-v1000/recipes-devtools/rgp/files/RadeonDeveloperServiceCLI
+++ b/meta-amd-bsp/recipes-devtools/rgp/rgp-1.3.1/RadeonDeveloperServiceCLI
diff --git a/meta-r1000/recipes-devtools/rgp/files/License.rtf b/meta-amd-bsp/recipes-devtools/rgp/rgp-1.5.1/License.rtf
index e2a23cfe..e2a23cfe 100644
--- a/meta-r1000/recipes-devtools/rgp/files/License.rtf
+++ b/meta-amd-bsp/recipes-devtools/rgp/rgp-1.5.1/License.rtf
diff --git a/meta-r1000/recipes-devtools/rgp/files/RadeonDeveloperServiceCLI b/meta-amd-bsp/recipes-devtools/rgp/rgp-1.5.1/RadeonDeveloperServiceCLI
index 425f275c..425f275c 100755
--- a/meta-r1000/recipes-devtools/rgp/files/RadeonDeveloperServiceCLI
+++ b/meta-amd-bsp/recipes-devtools/rgp/rgp-1.5.1/RadeonDeveloperServiceCLI
diff --git a/meta-r1000/recipes-devtools/rgp/rgp_1.5.1.bb b/meta-amd-bsp/recipes-devtools/rgp/rgp.inc
index 92428bbf..f10a36e9 100644
--- a/meta-r1000/recipes-devtools/rgp/rgp_1.5.1.bb
+++ b/meta-amd-bsp/recipes-devtools/rgp/rgp.inc
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+
 SUMMARY = "Radeon-GPUProfiler"
 DESCRIPTION = "The Radeon GPU Profiler (RGP) is a ground-breaking \
               low-level optimization tool from AMD.  It provides \
@@ -9,7 +11,6 @@ DESCRIPTION = "The Radeon GPU Profiler (RGP) is a ground-breaking \
               data."
 
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://License.rtf;md5=72fe1cfaa4cab2caf95a7a0ccd8a7ddd"
 
 inherit systemd
 
diff --git a/meta-amd-bsp/recipes-devtools/rgp/rgp_1.3.1.bb b/meta-amd-bsp/recipes-devtools/rgp/rgp_1.3.1.bb
new file mode 100644
index 00000000..55b0a7b8
--- /dev/null
+++ b/meta-amd-bsp/recipes-devtools/rgp/rgp_1.3.1.bb
@@ -0,0 +1,3 @@
+require rgp.inc
+
+LIC_FILES_CHKSUM = "file://License.rtf;md5=5441ae9fb95849e3aacd0f330710f9fa"
diff --git a/meta-amd-bsp/recipes-devtools/rgp/rgp_1.5.1.bb b/meta-amd-bsp/recipes-devtools/rgp/rgp_1.5.1.bb
new file mode 100644
index 00000000..34a34f57
--- /dev/null
+++ b/meta-amd-bsp/recipes-devtools/rgp/rgp_1.5.1.bb
@@ -0,0 +1,3 @@
+require rgp.inc
+
+LIC_FILES_CHKSUM = "file://License.rtf;md5=72fe1cfaa4cab2caf95a7a0ccd8a7ddd"
diff --git a/meta-v1000/recipes-devtools/rgp/files/rds-cli.service b/meta-v1000/recipes-devtools/rgp/files/rds-cli.service
deleted file mode 100644
index c44d1f07..00000000
--- a/meta-v1000/recipes-devtools/rgp/files/rds-cli.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description="Radeon Developer Service CLI"
-Wants=connman-wait-online.service
-After=connman-wait-online.service
-
-[Service]
-Type=simple
-Restart=always
-ExecStartPre=/bin/rm -f /dev/shm/sem.D0939873-BA4B-4C4E-9729-D82DED85BC41
-ExecStart=/usr/bin/RadeonDeveloperServiceCLI
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-v1000/recipes-devtools/rgp/rgp_1.3.1.bb b/meta-v1000/recipes-devtools/rgp/rgp_1.3.1.bb
deleted file mode 100644
index 4b9c6469..00000000
--- a/meta-v1000/recipes-devtools/rgp/rgp_1.3.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Radeon-GPUProfiler"
-DESCRIPTION = "The Radeon GPU Profiler (RGP) is a ground-breaking \
-              low-level optimization tool from AMD.  It provides \
-              detailed timing information on Radeon Graphics \
-              using custom, built-in, hardware thread-tracing, \
-              allowing the developer deep inspection of GPU workloads. \
-              This package merely deploys the remote profiling service \
-              on the target so a host can collect and display profiling \
-              data."
-
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://License.rtf;md5=5441ae9fb95849e3aacd0f330710f9fa"
-
-inherit systemd
-
-RDEPENDS_${PN} += "connman-wait-online"
-
-SRC_URI = "file://License.rtf \
-           file://RadeonDeveloperServiceCLI \
-           file://${BOOT_SERVICE}"
-
-S = "${WORKDIR}"
-BOOT_SERVICE = "rds-cli.service"
-SYSTEMD_SERVICE_${PN} = "${BOOT_SERVICE}"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-# Skip configure and compile
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install () {
-    # Install the binary for RDS CLI
-    install -d ${D}${bindir}
-    install -m 0755 ${S}/RadeonDeveloperServiceCLI ${D}${bindir}/
-
-    # Install the systemd service so we can kick start on boot
-    install -d ${D}${systemd_unitdir}/system
-    install -m 644 ${WORKDIR}/${BOOT_SERVICE} ${D}${systemd_unitdir}/system/
-}