25 files changed, 43 insertions, 62 deletions

diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/LICENSE b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/LICENSE
index fe3780b3..fe3780b3 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/LICENSE
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/LICENSE
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_asd.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_asd.bin
index 186cb5b4..186cb5b4 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_asd.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_asd.bin
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_ce.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_ce.bin
index 015bb206..015bb206 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_ce.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_ce.bin
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_gpu_info.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_gpu_info.bin
index 4c361f50..4c361f50 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_gpu_info.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_gpu_info.bin
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_me.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_me.bin
index b2e0ec2d..b2e0ec2d 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_me.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_me.bin
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_mec.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_mec.bin
index 5b68507f..5b68507f 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_mec.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_mec.bin
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_mec2.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_mec2.bin
index 5b68507f..5b68507f 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_mec2.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_mec2.bin
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_pfp.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_pfp.bin
index 17597231..17597231 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_pfp.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_pfp.bin
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_rlc.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_rlc.bin
index 8f65f810..8f65f810 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_rlc.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_rlc.bin
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_sdma.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_sdma.bin
index 80e4fb65..80e4fb65 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_sdma.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_sdma.bin
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_vcn.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_vcn.bin
index f20b5512..f20b5512 100644
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven2_vcn.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-r1000/raven2_vcn.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/LICENSE b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/LICENSE
index fe3780b3..fe3780b3 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/LICENSE
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/LICENSE
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_asd.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_asd.bin
index 7c4e7c09..7c4e7c09 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_asd.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_asd.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_ce.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_ce.bin
index 23636279..23636279 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_ce.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_ce.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_gpu_info.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_gpu_info.bin
index 03513749..03513749 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_gpu_info.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_gpu_info.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_me.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_me.bin
index da8c4bf9..da8c4bf9 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_me.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_me.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_mec.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_mec.bin
index c45de0a1..c45de0a1 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_mec.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_mec.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_mec2.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_mec2.bin
index c45de0a1..c45de0a1 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_mec2.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_mec2.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_pfp.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_pfp.bin
index 963a0111..963a0111 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_pfp.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_pfp.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_rlc.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_rlc.bin
index 9f0e8810..9f0e8810 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_rlc.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_rlc.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_sdma.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_sdma.bin
index f0aa630a..f0aa630a 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_sdma.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_sdma.bin
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_vcn.bin b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_vcn.bin
index 6f9a7e1a..6f9a7e1a 100644
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware/raven_vcn.bin
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware-v1000/raven_vcn.bin
diff --git a/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware.bb b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware.bb
new file mode 100644
index 00000000..161c4b14
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-firmware/amdgpu-firmware.bb
@@ -0,0 +1,43 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${MACHINE}:"
+
+DESCRIPTION = "These binaries provide kernel support for newer AMD GPUs"
+SECTION = "kernel"
+LICENSE = "Firmware-amd"
+
+SRC_URI_r1000 = "file://raven2_asd.bin \
+		 file://raven2_ce.bin \
+		 file://raven2_gpu_info.bin \
+		 file://raven2_me.bin \
+		 file://raven2_mec2.bin \
+		 file://raven2_mec.bin \
+		 file://raven2_pfp.bin \
+		 file://raven2_rlc.bin \
+		 file://raven2_sdma.bin \
+		 file://raven2_vcn.bin \
+		 file://LICENSE \
+"
+
+SRC_URI_v1000 = "file://raven_me.bin file://raven_pfp.bin file://raven_vcn.bin \
+		 file://raven_ce.bin file://raven_mec2.bin file://raven_rlc.bin \
+		 file://raven_gpu_info.bin file://raven_mec.bin file://raven_sdma.bin \
+		 file://raven_asd.bin file://LICENSE \
+"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=07b0c31777bd686d8e1609c6940b5e74"
+
+S = "${WORKDIR}"
+
+# Since, no binaries are generated for a specific target,
+# inherit allarch to simply populate prebuilt binaries
+inherit allarch
+
+do_compile() {
+	:
+}
+
+do_install() {
+	install -v -m 444 -D ${S}/LICENSE ${D}/lib/firmware/amdgpu/LICENSE
+	install -v -m 0644 ${S}/*.bin ${D}/lib/firmware/amdgpu
+}
+
+FILES_${PN} = "/lib/firmware/*"
diff --git a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware.bb b/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware.bb
deleted file mode 100644
index 87b55f71..00000000
--- a/meta-r1000/recipes-kernel/linux-firmware/amdgpu-firmware.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "These binaries provide kernel support for newer AMD GPUs"
-SECTION = "kernel"
-LICENSE = "Firmware-amd"
-
-SRC_URI = "file://raven2_asd.bin \
-	   file://raven2_ce.bin \
-	   file://raven2_gpu_info.bin \
-	   file://raven2_me.bin \
-	   file://raven2_mec2.bin \
-	   file://raven2_mec.bin \
-	   file://raven2_pfp.bin \
-	   file://raven2_rlc.bin \
-	   file://raven2_sdma.bin \
-	   file://raven2_vcn.bin \
-	   file://LICENSE"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=07b0c31777bd686d8e1609c6940b5e74"
-
-S = "${WORKDIR}"
-
-# Since, no binaries are generated for a specific target,
-# inherit allarch to simply populate prebuilt binaries
-inherit allarch
-
-do_compile() {
-	:
-}
-
-do_install() {
-	install -v -m 444 -D ${S}/LICENSE ${D}/lib/firmware/amdgpu/LICENSE
-	install -v -m 0644 ${S}/*.bin ${D}/lib/firmware/amdgpu
-}
-
-FILES_${PN} = "/lib/firmware/*"
diff --git a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware.bb b/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware.bb
deleted file mode 100644
index 2ae35e02..00000000
--- a/meta-v1000/recipes-kernel/linux-firmware/amdgpu-firmware.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "These binaries provide kernel support for newer AMD GPUs"
-SECTION = "kernel"
-LICENSE = "Firmware-amd"
-
-SRC_URI = "file://raven_me.bin file://raven_pfp.bin file://raven_vcn.bin \
-           file://raven_ce.bin file://raven_mec2.bin file://raven_rlc.bin \
-           file://raven_gpu_info.bin file://raven_mec.bin file://raven_sdma.bin \
-           file://raven_asd.bin file://LICENSE \
-	  "
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=07b0c31777bd686d8e1609c6940b5e74"
-
-S = "${WORKDIR}"
-
-# Since, no binaries are generated for a specific target,
-# inherit allarch to simply populate prebuilt binaries
-inherit allarch
-
-do_compile() {
-	:
-}
-
-do_install() {
-	install -v -m 444 -D ${S}/LICENSE ${D}/lib/firmware/amdgpu/LICENSE
-	install -v -m 0644 ${S}/*.bin ${D}/lib/firmware/amdgpu
-}
-
-FILES_${PN} = "/lib/firmware/*"