| Message ID | 1348173466-10956-1-git-send-email-marek.belisko@open-nandra.com |
|---|---|
| State | Superseded |
| Headers | show |
On 20/09/12 22:37, Marek Belisko wrote: > Add support for raspberrypi bootloader and VideoCore. > > Signed-off-by: Marek Belisko<marek.belisko@open-nandra.com> > Still some comments, but these can be fixed while committing, so: Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (untested). There should be a --- (three dashes on a line by itself) between the SOB and the changelog, otherwise the changelog becomes part of the commit message, which is not what we want. > Changes from V1: > - fix names in Config.in (BR2_PACKAGE_BOOTLOADER_ARM192 to > BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM192) > - remove unnecessary SOURCE in mk file > - fix installing VideoCore libraries and include > - copy bootloader files directly to images directory > - rework handling selection of GPU& ARM memory split > (inspired by Yann patch) > - bump to latest "turbo mode" firmware version > (http://www.raspberrypi.org/archives/2008) > [snip] > +if BR2_PACKAGE_RASPBERRYPI_BOOTLOADER > +choice > + > +prompt "Memory& GPU split" prompt should come immediately below choice (no empty line) and should be indented with 1 tab. > + default BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM192 > + help > + Select how much memory use for system and > + how much for GPU. [snip] > +ifeq ($(BR2_PACKAGE_RASPBERRYPI_VIDEOCORE),y) > +RASPBERRYPI_FIRMWARE_INSTALL_STAGING = YES > + > +define RASPBERRYPI_FIRMWARE_INSTALL_STAGING_CMDS > + cp -r -T $(@D)/hardfp/opt/vc/include $(STAGING_DIR)/usr/include > + cp -r -T $(@D)/hardfp/opt/vc/lib $(STAGING_DIR)/usr/lib I would prefer to use rsync -a $(@D)/hardfp/opt/vc/include/ $(STAGING_DIR)/usr/include but that's probably just personal preference. [snip]
Hi, just want to ask it this patch is in queue. It's month it was submitted. ---------- Forwarded message ---------- From: Arnout Vandecappelle <arnout@mind.be> Date: Tue, Oct 2, 2012 at 6:41 PM Subject: Re: [Buildroot] [PATCH v2] Add package raspberrypi-firmware. To: Marek Belisko <marek.belisko@open-nandra.com> Cc: buildroot@busybox.net On 20/09/12 22:37, Marek Belisko wrote: > > Add support for raspberrypi bootloader and VideoCore. > > Signed-off-by: Marek Belisko<marek.belisko@open-nandra.com> > Still some comments, but these can be fixed while committing, so: Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (untested). There should be a --- (three dashes on a line by itself) between the SOB and the changelog, otherwise the changelog becomes part of the commit message, which is not what we want. > Changes from V1: > - fix names in Config.in (BR2_PACKAGE_BOOTLOADER_ARM192 to > BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM192) > - remove unnecessary SOURCE in mk file > - fix installing VideoCore libraries and include > - copy bootloader files directly to images directory > - rework handling selection of GPU& ARM memory split > > (inspired by Yann patch) > - bump to latest "turbo mode" firmware version > (http://www.raspberrypi.org/archives/2008) > [snip] > +if BR2_PACKAGE_RASPBERRYPI_BOOTLOADER > +choice > + > +prompt "Memory& GPU split" prompt should come immediately below choice (no empty line) and should be indented with 1 tab. > + default BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM192 > + help > + Select how much memory use for system and > + how much for GPU. [snip] > +ifeq ($(BR2_PACKAGE_RASPBERRYPI_VIDEOCORE),y) > +RASPBERRYPI_FIRMWARE_INSTALL_STAGING = YES > + > +define RASPBERRYPI_FIRMWARE_INSTALL_STAGING_CMDS > + cp -r -T $(@D)/hardfp/opt/vc/include $(STAGING_DIR)/usr/include > + cp -r -T $(@D)/hardfp/opt/vc/lib $(STAGING_DIR)/usr/lib I would prefer to use rsync -a $(@D)/hardfp/opt/vc/include/ $(STAGING_DIR)/usr/include but that's probably just personal preference. [snip] -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286540 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F Thanks. Marek
On 20 October 2012 20:49, Belisko Marek <marek.belisko@gmail.com> wrote: > Hi, > > just want to ask it this patch is in queue. It's month it was submitted. I'd suggest it's probably not worth committing as-is, because this weekend we finally got rid of the multiple start_*.elf files. Alex
Hi, On Sat, Oct 20, 2012 at 11:10 PM, Alex Bradbury <asb@asbradbury.org> wrote: > On 20 October 2012 20:49, Belisko Marek <marek.belisko@gmail.com> wrote: >> Hi, >> >> just want to ask it this patch is in queue. It's month it was submitted. > > I'd suggest it's probably not worth committing as-is, because this > weekend we finally got rid of the multiple start_*.elf files. OK. I'll resend new version of patch. Thanks for info. > > Alex Cheers, marek
>>>>> "Alex" == Alex Bradbury <asb@asbradbury.org> writes: Alex> On 20 October 2012 20:49, Belisko Marek <marek.belisko@gmail.com> wrote: >> Hi, >> >> just want to ask it this patch is in queue. It's month it was submitted. Yes, sorry about that. I just started looking at the patch now. Alex> I'd suggest it's probably not worth committing as-is, because this Alex> weekend we finally got rid of the multiple start_*.elf files. Ahh, interesting - So how is the memory layout then defined?
On Sat, Oct 20, 2012 at 11:26 PM, Peter Korsgaard <jacmet@uclibc.org> wrote: >>>>>> "Alex" == Alex Bradbury <asb@asbradbury.org> writes: > > Alex> On 20 October 2012 20:49, Belisko Marek <marek.belisko@gmail.com> wrote: > >> Hi, > >> > >> just want to ask it this patch is in queue. It's month it was submitted. > > Yes, sorry about that. I just started looking at the patch now. > > Alex> I'd suggest it's probably not worth committing as-is, because this > Alex> weekend we finally got rid of the multiple start_*.elf files. > > Ahh, interesting - So how is the memory layout then defined? Described here: https://github.com/raspberrypi/firmware/commit/c57ea9dd367f12bf4fb41b7b86806a2dc6281176 > > -- > Bye, Peter Korsgaard Marek
diff --git a/package/Config.in b/package/Config.in index 58dd5e8..36635cd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -232,6 +232,7 @@ source "package/owl-linux/Config.in" source "package/parted/Config.in" source "package/pciutils/Config.in" source "package/picocom/Config.in" +source "package/raspberrypi-firmware/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" source "package/sane-backends/Config.in" diff --git a/package/raspberrypi-firmware/Config.in b/package/raspberrypi-firmware/Config.in new file mode 100644 index 0000000..e1b7e52 --- /dev/null +++ b/package/raspberrypi-firmware/Config.in @@ -0,0 +1,60 @@ +config BR2_PACKAGE_RASPBERRYPI_FIRMWARE + bool + +config BR2_PACKAGE_RASPBERRYPI_BOOTLOADER + bool "Raspberry Pi bootloader files" + select BR2_PACKAGE_RASPBERRYPI_FIRMWARE + help + These are the binary bootloader files from Broadcom. + + https://github.com/raspberrypi/firmware + +if BR2_PACKAGE_RASPBERRYPI_BOOTLOADER +choice + +prompt "Memory & GPU split" + default BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM192 + help + Select how much memory use for system and + how much for GPU. + +config BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM128 + bool "arm128" + help + 128M ARM, 128M GPU split (use this for heavy 3D work, possibly also + required for some video decoding) + +config BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM192 + bool "arm192" + help + 192M ARM, 64M GPU split (this is the default) + +config BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM224 + bool "arm224" + help + 224M ARM, 32M GPU split (use this for Linux only with no 3D or video + processing. Its enough for the 1080p framebuffer, but not much else) + +config BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM240 + bool "arm240" + help + 240M ARM, 16M GPU split (use this for headless mode only. It is enough + to boot the system, but you can not use video at all.) +endchoice + +config BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_FILE + string + default "arm128" if BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM128 + default "arm192" if BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM192 + default "arm224" if BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM224 + default "arm240" if BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM240 + +endif #BR2_PACKAGE_RASPBERRYPI_BOOTLOADER + +config BR2_PACKAGE_RASPBERRYPI_VIDEOCORE + bool "Raspberry Pi VideoCore drivers" + select BR2_PACKAGE_RASPBERRYPI_FIRMWARE + help + These are the binary VideoCore drivers from Broadcom. + + https://github.com/raspberrypi/firmware diff --git a/package/raspberrypi-firmware/raspberrypi-firmware.mk b/package/raspberrypi-firmware/raspberrypi-firmware.mk new file mode 100644 index 0000000..c788497 --- /dev/null +++ b/package/raspberrypi-firmware/raspberrypi-firmware.mk @@ -0,0 +1,37 @@ +RASPBERRYPI_FIRMWARE_VERSION = 9f7cff0 +RASPBERRYPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/master + +ifeq ($(BR2_PACKAGE_RASPBERRYPI_VIDEOCORE),y) +RASPBERRYPI_FIRMWARE_INSTALL_STAGING = YES + +define RASPBERRYPI_FIRMWARE_INSTALL_STAGING_CMDS + cp -r -T $(@D)/hardfp/opt/vc/include $(STAGING_DIR)/usr/include + cp -r -T $(@D)/hardfp/opt/vc/lib $(STAGING_DIR)/usr/lib +endef + +define RASPBERRYPI_FIRMWARE_INSTALL_TARGET_VIDEOCORE + cp -r -T $(@D)/hardfp/opt/vc/bin $(TARGET_DIR)/usr/bin + cp -r -T $(@D)/hardfp/opt/vc/lib $(TARGET_DIR)/usr/lib + cp -r -T $(@D)/hardfp/opt/vc/sbin $(TARGET_DIR)/usr/sbin +endef +endif + +ifeq ($(BR2_PACKAGE_RASPBERRYPI_BOOTLOADER),y) + +BOOT_FILE = $(call qstrip,$(BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_FILE)) + +define RASPBERRYPI_FIRMWARE_INSTALL_TARGET_BOOTLOADER + install -D -m 0644 $(@D)/boot/$(BOOT_FILE)_start.elf \ + $(BINARIES_DIR)/start.elf + install -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/bootcode.bin + install -D -m 0644 $(@D)/boot/loader.bin $(BINARIES_DIR)/loader.bin +endef +endif + +define RASPBERRYPI_FIRMWARE_INSTALL_TARGET_CMDS + $(RASPBERRYPI_FIRMWARE_INSTALL_TARGET_BOOTLOADER) + $(RASPBERRYPI_FIRMWARE_INSTALL_TARGET_VIDEOCORE) +endef + +$(eval $(generic-package)) +
Add support for raspberrypi bootloader and VideoCore. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Changes from V1: - fix names in Config.in (BR2_PACKAGE_BOOTLOADER_ARM192 to BR2_PACKAGE_RASPBERRYPI_BOOTLOADER_ARM192) - remove unnecessary SOURCE in mk file - fix installing VideoCore libraries and include - copy bootloader files directly to images directory - rework handling selection of GPU & ARM memory split (inspired by Yann patch) - bump to latest "turbo mode" firmware version (http://www.raspberrypi.org/archives/2008) --- package/Config.in | 1 + package/raspberrypi-firmware/Config.in | 60 ++++++++++++++++++++ .../raspberrypi-firmware/raspberrypi-firmware.mk | 37 ++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 package/raspberrypi-firmware/Config.in create mode 100644 package/raspberrypi-firmware/raspberrypi-firmware.mk