From b028a37fdb892fca5c8587b8efe07a2e91df5cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 8 Aug 2019 14:41:58 -0400 Subject: [PATCH] target/arm: Makefile cleanup (softmmu) Group SOFTMMU objects together. Since PSCI is TCG specific, keep it separate. Backports commit b601e0cd78c2c57548a468c6fdb566d514c05b89 from qemu --- qemu/target/arm/Makefile.objs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qemu/target/arm/Makefile.objs b/qemu/target/arm/Makefile.objs index 33a942c5..45bacbd7 100644 --- a/qemu/target/arm/Makefile.objs +++ b/qemu/target/arm/Makefile.objs @@ -1,9 +1,9 @@ obj-y += helper.o vfp_helper.o obj-y += cpu.o -obj-$(CONFIG_SOFTMMU) += psci.o obj-$(TARGET_AARCH64) += cpu64.o unicorn_aarch64.o obj-$(TARGET_ARM) += unicorn_arm.o -obj-y += arm-powerctl.o + +obj-$(CONFIG_SOFTMMU) += arm-powerctl.o DECODETREE = $(SRC_PATH)/scripts/decodetree.py @@ -30,6 +30,8 @@ obj-y += translate.o op_helper.o obj-y += crypto_helper.o obj-y += iwmmxt_helper.o vec_helper.o neon_helper.o +obj-$(CONFIG_SOFTMMU) += psci.o + obj-$(TARGET_AARCH64) += translate-a64.o helper-a64.o obj-$(TARGET_AARCH64) += translate-sve.o sve_helper.o obj-$(TARGET_AARCH64) += pauth_helper.o