[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/15] hw/arm: Move various units to softmmu_ss[]
From: |
Laurent Vivier |
Subject: |
[PULL 05/15] hw/arm: Move various units to softmmu_ss[] |
Date: |
Wed, 18 Jan 2023 08:52:24 +0100 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
arm_ss[] units are built twice: once for 32-bit word size and
once for 64-bit. The following units don't require any word
size knowledge and can be moved to softmmu_ss[] (where they
are built once):
- smmu-common.c
- exynos4_boards.c
- bcm2835_peripherals.c
- tosa.c
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230110164406.94366-2-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230112134928.1026006-5-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/arm/meson.build | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index 76d4d650e42e..b03604560392 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -3,7 +3,6 @@ arm_ss.add(files('boot.c'), fdt)
arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c'))
arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c'))
arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c'))
-arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
arm_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c'))
arm_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c'))
arm_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c'))
@@ -19,7 +18,6 @@ arm_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c'))
arm_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c'))
arm_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c'))
arm_ss.add(when: 'CONFIG_SPITZ', if_true: files('spitz.c'))
-arm_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c'))
arm_ss.add(when: 'CONFIG_Z2', if_true: files('z2.c'))
arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c'))
arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c'))
@@ -39,7 +37,7 @@ arm_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c',
'omap2.c'))
arm_ss.add(when: 'CONFIG_STRONGARM', if_true: files('strongarm.c'))
arm_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c',
'cubieboard.c'))
arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c',
'orangepi.c'))
-arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c',
'bcm2836.c', 'raspi.c'))
+arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c'))
arm_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_soc.c'))
arm_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c'))
arm_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c'))
@@ -60,8 +58,13 @@ arm_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c'))
arm_ss.add(when: 'CONFIG_MUSCA', if_true: files('musca.c'))
arm_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c'))
arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c',
'mcimx7d-sabre.c'))
-arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c',
'smmuv3.c'))
+arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c'))
arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c',
'mcimx6ul-evk.c'))
arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c'))
+softmmu_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c'))
+softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
+softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c'))
+softmmu_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c'))
+
hw_arch += {'arm': arm_ss}
--
2.38.1
- [PULL 00/15] Trivial branch for 8.0 patches, Laurent Vivier, 2023/01/18
- [PULL 03/15] hw/intc: Move some files out of the target-specific source set, Laurent Vivier, 2023/01/18
- [PULL 02/15] hw/display: Move omap_lcdc.c out of target-specific source set, Laurent Vivier, 2023/01/18
- [PULL 04/15] hw/tpm: Move tpm_ppi.c out of target-specific source set, Laurent Vivier, 2023/01/18
- [PULL 06/15] hw/cpu: Mark arm11 and realview mpcore as target-independent code, Laurent Vivier, 2023/01/18
- [PULL 05/15] hw/arm: Move various units to softmmu_ss[],
Laurent Vivier <=
- [PULL 09/15] tests/qtest/test-hmp: Improve the check for verbose mode, Laurent Vivier, 2023/01/18
- [PULL 08/15] hw/usb: Mark the XLNX_VERSAL-related files as target-independent, Laurent Vivier, 2023/01/18
- [PULL 07/15] hw/intc: Mark more interrupt-controller files as target independent, Laurent Vivier, 2023/01/18
- [PULL 10/15] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init, Laurent Vivier, 2023/01/18
- [PULL 12/15] hw/pvrdma: Protect against buggy or malicious guest driver, Laurent Vivier, 2023/01/18
- [PULL 11/15] ccid-card-emulated: fix cast warning/error, Laurent Vivier, 2023/01/18
- [PULL 13/15] hw/cxl/cxl-cdat.c: spelling: missmatch, Laurent Vivier, 2023/01/18
- [PULL 14/15] hw/cxl/cxl-host: Fix an error message typo, Laurent Vivier, 2023/01/18
- [PULL 01/15] Call qemu_socketpair() instead of socketpair() when possible, Laurent Vivier, 2023/01/18
- [PULL 15/15] hw/ssi/sifive_spi.c: spelling: reigster, Laurent Vivier, 2023/01/18