From ba3a417fbbccb5f6af9ac036eac97c87dcf4c1b7 Mon Sep 17 00:00:00 2001
From: Paul Barker <pbarker@konsulko.com>
Date: Wed, 25 Nov 2020 15:33:57 +0000
Subject: rpi-bootfiles: Rename recipe to avoid ambiguity

The name `bootfiles` is too generic, we should use `rpi-bootfiles`
instead.

Signed-off-by: Paul Barker <pbarker@konsulko.com>
---
 classes/sdcard_image-rpi.bbclass       |  5 +---
 conf/machine/include/rpi-base.inc      |  2 +-
 recipes-bsp/bootfiles/bootfiles.bb     | 43 ----------------------------------
 recipes-bsp/bootfiles/rpi-bootfiles.bb | 43 ++++++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 48 deletions(-)
 delete mode 100644 recipes-bsp/bootfiles/bootfiles.bb
 create mode 100644 recipes-bsp/bootfiles/rpi-bootfiles.bb

diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index ba50aa5..0ae98cd 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -25,9 +25,6 @@ inherit image_types
 # This image depends on the rootfs image
 IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}"
 
-# Set kernel and boot loader
-IMAGE_BOOTLOADER ?= "bootfiles"
-
 # Kernel image name
 SDIMG_KERNELIMAGE_raspberrypi  ?= "kernel.img"
 SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img"
@@ -56,7 +53,7 @@ do_image_rpi_sdimg[depends] = " \
     mtools-native:do_populate_sysroot \
     dosfstools-native:do_populate_sysroot \
     virtual/kernel:do_deploy \
-    ${IMAGE_BOOTLOADER}:do_deploy \
+    rpi-bootfiles:do_deploy \
     ${@bb.utils.contains('MACHINE_FEATURES', 'armstub', 'armstubs:do_deploy', '' ,d)} \
     ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
     ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot-default-script:do_deploy', '',d)} \
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index d4a25a4..18368c6 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -123,7 +123,7 @@ IMAGE_BOOT_FILES ?= "${BOOTFILES_DIR_NAME}/* \
                     '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
                  "
 do_image_wic[depends] += " \
-    bootfiles:do_deploy \
+    rpi-bootfiles:do_deploy \
     ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
     "
 
diff --git a/recipes-bsp/bootfiles/bootfiles.bb b/recipes-bsp/bootfiles/bootfiles.bb
deleted file mode 100644
index f1248ee..0000000
--- a/recipes-bsp/bootfiles/bootfiles.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Closed source binary files to help boot all raspberry pi devices."
-LICENSE = "Broadcom-RPi"
-
-LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=c403841ff2837657b2ed8e5bb474ac8d"
-
-inherit deploy nopackages
-
-include recipes-bsp/common/raspberrypi-firmware.inc
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-DEPENDS = "rpi-config rpi-cmdline"
-
-COMPATIBLE_MACHINE = "^rpi$"
-
-S = "${RPIFW_S}/boot"
-
-PR = "r3"
-
-do_deploy() {
-    install -d ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
-
-    for i in ${S}/*.elf ; do
-        cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
-    done
-    for i in ${S}/*.dat ; do
-        cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
-    done
-    for i in ${S}/*.bin ; do
-        cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
-    done
-
-    # Add stamp in deploy directory
-    touch ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/${PN}-${PV}.stamp
-}
-
-do_deploy[depends] += "rpi-config:do_deploy rpi-cmdline:do_deploy"
-
-addtask deploy before do_build after do_install
-do_deploy[dirs] += "${DEPLOYDIR}/${BOOTFILES_DIR_NAME}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
diff --git a/recipes-bsp/bootfiles/rpi-bootfiles.bb b/recipes-bsp/bootfiles/rpi-bootfiles.bb
new file mode 100644
index 0000000..f1248ee
--- /dev/null
+++ b/recipes-bsp/bootfiles/rpi-bootfiles.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "Closed source binary files to help boot all raspberry pi devices."
+LICENSE = "Broadcom-RPi"
+
+LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=c403841ff2837657b2ed8e5bb474ac8d"
+
+inherit deploy nopackages
+
+include recipes-bsp/common/raspberrypi-firmware.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+DEPENDS = "rpi-config rpi-cmdline"
+
+COMPATIBLE_MACHINE = "^rpi$"
+
+S = "${RPIFW_S}/boot"
+
+PR = "r3"
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
+
+    for i in ${S}/*.elf ; do
+        cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
+    done
+    for i in ${S}/*.dat ; do
+        cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
+    done
+    for i in ${S}/*.bin ; do
+        cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
+    done
+
+    # Add stamp in deploy directory
+    touch ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/${PN}-${PV}.stamp
+}
+
+do_deploy[depends] += "rpi-config:do_deploy rpi-cmdline:do_deploy"
+
+addtask deploy before do_build after do_install
+do_deploy[dirs] += "${DEPLOYDIR}/${BOOTFILES_DIR_NAME}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
-- 
cgit v1.2.3-54-g00ecf