From a3bb6eacbe536f32e3b41d3c67d675bb3a12e48d Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Wed, 12 Aug 2015 10:45:38 +0200 Subject: ARM: socfpga: select OFTREE and OFDEVICE SoCFPGA is completely multi-image enabled and probes the barebox from a built-in DT, so there is no point in building a barebox image that isn't able to probe from DT. Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- arch/arm/Kconfig | 2 ++ arch/arm/configs/socfpga_defconfig | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm') diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d836f66854..203f912e96 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -172,6 +172,8 @@ config ARCH_SOCFPGA select CLKDEV_LOOKUP select GPIOLIB select HAVE_PBL_MULTI_IMAGES + select OFDEVICE if !ARCH_SOCFPGA_XLOAD + select OFTREE if !ARCH_SOCFPGA_XLOAD config ARCH_S3C24xx bool "Samsung S3C2410, S3C2440" diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 414aa23a54..0a31de518d 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -66,7 +66,6 @@ CONFIG_CMD_TIME=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y -CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_NET_DESIGNWARE=y -- cgit v1.2.3