Skip to content

Commit ec2667d

Browse files
committed
arm64: dts: Remove the Pi5 FIRMWARE_UPDATED guards
The Raspberry Pi firmware has assumed that top level #size-cells value in dtb files is 1. As a result, the dts source files have had to use 32-bit sizes, making it awkward to declare memory regions of 4GB or larger, requiring them to be split into chunks. This primarily affects Pi 5, where the dts source has made use of conditional compilation to choose either 64-bit or 32-bit sizes, based on the presence or absence of the defined cpp symbol FIRMWARE_UPDATED. As of EEPROM release pieeprom-2025-02-11, the firmware has read and made use of the actual #size-cells value declared in the dtb, allowing the use of 64-bit sizes. Remove the conditional sections, retaining the 64-bit size values. Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1 parent 575595f commit ec2667d

File tree

5 files changed

+0
-39
lines changed

5 files changed

+0
-39
lines changed

arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,6 @@
44
#include "bcm2712.dtsi"
55

66
/ {
7-
#ifndef FIRMWARE_UPDATED
8-
#size-cells = <1>;
9-
10-
reserved-memory {
11-
ranges;
12-
#address-cells = <2>;
13-
#size-cells = <1>;
14-
15-
atf@0 {
16-
reg = <0x0 0x0 0x80000>;
17-
};
18-
19-
linux,cma {
20-
size = <0x4000000>; /* 64MB */
21-
alloc-ranges = <0x0 0x00000000 0x40000000>;
22-
};
23-
};
24-
#endif
25-
267
arm-pmu {
278
compatible = "arm,cortex-a76-pmu";
289
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717
/* Will be filled by the bootloader */
1818
memory@0 {
1919
device_type = "memory";
20-
#ifndef FIRMWARE_UPDATED
21-
reg = <0 0 0x28000000>;
22-
#else
2320
reg = <0 0 0 0x28000000>;
24-
#endif
2521
};
2622

2723
leds: leds {

arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
/* Will be filled by the bootloader */
1717
memory@0 {
1818
device_type = "memory";
19-
#ifndef FIRMWARE_UPDATED
20-
reg = <0 0 0x28000000>;
21-
#else
2219
reg = <0 0 0 0x28000000>;
23-
#endif
2420
};
2521

2622
leds: leds {

arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,11 +297,7 @@ pciex4: &pcie2 { };
297297
compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
298298
#address-cells = <1>;
299299
#size-cells = <1>;
300-
#ifndef FIRMWARE_UPDATED
301-
reg = <0x0 0x0 0x0>;
302-
#else
303300
reg = <0x0 0x0 0x0 0x0>;
304-
#endif
305301
no-map;
306302
status = "disabled";
307303
};
@@ -313,11 +309,7 @@ pciex4: &pcie2 { };
313309
compatible = "raspberrypi,bootloader-public-key", "nvmem-rmem";
314310
#address-cells = <1>;
315311
#size-cells = <1>;
316-
#ifndef FIRMWARE_UPDATED
317-
reg = <0x0 0x0 0x0>;
318-
#else
319312
reg = <0x0 0x0 0x0 0x0>;
320-
#endif
321313
no-map;
322314
status = "disabled";
323315
};

arch/arm64/boot/dts/broadcom/bcm2712.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,11 +608,7 @@
608608

609609
hvs: hvs@107c580000 {
610610
compatible = "brcm,bcm2712-hvs";
611-
#ifndef FIRMWARE_UPDATED
612-
reg = <0x10 0x7c580000 0x1a000>;
613-
#else
614611
reg = <0x10 0x7c580000 0x0 0x1a000>;
615-
#endif
616612
interrupt-parent = <&disp_intr>;
617613
interrupts = <2>, <9>, <16>;
618614
interrupt-names = "ch0-eof", "ch1-eof", "ch2-eof";

0 commit comments

Comments
 (0)