Skip to content

Commit dd3564f

Browse files
Torben Woltjenpelwell
authored andcommitted
Clarify docs: Add example for dtmerge and more precisely describe available parameters
1 parent f5c1e54 commit dd3564f

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

dtmerge/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ Install the prerequisites with "sudo apt install cmake libfdt-dev" - you need at
2121
```
2222
Usage:
2323
dtmerge [<options] <base dtb> <merged dtb> - [param=value] ...
24-
to apply a parameter to the base dtb (like dtparam)
24+
to apply a parameter to the base dtb, without an overlay (like dtparam)
2525
dtmerge [<options] <base dtb> <merged dtb> <overlay dtb> [param=value] ...
26-
to apply an overlay with parameters (like dtoverlay)
26+
to apply an overlay, optionally with parameters (like dtoverlay)
2727
where <options> is any of:
2828
-d Enable debug output
2929
-h Show this help message

dtmerge/dtmerge.1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,18 @@ Displays help on the application.
5252
.TP
5353
.B dtmerge /boot/bcm2711-rpi-4-b.dtb out.dtb - spi=on i2c=on
5454
Produce a device-tree for the Raspberry Pi 4 in "out.dtb" which has the SPI and
55-
I2C interfaces activated.
55+
I2C interfaces activated. No additional device-tree overlay is applied.
5656
.
5757
.TP
5858
.B dtmerge /boot/bcm2710-rpi-3-b-plus.dtb out.dtb /boot/overlays/gpio-shutdown.dtbo
5959
Produce a device-tree for the Raspberry Pi 3+ in "out.dtb" which includes the
6060
GPIO shutdown overlay (with all parameters set to their default).
6161
.
62+
.TP
63+
.B dtmerge /boot/bcm2710-rpi-3-b-plus.dtb out.dtb /boot/overlays/gpio-shutdown.dtbo gpio_pin=5
64+
Produce a device-tree for the Raspberry Pi 3+ in "out.dtb" which includes the
65+
GPIO shutdown overlay. Additionally, it sets the gpio shutdown pin to 5.
66+
.
6267
.
6368
.SH SEE ALSO
6469
.BR dtoverlay (1),

dtmerge/dtmerge.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ static void usage(void)
3535
{
3636
printf("Usage:\n");
3737
printf(" dtmerge [<options] <base dtb> <merged dtb> - [param=value] ...\n");
38-
printf(" to apply a parameter to the base dtb (like dtparam)\n");
38+
printf(" to apply a parameter to the base dtb, without an overlay (like dtparam)\n");
3939
printf(" dtmerge [<options] <base dtb> <merged dtb> <overlay dtb> [param=value] ...\n");
40-
printf(" to apply an overlay with parameters (like dtoverlay)\n");
40+
printf(" to apply an overlay, optionally with parameters (like dtoverlay)\n");
4141
printf(" where <options> is any of:\n");
4242
printf(" -d Enable debug output\n");
4343
printf(" -h Show this help message\n");

0 commit comments

Comments
 (0)