Other PBL-enabled architecture can benefit from compressed dtbs as well.
As the symbol doesn't have a prompt, it's safe to rename all of
instances of it to drop the ARM qualifier.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
arch/arm/Kconfig | 7 +------
arch/arm/cpu/start.c | 2 +-
arch/arm/mach-at91/Kconfig | 2 +-
arch/arm/mach-imx/Kconfig | 26 +++++++++++++-------------
arch/arm/mach-omap/Kconfig | 2 +-
common/Kconfig | 6 ++++++
6 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3b983c8b3d0a..0e444d17d5af 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -17,11 +17,6 @@ config ARM_LINUX
config HAVE_MACH_ARM_HEAD
bool
-config ARM_USE_COMPRESSED_DTB
- bool
- select UNCOMPRESS
- select LZO_DECOMPRESS
-
config TEXT_BASE
hex
default 0x0
@@ -208,7 +203,7 @@ config ARCH_STM32MP
select ARCH_HAS_RESET_CONTROLLER
select ARM_AMBA
select ARM_SMCCC
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config ARCH_VERSATILE
bool "ARM Versatile boards (ARM926EJ-S)"
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index f48f5beea807..5533466e01a7 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -75,7 +75,7 @@ void *barebox_arm_boot_dtb(void)
return barebox_boarddata;
}
- if (!IS_ENABLED(CONFIG_ARM_USE_COMPRESSED_DTB) || !barebox_boarddata
+ if (!IS_ENABLED(CONFIG_USE_COMPRESSED_DTBS) || !barebox_boarddata
|| !blob_is_compressed_fdt(barebox_boarddata))
return NULL;
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 52eefc736138..2d13b71ce3a1 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -573,7 +573,7 @@ endif
config AT91_MULTI_BOARDS
bool "Allow multiple boards to be selected"
select HAVE_PBL_MULTI_IMAGES
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
if AT91_MULTI_BOARDS
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 3f8012c73211..55931058f6d7 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -345,7 +345,7 @@ config MACH_PROTONIC_IMX6
bool "Protonic-Holland i.MX6 based boards"
select ARCH_IMX6
select ARCH_IMX6UL
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_KONTRON_SAMX6I
bool "Kontron sAMX6i"
@@ -409,18 +409,18 @@ config MACH_TECHNEXION_PICO_HOBBIT
bool "Technexion Pico Hobbit"
select ARCH_IMX6
select ARCH_IMX6UL
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_TECHNEXION_WANDBOARD
bool "Technexion Wandboard"
select ARCH_IMX6
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
select MCI_IMX_ESDHC_PBL
config MACH_EMBEST_MARSBOARD
bool "Embest MarSboard"
select ARCH_IMX6
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_EMBEST_RIOTBOARD
bool "Embest RIoTboard"
@@ -454,7 +454,7 @@ config MACH_CM_FX6
config MACH_ADVANTECH_ROM_742X
bool "Advantech ROM 742X"
select ARCH_IMX6
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_WARP7
bool "NXP i.MX7: element 14 WaRP7 Board"
@@ -464,7 +464,7 @@ config MACH_AC_SXB
bool "Atlas Copco: SXB board"
select ARCH_IMX7
select MCI_IMX_ESDHC_PBL
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_VF610_TWR
bool "Freescale VF610 Tower Board"
@@ -479,14 +479,14 @@ config MACH_ZII_RDU1
select MACH_FREESCALE_MX51_PDK_POWER
select CRC8
select MACH_ZII_COMMON
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_ZII_RDU2
bool "ZII i.MX6Q(+) RDU2"
select ARCH_IMX6
select MCI_IMX_ESDHC_PBL
select MACH_ZII_COMMON
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_ZII_IMX8MQ_DEV
bool "ZII i.MX8MQ based devices"
@@ -496,19 +496,19 @@ config MACH_ZII_IMX8MQ_DEV
select ARM_SMCCC
select MCI_IMX_ESDHC_PBL
select MACH_ZII_COMMON
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_ZII_VF610_DEV
bool "ZII VF610 Dev Family"
select ARCH_VF610
select CLKDEV_LOOKUP
select MACH_ZII_COMMON
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_ZII_IMX7D_DEV
bool "ZII i.MX7D based devices"
select ARCH_IMX7
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_PHYTEC_PHYCORE_IMX7
bool "Phytec phyCORE i.MX7"
@@ -576,12 +576,12 @@ config MACH_DIGI_CCIMX6ULSBCPRO
bool "Digi Internal CC-IMX6UL SBC Pro"
select ARCH_IMX6
select ARCH_IMX6UL
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_WEBASTO_CCBV2
bool "Webasto Common Communication Board V2"
select ARCH_IMX6UL
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
config MACH_MNT_REFORM
bool "MNT Reform"
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index 220b6351679c..3347d277bbb0 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -41,7 +41,7 @@ config ARCH_AM33XX
select GENERIC_GPIO
select OFTREE
select CLOCKSOURCE_TI_DM
- select ARM_USE_COMPRESSED_DTB
+ select USE_COMPRESSED_DTB
help
Say Y here if you are using Texas Instrument's AM33xx based platform
diff --git a/common/Kconfig b/common/Kconfig
index b1f4543e03cd..36207274f07f 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -42,6 +42,12 @@ config BLOCK
config BLOCK_WRITE
bool
+config USE_COMPRESSED_DTB
+ bool
+ depends on ARM
+ select UNCOMPRESS
+ select LZO_DECOMPRESS
+
config ELF
bool "ELF Support" if COMPILE_TEST
--
2.29.2
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
