Browse Source

arm device-tree option fix

Waldemar Brodkorb 7 years ago
parent
commit
9d6f423bd2
2 changed files with 3 additions and 1 deletions
  1. 2 0
      target/arm/Makefile
  2. 1 1
      target/config/Config.in.archopts

+ 2 - 0
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)

+ 1 - 1
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