[Buildroot] [PATCH v2 1/1] package/rpi-firmware: fix missing files in overlays

[Buildroot] [PATCH v2 1/1] package/rpi-firmware: fix missing files in overlays

[Sassen, Rutger]

[-- Attachment #1.1: Type: text/plain, Size: 2643 bytes --]

When supporting multiple hardware targets, overlay_map.dtb might
be needed to map overlay names to one of several implementations.

Signed-off-by: Rutger Sassen <rsassen@comecer.com>
---
Changes v1 -> v2:
  - instead of always copying overlay_map.dtb, make it configurable
    (suggested by Peter Seiderer)
  - do not copy README since it a special case, only needed when
    installing overlays to a non-standard location (suggested by Peter
    Seiderer)

 package/rpi-firmware/Config.in       | 9 +++++++++
 package/rpi-firmware/rpi-firmware.mk | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in
index 8070dc3019..13efa3dc87 100644
--- a/package/rpi-firmware/Config.in
+++ b/package/rpi-firmware/Config.in
@@ -93,6 +93,15 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 	  overlays, to support HATs (Hardware Attached on Top, add-on
 	  modules).

+config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP
+	bool "Install DTB overlay map"
+	default n
+	depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
+	help
+	  Say 'y' here if you need to support multiple hardware targets
+	  and you need target dependent mapping of overlay names to one
+	  of several overlay implementations.
+
 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
 	bool "vcdbg"
 	depends on BR2_arm # prebuilt arm binary, rpi-userland
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index b46a7f5270..800b560070 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 endef
 endif

+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y)
+define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP
+	$(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/
+endef
+endif
+
 # Install prebuilt libraries if RPI_USERLAND not enabled
 ifneq ($(BR2_PACKAGE_RPI_USERLAND),y)
 define RPI_FIRMWARE_INSTALL_TARGET_LIB
@@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
 	$(RPI_FIRMWARE_INSTALL_CONFIG)
 	$(RPI_FIRMWARE_INSTALL_DTB)
 	$(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS)
+	$(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP)
 endef
 
 $(eval $(generic-package))
-- 
2.20.1

This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you.

[-- Attachment #1.2: Type: text/html, Size: 3195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/rpi-firmware: fix missing files in overlays

[Peter Seiderer]

Hello Rutger,

On Wed, 16 Mar 2022 10:08:40 +0000, "Sassen, Rutger" <rsassen@comecer.com> wrote:

> When supporting multiple hardware targets, overlay_map.dtb might
> be needed to map overlay names to one of several implementations.
>
> Signed-off-by: Rutger Sassen <rsassen@comecer.com>
> ---
> Changes v1 -> v2:
>   - instead of always copying overlay_map.dtb, make it configurable
>     (suggested by Peter Seiderer)
>   - do not copy README since it a special case, only needed when
>     installing overlays to a non-standard location (suggested by Peter
>     Seiderer)
>
>  package/rpi-firmware/Config.in       | 9 +++++++++
>  package/rpi-firmware/rpi-firmware.mk | 7 +++++++
>  2 files changed, 16 insertions(+)
>
> diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in
> index 8070dc3019..13efa3dc87 100644
> --- a/package/rpi-firmware/Config.in
> +++ b/package/rpi-firmware/Config.in
> @@ -93,6 +93,15 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
>  	  overlays, to support HATs (Hardware Attached on Top, add-on
>  	  modules).

Would have expected

+if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
+

>
> +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP
> +	bool "Install DTB overlay map"
> +	default n

instead of this 'depends' line

> +	depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
> +	help
> +	  Say 'y' here if you need to support multiple hardware targets
> +	  and you need target dependent mapping of overlay names to one
> +	  of several overlay implementations.
> +

And the endif here

+
+endif

Maybe good to mention 'overlay_map.dtb' explicit in the help text like?

+         of several overlay implementations via overlay_map.dtb file.

Regards,
Peter


>  config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
>  	bool "vcdbg"
>  	depends on BR2_arm # prebuilt arm binary, rpi-userland
> diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
> index b46a7f5270..800b560070 100644
> --- a/package/rpi-firmware/rpi-firmware.mk
> +++ b/package/rpi-firmware/rpi-firmware.mk
> @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
>  endef
>  endif
>
> +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y)
> +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP
> +	$(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/
> +endef
> +endif
> +
>  # Install prebuilt libraries if RPI_USERLAND not enabled
>  ifneq ($(BR2_PACKAGE_RPI_USERLAND),y)
>  define RPI_FIRMWARE_INSTALL_TARGET_LIB
> @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
>  	$(RPI_FIRMWARE_INSTALL_CONFIG)
>  	$(RPI_FIRMWARE_INSTALL_DTB)
>  	$(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS)
> +	$(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP)
>  endef
>
>  $(eval $(generic-package))

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot