| Message ID | 1430579415-22802-1-git-send-email-bos@je-eigen-domein.nl |
|---|---|
| State | Changes Requested |
| Headers | show |
floris, All, On 2015-05-02 17:10 +0200, Floris Bos spake thusly: > The binary .dtb files are not suitable for everyone as they are > kernel version specific. > Reintroduces BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS option. I am revisitng this one now that I have a little tiny bit of time. Indeed, using the DTBs from rpi-firmware is not working with linux 3.19 or 4.0, although they do work with 3.18. > Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> > --- > package/rpi-firmware/Config.in | 10 ++++++++++ > package/rpi-firmware/rpi-firmware.mk | 2 ++ > 2 files changed, 12 insertions(+) > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > index cd45be4..2de26e3 100644 > --- a/package/rpi-firmware/Config.in > +++ b/package/rpi-firmware/Config.in > @@ -45,4 +45,14 @@ config BR2_PACKAGE_RPI_FIRMWARE_BOOT > default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X > default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD > > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS > + bool "Install Device Tree Blobs (DTBs)" > + default "y" > + help > + Say 'y' here if you want to install the binary DTB files which > + are suitable for a rpi-3.18.y branch Linux kernel. > + > + Say 'n' here if you intend to compile the device tree files > + from kernel source instead. I would rephrase that as: If you are using a Linux kernel <= 3.18, you should say 'y' here. If you are using a Linux kernel >= 3.19, you should say 'n' here, and enable BR2_LINUX_KERNEL_DTS_SUPPORT to let the kernel build the DTB. > + > endif # BR2_PACKAGE_RPI_FIRMWARE > diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk > index cbcf790..9cccb38 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -13,6 +13,7 @@ RPI_FIRMWARE_INSTALL_IMAGES = YES > > RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y) > define RPI_FIRMWARE_INSTALL_DTB > $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb > $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb > @@ -21,6 +22,7 @@ define RPI_FIRMWARE_INSTALL_DTB > $(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \ > done > endef > +endif I'd put the overlays out of the conditional block, because they are *not* built by the Linux kernel. Also, I think we'd want an option to enable/disable installign the overlays. I'll take your patch here and repsin a bit later tonight. Thanks! :-) Regards, Yann E. MORIN. > define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin > -- > 2.1.4 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
On 06/19/2015 10:30 PM, Yann E. MORIN wrote: > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS > + bool "Install Device Tree Blobs (DTBs)" > + default "y" > + help > + Say 'y' here if you want to install the binary DTB files which > + are suitable for a rpi-3.18.y branch Linux kernel. > + > + Say 'n' here if you intend to compile the device tree files > + from kernel source instead. > I would rephrase that as: > > If you are using a Linux kernel <= 3.18, you should say 'y' here. > > If you are using a Linux kernel >= 3.19, you should say 'n' here, > and enable BR2_LINUX_KERNEL_DTS_SUPPORT to let the kernel build > the DTB. > Rephrashing is fine with me. > endif # BR2_PACKAGE_RPI_FIRMWARE > diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk > index cbcf790..9cccb38 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -13,6 +13,7 @@ RPI_FIRMWARE_INSTALL_IMAGES = YES > > RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y) > define RPI_FIRMWARE_INSTALL_DTB > $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb > $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb > @@ -21,6 +22,7 @@ define RPI_FIRMWARE_INSTALL_DTB > $(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \ > done > endef > +endif > I'd put the overlays out of the conditional block, because they are > *not* built by the Linux kernel. They do seem to be part of the rpi Linux source tree: https://github.com/raspberrypi/linux/tree/rpi-3.18.y/arch/arm/boot/dts/overlays Isn't it a matter of adding overlay/name-of-overlay to BR2_LINUX_KERNEL_INTREE_DTS_NAME if someone wants an overlay build? Yours sincerely, Floris Bos
Floris, All, On 2015-06-19 22:52 +0200, Floris Bos spake thusly: > On 06/19/2015 10:30 PM, Yann E. MORIN wrote: > >+config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS > >+ bool "Install Device Tree Blobs (DTBs)" > >+ default "y" > >+ help > >+ Say 'y' here if you want to install the binary DTB files which > >+ are suitable for a rpi-3.18.y branch Linux kernel. > >+ > >+ Say 'n' here if you intend to compile the device tree files > >+ from kernel source instead. > >I would rephrase that as: > > > > If you are using a Linux kernel <= 3.18, you should say 'y' here. > > > > If you are using a Linux kernel >= 3.19, you should say 'n' here, > > and enable BR2_LINUX_KERNEL_DTS_SUPPORT to let the kernel build > > the DTB. > > Rephrashing is fine with me. OK, thanks. > > endif # BR2_PACKAGE_RPI_FIRMWARE > >diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk > >index cbcf790..9cccb38 100644 > >--- a/package/rpi-firmware/rpi-firmware.mk > >+++ b/package/rpi-firmware/rpi-firmware.mk > >@@ -13,6 +13,7 @@ RPI_FIRMWARE_INSTALL_IMAGES = YES > > RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware > >+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y) > > define RPI_FIRMWARE_INSTALL_DTB > > $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb > > $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb > >@@ -21,6 +22,7 @@ define RPI_FIRMWARE_INSTALL_DTB > > $(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \ > > done > > endef > >+endif > >I'd put the overlays out of the conditional block, because they are > >*not* built by the Linux kernel. > > They do seem to be part of the rpi Linux source tree: > https://github.com/raspberrypi/linux/tree/rpi-3.18.y/arch/arm/boot/dts/overlays Ah, indeed. I was mislead by looking at the rpi-4.0.y branch, which does not have that sub-directory. But looking further, the overlays are all along side the standard DTS, not in a sub-directory. I'll see what I can do with that. > Isn't it a matter of adding overlay/name-of-overlay to > BR2_LINUX_KERNEL_INTREE_DTS_NAME if someone wants an overlay build? It would seem so. I'll test that. Thanks for the tips! :-) Regards, Yann E. MORIN.
Floris, All, On 2015-06-19 23:07 +0200, Yann E. MORIN spake thusly: > On 2015-06-19 22:52 +0200, Floris Bos spake thusly: > > On 06/19/2015 10:30 PM, Yann E. MORIN wrote: [--SNIP--] > > >I'd put the overlays out of the conditional block, because they are > > >*not* built by the Linux kernel. > > > > They do seem to be part of the rpi Linux source tree: > > https://github.com/raspberrypi/linux/tree/rpi-3.18.y/arch/arm/boot/dts/overlays > > Ah, indeed. I was mislead by looking at the rpi-4.0.y branch, which does > not have that sub-directory. But looking further, the overlays are all > along side the standard DTS, not in a sub-directory. OK, so I was a bit mislead. I was looking at the rpi-3.19.y branch, which has all the overlays alongside the standard dts. the rpi-3.18.y and rpi4.0.y branches indeed have them in a specific sub-dir, as you pointed out. Regards, Yann E. MORIN.
Floris, All, On 2015-06-19 22:52 +0200, Floris Bos spake thusly: > On 06/19/2015 10:30 PM, Yann E. MORIN wrote: [--SNIP--] > >I'd put the overlays out of the conditional block, because they are > >*not* built by the Linux kernel. > > They do seem to be part of the rpi Linux source tree: https://github.com/raspberrypi/linux/tree/rpi-3.18.y/arch/arm/boot/dts/overlays > Isn't it a matter of adding overlay/name-of-overlay to > BR2_LINUX_KERNEL_INTREE_DTS_NAME if someone wants an overlay build? In fact, no, it does not work. We would need to do some changes in Buildroot for how we handle DTB generation to be able to generate the DTB overlays. So, I've postponed that change for later, and introduced a new Kconfig knob to install DTB overlays: https://patchwork.ozlabs.org/patch/489181/ Regards, Yann E. MORIN.
diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index cd45be4..2de26e3 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -45,4 +45,14 @@ config BR2_PACKAGE_RPI_FIRMWARE_BOOT default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS + bool "Install Device Tree Blobs (DTBs)" + default "y" + help + Say 'y' here if you want to install the binary DTB files which + are suitable for a rpi-3.18.y branch Linux kernel. + + Say 'n' here if you intend to compile the device tree files + from kernel source instead. + endif # BR2_PACKAGE_RPI_FIRMWARE diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index cbcf790..9cccb38 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -13,6 +13,7 @@ RPI_FIRMWARE_INSTALL_IMAGES = YES RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y) define RPI_FIRMWARE_INSTALL_DTB $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb @@ -21,6 +22,7 @@ define RPI_FIRMWARE_INSTALL_DTB $(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \ done endef +endif define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
The binary .dtb files are not suitable for everyone as they are kernel version specific. Reintroduces BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS option. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> --- package/rpi-firmware/Config.in | 10 ++++++++++ package/rpi-firmware/rpi-firmware.mk | 2 ++ 2 files changed, 12 insertions(+)