On Fri, May 15, 2026 at 5:11 PM Philippe Mathieu-Daudé <[email protected]> wrote: > > Commit 064f1ce95fe ("hw/arm/aspeed: Split AST2700 EVB > machine into a separate source file for maintainability") > remove the last TARGET_AARCH64 use. > > Now than Aspeed machines can be filtered when running a > qemu-system-arm or qemu-system-aarch64 binary, we can > compile the aspeed.c file once, moving it from arm_ss[] > source set to arm_common_ss[]. > > Signed-off-by: Philippe Mathieu-Daudé <[email protected]> > Reviewed-by: Pierrick Bouvier <[email protected]> > Reviewed-by: Richard Henderson <[email protected]> > ---
Reviewed-by: Manos Pitsidianakis <[email protected]> > hw/arm/meson.build | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/arm/meson.build b/hw/arm/meson.build > index 144e4827660..7c3d66f4378 100644 > --- a/hw/arm/meson.build > +++ b/hw/arm/meson.build > @@ -43,7 +43,7 @@ arm_common_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: > files('xlnx-versal.c', 'x > arm_common_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', > 'imx25_pdk.c')) > arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', > 'kzm.c')) > arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) > -arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( > +arm_common_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( > 'aspeed.c', > 'aspeed_soc_common.c', > 'aspeed_ast2400.c', > @@ -66,8 +66,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( > 'aspeed_ast2600_gb200nvl.c', > 'aspeed_ast2600_rainier.c', > 'aspeed_ast10x0.c', > - 'aspeed_ast10x0_evb.c')) > -arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: > files( > + 'aspeed_ast10x0_evb.c', > 'aspeed_ast1700.c', > 'aspeed_ast27x0.c', > 'aspeed_ast27x0_evb.c', > -- > 2.53.0 >
