summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-03-26 05:17:47 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-03-26 05:17:47 +0200
commit9d6f423bd25d36b5f63c2168fd64e83b8c7ebdbd (patch)
tree68fcc1b6595d859bb93582a881cbaa23466416ca
parent8d1ed6c3936baa1fd9a2088a32040006594a2d33 (diff)
arm device-tree option fix
-rw-r--r--target/arm/Makefile2
-rw-r--r--target/config/Config.in.archopts2
2 files changed, 3 insertions, 1 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile
index efadc88b3..d613e23f3 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -151,6 +151,7 @@ ifeq ($(ADK_TARGET_FS),squashfs)
endif
dtb-install:
+ifeq ($(ADK_TARGET_WITH_DEVICETREE),y)
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y)
env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
dtbs $(MAKE_TRACE)
@@ -197,6 +198,7 @@ endif
[[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/*.dtb $(FW_DIR); \
break; \
done
+endif
# filesystem specific targets
ifeq ($(ADK_TARGET_FS),archive)
diff --git a/target/config/Config.in.archopts b/target/config/Config.in.archopts
index 2094be6e8..aa4926c2a 100644
--- a/target/config/Config.in.archopts
+++ b/target/config/Config.in.archopts
@@ -39,5 +39,5 @@ config ADK_TARGET_NAN_MODE
config ADK_TARGET_WITH_DEVICETREE
bool
depends on ADK_TARGET_ARCH_ARM
- default y if ADK_TARGET_KERNEL_VERSION_4_9
+ default y if !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
default n