[PATCH v2 06/21] ARM: rpi: switch to ARM_USE_COMPRESSED_DTB

Ahmad Fatoum a.fatoum at pengutronix.de
Wed Jun 8 22:59:07 PDT 2022


We'll add a generic image containing multiple DTs in a follow-up commit,
which would benefit from compressing the DTs. For uniformity, compress
the existing DTs as well to save some kilobytes there.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 arch/arm/boards/raspberry-pi/lowlevel.c | 17 +++++++++--------
 arch/arm/mach-bcm283x/Kconfig           |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boards/raspberry-pi/lowlevel.c b/arch/arm/boards/raspberry-pi/lowlevel.c
index 7b9809b86cb7..091bfb8f4b14 100644
--- a/arch/arm/boards/raspberry-pi/lowlevel.c
+++ b/arch/arm/boards/raspberry-pi/lowlevel.c
@@ -57,26 +57,27 @@ static inline void start_raspberry_pi(unsigned long memsize, void *fdt,
 #define RPI_ENTRY_FUNCTION(name, memsize, r2) \
 	ENTRY_FUNCTION_WITHSTACK(name, rpi_stack_top(memsize), __r0, __r1, r2)
 
-extern char __dtb_bcm2835_rpi_start[];
+extern char __dtb_z_bcm2835_rpi_start[];
+extern char __dtb_z_bcm2836_rpi_2_start[];
+extern char __dtb_z_bcm2837_rpi_3_start[];
+extern char __dtb_z_bcm2837_rpi_cm3_start[];
+
 RPI_ENTRY_FUNCTION(start_raspberry_pi1, SZ_128M, r2)
 {
-	start_raspberry_pi(SZ_128M, __dtb_bcm2835_rpi_start, (void *)r2);
+	start_raspberry_pi(SZ_128M, __dtb_z_bcm2835_rpi_start, (void *)r2);
 }
 
-extern char __dtb_bcm2836_rpi_2_start[];
 RPI_ENTRY_FUNCTION(start_raspberry_pi2, SZ_512M, r2)
 {
-	start_raspberry_pi(SZ_512M, __dtb_bcm2836_rpi_2_start, (void *)r2);
+	start_raspberry_pi(SZ_512M, __dtb_z_bcm2836_rpi_2_start, (void *)r2);
 }
 
-extern char __dtb_bcm2837_rpi_3_start[];
 RPI_ENTRY_FUNCTION(start_raspberry_pi3, SZ_512M, r2)
 {
-	start_raspberry_pi(SZ_512M, __dtb_bcm2837_rpi_3_start, (void *)r2);
+	start_raspberry_pi(SZ_512M, __dtb_z_bcm2837_rpi_3_start, (void *)r2);
 }
 
-extern char __dtb_bcm2837_rpi_cm3_start[];
 RPI_ENTRY_FUNCTION(start_raspberry_pi_cm3, SZ_512M, r2)
 {
-	start_raspberry_pi(SZ_512M, __dtb_bcm2837_rpi_cm3_start, (void *)r2);
+	start_raspberry_pi(SZ_512M, __dtb_z_bcm2837_rpi_cm3_start, (void *)r2);
 }
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
index 75acee8dad56..5be236a68419 100644
--- a/arch/arm/mach-bcm283x/Kconfig
+++ b/arch/arm/mach-bcm283x/Kconfig
@@ -8,6 +8,7 @@ config ARCH_TEXT_BASE
 
 config MACH_RPI_COMMON
 	bool
+	select ARM_USE_COMPRESSED_DTB
 
 menu "select Broadcom BCM283X boards to be built"
 
-- 
2.30.2




More information about the barebox mailing list