Skip to contentSkip to conversation

package/rpi-firmware: select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT when needed

PATCH New Thomas Petazzoni 3 participants 5 messages May 16, 2020 – May 29, 2020 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/rpi-firmware: select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT when needed

When BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is enabled, and the DTBs are built by Linux (i.e BR2_LINUX_KERNEL_DTS_SUPPORT is enabled), these DTBs should be built with the -@ Device Tree compiler option, so that they can be used together with DTB overlays. So let's select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT in this situation.

Fixes:

https://bugs.busybox.net/show_bug.cgi?id=12831

---
 package/rpi-firmware/Config.in | 2 ++
 1 file changed, 2 insertions(+)
package/rpi-firmware/Config.in +2 -0
index 7cebc5e7ca..cced53f017 100644
@@ -85,6 +85,8 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 	default y
 	depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS \
 		|| BR2_LINUX_KERNEL_DTS_SUPPORT
+	select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT \
+		if BR2_LINUX_KERNEL_DTS_SUPPORT
 	help
 	  Say 'y' here if you need to load one or more of the DTB
 	  overlays, to support HATs (Hardware Attached on Top, add-on
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/2 configs/raspberrypi{3, 4}_64: enabling BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT no longer needed

BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT is now forcefully selected by BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS when the kernel is in charge of building DTBs (BR2_LINUX_KERNEL_DTS_SUPPORT=y). So enabling BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT is no longer needed in the 64-bit defconfigs for Raspberry Pi 3 and 4.

---
 configs/raspberrypi3_64_defconfig | 1 -
 configs/raspberrypi4_64_defconfig | 1 -
 2 files changed, 2 deletions(-)
configs/raspberrypi3_64_defconfig +0 -1
index 10e6079d54..27bd5aa0bb 100644
@@ -17,7 +17,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 # Build the DTB from the kernel sources
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b"
-BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
configs/raspberrypi4_64_defconfig +0 -1
index fd6f8e4dce..283ef4ba36 100644
@@ -17,7 +17,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 # Build the DTB from the kernel sources
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"
-BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/2 configs/raspberrypi{3, 4}_64: enabling BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT no longer needed

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT is now forcefully selected by BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS when the kernel is in charge of building DTBs (BR2_LINUX_KERNEL_DTS_SUPPORT=y). So enabling BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT is no longer needed in the 64-bit defconfigs for Raspberry Pi 3 and 4.

Committed to 2020.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 package/rpi-firmware: select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT when needed

In reply to Thomas Petazzoni

Thomas, All,

On 2020-05-16 16:02 +0200, Thomas Petazzoni spake thusly:

Quoted 11 lines

When BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is enabled, and the DTBs are built by Linux (i.e BR2_LINUX_KERNEL_DTS_SUPPORT is enabled), these DTBs should be built with the -@ Device Tree compiler option, so that they can be used together with DTB overlays. So let's select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT in this situation.

Fixes:

https://bugs.busybox.net/show_bug.cgi?id=12831

Both appiled to master, thanks.

Regards,
Yann E. MORIN.

Quoted 20 lines
---
 package/rpi-firmware/Config.in | 2 ++
 1 file changed, 2 insertions(+)
package/rpi-firmware/Config.in +2 -0
index 7cebc5e7ca..cced53f017 100644
@@ -85,6 +85,8 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 	default y
 	depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS \
 		|| BR2_LINUX_KERNEL_DTS_SUPPORT
+	select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT \
+		if BR2_LINUX_KERNEL_DTS_SUPPORT
 	help
 	  Say 'y' here if you need to load one or more of the DTB
 	  overlays, to support HATs (Hardware Attached on Top, add-on
Signature · 1 line
2.26.2
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 1/2 package/rpi-firmware: select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT when needed

In reply to Thomas Petazzoni
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

When BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is enabled, and the DTBs are built by Linux (i.e BR2_LINUX_KERNEL_DTS_SUPPORT is enabled), these DTBs should be built with the -@ Device Tree compiler option, so that they can be used together with DTB overlays. So let's select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT in this situation.

Quoted 5 lines

Fixes:

https://bugs.busybox.net/show_bug.cgi?id=12831

Committed to 2020.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard