Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa7d5f18 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Russell King
Browse files

ARM: 8454/1: OF implies OF_FLATTREE 



On the ARM architecture, individual platforms select CONFIG_USE_OF if they
need it, but all device tree code is keyed off CONFIG_OF. When building
a platform without DT support and manually enabling CONFIG_OF, we now
get a number of build errors, e.g.

arch/arm/kernel/devtree.c: In function 'setup_machine_fdt':
arch/arm/kernel/devtree.c:215:19: error: implicit declaration of function 'early_init_dt_verify' [-Werror=implicit-function-declaration]

We could now try to separate the use case of booting from DT vs. the
case of using the dynamic implementation, but that seems more complicated
than it can gain us.

This simply changes the ARM Kconfig file to always enable OF_RESERVED_MEM
and OF_EARLY_FLATTREE when CONFIG_OF is enabled. These options add a little
extra code when we just want the dynamic OF implementation, but that seems
like a rather obscure case, and this version solves all CONFIG_OF related
randconfig regressions.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 0166dc11 ("of: make CONFIG_OF user selectable")
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 28fa99b7

arch/arm/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -76,6 +76,8 @@ config ARM 
	select IRQ_FORCED_THREADING

	select IRQ_FORCED_THREADING

	select MODULES_USE_ELF_REL

	select MODULES_USE_ELF_REL

	select NO_BOOTMEM

	select NO_BOOTMEM

	select OF_EARLY_FLATTREE if OF

	select OF_RESERVED_MEM if OF

	select OLD_SIGACTION

	select OLD_SIGACTION

	select OLD_SIGSUSPEND3

	select OLD_SIGSUSPEND3

	select PERF_USE_VMALLOC

	select PERF_USE_VMALLOC
@@ -1822,8 +1824,6 @@ config USE_OF 
	bool "Flattened Device Tree support"

	bool "Flattened Device Tree support"

	select IRQ_DOMAIN

	select IRQ_DOMAIN

	select OF

	select OF

	select OF_EARLY_FLATTREE

	select OF_RESERVED_MEM

	help

	help

	  Include support for flattened device tree machine descriptions.

	  Include support for flattened device tree machine descriptions.