Merge branch 'raspberrypi:master' into patch-1

Author: macmpi

CMakeLists.txt

@@ -1,14 +1,26 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.1...3.27)
 
 project(utils)
 
 # List of subsidiary CMakeLists
 add_subdirectory(dtmerge)
+add_subdirectory(eeptools)
+add_subdirectory(kdtc)
 add_subdirectory(otpset)
 add_subdirectory(overlaycheck)
 add_subdirectory(ovmerge)
 add_subdirectory(pinctrl)
+add_subdirectory(piolib)
 add_subdirectory(raspinfo)
+add_subdirectory(vcgencmd)
 add_subdirectory(vclog)
 add_subdirectory(vcmailbox)
-add_subdirectory(vcgencmd)
+
+# Only build rpifwcrypto if GnuTLS is available
+include(CheckIncludeFile)
+check_include_file(gnutls/crypto.h HAVE_GNUTLS_CRYPTO_H)
+if(HAVE_GNUTLS_CRYPTO_H)
+    add_subdirectory(rpifwcrypto)
+else()
+    message(STATUS "gnutls/crypto.h not found - skipping rpifwcrypto")
+endif()

README.md

@@ -3,6 +3,8 @@ A collection of scripts and simple applications
 
 * [dtmerge](dtmerge/) - A tool for applying compiled DT overlays (`*.dtbo`) to base Device
     Tree files (`*.dtb`). Also includes the `dtoverlay` and `dtparam` utilities.
+* [eeptools](eeptools/) - Tools for creating and managing EEPROMs for HAT+ and HAT board.
+* [kdtc](kdtc/) - A tool for compiling overlays with #includes, etc., as used in the kernel tree.
 * [otpset](otpset/) - A short script to help with reading and setting the customer OTP
     bits.
 * [overlaycheck](overlaycheck/) - A tool for validating the overlay files and README in a
@@ -13,16 +15,21 @@ A collection of scripts and simple applications
 * [pinctrl](pinctrl/) - A more powerful replacement for raspi-gpio, a tool for
     displaying and modifying the GPIO and pin muxing state of a system, bypassing
     the kernel.
+* [piolib](piolib/) - A library for accessing the Pi 5's PIO hardware.
 * [raspinfo](raspinfo/) - A short script to dump information about the Pi. Intended for
     the submission of bug reports.
+* [rpifwcrypto](rpifwcrypto/) - A command line application and shared library for the
+    firmware cryptography service. Intended for use with Raspberry Pi Connect and
+    secure-boot provisioner.
 * [vclog](vclog/) - A tool to get VideoCore 'assert' or 'msg' logs
     with optional -f to wait for new logs to arrive.
 
 
 **Build Instructions**
 
-Install the prerequisites with "sudo apt install cmake device-tree-compiler libfdt-dev" - you need at least version 3.10 of cmake. Run the following commands to build and install everything, or see the README files in the subdirectories to just build utilities individually:
+Install the prerequisites with "sudo apt install cmake device-tree-compiler libfdt-dev libgnutls28-dev" - you need at least version 3.10 of cmake. Run the following commands to build and install everything, or see the README files in the subdirectories to just build utilities individually:
 
  - *cmake .*
+    N.B. Use *cmake -DBUILD_SHARED_LIBS=1 .* to build the libraries in the subprojects (libdtovl, gpiolib and piolib) as shared (as opposed to static) libraries.
  - *make*
  - *sudo make install*

dtmerge/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.10...3.27)
 
 include(GNUInstallDirs)
 
@@ -11,8 +11,13 @@ if (CMAKE_COMPILER_IS_GNUCC)
    add_definitions (-ffunction-sections)
 endif ()
 
-add_library (dtovl ${STATIC} dtoverlay.c)
+add_library (dtovl dtoverlay.c)
 target_link_libraries(dtovl fdt)
+set_target_properties(dtovl PROPERTIES PUBLIC_HEADER dtoverlay.h)
+set_target_properties(dtovl PROPERTIES SOVERSION 0)
+install(TARGETS dtovl
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 add_executable(dtmerge dtmerge.c)
 target_link_libraries(dtmerge dtovl)
@@ -21,12 +26,9 @@ install(FILES dtmerge.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 
 add_executable(dtoverlay dtoverlay_main.c utils.c)
 target_link_libraries(dtoverlay dtovl)
-install(TARGETS dtoverlay RUNTIME DESTINATION bin)
-install(FILES dtoverlay.1 DESTINATION man/man1)
+install(TARGETS dtoverlay RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES dtoverlay.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 
 add_custom_command(TARGET dtoverlay POST_BUILD COMMAND ln;-sf;dtoverlay;dtparam)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
-install(FILES dtparam.1 DESTINATION man/man1)
-
-set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
-install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES dtparam.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)

dtmerge/README.md

@@ -12,6 +12,7 @@ dtparam is a tool for applying paramaters of the base Device Tree of a live syst
 Install the prerequisites with "sudo apt install cmake libfdt-dev" - you need at least version 3.10 of cmake. Run the following commands here, or in the top-level directory to build and install all the utilities:
 
  - *cmake .*
+    N.B. Use *cmake -DBUILD_SHARED_LIBS=1 .* to build libdtovl as a shared (as opposed to static) library.
  - *make*
  - *sudo make install*
 
@@ -20,9 +21,9 @@ Install the prerequisites with "sudo apt install cmake libfdt-dev" - you need at
 ```
 Usage:
     dtmerge [<options] <base dtb> <merged dtb> - [param=value] ...
-        to apply a parameter to the base dtb (like dtparam)
+        to apply a parameter to the base dtb, without an overlay (like dtparam)
     dtmerge [<options] <base dtb> <merged dtb> <overlay dtb> [param=value] ...
-        to apply an overlay with parameters (like dtoverlay)
+        to apply an overlay, optionally with parameters (like dtoverlay)
   where <options> is any of:
     -d      Enable debug output
     -h      Show this help message

dtmerge/dtmerge.1

@@ -52,13 +52,21 @@ Displays help on the application.
 .TP
 .B dtmerge /boot/bcm2711-rpi-4-b.dtb out.dtb - spi=on i2c=on
 Produce a device-tree for the Raspberry Pi 4 in "out.dtb" which has the SPI and
-I2C interfaces activated.
+I2C interfaces activated. No additional device-tree overlay is applied.
 .
 .TP
 .B dtmerge /boot/bcm2710-rpi-3-b-plus.dtb out.dtb /boot/overlays/gpio-shutdown.dtbo
 Produce a device-tree for the Raspberry Pi 3+ in "out.dtb" which includes the
 GPIO shutdown overlay (with all parameters set to their default).
 .
+.TP
+.B dtmerge /boot/bcm2712-rpi-5-b.dtb out.dtb /boot/overlays/mcp2515-can0.dtbo oscillator=12000000 interrupt=25 spimaxfrequency=2000000
+Produce a device-tree for the Raspberry Pi 5 in "out.dtb" which includes the
+MCP2515 CAN bus module overlay. The overlay is configured with the following
+settings: the oscillator frequency is set to 12 MHz (depending on the quartz
+crystal used), the interrupt GPIO pin is set to 25, and the SPI frequency is
+limited to 2 MHz.
+.
 .
 .SH SEE ALSO
 .BR dtoverlay (1),
@@ -69,4 +77,4 @@ GPIO shutdown overlay (with all parameters set to their default).
 .SH REFERENCES
 .TP
 .B [DTREE]
-https://www.raspberrypi.org/documentation/configuration/device-tree.md
+https://www.raspberrypi.com/documentation/computers/configuration.html#part5.2