Pull request for branch yem/misc
From: "Yann E. MORIN" <[email protected]>
Hello All!
Here are two unrelated changesets:
- the first reduces the depth of the TOC in the manual
- the second allows one to only install the required RPi bootloader
Regards,
Yann E. MORIN.
The following changes since commit edce303b8da95a9b19939ab7a4199a39c0483c6f:
libtasn1: fix botched makeinfo/missing logic (2013-12-02 13:33:02 +0100)
are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem/misc
for you to fetch changes up to 631bcb8e1ae930cb7502e1f2840f045bfea776da:
package/rpi-firmware: only install one firmware file (2013-12-02 21:47:04 +0100)
----------------------------------------------------------------
Yann E. MORIN (2):
docs/manual: limit the depth of the TOC in the HTML output package/rpi-firmware: only install one firmware file
docs/manual/manual.mk | 4 ++-- package/rpi-firmware/Config.in | 39 ++++++++++++++++++++++++++++++++++++ package/rpi-firmware/rpi-firmware.mk | 8 ++------ 3 files changed, 43 insertions(+), 8 deletions(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/2 docs/manual: limit the depth of the TOC in the HTML output
From: "Yann E. MORIN" <[email protected]>
The current TOC level is set to 4, which does not mean 'a 4-level deep TOC', but really means 'a TOC deep to the 4th level', with the first level being level 0, which means we have:
12. Appendix
12.1. Makedev syntax documentation 12.2. Makeuser syntax documentation 12.3. Partition table layout description syntax
12.3.1. The global section
Properties for the global section
Which a bit too much. And yet, the fifth level is not shown, since we don't have any! :-/
Limit the depth of the TOC to three levels, which is just enough to be usefull, yet not cluttered by low-level titles.
--- docs/manual/manual.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
docs/manual/manual.mk +2 -2
@@ -72,8 +72,8 @@ endef # The variable <DOCUMENT_NAME>_SOURCES defines the dependencies. ################################################################################ define GENDOC -$(call GENDOC_INNER,$(1),xhtml,html,html,HTML,--xsltproc-opts "--stringparam toc.section.depth 4") -$(call GENDOC_INNER,$(1),chunked,split-html,chunked,split HTML,--xsltproc-opts "--stringparam toc.section.depth 4") +$(call GENDOC_INNER,$(1),xhtml,html,html,HTML,--xsltproc-opts "--stringparam toc.section.depth 2") +$(call GENDOC_INNER,$(1),chunked,split-html,chunked,split HTML,--xsltproc-opts "--stringparam toc.section.depth 2") $(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0") $(call GENDOC_INNER,$(1),text,text,text,text) $(call GENDOC_INNER,$(1),epub,epub,epub,ePUB)
Signature · 1 line
1.8.1.2
PATCH 1/2 docs/manual: limit the depth of the TOC in the HTML output
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
The current TOC level is set to 4, which does not mean 'a 4-level deep TOC', but really means 'a TOC deep to the 4th level', with the first level being level 0, which means we have:12. Appendix
12.1. Makedev syntax documentation 12.2. Makeuser syntax documentation 12.3. Partition table layout description syntax
12.3.1. The global section
Properties for the global section
Quoted 7 lines
Which a bit too much. And yet, the fifth level is not shown, since we don't have any! :-/
Limit the depth of the TOC to three levels, which is just enough to be usefull, yet not cluttered by low-level titles.
Signed-off-by "Yann E. MORIN" <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/rpi-firmware: only install one firmware file
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Since only one firmware is used to boot the Raspberry Pi, there is no reason to install all of them.
Add an option to select what firmware to install.
--- package/rpi-firmware/Config.in | 39 ++++++++++++++++++++++++++++++++++++ package/rpi-firmware/rpi-firmware.mk | 8 ++------ 2 files changed, 41 insertions(+), 6 deletions(-)
package/rpi-firmware/Config.in +39 -0
@@ -7,3 +7,42 @@ config BR2_PACKAGE_RPI_FIRMWARE https://github.com/raspberrypi/firmware +if BR2_PACKAGE_RPI_FIRMWARE + +choice + bool "Firmware to boot" + default BR2_PACKAGE_RPI_FIRMWARE_DEFAULT + help + There are three different firmware files: + - the default firmware, that enables standard GPU features; + - the extended firmware, that enables additional GPU features + (eg. more audio/video codecs); + - the cut-down firmware, for emergency situations, with only + features required to boot a Linux kernel. + +config BR2_PACKAGE_RPI_FIRMWARE_DEFAULT + bool "default" + help + The default firmware, that enables standard GPU features. + +config BR2_PACKAGE_RPI_FIRMWARE_X + bool "extended ('x', more codecs)" + help + The extended firmware, that enables additional GPU features + (eg. more audio/video codecs). + +config BR2_PACKAGE_RPI_FIRMWARE_CD + bool "cut-down ('cd', emergency)" + help + The cut-down firmware, for emergency situations, with only + features required to boot a Linux kernel. + +endchoice + +config BR2_PACKAGE_RPI_FIRMWARE_BOOT + string + default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT + default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X + default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD + +endif # BR2_PACKAGE_RPI_FIRMWARE
package/rpi-firmware/rpi-firmware.mk +2 -6
@@ -11,12 +11,8 @@ RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom define RPI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin - $(INSTALL) -D -m 0644 $(@D)/boot/start.elf $(BINARIES_DIR)/rpi-firmware/start.elf - $(INSTALL) -D -m 0644 $(@D)/boot/start_cd.elf $(BINARIES_DIR)/rpi-firmware/start_cd.elf - $(INSTALL) -D -m 0644 $(@D)/boot/start_x.elf $(BINARIES_DIR)/rpi-firmware/start_x.elf - $(INSTALL) -D -m 0644 $(@D)/boot/fixup.dat $(BINARIES_DIR)/rpi-firmware/fixup.dat - $(INSTALL) -D -m 0644 $(@D)/boot/fixup_cd.dat $(BINARIES_DIR)/rpi-firmware/fixup_cd.dat - $(INSTALL) -D -m 0644 $(@D)/boot/fixup_x.dat $(BINARIES_DIR)/rpi-firmware/fixup_x.dat + $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf + $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt endef
Signature · 1 line
1.8.1.2
PATCH 2/2 package/rpi-firmware: only install one firmware file
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
Since only one firmware is used to boot the Raspberry Pi, there is no reason to install all of them.Add an option to select what firmware to install.
Signed-off-by "Yann E. MORIN" <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard