diff options
| -rw-r--r-- | target/arm/Makefile | 25 | ||||
| -rw-r--r-- | target/arm/systems/qemu-arm-xilinx-zynq | 1 |
2 files changed, 21 insertions, 5 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 4428214a7..e5c7a3a6d 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -175,18 +175,33 @@ ifeq ($(ADK_TARGET_FS),squashfs) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) endif +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) +VENDOR:=arm/ +endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) +VENDOR:=arm/ +endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) +VENDOR:=arm/ +endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y) +VENDOR:=xilinx/ +endif +endif + dtb-install: ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y) ${KERNEL_MAKE} dtbs $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) - ${KERNEL_MAKE} vexpress-v2p-ca9.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)vexpress-v2p-ca9.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) - ${KERNEL_MAKE} arm-realview-eb-11mp-ctrevb.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)arm-realview-eb-11mp-ctrevb.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) - ${KERNEL_MAKE} versatile-pb.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)versatile-pb.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_WEGA),y) ${KERNEL_MAKE} am335x-wega-rdk.dtb $(MAKE_TRACE) @@ -237,8 +252,8 @@ endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) ${KERNEL_MAKE} dtbs $(MAKE_TRACE) endif - for x in $(LINUX_DIR)/arch/arm/boot/dts/*.dtb; do \ - [[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/*.dtb $(FW_DIR); \ + for x in $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb; do \ + [[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb $(FW_DIR); \ break; \ done diff --git a/target/arm/systems/qemu-arm-xilinx-zynq b/target/arm/systems/qemu-arm-xilinx-zynq index c00543509..08133822a 100644 --- a/target/arm/systems/qemu-arm-xilinx-zynq +++ b/target/arm/systems/qemu-arm-xilinx-zynq @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ bool "Qemu Emulator (Xilinx Zynq)" depends on ADK_TARGET_OS_LINUX select ADK_TARGET_CPU_ARM_CORTEX_A9 + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION |